mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8302 from akallabeth/stable_release_2_8_1

Browse Source 
Stable release 2 8 1
This commit is contained in:
Bernhard Miklautz 2022-10-12 12:58:39 +02:00 committed by GitHub
commit 0ad3f49f0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 89 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -85,7 +85,7 @@ if ($ENV{BUILD_NUMBER})
endif()
set(WITH_LIBRARY_VERSIONING "ON")
set(RAW_VERSION_STRING "2.8.0")
set(RAW_VERSION_STRING "2.8.1")
if(EXISTS "${CMAKE_SOURCE_DIR}/.source_tag")
file(READ ${CMAKE_SOURCE_DIR}/.source_tag RAW_VERSION_STRING)
elseif(USE_VERSION_FROM_GIT_TAG)

10
ChangeLog
View File

@ -1,7 +1,12 @@
# 20xx-xx-xx Version 2.x.x
# 2022-10-12 Version 2.8.1
Notewhorth changes:
* Fixed CVE-2022-39282
* Fixed CVE-2022-39283
* Added missing commit for backported #8041: Remove ALAW/ULAW codecs from linux backends (unreliable)
* Added hash checks for android build script dependencies
Fixed issues:
* Backported #8190: Fix build break with newer FFMPEG versions
* Backported #8234: Updated flatpak with build script
* Backported #8210: Better execinfo support check for android
@ -9,6 +14,7 @@ Fixed issues:
* Backported #8176: Check fullscreen state and not setting
* Backported #8236: Send resize on window state change
* Backported #7611: Audin macOS monterey fix
* Backported #8291: Android build script update
# 2022-07-28 Version 2.8.0

4
channels/audin/client/alsa/audin_alsa.c
View File

@ -242,10 +242,6 @@ static BOOL audin_alsa_format_supported(IAudinDevice* device, const AUDIO_FORMAT
break;
case WAVE_FORMAT_ALAW:
case WAVE_FORMAT_MULAW:
return TRUE;
default:
return FALSE;
}

4
channels/audin/client/oss/audin_oss.c
View File

@ -113,10 +113,6 @@ static BOOL audin_oss_format_supported(IAudinDevice* device, const AUDIO_FORMAT*
break;
case WAVE_FORMAT_ALAW:
case WAVE_FORMAT_MULAW:
return TRUE;
default:
return FALSE;
}

11
channels/audin/client/pulse/audin_pulse.c
View File

@ -236,17 +236,6 @@ static BOOL audin_pulse_format_supported(IAudinDevice* device, const AUDIO_FORMA
break;
case WAVE_FORMAT_ALAW: /* A-LAW */
case WAVE_FORMAT_MULAW: /* U-LAW */
if (format->cbSize == 0 && (format->nSamplesPerSec <= PA_RATE_MAX) &&
(format->wBitsPerSample == 8) &&
(format->nChannels >= 1 && format->nChannels <= PA_CHANNELS_MAX))
{
return TRUE;
}
break;
default:
return FALSE;
}

2
client/Android/android_freerdp.c
View File

