[pkg-wpa-devel] r1436 - in /wpasupplicant/trunk/debian: ./ patches/
kelmo-guest at users.alioth.debian.org
kelmo-guest at users.alioth.debian.org
Sun Nov 8 09:40:36 UTC 2009
Author: kelmo-guest
Date: Sun Nov 8 09:40:36 2009
New Revision: 1436
URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1436
Log:
* Drop debian/patches/10_multi_driver.patch due to its invasiveness -
it may make future patches which fix serious issues harder to apply
while providing an experimental feture only.
* Refresh patch series and fix rejects due to removal of
debian/patches/10_multi_driver.patch from series.
Modified:
wpasupplicant/trunk/debian/changelog
wpasupplicant/trunk/debian/patches/01_use_pkg-config_for_pcsc-lite_module.patch
wpasupplicant/trunk/debian/patches/05_qmake_version_makefile.patch
wpasupplicant/trunk/debian/patches/11_syslog.patch
wpasupplicant/trunk/debian/patches/12_wpa_supplicant_dont_force_disconnect_in_adhoc_mode.patch
wpasupplicant/trunk/debian/patches/13_deauthenticate_fixup.patch
wpasupplicant/trunk/debian/patches/14_start_and_finish_with_clean_slate.patch
wpasupplicant/trunk/debian/patches/series
Modified: wpasupplicant/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/changelog?rev=1436&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Sun Nov 8 09:40:36 2009
@@ -38,8 +38,13 @@
* wpa_action shell functions no longer require an ifupdown state file
to function as future providers of ifup/ifdown may not need or
provide it.
-
- -- Kel Modderman <kel at otaku42.de> Sun, 08 Nov 2009 16:56:09 +1000
+ * Drop debian/patches/10_multi_driver.patch due to its invasiveness -
+ it may make future patches which fix serious issues harder to apply
+ while providing an experimental feture only.
+ * Refresh patch series and fix rejects due to removal of
+ debian/patches/10_multi_driver.patch from series.
+
+ -- Kel Modderman <kel at otaku42.de> Sun, 08 Nov 2009 17:14:11 +1000
wpasupplicant (0.6.9-3) unstable; urgency=low
Modified: wpasupplicant/trunk/debian/patches/01_use_pkg-config_for_pcsc-lite_module.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/01_use_pkg-config_for_pcsc-lite_module.patch?rev=1436&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/01_use_pkg-config_for_pcsc-lite_module.patch (original)
+++ wpasupplicant/trunk/debian/patches/01_use_pkg-config_for_pcsc-lite_module.patch Sun Nov 8 09:40:36 2009
@@ -6,7 +6,7 @@
--- a/wpa_supplicant/Makefile
+++ b/wpa_supplicant/Makefile
-@@ -627,7 +627,7 @@ ifdef CONFIG_NATIVE_WINDOWS
+@@ -631,7 +631,7 @@ ifdef CONFIG_NATIVE_WINDOWS
#dynamic symbol loading that is now used in pcsc_funcs.c
#LIBS += -lwinscard
else
Modified: wpasupplicant/trunk/debian/patches/05_qmake_version_makefile.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/05_qmake_version_makefile.patch?rev=1436&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/05_qmake_version_makefile.patch (original)
+++ wpasupplicant/trunk/debian/patches/05_qmake_version_makefile.patch Sun Nov 8 09:40:36 2009
@@ -7,7 +7,7 @@
--- a/wpa_supplicant/Makefile
+++ b/wpa_supplicant/Makefile
-@@ -1160,13 +1160,13 @@ windows-bin: $(WINALL)
+@@ -1163,13 +1163,13 @@ windows-bin: $(WINALL)
$(STRIP) $(WINALL)
wpa_gui/Makefile:
Modified: wpasupplicant/trunk/debian/patches/11_syslog.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/11_syslog.patch?rev=1436&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/11_syslog.patch (original)
+++ wpasupplicant/trunk/debian/patches/11_syslog.patch Sun Nov 8 09:40:36 2009
@@ -123,51 +123,17 @@
"[-g<global ctrl>] \\\n"
" -i<ifname> -c<config file> [-C<ctrl>] [-D<driver>] "
"[-p<driver_param>] \\\n"
-@@ -52,27 +52,32 @@ static void usage(void)
- " -C = ctrl_interface parameter (only used if -c is not)\n"
- " -i = interface name\n"
- " -d = increase debugging verbosity (-dd even more)\n"
-- " -D = driver name (can be multiple drivers: nl80211,wext)\n"
-+ " -D = driver name (can be multiple drivers: nl80211,wext)\n");
- #ifdef CONFIG_DEBUG_FILE
-- " -f = log output to debug file instead of stdout\n"
-+ printf(" -f = log output to debug file instead of stdout\n");
+@@ -57,6 +57,9 @@ static void usage(void)
+ " -f = log output to debug file instead of stdout\n"
#endif /* CONFIG_DEBUG_FILE */
-- " -g = global ctrl_interface\n"
-- " -K = include keys (passwords, etc.) in debug output\n"
-- " -t = include timestamp in debug messages\n"
-+ printf(" -g = global ctrl_interface\n"
-+ " -K = include keys (passwords, etc.) in debug output\n");
-+#ifdef CONFIG_DEBUG_SYSLOG
-+ printf(" -s = log output to syslog instead of stdout\n");
-+#endif /* CONFIG_DEBUG_SYSLOG */
-+ printf(" -t = include timestamp in debug messages\n"
+ " -g = global ctrl_interface\n"
++#ifdef CONFIG_DEBUG_SYSLOG
++ " -s = log output to syslog instead of stdout\n"
++#endif /* CONFIG_DEBUG_SYSLOG */
+ " -K = include keys (passwords, etc.) in debug output\n"
+ " -t = include timestamp in debug messages\n"
" -h = show this help text\n"
-- " -L = show license (GPL and BSD)\n");
-- printf(" -p = driver parameters\n"
-+ " -L = show license (GPL and BSD)\n"
-+ " -p = driver parameters\n"
- " -P = PID file\n"
-- " -q = decrease debugging verbosity (-qq even less)\n"
-+ " -q = decrease debugging verbosity (-qq even less)\n");
- #ifdef CONFIG_CTRL_IFACE_DBUS
-- " -u = enable DBus control interface\n"
-+ printf(" -u = enable DBus control interface\n");
- #endif /* CONFIG_CTRL_IFACE_DBUS */
-- " -v = show version\n"
-+ printf(" -v = show version\n"
- " -W = wait for a control interface monitor before starting\n"
- " -N = start describing new interface\n");
-
- printf("example:\n"
-- " wpa_supplicant -Dwext -iwlan0 -c/etc/wpa_supplicant.conf\n");
-+ " wpa_supplicant -D%s -iwlan0 -c/etc/wpa_supplicant.conf\n",
-+ wpa_supplicant_drivers[i] ?
-+ wpa_supplicant_drivers[i]->name : "wext");
- #endif /* CONFIG_NO_STDOUT_DEBUG */
- }
-
-@@ -133,7 +138,7 @@ int main(int argc, char *argv[])
+@@ -133,7 +136,7 @@ int main(int argc, char *argv[])
wpa_supplicant_fd_workaround();
for (;;) {
@@ -176,7 +142,7 @@
if (c < 0)
break;
switch (c) {
-@@ -194,6 +199,11 @@ int main(int argc, char *argv[])
+@@ -194,6 +197,11 @@ int main(int argc, char *argv[])
case 'q':
params.wpa_debug_level++;
break;
@@ -190,7 +156,7 @@
break;
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
-@@ -2024,6 +2024,8 @@ struct wpa_global * wpa_supplicant_init(
+@@ -2016,6 +2016,8 @@ struct wpa_global * wpa_supplicant_init(
return NULL;
wpa_debug_open_file(params->wpa_debug_file_path);
@@ -199,7 +165,7 @@
ret = eap_peer_register_methods();
if (ret) {
-@@ -2174,5 +2176,6 @@ void wpa_supplicant_deinit(struct wpa_gl
+@@ -2166,5 +2168,6 @@ void wpa_supplicant_deinit(struct wpa_gl
os_free(global->params.ctrl_interface);
os_free(global);
Modified: wpasupplicant/trunk/debian/patches/12_wpa_supplicant_dont_force_disconnect_in_adhoc_mode.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/12_wpa_supplicant_dont_force_disconnect_in_adhoc_mode.patch?rev=1436&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/12_wpa_supplicant_dont_force_disconnect_in_adhoc_mode.patch (original)
+++ wpasupplicant/trunk/debian/patches/12_wpa_supplicant_dont_force_disconnect_in_adhoc_mode.patch Sun Nov 8 09:40:36 2009
@@ -13,7 +13,7 @@
--- a/src/drivers/driver_wext.c
+++ b/src/drivers/driver_wext.c
-@@ -1914,21 +1914,36 @@ static int wpa_driver_wext_mlme(struct w
+@@ -1900,21 +1900,36 @@ static int wpa_driver_wext_mlme(struct w
static void wpa_driver_wext_disconnect(struct wpa_driver_wext_data *drv)
{
Modified: wpasupplicant/trunk/debian/patches/13_deauthenticate_fixup.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/13_deauthenticate_fixup.patch?rev=1436&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/13_deauthenticate_fixup.patch (original)
+++ wpasupplicant/trunk/debian/patches/13_deauthenticate_fixup.patch Sun Nov 8 09:40:36 2009
@@ -14,7 +14,7 @@
--- a/src/drivers/driver_wext.c
+++ b/src/drivers/driver_wext.c
-@@ -1953,8 +1953,8 @@ static int wpa_driver_wext_deauthenticat
+@@ -1939,8 +1939,8 @@ static int wpa_driver_wext_deauthenticat
struct wpa_driver_wext_data *drv = priv;
int ret;
wpa_printf(MSG_DEBUG, "%s", __FUNCTION__);
Modified: wpasupplicant/trunk/debian/patches/14_start_and_finish_with_clean_slate.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/14_start_and_finish_with_clean_slate.patch?rev=1436&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/14_start_and_finish_with_clean_slate.patch (original)
+++ wpasupplicant/trunk/debian/patches/14_start_and_finish_with_clean_slate.patch Sun Nov 8 09:40:36 2009
@@ -17,12 +17,12 @@
@@ -35,6 +35,7 @@
static int wpa_driver_wext_flush_pmkid(void *priv);
static int wpa_driver_wext_get_range(void *priv);
- static int wpa_driver_wext_finish_drv_init(struct wpa_driver_wext_data *drv);
+ static void wpa_driver_wext_finish_drv_init(struct wpa_driver_wext_data *drv);
+static void wpa_driver_wext_disconnect(struct wpa_driver_wext_data *drv);
static int wpa_driver_wext_send_oper_ifla(struct wpa_driver_wext_data *drv,
-@@ -994,6 +995,13 @@ static int wpa_driver_wext_finish_drv_in
+@@ -982,6 +983,13 @@ static void wpa_driver_wext_finish_drv_i
wpa_driver_wext_get_range(drv);
@@ -36,7 +36,7 @@
drv->ifindex = if_nametoindex(drv->ifname);
if (os_strncmp(drv->ifname, "wlan", 4) == 0) {
-@@ -1035,8 +1043,7 @@ void wpa_driver_wext_deinit(void *priv)
+@@ -1021,8 +1029,7 @@ void wpa_driver_wext_deinit(void *priv)
* Clear possibly configured driver parameters in order to make it
* easier to use the driver after wpa_supplicant has been terminated.
*/
Modified: wpasupplicant/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/series?rev=1436&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/series (original)
+++ wpasupplicant/trunk/debian/patches/series Sun Nov 8 09:40:36 2009
@@ -3,7 +3,6 @@
05_qmake_version_makefile.patch
06_wpa_gui_menu_exec_path.patch
07_dbus_service_syslog.patch
-10_multi_driver.patch
11_syslog.patch
12_wpa_supplicant_dont_force_disconnect_in_adhoc_mode.patch
13_deauthenticate_fixup.patch
More information about the Pkg-wpa-devel
mailing list