[pkg-wpa-devel] r1457 - /wpasupplicant/trunk/debian/patches/
kelmo-guest at users.alioth.debian.org
kelmo-guest at users.alioth.debian.org
Fri Jan 29 14:22:15 UTC 2010
Author: kelmo-guest
Date: Fri Jan 29 14:22:15 2010
New Revision: 1457
URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1457
Log:
Refresh patches, drop patches applied upstream
Removed:
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/15_wpa_gui_wpa_tab_annoyance.patch
wpasupplicant/trunk/debian/patches/16_wpa_msg_ctrl.patch
wpasupplicant/trunk/debian/patches/19_kfreebsd.patch
Modified:
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/17_wpa_msg_ctrl_wps_ap_avail.patch
wpasupplicant/trunk/debian/patches/18_wpa_gui_wps_ap_avail_annoyance.patch
wpasupplicant/trunk/debian/patches/series
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=1457&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 Fri Jan 29 14:22:15 2010
@@ -6,7 +6,7 @@
--- a/wpa_supplicant/Makefile
+++ b/wpa_supplicant/Makefile
-@@ -631,7 +631,7 @@ ifdef CONFIG_NATIVE_WINDOWS
+@@ -632,7 +632,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=1457&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/05_qmake_version_makefile.patch (original)
+++ wpasupplicant/trunk/debian/patches/05_qmake_version_makefile.patch Fri Jan 29 14:22:15 2010
@@ -7,7 +7,7 @@
--- a/wpa_supplicant/Makefile
+++ b/wpa_supplicant/Makefile
-@@ -1163,13 +1163,13 @@ windows-bin: $(WINALL)
+@@ -1180,13 +1180,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=1457&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/11_syslog.patch (original)
+++ wpasupplicant/trunk/debian/patches/11_syslog.patch Fri Jan 29 14:22:15 2010
@@ -64,7 +64,7 @@
/**
* wpa_printf - conditional printf
* @level: priority level (MSG_*) of the message
-@@ -62,6 +101,11 @@ void wpa_printf(int level, char *fmt, ..
+@@ -62,6 +101,11 @@ void wpa_printf(int level, const char *f
va_start(ap, fmt);
if (level >= wpa_debug_level) {
@@ -76,7 +76,7 @@
wpa_debug_print_timestamp();
#ifdef CONFIG_DEBUG_FILE
if (out_file) {
-@@ -74,6 +118,9 @@ void wpa_printf(int level, char *fmt, ..
+@@ -74,6 +118,9 @@ void wpa_printf(int level, const char *f
#ifdef CONFIG_DEBUG_FILE
}
#endif /* CONFIG_DEBUG_FILE */
@@ -88,7 +88,7 @@
}
--- a/src/utils/wpa_debug.h
+++ b/src/utils/wpa_debug.h
-@@ -205,6 +205,23 @@ enum hostapd_logger_level {
+@@ -221,6 +221,23 @@ enum hostapd_logger_level {
};
@@ -156,7 +156,7 @@
break;
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
-@@ -2016,6 +2016,8 @@ struct wpa_global * wpa_supplicant_init(
+@@ -2047,6 +2047,8 @@ struct wpa_global * wpa_supplicant_init(
return NULL;
wpa_debug_open_file(params->wpa_debug_file_path);
@@ -165,7 +165,7 @@
ret = eap_peer_register_methods();
if (ret) {
-@@ -2166,5 +2168,6 @@ void wpa_supplicant_deinit(struct wpa_gl
+@@ -2197,5 +2199,6 @@ void wpa_supplicant_deinit(struct wpa_gl
os_free(global->params.ctrl_interface);
os_free(global);
@@ -188,7 +188,7 @@
/**
--- a/wpa_supplicant/Makefile
+++ b/wpa_supplicant/Makefile
-@@ -1008,6 +1008,10 @@ ifdef CONFIG_DEBUG_FILE
+@@ -1015,6 +1015,10 @@ ifdef CONFIG_DEBUG_FILE
CFLAGS += -DCONFIG_DEBUG_FILE
endif
Modified: wpasupplicant/trunk/debian/patches/17_wpa_msg_ctrl_wps_ap_avail.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/17_wpa_msg_ctrl_wps_ap_avail.patch?rev=1457&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/17_wpa_msg_ctrl_wps_ap_avail.patch (original)
+++ wpasupplicant/trunk/debian/patches/17_wpa_msg_ctrl_wps_ap_avail.patch Fri Jan 29 14:22:15 2010
@@ -6,7 +6,7 @@
---
--- a/wpa_supplicant/wps_supplicant.c
+++ b/wpa_supplicant/wps_supplicant.c
-@@ -868,12 +868,16 @@ void wpas_wps_notify_scan_results(struct
+@@ -903,12 +903,16 @@ void wpas_wps_notify_scan_results(struct
ie = wpa_scan_get_vendor_ie_multi(bss, WPS_IE_VENDOR_TYPE);
if (!ie)
continue;
@@ -23,7 +23,7 @@
+ wpa_printf(MSG_DEBUG, WPS_EVENT_AP_AVAILABLE_PIN);
+ wpa_msg_ctrl(wpa_s, MSG_INFO, WPS_EVENT_AP_AVAILABLE_PIN);
+ } else {
-+ wpa_printf(MSG_DEBUG, WPS_EVENT_AP_AVAILABLE_PIN);
++ wpa_printf(MSG_DEBUG, WPS_EVENT_AP_AVAILABLE);
+ wpa_msg_ctrl(wpa_s, MSG_INFO, WPS_EVENT_AP_AVAILABLE);
+ }
wpabuf_free(ie);
Modified: wpasupplicant/trunk/debian/patches/18_wpa_gui_wps_ap_avail_annoyance.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/18_wpa_gui_wps_ap_avail_annoyance.patch?rev=1457&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/18_wpa_gui_wps_ap_avail_annoyance.patch (original)
+++ wpasupplicant/trunk/debian/patches/18_wpa_gui_wps_ap_avail_annoyance.patch Fri Jan 29 14:22:15 2010
@@ -6,7 +6,7 @@
---
--- a/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
+++ b/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
-@@ -853,9 +853,6 @@ void WpaGui::processMsg(char *msg)
+@@ -855,9 +855,6 @@ void WpaGui::processMsg(char *msg)
QTimer::singleShot(5 * 1000, this, SLOT(showTrayStatus()));
stopWpsRun(true);
} else if (str_match(pos, WPS_EVENT_AP_AVAILABLE_PBC)) {
@@ -16,7 +16,7 @@
wpsStatusText->setText("WPS AP in active PBC mode found");
if (textStatus->text() == "INACTIVE" ||
textStatus->text() == "DISCONNECTED")
-@@ -863,23 +860,14 @@ void WpaGui::processMsg(char *msg)
+@@ -865,23 +862,14 @@ void WpaGui::processMsg(char *msg)
wpsInstructions->setText("Press the PBC button on the screen "
"to start registration");
} else if (str_match(pos, WPS_EVENT_AP_AVAILABLE_PIN)) {
Modified: wpasupplicant/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/series?rev=1457&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/series (original)
+++ wpasupplicant/trunk/debian/patches/series Fri Jan 29 14:22:15 2010
@@ -4,11 +4,5 @@
06_wpa_gui_menu_exec_path.patch
07_dbus_service_syslog.patch
11_syslog.patch
-12_wpa_supplicant_dont_force_disconnect_in_adhoc_mode.patch
-13_deauthenticate_fixup.patch
-14_start_and_finish_with_clean_slate.patch
-15_wpa_gui_wpa_tab_annoyance.patch
-16_wpa_msg_ctrl.patch
17_wpa_msg_ctrl_wps_ap_avail.patch
18_wpa_gui_wps_ap_avail_annoyance.patch
-19_kfreebsd.patch
More information about the Pkg-wpa-devel
mailing list