Hello community, here is the log from the commit of package wpa_supplicant checked in at Mon Aug 4 13:02:44 CEST 2008. -------- --- wpa_supplicant/wpa_supplicant.changes 2008-05-05 09:52:58.000000000 +0200 +++ /mounts/work_src_done/STABLE/wpa_supplicant/wpa_supplicant.changes 2008-08-04 12:53:59.804238000 +0200 @@ -1,0 +2,7 @@ +Mon Aug 4 12:33:10 CEST 2008 - hschaa@suse.de + +- Remove patches that are already upstream +- Rebase patches to new version +- Update to 0.6.3 + +------------------------------------------------------------------- Old: ---- wpa_supplicant-0.5.10.tar.bz2 wpa_supplicant-assoc-timeout.patch wpa_supplicant-fix-deprecated-dbus-function.patch New: ---- wpa_supplicant-0.6.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wpa_supplicant.spec ++++++ --- /var/tmp/diff_new_pack.h10615/_old 2008-08-04 13:02:32.000000000 +0200 +++ /var/tmp/diff_new_pack.h10615/_new 2008-08-04 13:02:32.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package wpa_supplicant (Version 0.5.10) +# spec file for package wpa_supplicant (Version 0.6.3) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -17,8 +17,8 @@ BuildRequires: madwifi-devel %endif Url: http://hostap.epitest.fi/wpa_supplicant/ -Version: 0.5.10 -Release: 26 +Version: 0.6.3 +Release: 1 License: BSD 3-Clause; GPL v2 or later Group: Productivity/Networking/Other Summary: WPA supplicant implementation @@ -26,13 +26,11 @@ Source1: config Source2: %{name}.conf Source3: fi.epitest.hostap.WPASupplicant.service -Patch0: wpa_supplicant-assoc-timeout.patch -Patch1: wpa_supplicant-driver-wext-debug.patch -Patch3: wpa_supplicant-fix-deprecated-dbus-function.patch -Patch5: wpa_supplicant-flush-debug-output.patch -Patch6: wpa_supplicant-sigusr1-changes-debuglevel.patch -Patch8: wpa_supplicant-dbus-iface-segfault-fix.patch -Patch9: wpa_supplicant-errormsg.patch +Patch0: wpa_supplicant-driver-wext-debug.patch +Patch1: wpa_supplicant-flush-debug-output.patch +Patch2: wpa_supplicant-sigusr1-changes-debuglevel.patch +Patch3: wpa_supplicant-dbus-iface-segfault-fix.patch +Patch4: wpa_supplicant-errormsg.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -65,18 +63,17 @@ %prep %setup -n wpa_supplicant-%{version} -cp %{SOURCE1} .config -%patch0 -p1 -%patch1 -p1 -%patch3 -p1 -%patch5 -p1 -%patch6 -p1 -%patch8 -p1 -%patch9 +cp %{SOURCE1} wpa_supplicant/.config +%patch0 -p2 +%patch1 -p2 +%patch2 -p2 +%patch3 -p2 +%patch4 -p2 %build +cd wpa_supplicant %ifarch %ix86 x86_64 -echo CONFIG_DRIVER_MADWIFI=y >>.config +echo CONFIG_DRIVER_MADWIFI=y >> .config echo "CFLAGS += -I/usr/include/madwifi" >> .config %endif CFLAGS="$RPM_OPT_FLAGS" make %{?jobs:-j%jobs} @@ -86,24 +83,24 @@ %install install -d %{buildroot}/%{_sbindir} -install -m 0755 wpa_cli %{buildroot}%{_sbindir} -install -m 0755 wpa_passphrase %{buildroot}%{_sbindir} -install -m 0755 wpa_supplicant %{buildroot}%{_sbindir} +install -m 0755 wpa_supplicant/wpa_cli %{buildroot}%{_sbindir} +install -m 0755 wpa_supplicant/wpa_passphrase %{buildroot}%{_sbindir} +install -m 0755 wpa_supplicant/wpa_supplicant %{buildroot}%{_sbindir} install -d %{buildroot}%{_sysconfdir}/dbus-1/system.d -install -m 0644 dbus-wpa_supplicant.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/wpa_supplicant.conf +install -m 0644 wpa_supplicant/dbus-wpa_supplicant.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/wpa_supplicant.conf install -d %{buildroot}/%{_sysconfdir}/%{name} install -m 0600 %{SOURCE2} %{buildroot}/%{_sysconfdir}/%{name} install -d %{buildroot}/%{_datadir}/dbus-1/system-services install -m 0644 %{SOURCE3} %{buildroot}/%{_datadir}/dbus-1/system-services install -d %{buildroot}/%{_localstatedir}/run/%{name} install -d %{buildroot}%{_mandir}/man{5,8} -install -m 0644 doc/docbook/*.8 %{buildroot}%{_mandir}/man8 -install -m 0644 doc/docbook/*.5 %{buildroot}%{_mandir}/man5 -install -m 755 wpa_gui-qt4/wpa_gui %{buildroot}%{_sbindir} +install -m 0644 wpa_supplicant/doc/docbook/*.8 %{buildroot}%{_mandir}/man8 +install -m 0644 wpa_supplicant/doc/docbook/*.5 %{buildroot}%{_mandir}/man5 +install -m 755 wpa_supplicant/wpa_gui-qt4/wpa_gui %{buildroot}%{_sbindir} %files %defattr(-,root,root) -%doc ChangeLog COPYING README todo.txt doc/wpa_supplicant.fig examples wpa_supplicant.conf +%doc wpa_supplicant/ChangeLog COPYING README wpa_supplicant/todo.txt wpa_supplicant/doc/wpa_supplicant.fig wpa_supplicant/examples wpa_supplicant/wpa_supplicant.conf %{_sbindir}/wpa_cli %{_sbindir}/wpa_passphrase %{_sbindir}/wpa_supplicant @@ -120,6 +117,10 @@ /usr/sbin/wpa_gui %changelog +* Mon Aug 04 2008 hschaa@suse.de +- Remove patches that are already upstream +- Rebase patches to new version +- Update to 0.6.3 * Mon May 05 2008 schwab@suse.de - Fix mangled error message. * Mon Mar 17 2008 hschaa@suse.de ++++++ wpa_supplicant-0.5.10.tar.bz2 -> wpa_supplicant-0.6.3.tar.bz2 ++++++ ++++ 283361 lines of diff (skipped) ++++++ wpa_supplicant-dbus-iface-segfault-fix.patch ++++++ --- /var/tmp/diff_new_pack.h10615/_old 2008-08-04 13:02:35.000000000 +0200 +++ /var/tmp/diff_new_pack.h10615/_new 2008-08-04 13:02:35.000000000 +0200 @@ -1,8 +1,7 @@ -Index: wpa_supplicant-0.5.8/wpa_supplicant.c -=================================================================== ---- wpa_supplicant-0.5.8.orig/wpa_supplicant.c -+++ wpa_supplicant-0.5.8/wpa_supplicant.c -@@ -2363,7 +2363,8 @@ static void wpa_supplicant_deinit_iface( +diff -ur BUILD/wpa_supplicant-0.6.3/wpa_supplicant/wpa_supplicant.c BUILD2/wpa_supplicant-0.6.3/wpa_supplicant/wpa_supplicant.c +--- BUILD/wpa_supplicant-0.6.3/wpa_supplicant/wpa_supplicant.c 2008-08-04 11:45:40.000000000 +0200 ++++ BUILD2/wpa_supplicant-0.6.3/wpa_supplicant/wpa_supplicant.c 2008-08-04 11:45:24.000000000 +0200 +@@ -1818,7 +1818,8 @@ wpa_clear_keys(wpa_s, NULL); } ++++++ wpa_supplicant-driver-wext-debug.patch ++++++ --- /var/tmp/diff_new_pack.h10615/_old 2008-08-04 13:02:35.000000000 +0200 +++ /var/tmp/diff_new_pack.h10615/_new 2008-08-04 13:02:35.000000000 +0200 @@ -1,8 +1,7 @@ -Index: wpa_supplicant-0.5.8/driver_wext.c -=================================================================== ---- wpa_supplicant-0.5.8.orig/driver_wext.c -+++ wpa_supplicant-0.5.8/driver_wext.c -@@ -1803,20 +1803,32 @@ wpa_driver_wext_associate(void *priv, +diff -ur BUILD/wpa_supplicant-0.6.3/src/drivers/driver_wext.c BUILD2/wpa_supplicant-0.6.3/src/drivers/driver_wext.c +--- BUILD/wpa_supplicant-0.6.3/src/drivers/driver_wext.c 2008-02-23 03:45:24.000000000 +0100 ++++ BUILD2/wpa_supplicant-0.6.3/src/drivers/driver_wext.c 2008-08-04 11:20:37.000000000 +0200 +@@ -2069,20 +2069,32 @@ */ if (drv->auth_alg_fallback && wpa_driver_wext_auth_alg_fallback(drv, params) < 0) @@ -34,8 +33,8 @@ +} if (params->wpa_ie == NULL || params->wpa_ie_len == 0) value = IW_AUTH_WPA_VERSION_DISABLED; - else if (params->wpa_ie[0] == RSN_INFO_ELEM) -@@ -1825,26 +1837,41 @@ wpa_driver_wext_associate(void *priv, + else if (params->wpa_ie[0] == WLAN_EID_RSN) +@@ -2091,26 +2103,41 @@ value = IW_AUTH_WPA_VERSION_WPA; if (wpa_driver_wext_set_auth_param(drv, IW_AUTH_WPA_VERSION, value) < 0) @@ -77,7 +76,7 @@ /* Allow unencrypted EAPOL messages even if pairwise keys are set when * not using WPA. IEEE 802.1X specifies that these frames are not -@@ -1858,14 +1885,26 @@ wpa_driver_wext_associate(void *priv, +@@ -2124,14 +2151,26 @@ if (wpa_driver_wext_set_auth_param(drv, IW_AUTH_RX_UNENCRYPTED_EAPOL, allow_unencrypted_eapol) < 0) @@ -104,7 +103,7 @@ return ret; } -@@ -1890,6 +1929,8 @@ static int wpa_driver_wext_set_auth_alg( +@@ -2156,6 +2195,8 @@ res = wpa_driver_wext_set_auth_param(drv, IW_AUTH_80211_AUTH_ALG, algs); drv->auth_alg_fallback = res == -2; ++++++ wpa_supplicant-errormsg.patch ++++++ --- /var/tmp/diff_new_pack.h10615/_old 2008-08-04 13:02:35.000000000 +0200 +++ /var/tmp/diff_new_pack.h10615/_new 2008-08-04 13:02:35.000000000 +0200 @@ -1,6 +1,7 @@ ---- driver_wext.c -+++ driver_wext.c -@@ -154,10 +154,12 @@ static int wpa_driver_wext_set_auth_para +diff -ur BUILD/wpa_supplicant-0.6.3/src/drivers/driver_wext.c BUILD2/wpa_supplicant-0.6.3/src/drivers/driver_wext.c +--- BUILD/wpa_supplicant-0.6.3/src/drivers/driver_wext.c 2008-08-04 11:49:26.000000000 +0200 ++++ BUILD2/wpa_supplicant-0.6.3/src/drivers/driver_wext.c 2008-08-04 11:49:11.000000000 +0200 +@@ -251,10 +251,12 @@ iwr.u.param.value = value; if (ioctl(drv->ioctl_sock, SIOCSIWAUTH, &iwr) < 0) { ++++++ wpa_supplicant-flush-debug-output.patch ++++++ --- /var/tmp/diff_new_pack.h10615/_old 2008-08-04 13:02:35.000000000 +0200 +++ /var/tmp/diff_new_pack.h10615/_new 2008-08-04 13:02:35.000000000 +0200 @@ -1,8 +1,7 @@ -Index: wpa_supplicant-0.5.8/common.c -=================================================================== ---- wpa_supplicant-0.5.8.orig/common.c -+++ wpa_supplicant-0.5.8/common.c -@@ -157,6 +157,7 @@ void wpa_debug_print_timestamp(void) +diff -ur BUILD/wpa_supplicant-0.6.3/src/utils/wpa_debug.c BUILD2/wpa_supplicant-0.6.3/src/utils/wpa_debug.c +--- BUILD/wpa_supplicant-0.6.3/src/utils/wpa_debug.c 2008-02-23 03:45:24.000000000 +0100 ++++ BUILD2/wpa_supplicant-0.6.3/src/utils/wpa_debug.c 2008-08-04 11:39:05.000000000 +0200 +@@ -39,6 +39,7 @@ if (out_file) { fprintf(out_file, "%ld.%06u: ", (long) tv.sec, (unsigned int) tv.usec); @@ -10,7 +9,7 @@ } else #endif /* CONFIG_DEBUG_FILE */ printf("%ld.%06u: ", (long) tv.sec, (unsigned int) tv.usec); -@@ -185,6 +186,7 @@ void wpa_printf(int level, char *fmt, .. +@@ -67,6 +68,7 @@ if (out_file) { vfprintf(out_file, fmt, ap); fprintf(out_file, "\n"); @@ -18,7 +17,7 @@ } else { #endif /* CONFIG_DEBUG_FILE */ vprintf(fmt, ap); -@@ -217,6 +219,7 @@ static void _wpa_hexdump(int level, cons +@@ -99,6 +101,7 @@ fprintf(out_file, " [REMOVED]"); } fprintf(out_file, "\n"); @@ -26,7 +25,7 @@ } else { #endif /* CONFIG_DEBUG_FILE */ printf("%s - hexdump(len=%lu):", title, (unsigned long) len); -@@ -262,12 +265,14 @@ static void _wpa_hexdump_ascii(int level +@@ -144,12 +147,14 @@ fprintf(out_file, "%s - hexdump_ascii(len=%lu): [REMOVED]\n", title, (unsigned long) len); @@ -41,7 +40,7 @@ return; } fprintf(out_file, "%s - hexdump_ascii(len=%lu):\n", -@@ -292,6 +297,7 @@ static void _wpa_hexdump_ascii(int level +@@ -174,6 +179,7 @@ pos += llen; len -= llen; } ++++++ wpa_supplicant-sigusr1-changes-debuglevel.patch ++++++ --- /var/tmp/diff_new_pack.h10615/_old 2008-08-04 13:02:35.000000000 +0200 +++ /var/tmp/diff_new_pack.h10615/_new 2008-08-04 13:02:35.000000000 +0200 @@ -1,11 +1,10 @@ -Index: wpa_supplicant-0.5.8/wpa_supplicant.c -=================================================================== ---- wpa_supplicant-0.5.8.orig/wpa_supplicant.c -+++ wpa_supplicant-0.5.8/wpa_supplicant.c -@@ -931,6 +931,24 @@ static void wpa_supplicant_reconfig(int +diff -ur BUILD/wpa_supplicant-0.6.3/wpa_supplicant/wpa_supplicant.c BUILD2/wpa_supplicant-0.6.3/wpa_supplicant/wpa_supplicant.c +--- BUILD/wpa_supplicant-0.6.3/wpa_supplicant/wpa_supplicant.c 2008-02-23 03:45:24.000000000 +0100 ++++ BUILD2/wpa_supplicant-0.6.3/wpa_supplicant/wpa_supplicant.c 2008-08-04 11:43:25.000000000 +0200 +@@ -133,6 +133,22 @@ + return set; } - +static void wpa_supplicant_handle_sigusr1(int sig, void *eloop_ctx, + void *signal_ctx) +{ @@ -22,12 +21,10 @@ + ((wpa_debug_level == MSG_DEBUG) ? "DEBUG" : + ((wpa_debug_level == MSG_MSGDUMP) ? "MSGDUMP" : "UNKNOWN"))); +} -+ -+ - static void wpa_supplicant_gen_assoc_event(struct wpa_supplicant *wpa_s) - { - struct wpa_ssid *ssid; -@@ -2570,6 +2588,8 @@ int wpa_supplicant_run(struct wpa_global + + static int wpa_supplicant_set_wpa_none_key(struct wpa_supplicant *wpa_s, + struct wpa_ssid *ssid) +@@ -2016,6 +2032,8 @@ eloop_register_signal_terminate(wpa_supplicant_terminate, NULL); eloop_register_signal_reconfig(wpa_supplicant_reconfig, NULL); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org