rpms/wpa_supplicant/F-7 wpa_supplicant-0.5.7-debug-file.patch, NONE, 1.1 wpa_supplicant-0.5.7-flush-debug-output.patch, NONE, 1.1 wpa_supplicant-0.5.7-qmake-location.patch, NONE, 1.1 wpa_supplicant.config, 1.4, 1.5 wpa_supplicant.spec, 1.24, 1.25 wpa_supplicant-0.5.7-use-syslog.patch, 1.1, NONE

[Daniel Williams (dcbw)]

Author: dcbw

Update of /cvs/extras/rpms/wpa_supplicant/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28296

Modified Files:
	wpa_supplicant.config wpa_supplicant.spec 
Added Files:
	wpa_supplicant-0.5.7-debug-file.patch 
	wpa_supplicant-0.5.7-flush-debug-output.patch 
	wpa_supplicant-0.5.7-qmake-location.patch 
Removed Files:
	wpa_supplicant-0.5.7-use-syslog.patch 
Log Message:
- Fix compilation with RPM_OPT_FLAGS (rh #249951)
- Make debug output to logfile a runtime option



wpa_supplicant-0.5.7-debug-file.patch:

--- NEW FILE wpa_supplicant-0.5.7-debug-file.patch ---
--- wpa_supplicant-0.5.7/main.c.debugfile	2007-07-30 21:48:35.000000000 -0400
+++ wpa_supplicant-0.5.7/main.c	2007-07-30 22:12:06.000000000 -0400
@@ -45,7 +45,12 @@ static void usage(void)
 	       "[-p<driver_param>] \\\n"
 	       "        [-b<br_ifname> [-N -i<ifname> -c<conf> [-C<ctrl>] "
 	       "[-D<driver>] \\\n"
-	       "        [-p<driver_param>] [-b<br_ifname>] ...]\n"
+	       "        [-p<driver_param>] [-b<br_ifname>] ...] "
+#ifdef CONFIG_DEBUG_FILE
+	       "[-f] \\\n"
+#else
+	       "\n"
+#endif
 	       "\n"
 	       "drivers:\n",
 	       wpa_supplicant_version, wpa_supplicant_license);
@@ -65,6 +70,9 @@ static void usage(void)
 	       "  -i = interface name\n"
 	       "  -d = increase debugging verbosity (-dd even more)\n"
 	       "  -D = driver name\n"
+#ifdef CONFIG_DEBUG_FILE
+	       "  -f = Log output to /var/log/wpa_supplicant.log\n"
+#endif
 	       "  -g = global ctrl_interface\n"
 	       "  -K = include keys (passwords, etc.) in debug output\n"
 	       "  -t = include timestamp in debug messages\n"
