← Back to branch summary

~ubuntu-branches/ubuntu/lucid/wpasupplicant/lucid-updates

« back to all changes in this revision

Viewing changes to debian/patches/11_update_config_fix.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Kel Modderman
  • Date: 2006-10-05 08:04:01 UTC
  • mfrom: (1.1.5 upstream) (3 etch)
  • mto: This revision was merged to the branch mainline in revision 4.
  • Revision ID: james.westby@ubuntu.com-20061005080401-r8lqlix4390yos7b
Tags: 0.5.5-2
http://bugs.debian.org/388316
* Update madwifi headers to latest SVN. (Closes: #388316)
* Remove failed attempt at action locking. [debian/functions.sh,
  debian/wpa_action.sh]
* Add hysteresis checking functions, to avoid "event loops" while
  using wpa-roam. [debian/functions.sh, debian/wpa_action.sh]
* Change of co-maintainer email address.
* Add ishex() function to functions.sh to determine wpa-psk value type in
  plaintext or hex. This effectively eliminates the need for the bogus and
  somewhat confusing wpa-passphrase contruct specific to our scripts and
  allows wpa-psk to work with either a 8 to 63 character long plaintext
  string or 64 character long hex string.
* Adjust README.modes to not refer to the redundant wpa-passphrase stuff.
* Add big fat NOTE about acceptable wpa-psk's to top of example gallery.
* Strip surrounding quotes from wpa-ssid if present, instead of just whining
  about them.
* Update email address in copyright blurb of functions.sh, ifupdown.sh and
  wpa_action.sh.  

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/11_update_config_fix.dpatch
1
 
#! /bin/sh /usr/share/dpatch/dpatch-run
2
 
## update_config_fix.patch by Kel Modderman <kelrin@tpg.com.au>
3
 
##
4
 
## All lines beginning with `## DP:' are a description of the patch.
5
 
## DP: Fixed writing of stakey, peerkey, and id_str network configuration
6
 
## DP: variables into the configuration file (update_confi=1).
7
 
 
8
 
@DPATCH@
9
 
diff -Nrup wpa_supplicant-0.5.4/config_file.c wpa_supplicant-0.5.4.update_config/config_file.c
10
 
--- wpa_supplicant-0.5.4/config_file.c  2006-06-01 12:29:31.000000000 +1000
11
 
+++ wpa_supplicant-0.5.4.update_config/config_file.c    2006-08-03 15:41:06.000000000 +1000
12
 
@@ -623,6 +623,9 @@ static void wpa_config_write_network(FIL
13
 
        INT(mode);
14
 
        INT(proactive_key_caching);
15
 
        INT(disabled);
16
 
+       INT(stakey);
17
 
+       INT(peerkey);
18
 
+       STR(id_str);
19
 
 
20
 
 #undef STR
21
 
 #undef INT
22
 
diff -Nrup wpa_supplicant-0.5.4/config_winreg.c wpa_supplicant-0.5.4.update_config/config_winreg.c
23
 
--- wpa_supplicant-0.5.4/config_winreg.c        2006-06-01 12:29:31.000000000 +1000
24
 
+++ wpa_supplicant-0.5.4.update_config/config_winreg.c  2006-08-03 15:41:22.000000000 +1000
25
 
@@ -745,6 +745,9 @@ static int wpa_config_write_network(HKEY
26
 
        INT(mode);
27
 
        INT(proactive_key_caching);
28
 
        INT(disabled);
29
 
+       INT(stakey);
30
 
+       INT(peerkey);
31
 
+       STR(id_str);
32
 
 
33
 
 #undef STR
34
 
 #undef INT