rpms/wireless-tools/devel wireless-tools-28-sscanf-64bit-fixes.patch, NONE, 1.1 wireless-tools.spec, 1.35, 1.36 wireless-tools-28-alignment-64bit.patch, 1.1, NONE
Christopher Aillon (caillon)
fedora-extras-commits at redhat.com
Mon May 14 12:15:16 UTC 2007
- Previous message (by thread): rpms/cernlib/devel cernlib.spec,1.53,1.54
- Next message (by thread): rpms/TeXmacs/devel TeXmacs-1.0.6.10-qual.patch, NONE, 1.1 .cvsignore, 1.26, 1.27 TeXmacs.spec, 1.46, 1.47 sources, 1.27, 1.28
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caillon
Update of /cvs/pkgs/rpms/wireless-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30884
Modified Files:
wireless-tools.spec
Added Files:
wireless-tools-28-sscanf-64bit-fixes.patch
Removed Files:
wireless-tools-28-alignment-64bit.patch
Log Message:
* Mon May 14 2007 Christopher Aillon <caillon at redhat.com> - 1:28-3
- Only the sscanf fixes this time.
wireless-tools-28-sscanf-64bit-fixes.patch:
--- NEW FILE wireless-tools-28-sscanf-64bit-fixes.patch ---
--- wireless_tools.28/iwconfig.c.sscanf-64-bit-fixes 2007-01-18 09:42:33.000000000 -0500
+++ wireless_tools.28/iwconfig.c 2007-01-18 10:00:27.000000000 -0500
@@ -674,11 +674,16 @@
wrq.u.nwid.disabled = 0;
}
else
- if(sscanf(args[i], "%lX", (unsigned long *) &(wrq.u.nwid.value))
- != 1)
- ABORT_ARG_TYPE("Set NWID", SIOCSIWNWID, args[i]);
- else
- wrq.u.nwid.disabled = 0;
+ {
+ unsigned long temp;
+ if(sscanf(args[i], "%lX", &(temp)) != 1)
+ ABORT_ARG_TYPE("Set NWID", SIOCSIWNWID, args[i]);
+ else
+ {
+ wrq.u.nwid.value = temp;
+ wrq.u.nwid.disabled = 0;
+ }
+ }
wrq.u.nwid.fixed = 1;
/* Set new nwid */
@@ -746,11 +751,13 @@
/* ---------- Set sensitivity ---------- */
if(!strncmp(args[i], "sens", 4))
{
+ int temp;
if(++i >= count)
ABORT_ARG_NUM("Set Sensitivity", SIOCSIWSENS);
- if(sscanf(args[i], "%i", &(wrq.u.sens.value)) != 1)
+ if(sscanf(args[i], "%i", &(temp)) != 1)
ABORT_ARG_TYPE("Set Sensitivity", SIOCSIWSENS, args[i]);
+ wrq.u.sens.value = temp;
IW_SET_EXT_ERR(skfd, ifname, SIOCSIWSENS, &wrq,
"Set Sensitivity");
continue;
@@ -1063,10 +1070,14 @@
"Set RTS Threshold");
wrq.u.rts.fixed = 1;
}
- else /* Should be a numeric value */
- if(sscanf(args[i], "%li", (unsigned long *) &(wrq.u.rts.value))
- != 1)
- ABORT_ARG_TYPE("Set RTS Threshold", SIOCSIWRTS, args[i]);
+ else
+ { /* Should be a numeric value */
+ long temp;
+ if(sscanf(args[i], "%li", (unsigned long *) &(temp)) != 1)
+ ABORT_ARG_TYPE("Set RTS Threshold", SIOCSIWRTS, args[i]);
+
+ wrq.u.rts.value = temp;
+ }
}
IW_SET_EXT_ERR(skfd, ifname, SIOCSIWRTS, &wrq,
@@ -1097,12 +1108,14 @@
"Set Fragmentation Threshold");
wrq.u.frag.fixed = 1;
}
- else /* Should be a numeric value */
- if(sscanf(args[i], "%li",
- (unsigned long *) &(wrq.u.frag.value))
- != 1)
- ABORT_ARG_TYPE("Set Fragmentation Threshold", SIOCSIWFRAG,
+ else
+ { /* Should be a numeric value */
+ long temp;
+ if(sscanf(args[i], "%li", &(temp)) != 1)
+ ABORT_ARG_TYPE("Set Fragmentation Threshold", SIOCSIWFRAG,
args[i]);
+ wrq.u.frag.value = temp;
+ }
}
IW_SET_EXT_ERR(skfd, ifname, SIOCSIWFRAG, &wrq,
Index: wireless-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wireless-tools/devel/wireless-tools.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- wireless-tools.spec 30 Apr 2007 19:26:36 -0000 1.35
+++ wireless-tools.spec 14 May 2007 12:14:41 -0000 1.36
@@ -8,12 +8,12 @@
License: GPL
Name: wireless-tools
Version: 28
-Release: 2%{?pre_version}%{?dist}
+Release: 3%{?pre_version}%{?dist}
Epoch: 1
URL: http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html
Source: http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.%{version}%{?pre_version}.tar.gz
Patch1: wireless-tools-28-makefile.patch
-Patch2: wireless-tools-28-alignment-64bit.patch
+Patch2: wireless-tools-28-sscanf-64bit-fixes.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
ExcludeArch: s390 s390x
@@ -42,7 +42,7 @@
%setup -n wireless_tools.%{version}
%patch1 -p1 -b .makefile
-%patch2 -p1 -b .alignment-64bit
+%patch2 -p1 -b .sscanf-64bit-fixes
%build
make clean
@@ -80,6 +80,9 @@
%changelog
+* Mon May 14 2007 Christopher Aillon <caillon at redhat.com> - 1:28-3
+- Only the sscanf fixes this time.
+
* Mon Apr 30 2007 Christopher Aillon <caillon at redhat.com> - 1:28-2
- Backport a few 64bit alignment fixes from the latest betas.
--- wireless-tools-28-alignment-64bit.patch DELETED ---
- Previous message (by thread): rpms/cernlib/devel cernlib.spec,1.53,1.54
- Next message (by thread): rpms/TeXmacs/devel TeXmacs-1.0.6.10-qual.patch, NONE, 1.1 .cvsignore, 1.26, 1.27 TeXmacs.spec, 1.46, 1.47 sources, 1.27, 1.28
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list