@@ -143,7 +151,7 @@ int main(int argc, char *argv[])
 	wpa_supplicant_fd_workaround();
 
 	for (;;) {
-		c = getopt(argc, argv, "b:Bc:C:D:dg:hi:KLNp:P:qtuvwW");
+		c = getopt(argc, argv, "b:Bc:C:D:dfg:hi:KLNp:P:qtuvwW");
 		if (c < 0)
 			break;
 		switch (c) {
@@ -172,6 +180,11 @@ int main(int argc, char *argv[])
 			params.wpa_debug_level--;
 			break;
 #endif /* CONFIG_NO_STDOUT_DEBUG */
+#ifdef CONFIG_DEBUG_FILE
+		case 'f':
+			params.wpa_debug_use_file = 1;
+			break;
+#endif
 		case 'g':
 			params.ctrl_interface = optarg;
 			break;
--- wpa_supplicant-0.5.7/common.c.debugfile	2007-07-30 21:39:40.000000000 -0400
+++ wpa_supplicant-0.5.7/common.c	2007-07-30 22:11:11.000000000 -0400
@@ -354,11 +354,8 @@ int wpa_debug_open_file(void)
 #ifdef _WIN32
 	os_snprintf(fname, sizeof(fname), "\\Temp\\wpa_supplicant-log-%d.txt",
 		    count++);
-#else /* _WIN32 */
-	os_snprintf(fname, sizeof(fname), "/tmp/wpa_supplicant-log-%d.txt",
-		    count++);
 #endif /* _WIN32 */
-	out_file = fopen(fname, "w");
+	out_file = fopen("/var/log/wpa_supplicant.log", "a");
 	return out_file == NULL ? -1 : 0;
 #else /* CONFIG_DEBUG_FILE */
 	return 0;
--- wpa_supplicant-0.5.7/Makefile.debugfile	2007-07-30 21:44:14.000000000 -0400
+++ wpa_supplicant-0.5.7/Makefile	2007-07-30 21:44:46.000000000 -0400
@@ -744,6 +744,10 @@ ifndef LDO
 LDO=$(CC)
 endif
 
+ifdef CONFIG_DEBUG_FILE
+CFLAGS += -DCONFIG_DEBUG_FILE
+endif
+
 dynamic_eap_methods: $(EAPDYN)
 
 wpa_supplicant: .config $(OBJS)

wpa_supplicant-0.5.7-flush-debug-output.patch:

--- NEW FILE wpa_supplicant-0.5.7-flush-debug-output.patch ---
--- wpa_supplicant-0.5.7/common.c.flush-debug	2007-07-30 23:15:34.000000000 -0400
+++ wpa_supplicant-0.5.7/common.c	2007-07-30 23:17:06.000000000 -0400
@@ -157,6 +157,7 @@ void wpa_debug_print_timestamp(void)
 	if (out_file) {
 		fprintf(out_file, "%ld.%06u: ", (long) tv.sec,
 			(unsigned int) tv.usec);
+		fflush(out_file);
 	} 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, ..
 		if (out_file) {
 			vfprintf(out_file, fmt, ap);
 			fprintf(out_file, "\n");
+			fflush(out_file);
 		} else {
 #endif /* CONFIG_DEBUG_FILE */
 		vprintf(fmt, ap);
@@ -217,6 +219,7 @@ static void _wpa_hexdump(int level, cons
 			fprintf(out_file, " [REMOVED]");
 		}
 		fprintf(out_file, "\n");
+		fflush(out_file);
 	} 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
 			fprintf(out_file,
 				"%s - hexdump_ascii(len=%lu): [REMOVED]\n",
 				title, (unsigned long) len);
+			fflush(out_file);
 			return;
 		}
 		if (buf == NULL) {
 			fprintf(out_file,
 				"%s - hexdump_ascii(len=%lu): [NULL]\n",
 				title, (unsigned long) len);
+			fflush(out_file);
 			return;
 		}
 		fprintf(out_file, "%s - hexdump_ascii(len=%lu):\n",
@@ -292,6 +297,7 @@ static void _wpa_hexdump_ascii(int level
 			pos += llen;
 			len -= llen;
 		}
+		fflush(out_file);
 	} else {
 #endif /* CONFIG_DEBUG_FILE */
 	if (!show) {

wpa_supplicant-0.5.7-qmake-location.patch:

--- NEW FILE wpa_supplicant-0.5.7-qmake-location.patch ---
--- wpa_supplicant-0.5.7/Makefile.qmake	2007-07-30 22:17:29.000000000 -0400
+++ wpa_supplicant-0.5.7/Makefile	2007-07-30 22:17:46.000000000 -0400
@@ -818,7 +818,7 @@ windows-bin: $(WINALL)
 	$(STRIP) $(WINALL)
 
 wpa_gui/Makefile:
-	qmake -o wpa_gui/Makefile wpa_gui/wpa_gui.pro 
+	$(QTDIR)/bin/qmake -o wpa_gui/Makefile wpa_gui/wpa_gui.pro 
 
 wpa_gui: wpa_gui/Makefile
 	$(MAKE) -C wpa_gui


Index: wpa_supplicant.config
===================================================================
RCS file: /cvs/extras/rpms/wpa_supplicant/F-7/wpa_supplicant.config,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wpa_supplicant.config	15 Mar 2007 18:48:00 -0000	1.4
+++ wpa_supplicant.config	1 Aug 2007 02:46:22 -0000	1.5
@@ -29,3 +29,5 @@
 //CONFIG_PCSC=y
 CONFIG_PKCS12=y
 CONFIG_SMARTCARD=y
+CONFIG_DEBUG_FILE=y
+


Index: wpa_supplicant.spec
===================================================================
RCS file: /cvs/extras/rpms/wpa_supplicant/F-7/wpa_supplicant.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- wpa_supplicant.spec	19 Jun 2007 17:00:31 -0000	1.24
+++ wpa_supplicant.spec	1 Aug 2007 02:46:22 -0000	1.25
@@ -16,6 +16,9 @@
 Patch2: wpa_supplicant-wep-key-fix.patch
 # http://hostap.epitest.fi/bugz/show_bug.cgi?id=192
 Patch3: wpa_supplicant-fix-deprecated-dbus-function.patch
+Patch4: wpa_supplicant-0.5.7-debug-file.patch
+Patch5: wpa_supplicant-0.5.7-qmake-location.patch
+Patch6: wpa_supplicant-0.5.7-flush-debug-output.patch
 URL: http://w1.fi/wpa_supplicant/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -46,10 +49,15 @@
 %patch1 -p1 -b .driver-wext-debug
 %patch2 -p1 -b .wep-key-fix
 %patch3 -p0 -b .fix-deprecated-dbus-functions
+%patch4 -p1 -b .debug-file
+%patch5 -p1 -b .qmake-location
+%patch6 -p1 -b .flush-debug-output
 
 %build
 cp %{SOURCE1} ./.config
 tar -xjf %{SOURCE5}
+CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ;
+CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ;
 make %{_smp_mflags}
 QTDIR=%{_libdir}/qt-3.3 make wpa_gui %{_smp_mflags}
 
@@ -129,6 +137,8 @@
 * Tue Jun 19 2007 Dan Williams <dcbw at redhat.com> - 0.5.7-4
 - Fix initscripts to use -Dwext by default, be more verbose on startup
     (rh #244511)
+- Fix compilation with RPM_OPT_FLAGS (rh #249951)
+- Make debug output to logfile a runtime option
 
 * Mon Jun  4 2007 Dan Williams <dcbw at redhat.com> - 0.5.7-3
 - Fix buffer overflow by removing syslog patch (#rh242455)


--- wpa_supplicant-0.5.7-use-syslog.patch DELETED ---