[pkg-wpa-devel] r1253 - in /wpasupplicant/trunk/debian: changelog patches/01_use_pkg-config_for_pcsc-lite_module.patch patches/05_qmake_version_makefile.patch patches/06_fix_segfault_32bit_compat_ioctls.patch patches/08_only_use_cached_scan_results_if_nonempty.patch
kelmo-guest at users.alioth.debian.org
kelmo-guest at users.alioth.debian.org
Wed Sep 24 16:58:52 UTC 2008
Author: kelmo-guest
Date: Wed Sep 24 16:58:52 2008
New Revision: 1253
URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1253
Log:
Refresh patch series to apply without offset.
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/06_fix_segfault_32bit_compat_ioctls.patch
wpasupplicant/trunk/debian/patches/08_only_use_cached_scan_results_if_nonempty.patch
Modified: wpasupplicant/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/changelog?rev=1253&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Wed Sep 24 16:58:52 2008
@@ -28,8 +28,9 @@
userspace:
- 07_restore_scanreq_if_initassoc_failed.patch
- 08_only_use_cached_scan_results_if_nonempty.patch
-
- -- Kel Modderman <kel at otaku42.de> Thu, 25 Sep 2008 02:54:04 +1000
+ * Refresh patch series to apply without offset.
+
+ -- Kel Modderman <kel at otaku42.de> Thu, 25 Sep 2008 02:58:41 +1000
wpasupplicant (0.6.4-2) 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=1253&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 Wed Sep 24 16:58:52 2008
@@ -6,7 +6,7 @@
--- a/wpa_supplicant/Makefile
+++ b/wpa_supplicant/Makefile
-@@ -568,7 +568,7 @@
+@@ -571,7 +571,7 @@
#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=1253&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/05_qmake_version_makefile.patch (original)
+++ wpasupplicant/trunk/debian/patches/05_qmake_version_makefile.patch Wed Sep 24 16:58:52 2008
@@ -7,7 +7,7 @@
--- a/wpa_supplicant/Makefile
+++ b/wpa_supplicant/Makefile
-@@ -1076,13 +1076,13 @@
+@@ -1079,13 +1079,13 @@
$(STRIP) $(WINALL)
wpa_gui/Makefile:
Modified: wpasupplicant/trunk/debian/patches/06_fix_segfault_32bit_compat_ioctls.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/06_fix_segfault_32bit_compat_ioctls.patch?rev=1253&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/06_fix_segfault_32bit_compat_ioctls.patch (original)
+++ wpasupplicant/trunk/debian/patches/06_fix_segfault_32bit_compat_ioctls.patch Wed Sep 24 16:58:52 2008
@@ -21,11 +21,9 @@
with incorrect compat-ioctl processing.
---
-diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
-index 45e3e1f..98dddd6 100644
--- a/src/drivers/driver_nl80211.c
+++ b/src/drivers/driver_nl80211.c
-@@ -1618,6 +1618,9 @@ static void wext_get_scan_iwevgenie(struct iw_event *iwe,
+@@ -1252,6 +1252,9 @@
char *genie, *gpos, *gend;
u8 *tmp;
@@ -35,7 +33,7 @@
gpos = genie = custom;
gend = genie + iwe->u.data.length;
if (gend > end) {
-@@ -1650,7 +1653,7 @@ static void wext_get_scan_custom(struct iw_event *iwe,
+@@ -1284,7 +1287,7 @@
int bytes;
spos = custom + 7;
bytes = custom + clen - spos;
@@ -44,7 +42,7 @@
return;
bytes /= 2;
tmp = os_realloc(res->ie, res->ie_len + bytes);
-@@ -1664,7 +1667,7 @@ static void wext_get_scan_custom(struct iw_event *iwe,
+@@ -1298,7 +1301,7 @@
int bytes;
spos = custom + 7;
bytes = custom + clen - spos;
@@ -53,11 +51,9 @@
return;
bytes /= 2;
tmp = os_realloc(res->ie, res->ie_len + bytes);
-diff --git a/src/drivers/driver_wext.c b/src/drivers/driver_wext.c
-index 6aac427..a3c4733 100644
--- a/src/drivers/driver_wext.c
+++ b/src/drivers/driver_wext.c
-@@ -1447,6 +1447,9 @@ static void wext_get_scan_iwevgenie(struct iw_event *iwe,
+@@ -1447,6 +1447,9 @@
char *genie, *gpos, *gend;
u8 *tmp;
@@ -67,7 +63,7 @@
gpos = genie = custom;
gend = genie + iwe->u.data.length;
if (gend > end) {
-@@ -1479,7 +1482,7 @@ static void wext_get_scan_custom(struct iw_event *iwe,
+@@ -1479,7 +1482,7 @@
int bytes;
spos = custom + 7;
bytes = custom + clen - spos;
@@ -76,7 +72,7 @@
return;
bytes /= 2;
tmp = os_realloc(res->ie, res->ie_len + bytes);
-@@ -1493,7 +1496,7 @@ static void wext_get_scan_custom(struct iw_event *iwe,
+@@ -1493,7 +1496,7 @@
int bytes;
spos = custom + 7;
bytes = custom + clen - spos;
Modified: wpasupplicant/trunk/debian/patches/08_only_use_cached_scan_results_if_nonempty.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/08_only_use_cached_scan_results_if_nonempty.patch?rev=1253&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/08_only_use_cached_scan_results_if_nonempty.patch (original)
+++ wpasupplicant/trunk/debian/patches/08_only_use_cached_scan_results_if_nonempty.patch Wed Sep 24 16:58:52 2008
@@ -11,11 +11,9 @@
processing from listeners for no gain.
---
-diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c
-index 0f9b338..04e3152 100644
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
-@@ -551,9 +551,18 @@ static void wpa_supplicant_event_scan_results(struct wpa_supplicant *wpa_s)
+@@ -548,9 +548,18 @@
goto req_scan;
}
More information about the Pkg-wpa-devel
mailing list