New version
- Dropped base64-decode-fix-off-by-one patch (upstreamed) - Switched to new version numbering - Switched image archive to xz
This commit is contained in:
Jaroslav Škarvada
parent
4e7d88c2cd
commit
cd4fafec7e
|
|
@ -1 +1,2 @@
|
|||
uhd-*.tar.gz
|
||||
/uhd-images_003.010.001.000-release.tar.xz
|
||||
|
|
|
|||
4
sources
4
sources
|
|
@ -1,2 +1,2 @@
|
|||
e6d2b6b8f4dfc4aca108450f66b0fd4c uhd-images_003.009.004-release.tar.gz
|
||||
0d6451b50afc000d1d13a1f6fb33ba6c uhd-release_003_009_004.tar.gz
|
||||
c68503082afa4d1408af8d17559120e2 uhd-release_003_010_001_000.tar.gz
|
||||
fb5e160c8ed57b45b91757f54c9fd14a uhd-images_003.010.001.000-release.tar.xz
|
||||
|
|
|
|||
|
|
@ -1,23 +0,0 @@
|
|||
From 99524f1dbf784e1c49d9e274f0efe56cb3a9e26a Mon Sep 17 00:00:00 2001
|
||||
From: Jonathan Wakely <github@kayari.org>
|
||||
Date: Wed, 25 May 2016 12:49:36 +0100
|
||||
Subject: [PATCH] Fix off-by-one error
|
||||
|
||||
There's an off-by-one error in base64_decode_value that results in undefined behaviour when it's passed `'\x7b'`
|
||||
---
|
||||
host/lib/usrp/x300/cdecode.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/host/lib/usrp/x300/cdecode.c b/host/lib/usrp/x300/cdecode.c
|
||||
index 1d09cbe..424de6c 100644
|
||||
--- a/host/lib/usrp/x300/cdecode.c
|
||||
+++ b/host/lib/usrp/x300/cdecode.c
|
||||
@@ -11,7 +11,7 @@ int base64_decode_value(char value_in){
|
||||
static const char decoding[] = {62,-1,-1,-1,63,52,53,54,55,56,57,58,59,60,61,-1,-1,-1,-2,-1,-1,-1,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,-1,-1,-1,-1,-1,-1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51};
|
||||
static const char decoding_size = sizeof(decoding);
|
||||
value_in -= 43;
|
||||
- if ((signed char)value_in < 0 || value_in > decoding_size) return -1;
|
||||
+ if ((signed char)value_in < 0 || value_in >= decoding_size) return -1;
|
||||
return decoding[(int)value_in];
|
||||
}
|
||||
|
||||
28
uhd.spec
28
uhd.spec
|
|
@ -7,12 +7,13 @@
|
|||
# building with --with=neon will enable auto detection
|
||||
%bcond_with neon
|
||||
|
||||
%global ver_major 3
|
||||
%global ver_minor 9
|
||||
%global ver_patch 4
|
||||
%global ver_1 3
|
||||
%global ver_2 10
|
||||
%global ver_3 1
|
||||
%global ver_4 0
|
||||
|
||||
%global ver %(printf "%03d.%03d.%03d" %{ver_major} %{ver_minor} %{ver_patch})
|
||||
%global ver_ %(printf "%03d_%03d_%03d" %{ver_major} %{ver_minor} %{ver_patch})
|
||||
%global ver %(printf "%03d.%03d.%03d.%03d" %{ver_1} %{ver_2} %{ver_3} %{ver_4})
|
||||
%global ver_ %(printf "%03d_%03d_%03d_%03d" %{ver_1} %{ver_2} %{ver_3} %{ver_4})
|
||||
|
||||
%global wireshark_ver %((%{__awk} '/^#define VERSION[ \t]+/ { print $NF }' /usr/include/wireshark/config.h 2>/dev/null||echo none)|/usr/bin/tr -d '"')
|
||||
|
||||
|
|
@ -24,8 +25,8 @@
|
|||
|
||||
Name: uhd
|
||||
URL: http://code.ettus.com/redmine/ettus/projects/uhd/wiki
|
||||
Version: %{ver_major}.%{ver_minor}.%{ver_patch}
|
||||
Release: 2%{?dist}
|
||||
Version: %{ver_1}.%{ver_2}.%{ver_3}.%{ver_4}
|
||||
Release: 1%{?dist}
|
||||
License: GPLv3+
|
||||
BuildRequires: cmake
|
||||
BuildRequires: boost-devel, libusb1-devel, python-cheetah, ncurses-devel
|
||||
|
|
@ -40,11 +41,9 @@ Group: Applications/Engineering
|
|||
Summary: Universal Hardware Driver for Ettus Research products
|
||||
Source0: http://github.com/EttusResearch/uhd/archive/release_%{ver_}.tar.gz#/uhd-release_%{ver_}.tar.gz
|
||||
Source1: %{name}-limits.conf
|
||||
Source2: http://files.ettus.com/binaries/images/uhd-images_%{ver}-release.tar.gz
|
||||
Source2: http://files.ettus.com/binaries/images/uhd-images_%{ver}-release.tar.xz
|
||||
# Fix firmware build with sdcc-3
|
||||
Patch0: uhd-3.4.2-sdcc-3-fix.patch
|
||||
# https://github.com/EttusResearch/uhd/pull/60
|
||||
Patch1: uhd-3.9.4-base64-decode-fix-off-by-one.patch
|
||||
|
||||
%description
|
||||
The UHD is the universal hardware driver for Ettus Research products.
|
||||
|
|
@ -84,13 +83,12 @@ Tools that are useful for working with and/or debugging USRP device.
|
|||
%prep
|
||||
%setup -q -n uhd-release_%{ver_}
|
||||
%patch0 -p1 -b .sdcc-3-fix
|
||||
%patch1 -p1 -b .3.9.4-base64-decode-fix-off-by-one
|
||||
|
||||
# firmware
|
||||
%if %{with binary_firmware}
|
||||
# extract binary firmware
|
||||
mkdir -p images/images
|
||||
tar -xzf %{SOURCE2} -C images/images --strip-components=4
|
||||
tar -xJf %{SOURCE2} -C images/images --strip-components=4
|
||||
rm -f images/images/{LICENSE.txt,*.tag}
|
||||
%endif
|
||||
|
||||
|
|
@ -211,6 +209,12 @@ install -Dpm 0755 tools/uhd_dump/chdr_log %{buildroot}%{_bindir}/chdr_log
|
|||
%{_bindir}/chdr_log
|
||||
|
||||
%changelog
|
||||
* Tue Nov 22 2016 Jaroslav Škarvada <jskarvad@redhat.com> - 3.10.1.0-1
|
||||
- New version
|
||||
- Dropped base64-decode-fix-off-by-one patch (upstreamed)
|
||||
- Switched to new version numbering
|
||||
- Switched image archive to xz
|
||||
|
||||
* Wed May 25 2016 Jaroslav Škarvada <jskarvad@redhat.com> - 3.9.4-2
|
||||
- Fixed off by one in base64_decode by base64-decode-fix-off-by-one patch
|
||||
Related: rhbz#1308204
|
||||
|
|
|
|||
Loading…
Reference in New Issue