rpms/wpa_supplicant/F-8 wpa_supplicant-0.5.10-default-log-file.patch, NONE, 1.1 wpa_supplicant.spec, 1.46, 1.47 wpa_supplicant.sysconfig, 1.5, 1.6
Daniel Williams (dcbw)
fedora-extras-commits at redhat.com
Sat Mar 8 20:13:36 UTC 2008
- Previous message (by thread): rpms/ocsinventory-agent/devel ocsinventory-agent.spec,1.1,1.2
- Next message (by thread): rpms/kernel/devel patch-2.6.25-rc4-git3.bz2.sign, NONE, 1.1 .cvsignore, 1.776, 1.777 kernel.spec, 1.484, 1.485 sources, 1.736, 1.737 upstream, 1.658, 1.659 linux-2.6-ia32-syscall-restart-ptrace64.patch, 1.1, NONE patch-2.6.25-rc4-git2.bz2.sign, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: dcbw
Update of /cvs/extras/rpms/wpa_supplicant/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11501
Modified Files:
wpa_supplicant.spec wpa_supplicant.sysconfig
Added Files:
wpa_supplicant-0.5.10-default-log-file.patch
Log Message:
* Sat Mar 8 2008 Dan Williams <dcbw at redhat.com> - 0.5.10-4
- Fix log file path in service config file
wpa_supplicant-0.5.10-default-log-file.patch:
--- NEW FILE wpa_supplicant-0.5.10-default-log-file.patch ---
diff -up wpa_supplicant-0.5.10/main.c.default-log wpa_supplicant-0.5.10/main.c
--- wpa_supplicant-0.5.10/main.c.default-log 2008-03-08 15:02:45.000000000 -0500
+++ wpa_supplicant-0.5.10/main.c 2008-03-08 15:05:27.000000000 -0500
@@ -67,7 +67,7 @@ static void usage(void)
" -d = increase debugging verbosity (-dd even more)\n"
" -D = driver name\n"
#ifdef CONFIG_DEBUG_FILE
- " -f = log output to debug file instead of stdout\n"
+ " -f = log output to debug file instead of stdout (default: /var/log/wpa_supplicant.log)\n"
#endif /* CONFIG_DEBUG_FILE */
" -g = global ctrl_interface\n"
" -K = include keys (passwords, etc.) in debug output\n"
@@ -147,7 +147,7 @@ int main(int argc, char *argv[])
wpa_supplicant_fd_workaround();
for (;;) {
- c = getopt(argc, argv, "b:Bc:C:D:df:g:hi:KLNp:P:qtuvwW");
+ c = getopt(argc, argv, "b:Bc:C:D:df::g:hi:KLNp:P:qtuvwW");
if (c < 0)
break;
switch (c) {
@@ -178,7 +178,10 @@ int main(int argc, char *argv[])
#endif /* CONFIG_NO_STDOUT_DEBUG */
#ifdef CONFIG_DEBUG_FILE
case 'f':
- params.wpa_debug_file_path = optarg;
+ if (!optarg)
+ params.wpa_debug_file_path = "/var/log/wpa_supplicant.log";
+ else
+ params.wpa_debug_file_path = optarg;
break;
#endif /* CONFIG_DEBUG_FILE */
case 'g':
Index: wpa_supplicant.spec
===================================================================
RCS file: /cvs/extras/rpms/wpa_supplicant/F-8/wpa_supplicant.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- wpa_supplicant.spec 6 Mar 2008 22:50:45 -0000 1.46
+++ wpa_supplicant.spec 8 Mar 2008 20:12:58 -0000 1.47
@@ -2,7 +2,7 @@
Name: wpa_supplicant
Epoch: 1
Version: 0.5.10
-Release: 3%{?dist}
+Release: 4%{?dist}
License: BSD
Group: System Environment/Base
Source0: http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz
@@ -20,6 +20,7 @@
Patch3: wpa_supplicant-0.5.7-flush-debug-output.patch
Patch4: wpa_supplicant-0.5.7-use-IW_ENCODE_TEMP.patch
Patch5: wpa_supplicant-0.5.10-dbus-service-file.patch
+Patch6: wpa_supplicant-0.5.10-default-log-file.patch
URL: http://w1.fi/wpa_supplicant/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -53,6 +54,7 @@
%patch3 -p1 -b .flush-debug-output
%patch4 -p1 -b .use-IW_ENCODE_TEMP
%patch5 -p1 -b .dbus-service-file
+%patch6 -p1 -b .default-log-file
%build
cp %{SOURCE1} ./.config
@@ -141,6 +143,9 @@
%{_bindir}/wpa_gui
%changelog
+* Sat Mar 8 2008 Dan Williams <dcbw at redhat.com> - 0.5.10-4
+- Fix log file path in service config file
+
* Thu Mar 6 2008 Dan Williams <dcbw at redhat.com> - 0.5.10-3
- Don't start the supplicant by default when installed (rh #436380)
Index: wpa_supplicant.sysconfig
===================================================================
RCS file: /cvs/extras/rpms/wpa_supplicant/F-8/wpa_supplicant.sysconfig,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wpa_supplicant.sysconfig 3 Dec 2007 19:03:45 -0000 1.5
+++ wpa_supplicant.sysconfig 8 Mar 2008 20:12:58 -0000 1.6
@@ -9,4 +9,4 @@
# Other arguments
# -u Enable the D-Bus interface (required for use with NetworkManager)
# -f Log to /var/log/wpa_supplicant.log
-OTHER_ARGS="-u -f"
+OTHER_ARGS="-u -f /var/log/wpa_supplicant.log"
- Previous message (by thread): rpms/ocsinventory-agent/devel ocsinventory-agent.spec,1.1,1.2
- Next message (by thread): rpms/kernel/devel patch-2.6.25-rc4-git3.bz2.sign, NONE, 1.1 .cvsignore, 1.776, 1.777 kernel.spec, 1.484, 1.485 sources, 1.736, 1.737 upstream, 1.658, 1.659 linux-2.6-ia32-syscall-restart-ptrace64.patch, 1.1, NONE patch-2.6.25-rc4-git2.bz2.sign, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list