From b809eb9d31058aad51fb82ff321a6bef45b23e58 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Wed, 18 Sep 2019 06:27:43 -0400 Subject: meta-openembedded: subtree update:19528ba2a6..ef1b17f4ef Callaghan, Dan (1): lmsensors: add a PACKAGECONFIG for sensord Changqing Li (1): ntp: fix package split wrongly when enabled usrmerge Khem Raj (1): remove spurious file Nathan Rossi (3): libeigen: Add native and nativesdk to BBCLASSEXTEND python*-pyusb: Add native and nativesdk to BBCLASSEXTEND python*-pyserial: Add native and nativesdk to BBCLASSEXTEND Oleksandr Kravchuk (23): babl: update to 0.1.62 znc: update to 1.7.4 zlog: update to 1.2.14 wipe: update to 0.24 upower: update to 0.99.11 python-pyobject: update to 3.34.0 python-pytoml: update to 0.1.21 python-cpuset: update to 1.6 libwebsockets: update to 3.2.0 libvpx: update to 1.8.1 libvdpau: update to 1.3 libmicrohttpd: update to 0.9.66 lcms: update to 2.9 libblockdev: update to 2.23 libbytesize: update to 2.1 iwd: update to 0.20 gsl: update to 2.6 gflags: update to 2.2.2 digitemp: update to 3.7.2 catch2: update to 2.9.2 botan: update to 2.11.0 agent-proxy: update to 1.97 ceres-solver: fix package version Paul Eggleton (1): mosquitto: update to 1.6.5 Scott Ellis (1): wireguard: Upgrade 20190905 to 20190913 Trevor Gamblin (1): openjpeg: upgrade 2.3.0 -> 2.3.1 Yi Zhao (1): samba: upgrade 4.10.7 -> 4.10.8 Zang Ruochen (2): python-dbus: upgrade 1.2.10 -> 1.2.12 python-pluggy: upgrade 0.12.0 -> 0.13.0 Zheng Ruoqin (1): xrdp: 0.9.4 -> 0.9.11 Change-Id: I3152060569cc5af7f7950c7037f25f54191d20a9 Signed-off-by: Brad Bishop --- .../ceres-solver/ceres-solver_1.14.0.bb | 34 +++++ .../ceres-solver/ceres-solver_1.14.bb | 34 ----- .../recipes-support/digitemp/digitemp_3.7.2.bb | 23 ++++ .../recipes-support/digitemp/digitemp_git.bb | 25 ---- .../meta-oe/recipes-support/gflags/gflags_2.2.0.bb | 20 --- .../meta-oe/recipes-support/gflags/gflags_2.2.2.bb | 20 +++ .../meta-oe/recipes-support/gsl/gsl_2.5.bb | 6 - .../meta-oe/recipes-support/gsl/gsl_2.6.bb | 5 + .../meta-oe/recipes-support/lcms/lcms_2.7.bb | 15 --- .../meta-oe/recipes-support/lcms/lcms_2.9.bb | 16 +++ .../files/0001-fix-out-of-tree-build-failure.patch | 37 ------ .../recipes-support/libbytesize/libbytesize_2.0.bb | 34 ----- .../recipes-support/libbytesize/libbytesize_2.1.bb | 32 +++++ .../recipes-support/libeigen/libeigen_3.3.7.bb | 2 + .../libmicrohttpd/libmicrohttpd_0.9.59.bb | 28 ---- .../libmicrohttpd/libmicrohttpd_0.9.66.bb | 29 ++++ ...wer-severity-of-unhandled-action-messages.patch | 31 ----- .../recipes-support/upower/upower_0.99.11.bb | 35 +++++ .../recipes-support/upower/upower_0.99.7.bb | 36 ----- .../xrdp/xrdp/0001-Fix-of-CVE-2017-16927.patch | 148 --------------------- .../xrdp/0001-Fix-sesman.ini-and-xrdp.ini.patch | 75 ----------- .../meta-oe/recipes-support/xrdp/xrdp_0.9.11.bb | 97 ++++++++++++++ .../meta-oe/recipes-support/xrdp/xrdp_0.9.4.bb | 99 -------------- 23 files changed, 293 insertions(+), 588 deletions(-) create mode 100644 meta-openembedded/meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/digitemp/digitemp_3.7.2.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/digitemp/digitemp_git.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/gflags/gflags_2.2.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/gflags/gflags_2.2.2.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/gsl/gsl_2.5.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/gsl/gsl_2.6.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/lcms/lcms_2.7.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/lcms/lcms_2.9.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/libbytesize/files/0001-fix-out-of-tree-build-failure.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_2.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_2.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.59.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.66.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/upower/upower/0001-linux-lower-severity-of-unhandled-action-messages.patch create mode 100644 meta-openembedded/meta-oe/recipes-support/upower/upower_0.99.11.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/upower/upower_0.99.7.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/xrdp/xrdp/0001-Fix-of-CVE-2017-16927.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/xrdp/xrdp/0001-Fix-sesman.ini-and-xrdp.ini.patch create mode 100644 meta-openembedded/meta-oe/recipes-support/xrdp/xrdp_0.9.11.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/xrdp/xrdp_0.9.4.bb (limited to 'meta-openembedded/meta-oe/recipes-support') diff --git a/meta-openembedded/meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.0.bb b/meta-openembedded/meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.0.bb new file mode 100644 index 000000000..ac463038a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.0.bb @@ -0,0 +1,34 @@ +DESCRIPTION = "Ceres Solver is an open source C++ library for modeling and solving large, complicated optimization problems." +AUTHOR = "Sameer Agarwal and Keir Mierle and Others" +HOMEPAGE = "http://ceres-solver.org/" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=35e00f0c4c96a0820a03e0b31e6416be" + +DEPENDS = "libeigen glog" + +SRC_URI = "git://github.com/ceres-solver/ceres-solver.git" +SRCREV = "facb199f3eda902360f9e1d5271372b7e54febe1" + +S = "${WORKDIR}/git" + +inherit cmake + +# We don't want path to eigen3 in ceres-solver RSS to be +# used by components which use CeresConfig.cmake from their +# own RSS +# ceres-solver/1.14-r0/packages-split/ceres-solver-dev/usr/lib/cmake/Ceres/CeresConfig.cmake: set(Eigen3_DIR ceres-solver/1.14-r0/recipe-sysroot/usr/share/eigen3/cmake) +# ceres-solver/1.14-r0/packages-split/ceres-solver-dev/usr/lib/cmake/Ceres/CeresConfig.cmake: list(APPEND EIGEN_INCLUDE_DIR_HINTS ceres-solver/1.14-r0/recipe-sysroot/usr/include/eigen3) +# ceres-solver/1.14-r0/packages-split/ceres-solver-dev/usr/lib/cmake/Ceres/CeresConfig.cmake: set(glog_DIR ceres-solver/1.14-r0/recipe-sysroot/usr/lib/cmake/glog) +SSTATE_SCAN_FILES += "*.cmake" + +PACKAGECONFIG ??= "" + +# suitesparse* recipes will be in meta-ros layer +PACKAGECONFIG[suitesparse] = "-DSUITESPARSE=ON,-DSUITESPARSE=OFF,suitesparse-config suitesparse-amd suitesparse-camd suitesparse-colamd suitesparse-ccolamd suitesparse-cholmod suitesparse-metis suitesparse-spqr" +PACKAGECONFIG[cxsparse] = "-DCXSPARSE=ON,-DCXSPARSE=OFF,suitesparse-cxsparse" +PACKAGECONFIG[lapack] = "-DLAPACK=ON,-DLAPACK=OFF,lapack" + +# Only a static library and headers are created +RDEPENDS_${PN}-dev = "" +RRECOMMENDS_${PN}-dev = "${PN}-staticdev" +RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" diff --git a/meta-openembedded/meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.bb b/meta-openembedded/meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.bb deleted file mode 100644 index ac463038a..000000000 --- a/meta-openembedded/meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.bb +++ /dev/null @@ -1,34 +0,0 @@ -DESCRIPTION = "Ceres Solver is an open source C++ library for modeling and solving large, complicated optimization problems." -AUTHOR = "Sameer Agarwal and Keir Mierle and Others" -HOMEPAGE = "http://ceres-solver.org/" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=35e00f0c4c96a0820a03e0b31e6416be" - -DEPENDS = "libeigen glog" - -SRC_URI = "git://github.com/ceres-solver/ceres-solver.git" -SRCREV = "facb199f3eda902360f9e1d5271372b7e54febe1" - -S = "${WORKDIR}/git" - -inherit cmake - -# We don't want path to eigen3 in ceres-solver RSS to be -# used by components which use CeresConfig.cmake from their -# own RSS -# ceres-solver/1.14-r0/packages-split/ceres-solver-dev/usr/lib/cmake/Ceres/CeresConfig.cmake: set(Eigen3_DIR ceres-solver/1.14-r0/recipe-sysroot/usr/share/eigen3/cmake) -# ceres-solver/1.14-r0/packages-split/ceres-solver-dev/usr/lib/cmake/Ceres/CeresConfig.cmake: list(APPEND EIGEN_INCLUDE_DIR_HINTS ceres-solver/1.14-r0/recipe-sysroot/usr/include/eigen3) -# ceres-solver/1.14-r0/packages-split/ceres-solver-dev/usr/lib/cmake/Ceres/CeresConfig.cmake: set(glog_DIR ceres-solver/1.14-r0/recipe-sysroot/usr/lib/cmake/glog) -SSTATE_SCAN_FILES += "*.cmake" - -PACKAGECONFIG ??= "" - -# suitesparse* recipes will be in meta-ros layer -PACKAGECONFIG[suitesparse] = "-DSUITESPARSE=ON,-DSUITESPARSE=OFF,suitesparse-config suitesparse-amd suitesparse-camd suitesparse-colamd suitesparse-ccolamd suitesparse-cholmod suitesparse-metis suitesparse-spqr" -PACKAGECONFIG[cxsparse] = "-DCXSPARSE=ON,-DCXSPARSE=OFF,suitesparse-cxsparse" -PACKAGECONFIG[lapack] = "-DLAPACK=ON,-DLAPACK=OFF,lapack" - -# Only a static library and headers are created -RDEPENDS_${PN}-dev = "" -RRECOMMENDS_${PN}-dev = "${PN}-staticdev" -RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" diff --git a/meta-openembedded/meta-oe/recipes-support/digitemp/digitemp_3.7.2.bb b/meta-openembedded/meta-oe/recipes-support/digitemp/digitemp_3.7.2.bb new file mode 100644 index 000000000..9fcc278d3 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/digitemp/digitemp_3.7.2.bb @@ -0,0 +1,23 @@ +SUMMARY = "read temperature sensors in a 1-Wire net" +SECTION = "util" +DEPENDS = "libusb1" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=44fee82a1d2ed0676cf35478283e0aa0" + +SRC_URI = "git://github.com/bcl/digitemp" + +SRCREV = "a162e63aad35358aab325388f3d5e88121606419" + +S = "${WORKDIR}/git" + +EXTRA_OEMAKE = "ds9097 ds9097u \ + SYSTYPE='Linux' \ +" +do_configure() { + rm -f digitemp_* +} + +do_install() { + install -d ${D}${sbindir} + install -m 0755 digitemp_* ${D}${sbindir} +} diff --git a/meta-openembedded/meta-oe/recipes-support/digitemp/digitemp_git.bb b/meta-openembedded/meta-oe/recipes-support/digitemp/digitemp_git.bb deleted file mode 100644 index 460aa1438..000000000 --- a/meta-openembedded/meta-oe/recipes-support/digitemp/digitemp_git.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "read temperature sensors in a 1-Wire net" -SECTION = "util" -DEPENDS = "libusb1" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=44fee82a1d2ed0676cf35478283e0aa0" - -PV = "3.7.1+git${SRCPV}" - -SRC_URI = "git://github.com/bcl/digitemp" - -SRCREV = "389f67655efa1674f595106c3a47b5ad082609a7" - -S = "${WORKDIR}/git" - -EXTRA_OEMAKE = "ds9097 ds9097u \ - SYSTYPE='Linux' \ -" -do_configure() { - rm -f digitemp_* -} - -do_install() { - install -d ${D}${sbindir} - install -m 0755 digitemp_* ${D}${sbindir} -} diff --git a/meta-openembedded/meta-oe/recipes-support/gflags/gflags_2.2.0.bb b/meta-openembedded/meta-oe/recipes-support/gflags/gflags_2.2.0.bb deleted file mode 100644 index 29a1125cd..000000000 --- a/meta-openembedded/meta-oe/recipes-support/gflags/gflags_2.2.0.bb +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION = "The gflags package contains a C++ library that implements commandline flags processing. It includes built-in support for standard types such as string and the ability to define flags in the source file in which they are used" -HOMEPAGE = "https://github.com/gflags/gflags" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING.txt;md5=c80d1a3b623f72bb85a4c75b556551df" - -SRC_URI = "git://github.com/gflags/gflags.git" -SRCREV = "f8a0efe03aa69b3336d8e228b37d4ccb17324b88" - -S = "${WORKDIR}/git" - -inherit cmake - -EXTRA_OECMAKE="-DBUILD_SHARED_LIBS=ON -DREGISTER_INSTALL_PREFIX=OFF -DLIB_INSTALL_DIR=${baselib}" - -PACKAGES =+ "${PN}-bash-completion" -FILES_${PN}-bash-completion += "${bindir}/gflags_completions.sh" - -RDEPENDS_${PN}-bash-completion = "bash bash-completion" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-support/gflags/gflags_2.2.2.bb b/meta-openembedded/meta-oe/recipes-support/gflags/gflags_2.2.2.bb new file mode 100644 index 000000000..6eea0c00e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/gflags/gflags_2.2.2.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "The gflags package contains a C++ library that implements commandline flags processing. It includes built-in support for standard types such as string and the ability to define flags in the source file in which they are used" +HOMEPAGE = "https://github.com/gflags/gflags" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING.txt;md5=c80d1a3b623f72bb85a4c75b556551df" + +SRC_URI = "git://github.com/gflags/gflags.git" +SRCREV = "e171aa2d15ed9eb17054558e0b3a6a413bb01067" + +S = "${WORKDIR}/git" + +inherit cmake + +EXTRA_OECMAKE="-DBUILD_SHARED_LIBS=ON -DREGISTER_INSTALL_PREFIX=OFF -DLIB_INSTALL_DIR=${baselib}" + +PACKAGES =+ "${PN}-bash-completion" +FILES_${PN}-bash-completion += "${bindir}/gflags_completions.sh" + +RDEPENDS_${PN}-bash-completion = "bash bash-completion" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-support/gsl/gsl_2.5.bb b/meta-openembedded/meta-oe/recipes-support/gsl/gsl_2.5.bb deleted file mode 100644 index 4e8541812..000000000 --- a/meta-openembedded/meta-oe/recipes-support/gsl/gsl_2.5.bb +++ /dev/null @@ -1,6 +0,0 @@ -include gsl.inc - -SRC_URI = "${GNU_MIRROR}/gsl/gsl-${PV}.tar.gz" - -SRC_URI[md5sum] = "52fcbe147ba413d78841084cb43c95fb" -SRC_URI[sha256sum] = "0460ad7c2542caaddc6729762952d345374784100223995eb14d614861f2258d" diff --git a/meta-openembedded/meta-oe/recipes-support/gsl/gsl_2.6.bb b/meta-openembedded/meta-oe/recipes-support/gsl/gsl_2.6.bb new file mode 100644 index 000000000..367a08321 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/gsl/gsl_2.6.bb @@ -0,0 +1,5 @@ +include gsl.inc + +SRC_URI = "${GNU_MIRROR}/gsl/gsl-${PV}.tar.gz" +SRC_URI[md5sum] = "bda73a3dd5ff2f30b5956764399db6e7" +SRC_URI[sha256sum] = "b782339fc7a38fe17689cb39966c4d821236c28018b6593ddb6fd59ee40786a8" diff --git a/meta-openembedded/meta-oe/recipes-support/lcms/lcms_2.7.bb b/meta-openembedded/meta-oe/recipes-support/lcms/lcms_2.7.bb deleted file mode 100644 index 12ccb2050..000000000 --- a/meta-openembedded/meta-oe/recipes-support/lcms/lcms_2.7.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "Little cms is a small-footprint, speed optimized color management engine" -SECTION = "libs" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=6c786c3b7a4afbd3c990f1b81261d516" -SRC_URI = "${SOURCEFORGE_MIRROR}/lcms/lcms2-${PV}.tar.gz" -SRC_URI[md5sum] = "06c1626f625424a811fb4b5eb070839d" -SRC_URI[sha256sum] = "4524234ae7de185e6b6da5d31d6875085b2198bc63b1211f7dde6e2d197d6a53" - -DEPENDS = "tiff" - -BBCLASSEXTEND = "native" - -S = "${WORKDIR}/lcms2-${PV}" - -inherit autotools diff --git a/meta-openembedded/meta-oe/recipes-support/lcms/lcms_2.9.bb b/meta-openembedded/meta-oe/recipes-support/lcms/lcms_2.9.bb new file mode 100644 index 000000000..be72d765e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/lcms/lcms_2.9.bb @@ -0,0 +1,16 @@ +SUMMARY = "Little cms is a small-footprint, speed optimized color management engine" +SECTION = "libs" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=6c786c3b7a4afbd3c990f1b81261d516" + +SRC_URI = "${SOURCEFORGE_MIRROR}/lcms/lcms2-${PV}.tar.gz" +SRC_URI[md5sum] = "8de1b7724f578d2995c8fdfa35c3ad0e" +SRC_URI[sha256sum] = "48c6fdf98396fa245ed86e622028caf49b96fa22f3e5734f853f806fbc8e7d20" + +DEPENDS = "tiff" + +BBCLASSEXTEND = "native" + +S = "${WORKDIR}/lcms2-${PV}" + +inherit autotools diff --git a/meta-openembedded/meta-oe/recipes-support/libbytesize/files/0001-fix-out-of-tree-build-failure.patch b/meta-openembedded/meta-oe/recipes-support/libbytesize/files/0001-fix-out-of-tree-build-failure.patch deleted file mode 100644 index 3f42c25d7..000000000 --- a/meta-openembedded/meta-oe/recipes-support/libbytesize/files/0001-fix-out-of-tree-build-failure.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 55802fd187b844f0c114c1657b18482bfc80ec51 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia -Date: Tue, 2 Jul 2019 02:52:31 +0000 -Subject: [PATCH] fix out of tree build failure - -Since commit [116da95 Add the '--version' option to bs_calc.py] applied, -while build out of tree, there is a install failure -... -|install -m0755 ../../git/tools/bs_calc.py /usr/bin/bscalc -|install: cannot stat '../../git/tools/bs_calc.py': No such file or directory -... - -The generated bs_calc.py locates in builddir rather than srcdir - -Upstream-Status: Submitted [https://github.com/storaged-project/libbytesize/pull/59] - -Signed-off-by: Hongxu Jia ---- - tools/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/Makefile.am b/tools/Makefile.am -index 08223a8..ae22fed 100644 ---- a/tools/Makefile.am -+++ b/tools/Makefile.am -@@ -5,7 +5,7 @@ dist_man1_MANS = bscalc.man - - install-exec-local: - install -d ${DESTDIR}${bindir} -- install -m0755 ${srcdir}/bs_calc.py ${DESTDIR}${bindir}/bscalc -+ install -m0755 ${builddir}/bs_calc.py ${DESTDIR}${bindir}/bscalc - - uninstall-local: - rm ${DESTDIR}${bindir}/bscalc --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_2.0.bb b/meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_2.0.bb deleted file mode 100644 index 74f1800d1..000000000 --- a/meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_2.0.bb +++ /dev/null @@ -1,34 +0,0 @@ -DESCRIPTION = "The goal of this project is to provide a tiny library that would \ -facilitate the common operations with sizes in bytes." -HOMEPAGE = "https://github.com/rhinstaller/libbytesize" -LICENSE = "LGPLv2+" -SECTION = "devel/lib" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=c07cb499d259452f324bb90c3067d85c" - -S = "${WORKDIR}/git" -B = "${S}" - -SRCREV = "92c00638a6f846df5c40dbb690f9fcf998ad6df2" -SRC_URI = "git://github.com/rhinstaller/libbytesize;branch=master \ - file://0001-fix-out-of-tree-build-failure.patch \ -" - -inherit gettext autotools python3native - -DEPENDS += " \ - libpcre2 \ - gmp \ - mpfr \ - gettext-native \ -" - -FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}/bytesize" - -PACKAGECONFIG ??= "python3" -PACKAGECONFIG[python3] = "--with-python3, --without-python3,,python3-core" -PACKAGECONFIG[doc] = "--with-gtk-doc, --without-gtk-doc, gtk-doc-native" - -EXTRA_OEMAKE = "py3libdir=${PYTHON_SITEPACKAGES_DIR}" - - diff --git a/meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_2.1.bb b/meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_2.1.bb new file mode 100644 index 000000000..07bf1faae --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_2.1.bb @@ -0,0 +1,32 @@ +DESCRIPTION = "The goal of this project is to provide a tiny library that would \ +facilitate the common operations with sizes in bytes." +HOMEPAGE = "https://github.com/rhinstaller/libbytesize" +LICENSE = "LGPLv2+" +SECTION = "devel/lib" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=c07cb499d259452f324bb90c3067d85c" + +S = "${WORKDIR}/git" +B = "${S}" + +SRCREV = "9ecc1042109528051983261ffd491d45e7c471e1" +SRC_URI = "git://github.com/rhinstaller/libbytesize;branch=master" + +inherit gettext autotools python3native + +DEPENDS += " \ + libpcre2 \ + gmp \ + mpfr \ + gettext-native \ +" + +FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}/bytesize" + +PACKAGECONFIG ??= "python3" +PACKAGECONFIG[python3] = "--with-python3, --without-python3,,python3-core" +PACKAGECONFIG[doc] = "--with-gtk-doc, --without-gtk-doc, gtk-doc-native" + +EXTRA_OEMAKE = "py3libdir=${PYTHON_SITEPACKAGES_DIR}" + + diff --git a/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen_3.3.7.bb b/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen_3.3.7.bb index e1deb662a..f638848d1 100644 --- a/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen_3.3.7.bb +++ b/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen_3.3.7.bb @@ -18,3 +18,5 @@ FILES_${PN}-dev = "${includedir} ${datadir}/eigen3/cmake ${datadir}/cmake/Module # ${PN} is empty so we need to tweak -dev and -dbg package dependencies RDEPENDS_${PN}-dev = "" RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.59.bb b/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.59.bb deleted file mode 100644 index 7e50edf7b..000000000 --- a/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.59.bb +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION = "A small C library that is supposed to make it easy to run an HTTP server as part of another application" -HOMEPAGE = "http://www.gnu.org/software/libmicrohttpd/" -LICENSE = "LGPL-2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=9331186f4f80db7da0e724bdd6554ee5" -SECTION = "net" -DEPENDS = "file" - -SRC_URI = "${GNU_MIRROR}/libmicrohttpd/${BPN}-${PV}.tar.gz" -SRC_URI[md5sum] = "8ab5123535549195aff19e91b4e49f48" -SRC_URI[sha256sum] = "9b9ccd7d0b11b0e179f1f58dc2caa3e0c62c8609e1e1dc7dcaadf941b67d923c" - -inherit autotools lib_package pkgconfig gettext - -CFLAGS += "-pthread -D_REENTRANT" - -EXTRA_OECONF += "--disable-static --with-gnutls=${STAGING_LIBDIR}/../" - -PACKAGECONFIG ?= "curl https" -PACKAGECONFIG_append_class-target = "\ - ${@bb.utils.filter('DISTRO_FEATURES', 'largefile', d)} \ -" -PACKAGECONFIG[largefile] = "--enable-largefile,--disable-largefile,," -PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl," -PACKAGECONFIG[https] = "--enable-https,--disable-https,libgcrypt gnutls," - -do_compile_append() { - sed -i s:-L${STAGING_LIBDIR}::g libmicrohttpd.pc -} diff --git a/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.66.bb b/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.66.bb new file mode 100644 index 000000000..7d349b94e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.66.bb @@ -0,0 +1,29 @@ +DESCRIPTION = "A small C library that is supposed to make it easy to run an HTTP server as part of another application" +HOMEPAGE = "http://www.gnu.org/software/libmicrohttpd/" +LICENSE = "LGPL-2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=57d09285feac8a64efa878e692b14f36" +SECTION = "net" + +DEPENDS = "file" + +SRC_URI = "${GNU_MIRROR}/libmicrohttpd/${BPN}-${PV}.tar.gz" +SRC_URI[md5sum] = "ce4050e75cc40d68506e2b403e1a76f9" +SRC_URI[sha256sum] = "4e66d4db1574f4912fbd2690d10d227cc9cc56df6a10aa8f4fc2da75cea7ab1b" + +inherit autotools lib_package pkgconfig gettext + +CFLAGS += "-pthread -D_REENTRANT" + +EXTRA_OECONF += "--disable-static --with-gnutls=${STAGING_LIBDIR}/../" + +PACKAGECONFIG ?= "curl https" +PACKAGECONFIG_append_class-target = "\ + ${@bb.utils.filter('DISTRO_FEATURES', 'largefile', d)} \ +" +PACKAGECONFIG[largefile] = "--enable-largefile,--disable-largefile,," +PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl," +PACKAGECONFIG[https] = "--enable-https,--disable-https,libgcrypt gnutls," + +do_compile_append() { + sed -i s:-L${STAGING_LIBDIR}::g libmicrohttpd.pc +} diff --git a/meta-openembedded/meta-oe/recipes-support/upower/upower/0001-linux-lower-severity-of-unhandled-action-messages.patch b/meta-openembedded/meta-oe/recipes-support/upower/upower/0001-linux-lower-severity-of-unhandled-action-messages.patch deleted file mode 100644 index de89dc01c..000000000 --- a/meta-openembedded/meta-oe/recipes-support/upower/upower/0001-linux-lower-severity-of-unhandled-action-messages.patch +++ /dev/null @@ -1,31 +0,0 @@ -From f64b6ce8054b47e5bdcc8c4c7965534b388e6151 Mon Sep 17 00:00:00 2001 -From: Dmitry Torokhov -Date: Fri, 6 Apr 2018 11:26:54 -0700 -Subject: [PATCH] linux: lower severity of "unhandled action" messages - -Newer kernels emit bind/unbind uevents that are not of interest to -powerd. To avoid littering logs with scary messages, let's lower their -severity to "debug". - -https://bugs.freedesktop.org/show_bug.cgi?id=106019 - -Upstream-Status: Backport ---- - src/linux/up-backend.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/linux/up-backend.c b/src/linux/up-backend.c -index e668dc8..b8021e7 100644 ---- a/src/linux/up-backend.c -+++ b/src/linux/up-backend.c -@@ -273,7 +273,7 @@ up_backend_uevent_signal_handler_cb (GUdevClient *client, const gchar *action, - g_debug ("SYSFS change %s", g_udev_device_get_sysfs_path (device)); - up_backend_device_changed (backend, device); - } else { -- g_warning ("unhandled action '%s' on %s", action, g_udev_device_get_sysfs_path (device)); -+ g_debug ("unhandled action '%s' on %s", action, g_udev_device_get_sysfs_path (device)); - } - } - --- -2.17.0.484.g0c8726318c-goog diff --git a/meta-openembedded/meta-oe/recipes-support/upower/upower_0.99.11.bb b/meta-openembedded/meta-oe/recipes-support/upower/upower_0.99.11.bb new file mode 100644 index 000000000..c4cc62711 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/upower/upower_0.99.11.bb @@ -0,0 +1,35 @@ +DESCRIPTION = "UPower is an abstraction for enumerating power devices, listening to device events and querying history and statistics. " +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=0de8fbf1d97a140d1d93b9f14dcfbf08" + +DEPENDS = "intltool-native libusb1 libgudev glib-2.0 dbus-glib" + +SRC_URI = " \ + http://upower.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ +" +SRC_URI[md5sum] = "abe6acb617f11f2e8dbd9846fcf86e24" +SRC_URI[sha256sum] = "64b5ffbfccd5bdb15d925777979a4dbee1a957f9eaeb158dc76175267eddbdef" + +inherit autotools pkgconfig gettext gobject-introspection systemd distro_features_check + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG[idevice] = "--with-idevice,--without-idevice,libimobiledevice libplist" +PACKAGECONFIG[systemd] = "--with-systemdutildir=${systemd_unitdir} --with-systemdsystemunitdir=${systemd_system_unitdir}, \ + --without-systemdutildir --without-systemdsystemunitdir,systemd" + +EXTRA_OECONF = " --with-backend=linux" + +SYSTEMD_SERVICE_${PN} = "upower.service" +# don't start on boot by default - dbus does that on demand +SYSTEMD_AUTO_ENABLE = "disable" + +do_configure_prepend() { + sed -i -e s:-nonet:\:g ${S}/doc/man/Makefile.am + sed -i -e 's: doc : :g' ${S}/Makefile.am +} + +RDEPENDS_${PN} += "dbus" +RRECOMMENDS_${PN} += "pm-utils" +FILES_${PN} += "${datadir}/dbus-1/ \ + ${base_libdir}/udev/* \ +" diff --git a/meta-openembedded/meta-oe/recipes-support/upower/upower_0.99.7.bb b/meta-openembedded/meta-oe/recipes-support/upower/upower_0.99.7.bb deleted file mode 100644 index ffa2c49ee..000000000 --- a/meta-openembedded/meta-oe/recipes-support/upower/upower_0.99.7.bb +++ /dev/null @@ -1,36 +0,0 @@ -DESCRIPTION = "UPower is an abstraction for enumerating power devices, listening to device events and querying history and statistics. " -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=0de8fbf1d97a140d1d93b9f14dcfbf08" - -DEPENDS = "intltool-native libusb1 libgudev glib-2.0 dbus-glib" - -SRC_URI = " \ - http://upower.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ - file://0001-linux-lower-severity-of-unhandled-action-messages.patch \ -" -SRC_URI[md5sum] = "236bb439d9ff1151450b3d8582399532" -SRC_URI[sha256sum] = "24bcc2f6ab25a2533bac70b587bcb019e591293076920f5b5e04bdedc140a401" - -inherit autotools pkgconfig gettext gobject-introspection systemd distro_features_check - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" -PACKAGECONFIG[idevice] = "--with-idevice,--without-idevice,libimobiledevice libplist" -PACKAGECONFIG[systemd] = "--with-systemdutildir=${systemd_unitdir} --with-systemdsystemunitdir=${systemd_system_unitdir}, \ - --without-systemdutildir --without-systemdsystemunitdir,systemd" - -EXTRA_OECONF = " --with-backend=linux" - -SYSTEMD_SERVICE_${PN} = "upower.service" -# don't start on boot by default - dbus does that on demand -SYSTEMD_AUTO_ENABLE = "disable" - -do_configure_prepend() { - sed -i -e s:-nonet:\:g ${S}/doc/man/Makefile.am - sed -i -e 's: doc : :g' ${S}/Makefile.am -} - -RDEPENDS_${PN} += "dbus" -RRECOMMENDS_${PN} += "pm-utils" -FILES_${PN} += "${datadir}/dbus-1/ \ - ${base_libdir}/udev/* \ -" diff --git a/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp/0001-Fix-of-CVE-2017-16927.patch b/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp/0001-Fix-of-CVE-2017-16927.patch deleted file mode 100644 index 4c93647f6..000000000 --- a/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp/0001-Fix-of-CVE-2017-16927.patch +++ /dev/null @@ -1,148 +0,0 @@ -Subject: [PATCH] Fix CVE-2017-16927 - -sesman: scpv0, accept variable length data fields - -Upstream-Status: Backport - ---- - sesman/libscp/libscp_v0.c | 32 +++++++++++++++++++++++++------- - 1 file changed, 25 insertions(+), 7 deletions(-) - -diff --git a/sesman/libscp/libscp_v0.c b/sesman/libscp/libscp_v0.c -index 5a0c8bf..5693407 100644 ---- a/sesman/libscp/libscp_v0.c -+++ b/sesman/libscp/libscp_v0.c -@@ -161,7 +161,7 @@ scp_v0s_accept(struct SCP_CONNECTION *c, struct SCP_SESSION **s, int skipVchk) - struct SCP_SESSION *session = 0; - tui16 sz; - tui32 code = 0; -- char buf[257]; -+ char *buf = 0; - - if (!skipVchk) - { -@@ -226,27 +226,31 @@ scp_v0s_accept(struct SCP_CONNECTION *c, struct SCP_SESSION **s, int skipVchk) - - /* reading username */ - in_uint16_be(c->in_s, sz); -- buf[sz] = '\0'; -+ buf = g_new0(char, sz); - in_uint8a(c->in_s, buf, sz); -- -+ buf[sz] = '\0'; - if (0 != scp_session_set_username(session, buf)) - { - scp_session_destroy(session); - log_message(LOG_LEVEL_WARNING, "[v0:%d] connection aborted: error setting username", __LINE__); -+ g_free(buf); - return SCP_SERVER_STATE_INTERNAL_ERR; - } -+ g_free(buf); - - /* reading password */ - in_uint16_be(c->in_s, sz); -- buf[sz] = '\0'; -+ buf = g_new0(char, sz); - in_uint8a(c->in_s, buf, sz); -- -+ buf[sz] = '\0'; - if (0 != scp_session_set_password(session, buf)) - { - scp_session_destroy(session); - log_message(LOG_LEVEL_WARNING, "[v0:%d] connection aborted: error setting password", __LINE__); -+ g_free(buf); - return SCP_SERVER_STATE_INTERNAL_ERR; - } -+ g_free(buf); - - /* width */ - in_uint16_be(c->in_s, sz); -@@ -272,9 +276,11 @@ scp_v0s_accept(struct SCP_CONNECTION *c, struct SCP_SESSION **s, int skipVchk) - - if (sz > 0) - { -+ buf = g_new0(char, sz); - in_uint8a(c->in_s, buf, sz); - buf[sz] = '\0'; - scp_session_set_domain(session, buf); -+ g_free(buf); - } - } - -@@ -285,9 +291,11 @@ scp_v0s_accept(struct SCP_CONNECTION *c, struct SCP_SESSION **s, int skipVchk) - - if (sz > 0) - { -+ buf = g_new0(char, sz); - in_uint8a(c->in_s, buf, sz); - buf[sz] = '\0'; - scp_session_set_program(session, buf); -+ g_free(buf); - } - } - -@@ -298,9 +306,11 @@ scp_v0s_accept(struct SCP_CONNECTION *c, struct SCP_SESSION **s, int skipVchk) - - if (sz > 0) - { -+ buf = g_new0(char, sz); - in_uint8a(c->in_s, buf, sz); - buf[sz] = '\0'; - scp_session_set_directory(session, buf); -+ g_free(buf); - } - } - -@@ -311,9 +321,11 @@ scp_v0s_accept(struct SCP_CONNECTION *c, struct SCP_SESSION **s, int skipVchk) - - if (sz > 0) - { -+ buf = g_new0(char, sz); - in_uint8a(c->in_s, buf, sz); - buf[sz] = '\0'; - scp_session_set_client_ip(session, buf); -+ g_free(buf); - } - } - } -@@ -332,29 +344,35 @@ scp_v0s_accept(struct SCP_CONNECTION *c, struct SCP_SESSION **s, int skipVchk) - scp_session_set_type(session, SCP_GW_AUTHENTICATION); - /* reading username */ - in_uint16_be(c->in_s, sz); -- buf[sz] = '\0'; -+ buf = g_new0(char, sz); - in_uint8a(c->in_s, buf, sz); -+ buf[sz] = '\0'; - - /* g_writeln("Received user name: %s",buf); */ - if (0 != scp_session_set_username(session, buf)) - { - scp_session_destroy(session); - /* until syslog merge log_message(s_log, LOG_LEVEL_WARNING, "[v0:%d] connection aborted: error setting username", __LINE__);*/ -+ g_free(buf); - return SCP_SERVER_STATE_INTERNAL_ERR; - } -+ g_free(buf); - - /* reading password */ - in_uint16_be(c->in_s, sz); -- buf[sz] = '\0'; -+ buf = g_new0(char, sz); - in_uint8a(c->in_s, buf, sz); -+ buf[sz] = '\0'; - - /* g_writeln("Received password: %s",buf); */ - if (0 != scp_session_set_password(session, buf)) - { - scp_session_destroy(session); - /* until syslog merge log_message(s_log, LOG_LEVEL_WARNING, "[v0:%d] connection aborted: error setting password", __LINE__); */ -+ g_free(buf); - return SCP_SERVER_STATE_INTERNAL_ERR; - } -+ g_free(buf); - } - else - { --- -2.7.4 - diff --git a/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp/0001-Fix-sesman.ini-and-xrdp.ini.patch b/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp/0001-Fix-sesman.ini-and-xrdp.ini.patch deleted file mode 100644 index deaadde8c..000000000 --- a/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp/0001-Fix-sesman.ini-and-xrdp.ini.patch +++ /dev/null @@ -1,75 +0,0 @@ -From a9c460f158d68c1b3de6a31ce853de5379977695 Mon Sep 17 00:00:00 2001 -From: Lei Maohui -Date: Thu, 30 Nov 2017 11:10:04 +0900 -Subject: [PATCH] Fix sesman.ini and xrdp.ini - -Signed-off-by: Lei Maohui ---- - sesman/sesman.ini | 20 ++++++-------------- - xrdp/xrdp.ini | 10 ---------- - 2 files changed, 6 insertions(+), 24 deletions(-) - -diff --git a/sesman/sesman.ini b/sesman/sesman.ini -index 8225ee4..c09189e 100644 ---- a/sesman/sesman.ini -+++ b/sesman/sesman.ini -@@ -54,12 +54,14 @@ LogLevel=DEBUG - EnableSyslog=1 - SyslogLevel=DEBUG - --[X11rdp] --param=X11rdp --param=-bs -+[Xorg] -+param=Xorg -+param=-config -+param=xrdp/xorg.conf -+param=-noreset - param=-nolisten - param=tcp --param=-uds -+ - - [Xvnc] - param=Xvnc -@@ -70,16 +72,6 @@ param=-localhost - param=-dpi - param=96 - --[Xorg] --param=Xorg --param=-config --param=xrdp/xorg.conf --param=-noreset --param=-nolisten --param=tcp --param=-logfile --param=.xorgxrdp.%s.log -- - [Chansrv] - ; drive redirection, defaults to xrdp_client if not set - FuseMountName=thinclient_drives -diff --git a/xrdp/xrdp.ini b/xrdp/xrdp.ini -index cb6d7c3..9f63a69 100644 ---- a/xrdp/xrdp.ini -+++ b/xrdp/xrdp.ini -@@ -157,16 +157,6 @@ ip=127.0.0.1 - port=-1 - code=20 - --[X11rdp] --name=X11rdp --lib=libxup.so --username=ask --password=ask --ip=127.0.0.1 --port=-1 --xserverbpp=24 --code=10 -- - [Xvnc] - name=Xvnc - lib=libvnc.so --- -1.8.4.2 - diff --git a/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp_0.9.11.bb b/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp_0.9.11.bb new file mode 100644 index 000000000..75caf8d6b --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp_0.9.11.bb @@ -0,0 +1,97 @@ +SUMMARY = "An open source remote desktop protocol(rdp) server." + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=72cfbe4e7bd33a0a1de9630c91195c21 \ +" + +inherit distro_features_check autotools pkgconfig useradd systemd + +DEPENDS = "openssl virtual/libx11 libxfixes libxrandr libpam nasm-native" + +REQUIRED_DISTRO_FEATURES = "x11 pam" + +SRC_URI = "git://github.com/neutrinolabs/xrdp.git \ + file://xrdp.sysconfig \ + file://0001-Added-req_distinguished_name-in-etc-xrdp-openssl.con.patch \ + file://0001-Fix-the-compile-error.patch \ + " + +SRCREV = "1e4b03eb3c9aa7173de251a328c93c073dcc0fca" + +PV = "0.9.11" + +S = "${WORKDIR}/git" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[fuse] = " --enable-fuse, --disable-fuse, fuse" + +USERADD_PACKAGES = "${PN}" +GROUPADD_PARAM_${PN} = "--system xrdp" +USERADD_PARAM_${PN} = "--system --home /var/run/xrdp -g xrdp \ + --no-create-home --shell /bin/false xrdp" + +FILES_${PN} += "${datadir}/dbus-1/services/*.service \ + ${datadir}/dbus-1/accessibility-services/*.service " + +FILES_${PN}-dev += "${libdir}/xrdp/libcommon.so \ + ${libdir}/xrdp/libxrdp.so \ + ${libdir}/xrdp/libscp.so \ + ${libdir}/xrdp/libxrdpapi.so " + +EXTRA_OECONF = "--enable-pam-config=suse" + +do_configure_prepend() { + cd ${S} + ./bootstrap + cd - +} + +do_compile_prepend() { + sed -i 's/(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am/(MAKE) $(AM_MAKEFLAGS) install-exec-am/g' ${S}/keygen/Makefile.in +} + + +do_install_append() { + install -d ${D}${sysconfdir} + install -d ${D}${sysconfdir}/xrdp + install -d ${D}${sysconfdir}/xrdp/pam.d + install -d ${D}${sysconfdir}/sysconfig/xrdp + + # deal with systemd unit files + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${S}/instfiles/xrdp.service.in ${D}${systemd_unitdir}/system/xrdp.service + install -m 0644 ${S}/instfiles/xrdp-sesman.service.in ${D}${systemd_unitdir}/system/xrdp-sesman.service + sed -i -e 's,@localstatedir@,${localstatedir},g' ${D}${systemd_unitdir}/system/xrdp.service ${D}${systemd_unitdir}/system/xrdp-sesman.service + sed -i -e 's,@sysconfdir@,${sysconfdir},g' ${D}${systemd_unitdir}/system/xrdp.service ${D}${systemd_unitdir}/system/xrdp-sesman.service + sed -i -e 's,@sbindir@,${sbindir},g' ${D}${systemd_unitdir}/system/xrdp.service ${D}${systemd_unitdir}/system/xrdp-sesman.service + + install -m 0644 ${S}/instfiles/*.ini ${D}${sysconfdir}/xrdp/ + install -m 0644 ${S}/sesman/sesman.ini.in ${D}${sysconfdir}/xrdp/ + install -m 0644 ${S}/sesman/startwm.sh ${D}${sysconfdir}/xrdp/ + install -m 0644 ${S}/xrdp/xrdp.ini.in ${D}${sysconfdir}/xrdp/ + install -m 0644 ${S}/xrdp/xrdp_keyboard.ini ${D}${sysconfdir}/xrdp/ + install -m 0644 ${S}/instfiles/xrdp.sh ${D}${sysconfdir}/xrdp/ + install -m 0644 ${S}/keygen/openssl.conf ${D}${sysconfdir}/xrdp/ + install -m 0644 ${WORKDIR}/xrdp.sysconfig ${D}${sysconfdir}/sysconfig/xrdp/ + chown xrdp:xrdp ${D}${sysconfdir}/xrdp +} + +SYSTEMD_SERVICE_${PN} = "xrdp.service xrdp-sesman.service" + +pkg_postinst_${PN}() { + if test -z "$D" + then + if test -x ${bindir}/xrdp-keygen + then + ${bindir}/xrdp-keygen xrdp ${sysconfdir}/xrdp/rsakeys.ini >/dev/null + fi + if test ! -s ${sysconfdir}/xrdp/cert.pem + then + openssl req -x509 -newkey rsa:2048 -sha256 -nodes -days 3652 \ + -keyout ${sysconfdir}/xrdp/key.pem \ + -out ${sysconfdir}/xrdp/cert.pem \ + -config ${sysconfdir}/xrdp/openssl.conf >/dev/null 2>&1 + chmod 400 ${sysconfdir}/xrdp/key.pem + fi + fi +} diff --git a/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp_0.9.4.bb b/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp_0.9.4.bb deleted file mode 100644 index 3ef7c9853..000000000 --- a/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp_0.9.4.bb +++ /dev/null @@ -1,99 +0,0 @@ -SUMMARY = "An open source remote desktop protocol(rdp) server." - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=72cfbe4e7bd33a0a1de9630c91195c21 \ -" - -inherit distro_features_check autotools pkgconfig useradd systemd - -DEPENDS = "openssl virtual/libx11 libxfixes libxrandr libpam nasm-native" - -REQUIRED_DISTRO_FEATURES = "x11 pam" - -SRC_URI = "git://github.com/neutrinolabs/xrdp.git \ - file://xrdp.sysconfig \ - file://0001-Fix-sesman.ini-and-xrdp.ini.patch \ - file://0001-Added-req_distinguished_name-in-etc-xrdp-openssl.con.patch \ - file://0001-Fix-the-compile-error.patch \ - file://0001-Fix-of-CVE-2017-16927.patch \ - " - -SRCREV = "c295dd61b882e8b56677cf12791f43634f9190b5" - -PV = "0.9.4+git${SRCPV}" - -S = "${WORKDIR}/git" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[fuse] = " --enable-fuse, --disable-fuse, fuse" - -USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "--system xrdp" -USERADD_PARAM_${PN} = "--system --home /var/run/xrdp -g xrdp \ - --no-create-home --shell /bin/false xrdp" - -FILES_${PN} += "${datadir}/dbus-1/services/*.service \ - ${datadir}/dbus-1/accessibility-services/*.service " - -FILES_${PN}-dev += "${libdir}/xrdp/libcommon.so \ - ${libdir}/xrdp/libxrdp.so \ - ${libdir}/xrdp/libscp.so \ - ${libdir}/xrdp/libxrdpapi.so " - -EXTRA_OECONF = "--enable-pam-config=suse" - -do_configure_prepend() { - cd ${S} - ./bootstrap - cd - -} - -do_compile_prepend() { - sed -i 's/(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am/(MAKE) $(AM_MAKEFLAGS) install-exec-am/g' ${S}/keygen/Makefile.in -} - - -do_install_append() { - install -d ${D}${sysconfdir} - install -d ${D}${sysconfdir}/xrdp - install -d ${D}${sysconfdir}/xrdp/pam.d - install -d ${D}${sysconfdir}/sysconfig/xrdp - - # deal with systemd unit files - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${S}/instfiles/xrdp.service.in ${D}${systemd_unitdir}/system/xrdp.service - install -m 0644 ${S}/instfiles/xrdp-sesman.service.in ${D}${systemd_unitdir}/system/xrdp-sesman.service - sed -i -e 's,@localstatedir@,${localstatedir},g' ${D}${systemd_unitdir}/system/xrdp.service ${D}${systemd_unitdir}/system/xrdp-sesman.service - sed -i -e 's,@sysconfdir@,${sysconfdir},g' ${D}${systemd_unitdir}/system/xrdp.service ${D}${systemd_unitdir}/system/xrdp-sesman.service - sed -i -e 's,@sbindir@,${sbindir},g' ${D}${systemd_unitdir}/system/xrdp.service ${D}${systemd_unitdir}/system/xrdp-sesman.service - - install -m 0644 ${S}/instfiles/*.ini ${D}${sysconfdir}/xrdp/ - install -m 0644 ${S}/sesman/sesman.ini ${D}${sysconfdir}/xrdp/ - install -m 0644 ${S}/sesman/startwm.sh ${D}${sysconfdir}/xrdp/ - install -m 0644 ${S}/xrdp/xrdp.ini ${D}${sysconfdir}/xrdp/ - install -m 0644 ${S}/xrdp/xrdp_keyboard.ini ${D}${sysconfdir}/xrdp/ - install -m 0644 ${S}/instfiles/xrdp.sh ${D}${sysconfdir}/xrdp/ - install -m 0644 ${S}/keygen/openssl.conf ${D}${sysconfdir}/xrdp/ - install -m 0644 ${WORKDIR}/xrdp.sysconfig ${D}${sysconfdir}/sysconfig/xrdp/ - chown xrdp:xrdp ${D}${sysconfdir}/xrdp -} - -SYSTEMD_SERVICE_${PN} = "xrdp.service xrdp-sesman.service" - -pkg_postinst_${PN}() { - if test -z "$D" - then - if test -x ${bindir}/xrdp-keygen - then - ${bindir}/xrdp-keygen xrdp ${sysconfdir}/xrdp/rsakeys.ini >/dev/null - fi - if test ! -s ${sysconfdir}/xrdp/cert.pem - then - openssl req -x509 -newkey rsa:2048 -sha256 -nodes -days 3652 \ - -keyout ${sysconfdir}/xrdp/key.pem \ - -out ${sysconfdir}/xrdp/cert.pem \ - -config ${sysconfdir}/xrdp/openssl.conf >/dev/null 2>&1 - chmod 400 ${sysconfdir}/xrdp/key.pem - fi - fi -} -- cgit v1.2.3