packages/freerdp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!3 freerdp补充自研patch

Browse Source 
Merge pull request !3 from duyyb/next_openeuler
This commit is contained in:
openeuler-ci-bot 2019-12-03 17:24:30 +08:00 committed by Gitee
commit 59d54c5362
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CVE-2018-8788.patch
View File

@ -1,5 +1,4 @@
From d1112c279bd1a327e8e4d0b5f371458bf2579659 Mon Sep 17 00:00:00 2001
m d1112c279bd1a327e8e4d0b5f371458bf2579659 Mon Sep 17 00:00:00 2001
From: Armin Novak <armin.novak@thincast.com> From: Armin Novak <armin.novak@thincast.com>
Date: Mon, 22 Oct 2018 16:52:21 +0200 Date: Mon, 22 Oct 2018 16:52:21 +0200
Subject: [PATCH] Fixed CVE-2018-8788 Subject: [PATCH] Fixed CVE-2018-8788
@ -58,6 +57,7 @@ index d0547cd333..bad0aec1c9 100644
+ +
+ if (!bmpdata) + if (!bmpdata)
+ return FALSE; + return FALSE;
for (y = 0; y < context->height; y++) for (y = 0; y < context->height; y++)
{ {
@@ -80,6 +91,11 @@ static void nsc_decode(NSC_CONTEXT* context) @@ -80,6 +91,11 @@ static void nsc_decode(NSC_CONTEXT* context)
@ -366,4 +366,3 @@ index 149e80a83c..966525f16d 100644
} }
void nsc_init_sse2(NSC_CONTEXT* context) void nsc_init_sse2(NSC_CONTEXT* context)

12
freerdp.spec
View File

@ -72,7 +72,6 @@ Man pages and other related help documents for freerdp.
find . -name "*.h" -exec chmod 664 {} \; find . -name "*.h" -exec chmod 664 {} \;
find . -name "*.c" -exec chmod 664 {} \; find . -name "*.c" -exec chmod 664 {} \;
%build %build
%cmake %{?_cmake_skip_rpath} \ %cmake %{?_cmake_skip_rpath} \
-DCMAKE_INSTALL_LIBDIR:PATH=%{_lib} -DWITH_ALSA=ON -DWITH_CUPS=ON -DWITH_CHANNELS=ON \ -DCMAKE_INSTALL_LIBDIR:PATH=%{_lib} -DWITH_ALSA=ON -DWITH_CUPS=ON -DWITH_CHANNELS=ON \
@ -83,7 +82,14 @@ find . -name "*.c" -exec chmod 664 {} \;
-DWITH_OPENSSL=ON -DWITH_PCSC=ON -DWITH_PULSE=ON -DWITH_SERVER=ON -DWITH_SERVER_INTERFACE=ON \ -DWITH_OPENSSL=ON -DWITH_PCSC=ON -DWITH_PULSE=ON -DWITH_SERVER=ON -DWITH_SERVER_INTERFACE=ON \
-DWITH_SHADOW_X11=ON -DWITH_SHADOW_MAC=ON -DWITH_WAYLAND=ON -DWITH_X11=ON \ -DWITH_SHADOW_X11=ON -DWITH_SHADOW_MAC=ON -DWITH_WAYLAND=ON -DWITH_X11=ON \
-DWITH_X264=OFF -DWITH_XCURSOR=ON -DWITH_XEXT=ON \ -DWITH_X264=OFF -DWITH_XCURSOR=ON -DWITH_XEXT=ON \
-DWITH_XKBFILE=ON -DWITH_XI=ON -DWITH_X -DWITH_XKBFILE=ON -DWITH_XI=ON -DWITH_XINERAMA=ON -DWITH_XRENDER=ON -DWITH_XTEST=OFF \
-DWITH_XV=ON -DWITH_ZLIB=ON \
%ifarch x86_64
-DWITH_SSE2=ON \
%else
-DWITH_SSE2=OFF \
%endif
.
%make_build %make_build
cd winpr/tools/makecert-cli cd winpr/tools/makecert-cli
@ -120,7 +126,7 @@ find %{buildroot} -name "*.a" -delete
%files -n libwinpr %files -n libwinpr
%{!?_licensedir:%global license %%doc} %{!?_licensedir:%global license %%doc}
%license LICENSE:q!:q %license LICENSE
%doc README ChangeLog %doc README ChangeLog
%{_libdir}/{libwinpr2.so.*,libwinpr-tools2.so.*} %{_libdir}/{libwinpr2.so.*,libwinpr-tools2.so.*}