@ -57,7 +57,7 @@
#define TAG CLIENT_TAG("android")
/* Defines the JNI version supported by this library. */
#define FREERDP_JNI_VERSION "2.8.0"
#define FREERDP_JNI_VERSION "2.8.1"
static void android_OnChannelConnectedEventHandler(void* context, ChannelConnectedEventArgs* e)
{

9
scripts/android-build-32.conf
View File

@ -9,7 +9,6 @@
# If you require support for older NDK API levels,
# create seperate configurations for each NDK API level
# and architecture you want to support.
WITH_JPEG=0
WITH_OPENH264=0
WITH_OPENSSL=1
WITH_FFMPEG=1
@ -18,10 +17,12 @@ DEPS_ONLY=0
NDK_TARGET=21
WITH_MEDIACODEC=1
JPEG_TAG=master
OPENH264_TAG=v2.2.0 # NOTE: NDK r15c or earlier needed in --openh624-ndk for v1.8.0
OPENSSL_TAG=OpenSSL_1_1_1o
OPENH264_TAG=v2.3.1
OPENH264_HASH=453afa66dacb560bc5fd0468aabee90c483741571bca820a39a1c07f0362dc32
OPENSSL_TAG=openssl-1.1.1q
OPENSSL_HASH=d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca
FFMPEG_TAG=n4.4.1
FFMPEG_HASH=82b43cc67296bcd01a59ae6b327cdb50121d3a9e35f41a30de1edd71bb4a6666
SRC_DIR=$SCRIPT_PATH/..
BUILD_DST=$SCRIPT_PATH/../client/Android/Studio/freeRDPCore/src/main/jniLibs

9
scripts/android-build-64.conf
View File

@ -9,7 +9,6 @@
# If you require support for older NDK API levels,
# create seperate configurations for each NDK API level
# and architecture you want to support.
WITH_JPEG=0
WITH_OPENH264=1
WITH_OPENSSL=1
WITH_FFMPEG=1
@ -18,10 +17,12 @@ DEPS_ONLY=0
NDK_TARGET=21
WITH_MEDIACODEC=1
JPEG_TAG=master
OPENH264_TAG=v2.2.0 # NOTE: NDK r15c or earlier needed in --openh624-ndk for v1.8.0
OPENSSL_TAG=OpenSSL_1_1_1o
OPENH264_TAG=v2.3.1
OPENH264_HASH=453afa66dacb560bc5fd0468aabee90c483741571bca820a39a1c07f0362dc32
OPENSSL_TAG=openssl-1.1.1q
OPENSSL_HASH=d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca
FFMPEG_TAG=n4.4.1
FFMPEG_HASH=82b43cc67296bcd01a59ae6b327cdb50121d3a9e35f41a30de1edd71bb4a6666
SRC_DIR=$SCRIPT_PATH/..
BUILD_DST=$SCRIPT_PATH/../client/Android/Studio/freeRDPCore/src/main/jniLibs

44
scripts/android-build-common.sh
View File

@ -1,8 +1,20 @@
#!/bin/bash
#!/bin/bash -x
SCRIPT_PATH=$(dirname "${BASH_SOURCE[0]}")
SCRIPT_PATH=$(realpath "$SCRIPT_PATH")
FIND_ARGS="-type f -print -quit"
case "$(uname -s)" in
Darwin)
FIND_ARGS="-perm +111 $FIND_ARGS"
;;
*)
FIND_ARGS="-executable $FIND_ARGS"
;;
esac
if [ -z $BUILD_ARCH ]; then
BUILD_ARCH="armeabi-v7a x86 x86_64 arm64-v8a"
fi
@ -12,7 +24,7 @@ if [ -z $NDK_TARGET ]; then
fi
if [ -z $CMAKE_PROGRAM ]; then
CMAKE_PROGRAM=$(find $ANDROID_SDK/cmake -name cmake -type f -executable -print -quit)
CMAKE_PROGRAM=$(find $ANDROID_SDK/cmake -name cmake $FIND_ARGS)
fi
if [ -z $CCACHE ]; then
@ -61,6 +73,8 @@ function common_help {
echo " SCM_URL=$SCM_URL"
echo " --tag The SCM branch or tag to check out"
echo " SCM_TAG=$SCM_TAG"
echo " --hash The SCM commit or hash to check out"
echo " SCM_HASH=$SCM_HASH"
echo " --clean Clean the destination before build"
echo " --help Display this help"
exit 0
@ -99,7 +113,7 @@ function common_parse_arguments {
--sdk)
ANDROID_SDK="$2"
CMAKE_PROGRAM=$(find $ANDROID_SDK/cmake -name cmake -type f -executable -print -quit)
CMAKE_PROGRAM=$(find $ANDROID_SDK/cmake -name cmake $FIND_ARGS)
shift
;;
@ -128,6 +142,11 @@ function common_parse_arguments {
shift
;;
--hash)
SCM_HASH="$2"
shift
;;
--clean)
CLEAN_BUILD_DIR=1
shift
@ -181,6 +200,12 @@ function common_check_requirements {
exit 1
fi
if [[ -z $SCM_HASH ]];
then
echo "SCM HASH not defined! Define SCM_HASH"
exit 1
fi
if [[ -z $NDK_TARGET ]];
then
echo "Android platform NDK_TARGET not defined"
@ -196,7 +221,7 @@ function common_check_requirements {
fi
if [ -z $CMAKE_PROGRAM ]; then
CMAKE_PROGRAM=$(find $ANDROID_SDK/cmake -name cmake -type f -executable -print -quit)
CMAKE_PROGRAM=$(find $ANDROID_SDK/cmake -name cmake $FIND_ARGS)
fi
for CMD in make git $CMAKE_PROGRAM $NDK_BUILD
@ -218,7 +243,7 @@ function common_check_requirements {
}
function common_update {
if [ $# -ne 3 ];
if [ $# -ne 4 ];
then
echo "Invalid arguments to update function $@"
exit 1
@ -226,19 +251,22 @@ function common_update {
SCM_URL=$1
SCM_TAG=$2
BUILD_SRC=$3
SCM_HASH=$4
echo "Preparing checkout..."
BASE=$(pwd)
CACHE=$SCRIPT_PATH/../cache
common_run mkdir -p $CACHE
TARFILE="$CACHE/$SCM_TAG.tar.gz"
if [[ ! -f "$TARFILE" ]];
then
common_run wget -O "$TARFILE" "$SCM_URL/archive/$SCM_TAG.tar.gz"
common_run wget -O "$TARFILE" "$SCM_URL/$SCM_TAG.tar.gz"
fi
echo "$SCM_HASH $TARFILE" > $TARFILE.sha256sum
common_run sha256sum -c $TARFILE.sha256sum
if [[ -d $BUILD_SRC ]];
then
common_run rm -rf $BUILD_SRC

3
scripts/android-build-ffmpeg.sh
View File

@ -2,6 +2,7 @@
SCM_URL=https://github.com/FFmpeg/FFmpeg
SCM_TAG=n4.4.1
SCM_HASH=82b43cc67296bcd01a59ae6b327cdb50121d3a9e35f41a30de1edd71bb4a6666
OLD_PATH=$PATH
@ -135,7 +136,7 @@ function build {
# Run the main program.
common_parse_arguments $@
common_check_requirements
common_update $SCM_URL $SCM_TAG $BUILD_SRC
common_update $SCM_URL $SCM_TAG $BUILD_SRC $SCM_HASH
HOST_PKG_CONFIG_PATH=`command -v pkg-config`
if [ -z ${HOST_PKG_CONFIG_PATH} ]; then

39
scripts/android-build-freerdp.sh
View File

@ -1,11 +1,12 @@
#!/bin/bash
JPEG_TAG=master
OPENH264_TAG=master
OPENSSL_TAG=master
OPENH264_TAG=v2.3.1
OPENH264_HASH=453afa66dacb560bc5fd0468aabee90c483741571bca820a39a1c07f0362dc32
OPENSSL_TAG=openssl-1.1.1q
OPENSSL_HASH=d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca
FFMPEG_TAG=n4.4.1
FFMPEG_HASH=82b43cc67296bcd01a59ae6b327cdb50121d3a9e35f41a30de1edd71bb4a6666
WITH_JPEG=0
WITH_OPENH264=0
WITH_OPENSSL=0
WITH_FFMPEG=0
@ -32,10 +33,6 @@ do
SRC_DIR="$2"
shift
;;
--jpeg)
WITH_JPEG=1
shift
;;
--openh264)
WITH_OPENH264=1
shift
@ -108,21 +105,6 @@ BASE=$(pwd)
for ARCH in $BUILD_ARCH
do
# build dependencies.
if [ $WITH_JPEG -ne 0 ];
then
if [ $BUILD_DEPS -ne 0 ];
then
common_run bash $SCRIPT_PATH/android-build-jpeg.sh \
--src $BUILD_SRC/jpeg --dst $BUILD_DST \
--ndk $ANDROID_NDK \
--arch $ARCH \
--target $NDK_TARGET \
--tag $JPEG_TAG
fi
CMAKE_CMD_ARGS="$CMAKE_CMD_ARGS -DWITH_JPEG=ON"
else
CMAKE_CMD_ARGS="$CMAKE_CMD_ARGS -DWITH_JPEG=OFF"
fi
if [ $WITH_OPENH264 -ne 0 ];
then
if [ -z "$ANDROID_NDK_OPENH264" ]
@ -140,7 +122,8 @@ do
--ndk "$ANDROID_NDK_OPENH264" \
--arch $ARCH \
--target $NDK_TARGET \
--tag $OPENH264_TAG
--tag $OPENH264_TAG \
--hash $OPENH264_HASH
fi
CMAKE_CMD_ARGS="$CMAKE_CMD_ARGS -DWITH_OPENH264=ON"
else
@ -164,7 +147,8 @@ do
--ndk "$ANDROID_NDK" \
--arch $ARCH \
--target $NDK_TARGET \
--tag $FFMPEG_TAG
--tag $FFMPEG_TAG \
--hash $FFMPEG_HASH
fi
CMAKE_CMD_ARGS="$CMAKE_CMD_ARGS -DWITH_FFMPEG=ON -DWITH_SWSCALE=ON -DWITH_DSP_FFMPEG=ON"
else
@ -179,8 +163,9 @@ do
--sdk "$ANDROID_SDK" \
--ndk $ANDROID_NDK \
--arch $ARCH \
--target $NDK_TARGET \
--tag $OPENSSL_TAG
--target $NDK_TARGET \
--tag $OPENSSL_TAG \
--hash $OPENSSL_HASH
fi
fi

40
scripts/android-build-jpeg.sh
View File

@ -1,40 +0,0 @@
#!/bin/bash
SCM_URL=https://github.com/akallabeth/jpeg8d
SCM_TAG=master
source $(dirname "${BASH_SOURCE[0]}")/android-build-common.sh
function usage {
echo $0 [arguments]
echo "\tThe script checks out the OpenH264 git repository"
echo "\tto a local source directory, builds and installs"
echo "\tthe library for all architectures defined to"
echo "\tthe destination directory."
echo ""
echo "\t[-s|--source-dir <path>]"
echo "\t[-d|--destination-dir <path>]"
echo "\t[-a|--arch <architectures>]"
echo "\t[-t|--tag <tag or branch>]"
echo "\t[--scm-url <url>]"
echo "\t[--ndk <android NDK path>]"
echo "\t[--sdk <android SDK path>]"
exit 1
}
function build {
echo "Building architectures $BUILD_ARCH..."
BASE=$(pwd)
common_run cd $BUILD_SRC
common_run $NDK_BUILD V=1 APP_ABI="${BUILD_ARCH}" NDK_TOOLCHAIN_VERSION=4.9 -j clean
common_run $NDK_BUILD V=1 APP_ABI="${BUILD_ARCH}" NDK_TOOLCHAIN_VERSION=4.9 -j
common_run cd $BASE
}
# Run the main program.
common_parse_arguments $@
common_check_requirements
common_update $SCM_URL $SCM_TAG $BUILD_SRC
build
common_copy $BUILD_SRC $BUILD_DST

7
scripts/android-build-openh264.sh
View File

@ -1,6 +1,7 @@
#!/bin/bash
SCM_URL=https://github.com/cisco/openh264
SCM_TAG=master
SCM_URL=https://github.com/cisco/openh264/archive
SCM_TAG=v2.3.1
SCM_HASH=453afa66dacb560bc5fd0468aabee90c483741571bca820a39a1c07f0362dc32
source $(dirname "${BASH_SOURCE[0]}")/android-build-common.sh
@ -26,7 +27,7 @@ function build {
# Run the main program.
common_parse_arguments $@
common_check_requirements
common_update $SCM_URL $SCM_TAG $BUILD_SRC
common_update $SCM_URL $SCM_TAG $BUILD_SRC $SCM_HASH
for ARCH in $BUILD_ARCH

8
scripts/android-build-openssl.sh
View File

@ -1,7 +1,8 @@
#!/bin/bash
SCM_URL=https://github.com/openssl/openssl
SCM_TAG=master
SCM_URL=https://www.openssl.org/source
SCM_TAG=OpenSSL_1_1_1q
SCM_HASH=d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca
COMPILER=4.9
@ -43,7 +44,7 @@ function build {
# Run the main program.
common_parse_arguments $@
common_check_requirements
common_update $SCM_URL $SCM_TAG $BUILD_SRC
common_update $SCM_URL $SCM_TAG $BUILD_SRC $SCM_HASH
ORG_PATH=$PATH
for ARCH in $BUILD_ARCH
@ -74,4 +75,3 @@ then
common_run mkdir -p $BUILD_DST/$ARCH/include
fi
common_run cp -L -R $BUILD_SRC/include/openssl $BUILD_DST/$ARCH/include/

9
scripts/android-build-release.conf
View File

@ -9,7 +9,6 @@
# If you require support for older NDK API levels,
# create seperate configurations for each NDK API level
# and architecture you want to support.
WITH_JPEG=0
WITH_OPENH264=0
WITH_OPENSSL=1
WITH_FFMPEG=1
@ -18,10 +17,12 @@ DEPS_ONLY=0
NDK_TARGET=23
WITH_MEDIACODEC=1
JPEG_TAG=master
OPENH264_TAG=v2.2.0 # NOTE: NDK r15c or earlier needed in --openh624-ndk for v1.8.0
OPENSSL_TAG=OpenSSL_1_1_1o
OPENH264_TAG=v2.3.1
OPENH264_HASH=453afa66dacb560bc5fd0468aabee90c483741571bca820a39a1c07f0362dc32
OPENSSL_TAG=openssl-1.1.1q
OPENSSL_HASH=d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca
FFMPEG_TAG=n4.4.1
FFMPEG_HASH=82b43cc67296bcd01a59ae6b327cdb50121d3a9e35f41a30de1edd71bb4a6666
SRC_DIR=$SCRIPT_PATH/..
BUILD_DST=$SCRIPT_PATH/../client/Android/Studio/freeRDPCore/src/main/jniLibs

9
scripts/android-build.conf
View File

@ -9,7 +9,6 @@
# If you require support for older NDK API levels,
# create seperate configurations for each NDK API level
# and architecture you want to support.
WITH_JPEG=0
WITH_OPENH264=0
WITH_OPENSSL=1
WITH_FFMPEG=0
@ -18,10 +17,12 @@ DEPS_ONLY=0
NDK_TARGET=21
WITH_MEDIACODEC=1
JPEG_TAG=master
OPENH264_TAG=v2.2.0 # NOTE: NDK r15c or earlier needed in --openh624-ndk for v1.8.0
OPENSSL_TAG=OpenSSL_1_1_1o
OPENH264_TAG=v2.3.1
OPENH264_HASH=453afa66dacb560bc5fd0468aabee90c483741571bca820a39a1c07f0362dc32
OPENSSL_TAG=openssl-1.1.1q
OPENSSL_HASH=d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca
FFMPEG_TAG=n4.4.1
FFMPEG_HASH=82b43cc67296bcd01a59ae6b327cdb50121d3a9e35f41a30de1edd71bb4a6666
SRC_DIR=$SCRIPT_PATH/..
BUILD_DST=$SCRIPT_PATH/../client/Android/Studio/freeRDPCore/src/main/jniLibs

2
winpr/CMakeLists.txt
View File

@ -57,7 +57,7 @@ if (NOT WIN32)
endif()
# Soname versioning
set(RAW_VERSION_STRING "2.8.0")
set(RAW_VERSION_STRING "2.8.1")
if(EXISTS "${CMAKE_SOURCE_DIR}/.source_tag")
file(READ ${CMAKE_SOURCE_DIR}/.source_tag RAW_VERSION_STRING)
elseif(USE_VERSION_FROM_GIT_TAG)