diff options
| author | Michael Biebl <biebl@debian.org> | 2007-03-03 02:55:22 +0000 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2007-03-03 02:55:22 +0000 |
| commit | b2f669e84c3cf0ab1ec1b9c29c877dcb80aa20b9 (patch) | |
| tree | d6060cf4e58f21780aced8dd81a704e2ffbcb5e3 | |
| parent | 97e0f5b21486b4759830beb09f45c53db6c96b5f (diff) | |
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
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/patches/13-wep_capabilities.patch | 21 |
3 files changed, 29 insertions, 2 deletions
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 <biebl@debian.org> 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) |