pkcs11-helper: Upgrade to 1.25.1
PATCH 1/17 pkcs11-helper: Upgrade to 1.25.1
* Fixes build with OpenSSL 1.1.x
License-Update:
* update year to 2018
* remove 'All rights reserved'
---
.../{pkcs11-helper_1.11.bb => pkcs11-helper_1.25.1.bb} | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
rename meta-oe/recipes-crypto/pkcs11-helper/{pkcs11-helper_1.11.bb => pkcs11-helper_1.25.1.bb} (74%)meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.25.1.bb renamed from meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.11.bb +4 -5
@@ -11,16 +11,15 @@ SECTION = "Development/Libraries" LICENSE = "GPLv2 & BSD" LIC_FILES_CHKSUM = " \ - file://COPYING;md5=4948810631bcac142af53d32df5b6ee1 \ + file://COPYING;md5=30f10d22cfb1ba98ccd714a41ad3311a \ file://COPYING.GPL;md5=8a71d0475d08eee76d8b6d0c6dbec543 \ - file://COPYING.BSD;md5=f79f90ea7a106796af80b5d05f1f8da1 \ + file://COPYING.BSD;md5=66b7a37c3c10483c1fd86007726104d7 \ " SRC_URI = "git://github.com/OpenSC/${BPN}.git" -SRC_URI[md5sum] = "9f62af9f475901b89355266141306673" -SRC_URI[sha256sum] = "494ec59c93e7c56c528f335d9353849e2e7c94a6b1b41c89604694e738113386" S = "${WORKDIR}/git" -SRCREV = "e7adf8f35be232a4f04c53b4ac409be52792093e" +# v1.25.1 +SRCREV = "2713cb09dcd90104cb7bceb5f14cd6f90834f7b1" DEPENDS = "zlib nettle gnutls gmp openssl nss nspr"
Signature · 1 line
2.18.0
PATCH 2/17 links,links-x11: Upgrade to 2.16
* Fixes build with OpenSSL 1.1.x
License-Update: Corrected formatting
---
.../links/files/ac-prog-cxx.patch | 24 ++++++---
.../recipes-support/links/links-x11_2.16.bb | 53 +++++++++++++++++++
.../recipes-support/links/links-x11_2.7.bb | 31 -----------
meta-oe/recipes-support/links/links.inc | 2 +-
.../links/{links_2.7.bb => links_2.16.bb} | 6 ++-
5 files changed, 75 insertions(+), 41 deletions(-)
create mode 100644 meta-oe/recipes-support/links/links-x11_2.16.bb
delete mode 100644 meta-oe/recipes-support/links/links-x11_2.7.bb
rename meta-oe/recipes-support/links/{links_2.7.bb => links_2.16.bb} (53%)meta-oe/recipes-support/links/files/ac-prog-cxx.patch +17 -7
@@ -1,11 +1,21 @@ ---- links-2.1pre20/configure.in.orig 2005-12-21 15:23:49.000000000 +0000 -+++ links-2.1pre20/configure.in 2005-12-21 15:23:59.000000000 +0000 -@@ -18,7 +18,7 @@ +From c00668541f68c17a5e453a4dcc2a86022b20af87 Mon Sep 17 00:00:00 2001 +From: Martin Jansa <[email protected]> +Date: Mon, 30 Jul 2012 23:52:49 +0200 + +--- + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.in b/configure.in +index 7c15b6b..9896631 100644 +--- a/configure.in ++++ b/configure.in +@@ -23,7 +23,7 @@ AM_CONFIG_HEADER(config.h) dnl Checks for programs. AC_PROG_CC --#AC_PROG_CXX +-dnl AC_PROG_CXX +AC_PROG_CXX - #AC_PROG_AWK - #AM_PROG_LEX - #AC_PROG_YACC + dnl AC_PROG_AWK + dnl AM_PROG_LEX + dnl AC_PROG_YACC
meta-oe/recipes-support/links/links-x11_2.16.bb new file +53 -0
53 lines not on this page · raw message
meta-oe/recipes-support/links/links-x11_2.7.bb deleted +0 -31
@@ -1,31 +0,0 @@ -require links.inc - -DEPENDS += "virtual/libx11" -RCONFLICTS_${PN} = "links" - -inherit distro_features_check -# depends on virtual/libx11 -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI += " file://links2.desktop \ - http://www.xora.org.uk/oe/links2.png;name=icon" - -S = "${WORKDIR}/links-${PV}" - -EXTRA_OECONF = "--enable-graphics \ - --with-ssl=${STAGING_LIBDIR}/.. --with-libjpeg \ - --without-libtiff --without-svgalib --without-fb \ - --without-directfb --without-pmshell --without-atheos \ - --with-x --without-gpm" - -do_install_append() { - install -d ${D}/${datadir}/applications - install -m 0644 ${WORKDIR}/links2.desktop ${D}/${datadir}/applications - install -d ${D}/${datadir}/pixmaps - install -m 0644 ${WORKDIR}/links2.png ${D}/${datadir}/pixmaps -} - -SRC_URI[md5sum] = "d06aa6e14b2172d73188871a5357185a" -SRC_URI[sha256sum] = "0c182b1cbcdfd5cdcd2f75a6032d1a4b660d07c1225c1e07757cec81d3302130" -SRC_URI[icon.md5sum] = "477e8787927c634614bac01b44355a33" -SRC_URI[icon.sha256sum] = "eddcd8b8c8698aa621d1a453943892d77b72ed492e0d14e0dbac5c6a57e52f47"
meta-oe/recipes-support/links/links.inc +1 -1
@@ -3,7 +3,7 @@ browser, similar to Lynx." HOMEPAGE = "http://links.twibright.com/" SECTION = "console/network" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=65e735be2e05d5943803344148f57603" +LIC_FILES_CHKSUM = "file://COPYING;md5=b0c80473f97008e42e29a9f80fcc55ff" DEPENDS = "jpeg libpng flex openssl zlib" SRC_URI = "http://links.twibright.com/download/links-${PV}.tar.bz2 \
meta-oe/recipes-support/links/links_2.16.bb renamed from meta-oe/recipes-support/links/links_2.7.bb +4 -2
@@ -9,5 +9,7 @@ EXTRA_OECONF = "--enable-graphics \ --without-directfb --without-pmshell --without-atheos \ --without-x" -SRC_URI[md5sum] = "d06aa6e14b2172d73188871a5357185a" -SRC_URI[sha256sum] = "0c182b1cbcdfd5cdcd2f75a6032d1a4b660d07c1225c1e07757cec81d3302130" +SRC_URI[md5sum] = "645fb0c0294e4c3268f94d307d394ffb" +SRC_URI[sha256sum] = "82f03038d5e050a65681b9888762af41c40fd42dec7e59a8d630bfb0ee134a3f" +SRC_URI[icon.md5sum] = "477e8787927c634614bac01b44355a33" +SRC_URI[icon.sha256sum] = "eddcd8b8c8698aa621d1a453943892d77b72ed492e0d14e0dbac5c6a57e52f47"
Signature · 1 line
2.18.0
PATCH 3/17 boinc: Upgrade to 7.12
In reply to Khem Raj* Fixes build wth OpenSSL 1.1.x
* Drop cross compile patch, not needed anymore
* Package systemd support
* Drop no-pie flags, works ok with PIE now
* autotools-brokensep is no longer needed
---
.../boinc/boinc-client/cross-compile.patch | 98 -------------------
...-client_7.6.33.bb => boinc-client_7.12.bb} | 24 +++--
2 files changed, 16 insertions(+), 106 deletions(-)
delete mode 100644 meta-oe/recipes-extended/boinc/boinc-client/cross-compile.patch
rename meta-oe/recipes-extended/boinc/{boinc-client_7.6.33.bb => boinc-client_7.12.bb} (82%)meta-oe/recipes-extended/boinc/boinc-client/cross-compile.patch deleted +0 -98
@@ -1,98 +0,0 @@ -Remove rpath, its bad for cross compiling to encode -build time rpaths - -Signed-off-by: Khem Raj <[email protected]> -Upstream-Status: Pending - -Index: boinc-client_release-7.6-7.6.33/api/Makefile.am -=================================================================== ---- boinc-client_release-7.6-7.6.33.orig/api/Makefile.am -+++ boinc-client_release-7.6-7.6.33/api/Makefile.am -@@ -43,18 +43,18 @@ endif - - lib_LTLIBRARIES = libboinc_api.la - libboinc_api_la_SOURCES = $(api_files) --libboinc_api_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION) -+libboinc_api_la_LDFLAGS = -version-number $(LIBBOINC_VERSION) - - if BUILD_GRAPHICS_API - lib_LTLIBRARIES += libboinc_graphics2.la - libboinc_graphics2_la_SOURCES = $(graphics2_files) - libboinc_graphics2_la_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/samples/image_libs --libboinc_graphics2_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION) -ljpeg -+libboinc_graphics2_la_LDFLAGS = -version-number $(LIBBOINC_VERSION) -ljpeg - endif #BUILD_GRAPHICS_API - - lib_LTLIBRARIES += libboinc_opencl.la - libboinc_opencl_la_SOURCES = $(opencl_files) --libboinc_opencl_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION) -+libboinc_opencl_la_LDFLAGS = -version-number $(LIBBOINC_VERSION) - - if INSTALL_HEADERS - ## install only headers that are meant for exporting the API !! -Index: boinc-client_release-7.6-7.6.33/lib/Makefile.am -=================================================================== ---- boinc-client_release-7.6-7.6.33.orig/lib/Makefile.am -+++ boinc-client_release-7.6-7.6.33/lib/Makefile.am -@@ -173,7 +173,7 @@ lib_LTLIBRARIES = libboinc.la - libboinc_la_SOURCES = $(generic_sources) $(mac_sources) $(win_sources) - libboinc_la_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS) - libboinc_la_CXXFLAGS = $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS) --libboinc_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -static -version-number $(LIBBOINC_VERSION) -+libboinc_la_LDFLAGS = -static -version-number $(LIBBOINC_VERSION) - libboinc_la_LIBADD = - - if ENABLE_BOINCCRYPT -@@ -181,7 +181,7 @@ lib_LTLIBRARIES += libboinc_crypt.la - libboinc_crypt_la_SOURCES = crypt.cpp - libboinc_crypt_la_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS) $(SSL_CFLAGS) - libboinc_crypt_la_CXXFLAGS = $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS) $(SSL_CXXFLAGS) --libboinc_crypt_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -static -version-number $(LIBBOINC_VERSION) -+libboinc_crypt_la_LDFLAGS = -static -version-number $(LIBBOINC_VERSION) - libboinc_crypt_la_LIBADD = - endif - -@@ -190,7 +190,7 @@ lib_LTLIBRARIES += libboinc_fcgi.la - libboinc_fcgi_la_SOURCES = $(libfcgi_sources) $(mac_sources) $(win_sources) - libboinc_fcgi_la_CFLAGS = -D_USING_FCGI_ $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS) - libboinc_fcgi_la_CXXFLAGS = -D_USING_FCGI_ $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS) --libboinc_fcgi_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION) -+libboinc_fcgi_la_LDFLAGS = -version-number $(LIBBOINC_VERSION) - libboinc_fcgi_la_LIBADD = - endif - # end of "if ENABLE_FCGI" -Index: boinc-client_release-7.6-7.6.33/sched/Makefile.am -=================================================================== ---- boinc-client_release-7.6-7.6.33.orig/sched/Makefile.am -+++ boinc-client_release-7.6-7.6.33/sched/Makefile.am -@@ -26,7 +26,7 @@ lib_LTLIBRARIES = libsched.la - libsched_la_SOURCES = $(libsched_sources) - libsched_la_CFLAGS = $(AM_CPPFLAGS) - libsched_la_CXXFLAGS = $(AM_CPPFLAGS) --libsched_la_LDFLAGS= -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION) -+libsched_la_LDFLAGS= -version-number $(LIBBOINC_VERSION) - libsched_la_LIBADD= $(SSL_LIBS) - - ## install only headers that are meant for exporting the API !! -@@ -48,7 +48,7 @@ lib_LTLIBRARIES += libsched_fcgi.la - libsched_fcgi_la_SOURCES = $(libsched_sources) - libsched_fcgi_la_CFLAGS = -D_USING_FCGI_ $(AM_CPPFLAGS) - libsched_fcgi_la_CXXFLAGS = -D_USING_FCGI_ $(AM_CPPFLAGS) --libsched_fcgi_la_LDFLAGS= -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION) -+libsched_fcgi_la_LDFLAGS= -version-number $(LIBBOINC_VERSION) - libsched_fcgi_la_LIBADD= - - endif -Index: boinc-client_release-7.6-7.6.33/zip/Makefile.am -=================================================================== ---- boinc-client_release-7.6-7.6.33.orig/zip/Makefile.am -+++ boinc-client_release-7.6-7.6.33/zip/Makefile.am -@@ -61,7 +61,7 @@ endif - - lib_LTLIBRARIES = libboinc_zip.la - libboinc_zip_la_SOURCES = $(libboinc_zip_sources) --libboinc_zip_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION) -+libboinc_zip_la_LDFLAGS = -version-number $(LIBBOINC_VERSION) - libboinc_zip_la_LIBADD = - - # Some OSs may not prefix libraries with lib.
meta-oe/recipes-extended/boinc/boinc-client_7.12.bb renamed from meta-oe/recipes-extended/boinc/boinc-client_7.6.33.bb +16 -8
@@ -29,21 +29,19 @@ DEPENDS = "curl \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk+ libnotify xcb-util libxscrnsaver', '', d)} \ nettle \ " - -SRC_URI = "https://github.com/BOINC/boinc/archive/client_release/7.6/${PV}.tar.gz \ +SRCREV = "bd12338dbd29083daa5a4b022592ca31ff68cd98" +BRANCH = "client_release/7/${PV}" +SRC_URI = "git://github.com/BOINC/boinc;protocol=https;branch=${BRANCH} \ file://boinc-AM_CONDITIONAL.patch \ file://opengl_m4_check.patch \ - file://cross-compile.patch \ file://gtk-configure.patch \ " -SRC_URI[md5sum] = "437b4b98e384b4bda4ef7056e68166ac" -SRC_URI[sha256sum] = "c4b1c29b9655013e0ac61dddf47ad7f30f38c46159f02a9d9dc8ab854e99aa6d" -inherit gettext autotools-brokensep pkgconfig distro_features_check +inherit gettext autotools pkgconfig distro_features_check systemd REQUIRED_DISTRO_FEATURES += "opengl" -S = "${WORKDIR}/${BPN}_release-7.6-${PV}" +S = "${WORKDIR}/git" EXTRA_OECONF += "\ --enable-libraries \
@@ -75,5 +73,15 @@ do_compile_prepend () { sed -i -e 's|^sys_lib_dlsearch_path_spec=.*|sys_lib_dlsearch_path_spec=""|g' ${B}/${TARGET_SYS}-libtool sed -i -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' ${B}/${TARGET_SYS}-libtool } +do_install_append() { + if [ -e ${D}${libdir}/systemd/system/boinc-client.service ]; then + install -D -m 0644 \ + ${D}${libdir}/systemd/system/boinc-client.service \ + ${D}${systemd_system_unitdir}/boinc-client.service + rm -rf ${D}${libdir}/systemd + fi +} + +SYSTEMD_SERVICE_${PN} = "boinc-client.service" -SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" +FILES_${PN} += "${libdir}/systemd"
Signature · 1 line
2.18.0
PATCH 4/17 znc: Upgrade to 1.7.1
In reply to Khem RajFixes build with OpenSSL 1.1.x
--- meta-networking/recipes-irc/znc/znc_git.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
meta-networking/recipes-irc/znc/znc_git.bb +3 -3
@@ -5,13 +5,13 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" DEPENDS = "openssl zlib icu" -PV = "1.6.0" +PV = "1.7.1" SRC_URI = "git://github.com/znc/znc.git;name=znc \ git://github.com/jimloco/Csocket.git;destsuffix=git/third_party/Csocket;name=Csocket \ " -SRCREV_znc = "f47e8465efa4e1cd948b9caae93ac401b4355df8" -SRCREV_Csocket = "07b4437396122650e5b8fb3d014e820a5decf4ee" +SRCREV_znc = "c426898b3a1b899dfe8a8b2a3eeb4b18d8be1bf2" +SRCREV_Csocket = "e8d9e0bb248c521c2c7fa01e1c6a116d929c41b4" # This constructs a composite revision based on multiple SRCREV's. #
Signature · 1 line
2.18.0
PATCH 5/17 uftp: Upgrade to 4.9.8
In reply to Khem RajFixes build with OpenSSL 1.1.x
---
.../recipes-support/uftp/{uftp_4.9.3.bb => uftp_4.9.8.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-networking/recipes-support/uftp/{uftp_4.9.3.bb => uftp_4.9.8.bb} (73%)meta-networking/recipes-support/uftp/uftp_4.9.8.bb renamed from meta-networking/recipes-support/uftp/uftp_4.9.3.bb +2 -2
@@ -6,8 +6,8 @@ LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=d32239bcb673463ab874e80d47fae504" SRC_URI = "${SOURCEFORGE_MIRROR}/uftp-multicast/source-tar/uftp-${PV}.tar.gz" -SRC_URI[md5sum] = "231d6ba7820d89a712fe7d727ab0f8e6" -SRC_URI[sha256sum] = "9e9215af0315257c6cc4f40fbc6161057e861be1fff10a38a5564f699e99c78f" +SRC_URI[md5sum] = "f7a5affd3000b5aafbb13df49719b6c0" +SRC_URI[sha256sum] = "e98c6318e497124d777ca71eae752d213207c35de9f782c8bcaaf82ece20e599" DEPENDS = "openssl"
Signature · 1 line
2.18.0
PATCH 6/17 pam-ssh-agent-auth: Depend on openssl10
In reply to Khem Raj--- meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb +1 -1
@@ -11,7 +11,7 @@ SRC_URI = "http://sourceforge.net/projects/pamsshagentauth/files/pam_ssh_agent_a SRC_URI[md5sum] = "8dbe90ab3625e545036333e6f51ccf1d" SRC_URI[sha256sum] = "3c53d358d6eaed1b211239df017c27c6f9970995d14102ae67bae16d4f47a763" -DEPENDS += "libpam openssl" +DEPENDS += "libpam openssl10" inherit distro_features_check REQUIRED_DISTRO_FEATURES = "pam"
Signature · 1 line
2.18.0
PATCH 7/17 libyui, libyui-ncurse: Update to latest on git
In reply to Khem Raj* Add fixes for building with clang
--- .../0001-Use-override-consistently.patch | 147 ++++++++++++++++++ ...use-_nl_msg_cat_cntr-only-with-glibc.patch | 40 ----- ...e-in-NCPad-and-fix-param-type-of-Set.patch | 49 ++++++ .../libyui/libyui-ncurses_git.bb | 9 +- .../libyui/0001-Fix-GCC-8-warning.patch | 48 ------ ...1-Use-curly-braces-for-MAKE-variable.patch | 32 ++++ meta-oe/recipes-graphics/libyui/libyui_git.bb | 12 +- 7 files changed, 239 insertions(+), 98 deletions(-) create mode 100644 meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-Use-override-consistently.patch delete mode 100644 meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-use-_nl_msg_cat_cntr-only-with-glibc.patch create mode 100644 meta-oe/recipes-graphics/libyui/libyui-ncurses/0002-Define-own-resize-in-NCPad-and-fix-param-type-of-Set.patch delete mode 100644 meta-oe/recipes-graphics/libyui/libyui/0001-Fix-GCC-8-warning.patch create mode 100644 meta-oe/recipes-graphics/libyui/libyui/0001-Use-curly-braces-for-MAKE-variable.patch
meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-Use-override-consistently.patch new file +147 -0
@@ -0,0 +1,147 @@ +From 0acfb67f99fd8d6af323311fee8c08116295b148 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Wed, 5 Sep 2018 18:21:19 -0700 +Subject: [PATCH 1/2] Use override consistently + +Make clang++ happy +error: 'setApplicationTitle' overrides a member function but is not marked 'override' [-Werror,-Winconsistent-missing-over ride] + +Upstream-Status: Submitted [https://github.com/libyui/libyui-ncurses/pull/69] +Signed-off-by: Khem Raj <[email protected]> +--- + src/NCApplication.h | 46 ++++++++++++++++++++++----------------------- + 1 file changed, 23 insertions(+), 23 deletions(-) + +diff --git a/src/NCApplication.h b/src/NCApplication.h +index e24c3eb..09e4708 100644 +--- a/src/NCApplication.h ++++ b/src/NCApplication.h +@@ -60,7 +60,7 @@ public: + * Reimplemented from YApplication. + **/ + virtual void setLanguage( const std::string & language, +- const std::string & encoding = std::string() ); ++ const std::string & encoding = std::string() ) override; + + /** + * Open a directory selection box and prompt the user for an existing +@@ -77,7 +77,7 @@ public: + * Implemented from YApplication. + **/ + virtual std::string askForExistingDirectory( const std::string & startDir, +- const std::string & headline ); ++ const std::string & headline ) override; + + /** + * Open a file selection box and prompt the user for an existing file. +@@ -97,7 +97,7 @@ public: + **/ + virtual std::string askForExistingFile( const std::string & startWith, + const std::string & filter, +- const std::string & headline ); ++ const std::string & headline ) override; + + /** + * Open a file selection box and prompt the user for a file to save data +@@ -119,28 +119,28 @@ public: + **/ + virtual std::string askForSaveFileName( const std::string & startWith, + const std::string & filter, +- const std::string & headline ); ++ const std::string & headline ) override; + + /** + * Beep. + * + * Reimplemented from YApplication. + **/ +- virtual void beep(); ++ virtual void beep() override; + + /** + * Redraw the screen. + * + * Reimplemented from YApplication. + **/ +- virtual void redrawScreen(); ++ virtual void redrawScreen() override; + + /** + * Initialize the (text) console keyboard. + * + * Reimplemented from YApplication. + **/ +- virtual void initConsoleKeyboard(); ++ virtual void initConsoleKeyboard() override; + + /** + * Set the (text) console font according to the current encoding etc. +@@ -152,7 +152,7 @@ public: + const std::string & font, + const std::string & screen_map, + const std::string & unicode_map, +- const std::string & language ); ++ const std::string & language ) override; + + /** + * Run a shell command (typically an interactive program using NCurses) +@@ -165,7 +165,7 @@ public: + * + * Reimplemented from YApplication. + **/ +- virtual int runInTerminal( const std::string & command ); ++ virtual int runInTerminal( const std::string & command ) override; + + + /// @{ +@@ -183,33 +183,33 @@ public: + // + // All implemented from YApplication. + +- virtual int displayWidth(); +- virtual int displayHeight(); +- virtual int displayDepth(); +- virtual long displayColors(); ++ virtual int displayWidth() override; ++ virtual int displayHeight() override; ++ virtual int displayDepth() override; ++ virtual long displayColors() override; + +- virtual int defaultWidth(); +- virtual int defaultHeight(); ++ virtual int defaultWidth() override; ++ virtual int defaultHeight() override; + +- virtual bool isTextMode() { return true; } ++ virtual bool isTextMode() override { return true; } + +- virtual bool hasImageSupport() { return false; } ++ virtual bool hasImageSupport() override { return false; } + +- virtual bool hasIconSupport() { return false; } ++ virtual bool hasIconSupport() override { return false; } + +- virtual bool hasAnimationSupport() { return false; } ++ virtual bool hasAnimationSupport() override { return false; } + +- virtual bool hasFullUtf8Support(); +- virtual bool richTextSupportsTable() { return false; } ++ virtual bool hasFullUtf8Support() override; ++ virtual bool richTextSupportsTable() override { return false; } + +- virtual bool leftHandedMouse() { return false; } ++ virtual bool leftHandedMouse() override { return false; } + + /** + * Set the application title + * + * Reimplemented from YApplication. + **/ +- virtual void setApplicationTitle(const std::string& title); ++ virtual void setApplicationTitle(const std::string& title) override; + }; + + +-- +2.18.0 +
meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-use-_nl_msg_cat_cntr-only-with-glibc.patch deleted +0 -40
@@ -1,40 +0,0 @@ -From 4b84f243a70a8c07f6a38dad3c9411fa707f25c9 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Sun, 4 Mar 2018 17:08:43 -0800 -Subject: [PATCH] use _nl_msg_cat_cntr only with glibc - -The musl libc provides libintl (similar to glibc) -but does not use the same internals, -so even though we are using the GNU gettext -the libintl included with the libc does not define -_nl_msg_cat_cntr and it does not need to. - -Signed-off-by: Khem Raj <[email protected]> ---- -Upstream-Status: Pending - - src/NCi18n.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/NCi18n.h b/src/NCi18n.h -index 165b0e7..bfc4ed7 100644 ---- a/src/NCi18n.h -+++ b/src/NCi18n.h -@@ -59,12 +59,13 @@ inline void setTextdomain( const char * domain ) - bindtextdomain( domain, YSettings::localeDir().c_str() ); - bind_textdomain_codeset( domain, "UTF-8" ); - textdomain( domain ); -- -+#if defined(__GLIBC__) - // Make change known - { - extern int _nl_msg_cat_cntr; - ++_nl_msg_cat_cntr; - } -+#endif - } - - --- -2.16.2 -
meta-oe/recipes-graphics/libyui/libyui-ncurses/0002-Define-own-resize-in-NCPad-and-fix-param-type-of-Set.patch new file +49 -0
49 lines not on this page · raw message
meta-oe/recipes-graphics/libyui/libyui-ncurses_git.bb +5 -4
@@ -5,13 +5,14 @@ LIC_FILES_CHKSUM = "file://COPYING.lgpl-3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ " SRC_URI = "git://github.com/libyui/libyui-ncurses.git \ - file://0001-use-_nl_msg_cat_cntr-only-with-glibc.patch \ + file://0001-Use-override-consistently.patch \ + file://0002-Define-own-resize-in-NCPad-and-fix-param-type-of-Set.patch \ " SRC_URI_append_class-target = " file://0001-Fix-the-error-of-can-t-find-header-file.patch" PV = "2.48.3+git${SRCPV}" -SRCREV = "79b804b45ffc6a0d92e28e793ff389a20b63b54b" +SRCREV = "c941b32246e8b2952fce4fd5743f8e318222ab98" S = "${WORKDIR}/git"
@@ -29,8 +30,8 @@ do_configure_prepend () { mkdir -p ${PKG_CONFIG_SYSROOT_DIR}${base_prefix}/usr/lib64/ cp ${PKG_CONFIG_SYSROOT_DIR}${base_prefix}/usr/lib/libyui.so* ${PKG_CONFIG_SYSROOT_DIR}${base_prefix}/usr/lib64/ cd - - sed -i "s#\${YPREFIX}#\${PKG_CONFIG_SYSROOT_DIR}${base_prefix}&#" ${S}/CMakeLists.txt - sed -i "s#/usr#${PKG_CONFIG_SYSROOT_DIR}${base_prefix}&#" ${PKG_CONFIG_SYSROOT_DIR}${libdir}/cmake/libyui/LibyuiLibraryDepends-release.cmake + sed -i -e "s#\${YPREFIX}#\${PKG_CONFIG_SYSROOT_DIR}${base_prefix}&#" ${S}/CMakeLists.txt + sed -i -e "s#/usr#${PKG_CONFIG_SYSROOT_DIR}${base_prefix}&#" ${PKG_CONFIG_SYSROOT_DIR}${libdir}/cmake/libyui/LibyuiLibraryDepends-release.cmake } do_install_append () {
meta-oe/recipes-graphics/libyui/libyui/0001-Fix-GCC-8-warning.patch deleted +0 -48
48 lines not on this page · raw message
meta-oe/recipes-graphics/libyui/libyui/0001-Use-curly-braces-for-MAKE-variable.patch new file +32 -0
@@ -0,0 +1,32 @@ +From 4eed37b1a61458fc8e5251f7cb7c6d64e8e9da8d Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Wed, 5 Sep 2018 17:48:09 -0700 +Subject: [PATCH] Use curly braces for MAKE variable + +Fixes errors with ninja +| ninja: error: build.ninja:142: bad $-escape (literal $ must be written as $$) + +Upstream-Status: Submitted [https://github.com/libyui/libyui/pull/137] +Signed-off-by: Khem Raj <[email protected]> +--- + buildtools/LibyuiCommon.cmake | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/buildtools/LibyuiCommon.cmake b/buildtools/LibyuiCommon.cmake +index cb93307..e6fbefd 100644 +--- a/buildtools/LibyuiCommon.cmake ++++ b/buildtools/LibyuiCommon.cmake +@@ -122,8 +122,8 @@ MACRO( SET_BUILD_FLAGS ) # setup compiler-flags depending on CMAKE_BUILD_TYPE + ENABLE_TESTING() + # add a wrapper "tests" target, the builtin "test" cannot be extended :-( + ADD_CUSTOM_TARGET(tests +- $(MAKE) +- COMMAND $(MAKE) test ++ ${MAKE} ++ COMMAND ${MAKE} test + ) + ENDIF ( ENABLE_TESTS OR ENABLE_CODE_COVERAGE) + +-- +2.18.0 +
meta-oe/recipes-graphics/libyui/libyui_git.bb +6 -6
@@ -6,13 +6,13 @@ LIC_FILES_CHKSUM = "file://COPYING.gpl-3;md5=d32239bcb673463ab874e80d47fae504 \ " SRC_URI = "git://github.com/libyui/libyui.git \ - file://0001-Fix-GCC-8-warning.patch \ file://0001-Fix-build-with-clang.patch \ + file://0001-Use-curly-braces-for-MAKE-variable.patch \ " PV = "3.3.3+git" -SRCREV = "2b634cb7821e2e79dd4b7a73caf8e67c50189376" - +SRCREV = "50672da835ec9d52766320a44a2677e08a24c99c" +SRCREV_FORMAT = "default" S = "${WORKDIR}/git" inherit cmake gettext pkgconfig
@@ -22,9 +22,9 @@ DEPENDS += "boost" BBCLASSEXTEND = "native nativesdk" do_configure_prepend () { - cd ${S} - ./bootstrap.sh - cd - + (cd ${S} && + ./bootstrap.sh && + cd -) } do_install_append () {
Signature · 1 line
2.18.0
PATCH 8/17 crda: Depend on openssl10
In reply to Khem Raj--- meta-networking/recipes-connectivity/crda/crda_3.18.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
meta-networking/recipes-connectivity/crda/crda_3.18.bb +2 -1
@@ -4,7 +4,8 @@ SECTION = "net" LICENSE = "copyleft-next-0.3.0" LIC_FILES_CHKSUM = "file://copyleft-next-0.3.0;md5=8743a2c359037d4d329a31e79eabeffe" -DEPENDS = "python-m2crypto-native python-typing-native python-native libgcrypt libnl openssl" +DEPENDS = "python-m2crypto-native python-typing-native python-native \ + libgcrypt libnl openssl10" SRC_URI = "https://www.kernel.org/pub/software/network/${BPN}/${BP}.tar.xz \ file://do-not-run-ldconfig-if-destdir-is-set.patch \
Signature · 1 line
2.18.0
PATCH 9/17 poco: Fix cross compilation
In reply to Khem RajBackport a pull request to fix build error seen during cross compiling
--- ...tall-non-existing-Encodings-testsuit.patch | 31 +++++++++++++++++++ meta-oe/recipes-support/poco/poco_1.9.0.bb | 5 +-- 2 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 meta-oe/recipes-support/poco/poco/0001-Don-t-try-to-install-non-existing-Encodings-testsuit.patch
meta-oe/recipes-support/poco/poco/0001-Don-t-try-to-install-non-existing-Encodings-testsuit.patch new file +31 -0
@@ -0,0 +1,31 @@ +From fa079dfc5e1d22ea35762bf4c5b09999bdc5e731 Mon Sep 17 00:00:00 2001 +From: Jochen Sprickerhof <[email protected]> +Date: Wed, 22 Aug 2018 21:42:09 +0200 +Subject: [PATCH] Don't try to install non existing Encodings/testsuite/data + +Upstream-Status: Backport [https://github.com/pocoproject/poco/pull/2437] +--- + Encodings/testsuite/CMakeLists.txt | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/Encodings/testsuite/CMakeLists.txt b/Encodings/testsuite/CMakeLists.txt +index 7508e5522..79495ae02 100644 +--- a/Encodings/testsuite/CMakeLists.txt ++++ b/Encodings/testsuite/CMakeLists.txt +@@ -19,12 +19,9 @@ POCO_SOURCES_AUTO_PLAT( TEST_SRCS WINCE + add_executable( ${TESTUNIT} ${TEST_SRCS} ) + if(ANDROID) + add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} +- COMMAND ${CMAKE_COMMAND} -DANDROID_NDK=${ANDROID_NDK} "-DTEST_FILES=${CMAKE_CURRENT_SOURCE_DIR}/data;" -DLIBRARY_DIR=${CMAKE_BINARY_DIR}/lib -DUNITTEST=${CMAKE_BINARY_DIR}/bin/${TESTUNIT} -DTEST_PARAMETER=-all -P ${CMAKE_SOURCE_DIR}/cmake/ExecuteOnAndroid.cmake) ++ COMMAND ${CMAKE_COMMAND} -DANDROID_NDK=${ANDROID_NDK} -DLIBRARY_DIR=${CMAKE_BINARY_DIR}/lib -DUNITTEST=${CMAKE_BINARY_DIR}/bin/Encodings-testrunner -DTEST_PARAMETER=-all -P ${CMAKE_SOURCE_DIR}/cmake/ExecuteOnAndroid.cmake) + else() + add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${TESTUNIT} -all) +- # The test is run in the build directory. So the test data is copied there too +- add_custom_command(TARGET ${TESTUNIT} POST_BUILD +- COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/data ${CMAKE_CURRENT_BINARY_DIR}/data ) + endif() + #set_target_properties( ${TESTUNIT} PROPERTIES COMPILE_FLAGS ${RELEASE_CXX_FLAGS} ) + target_link_libraries( ${TESTUNIT} PocoEncodings PocoFoundation CppUnit ) +-- +2.18.0 +
meta-oe/recipes-support/poco/poco_1.9.0.bb +3 -2
@@ -9,10 +9,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=4267f48fc738f50380cbeeb76f95cebc" DEPENDS = "libpcre zlib" SRC_URI = " \ - git://github.com/pocoproject/poco.git \ + git://github.com/pocoproject/poco.git;branch=poco-${PV} \ + file://0001-Don-t-try-to-install-non-existing-Encodings-testsuit.patch \ file://run-ptest \ " -SRCREV = "94966785a8f9ad0191dffd075ebd67826e6e4b6d" +SRCREV = "daf00da73ab917e4d4581e3aa00c0ee61e0cc58b" S = "${WORKDIR}/git"
Signature · 1 line
2.18.0
Re: [meta-oe][PATCH 09/17] poco: Fix cross compilation
I can confirm that issue with new cmake and that this fix fixed it.
Thanks!
Quoted 98 lines · Khem Raj
Backport a pull request to fix build error seen during cross compiling
Signed-off-by Khem Raj <[email protected]>--- ...tall-non-existing-Encodings-testsuit.patch | 31 +++++++++++++++++++ meta-oe/recipes-support/poco/poco_1.9.0.bb | 5 +-- 2 files changed, 34 insertions(+), 2 deletions(-) create mode 100644
meta-oe/recipes-support/poco/poco/0001-Don-t-try-to-install-non-existing-Encodings-testsuit.patchdiff --git
a/meta-oe/recipes-support/poco/poco/0001-Don-t-try-to-install-non-existing-Encodings-testsuit.patchb/meta-oe/recipes-support/poco/poco/0001-Don-t-try-to-install-non-existing-Encodings-testsuit.patchnew file mode 100644
index 0000000000..f4a358f47f
---/dev/null
+++b/meta-oe/recipes-support/poco/poco/0001-Don-t-try-to-install-non-existing-Encodings-testsuit.patchmeta-oe/recipes-support/poco/poco/0001-Don-t-try-to-install-non-existing-Encodings-testsuit.patch new file +4
-0@@ -0,0 +1,31 @@ +From fa079dfc5e1d22ea35762bf4c5b09999bdc5e731 Mon Sep 17 00:00:00 2001 +From: Jochen Sprickerhof <[email protected]> +Date: Wed, 22 Aug 2018 21:42:09 +0200 +Subject: [PATCH] Don't try to install non existingEncodings/testsuite/data
meta-oe/recipes-support/poco/poco/0001-Don-t-try-to-install-non-existing-Encodings-testsuit.patch new file +7
-0+ +Upstream-Status: Backport [https://github.com/pocoproject/poco/pull/2437] +--- + Encodings/testsuite/CMakeLists.txt | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/Encodings/testsuite/CMakeLists.txt
b/Encodings/testsuite/CMakeLists.txtmeta-oe/recipes-support/poco/poco/0001-Don-t-try-to-install-non-existing-Encodings-testsuit.patch new file +7
-0+index 7508e5522..79495ae02 100644 +--- a/Encodings/testsuite/CMakeLists.txt ++++ b/Encodings/testsuite/CMakeLists.txt +@@ -19,12 +19,9 @@ POCO_SOURCES_AUTO_PLAT( TEST_SRCS WINCE + add_executable( ${TESTUNIT} ${TEST_SRCS} ) + if(ANDROID) + add_test(NAME ${LIBNAME} WORKING_DIRECTORY${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
+- COMMAND ${CMAKE_COMMAND}
-DANDROID_NDK=${ANDROID_NDK}
"-DTEST_FILES=${CMAKE_CURRENT_SOURCE_DIR}/data;"(quoted diff) +0
-2-DLIBRARY_DIR=${CMAKE_BINARY_DIR}/lib -DUNITTEST=${CMAKE_BINARY_DIR}/bin/${TESTUNIT} -DTEST_PARAMETER=-all -P${CMAKE_SOURCE_DIR}/cmake/ExecuteOnAndroid.cmake)
++ COMMAND ${CMAKE_COMMAND}(quoted diff) +2
-3-DANDROID_NDK=${ANDROID_NDK} -DLIBRARY_DIR=${CMAKE_BINARY_DIR}/lib -DUNITTEST=${CMAKE_BINARY_DIR}/bin/Encodings-testrunner -DTEST_PARAMETER=-all -P ${CMAKE_SOURCE_DIR}/cmake/ExecuteOnAndroid.cmake) + else() + add_test(NAME ${LIBNAME} WORKING_DIRECTORY${CMAKE_CURRENT_BINARY_DIR} COMMAND ${TESTUNIT} -all)
+- # The test is run in the build directory. So the test data is
copied there too+- add_custom_command(TARGET ${TESTUNIT} POST_BUILD +- COMMAND ${CMAKE_COMMAND} -E
copy_directory${CMAKE_CURRENT_SOURCE_DIR}/data ${CMAKE_CURRENT_BINARY_DIR}/data )
+endif()
+ #set_target_properties( ${TESTUNIT} PROPERTIESCOMPILE_FLAGS${RELEASE_CXX_FLAGS} )
+target_link_libraries( ${TESTUNIT} PocoEncodings PocoFoundation CppUnit )
+--
+2.18.0(quoted diff) +1
-0+meta-oe/recipes-support/poco/poco_1.9.0.bb +0
-0@@ -9,10 +9,11 @@ LIC_FILES_CHKSUM ="file://LICENSE;md5=4267f48fc738f50380cbeeb76f95cebc"
DEPENDS = "libpcre zlib"
SRC_URI= " \meta-oe/recipes-support/poco/poco_1.9.0.bb +1
-1- git://github.com/pocoproject/poco.git \ + git://github.com/pocoproject/poco.git;branch=poco-${PV}<http://github.com/pocoproject/poco.git;branch=poco-$%7BPV%7D> \
+file://0001-Don-t-try-to-install-non-existing-Encodings-testsuit.patch \ file://run-ptest \ "meta-oe/recipes-support/poco/poco_1.9.0.bb +1
-2-SRCREV = "94966785a8f9ad0191dffd075ebd67826e6e4b6d" +SRCREV = "daf00da73ab917e4d4581e3aa00c0ee61e0cc58b" S = "${WORKDIR}/git" --2.18.0
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
PATCH 10/17 mosquitto: Make enabling systemd also enable build dep on systemd
In reply to Khem Rajsystemd support in mqtt needs system developement headers and libs installed in recipe sysroot
--- .../recipes-connectivity/mosquitto/mosquitto_1.5.1.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
meta-networking/recipes-connectivity/mosquitto/mosquitto_1.5.1.bb +4 -2
@@ -20,11 +20,14 @@ SRC_URI[sha256sum] = "8557bc7ae34dfaf32a0fb56d2491b7a7f731269c88337227233013502d inherit systemd update-rc.d useradd -PACKAGECONFIG ??= "ssl uuid" +PACKAGECONFIG ??= "ssl uuid \ + ${@bb.utils.filter('DISTRO_FEATURES','systemd', d)} \ + " PACKAGECONFIG[dns-srv] = ",,c-ares" PACKAGECONFIG[ssl] = ",,openssl" PACKAGECONFIG[uuid] = ",,util-linux" +PACKAGECONFIG[systemd] = "WITH_SYSTEMD=yes,WITH_SYSTEMD=no,systemd" EXTRA_OEMAKE = " \ prefix=${prefix} \
@@ -33,7 +36,6 @@ EXTRA_OEMAKE = " \ ${@bb.utils.contains('PACKAGECONFIG', 'dns-srv', 'WITH_SRV=yes', 'WITH_SRV=no', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'ssl', 'WITH_TLS=yes WITH_TLS_PSK=yes', 'WITH_TLS=no WITH_TLS_PSK=no', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'uuid', 'WITH_UUID=yes', 'WITH_UUID=no', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'WITH_SYSTEMD=yes', 'WITH_SYSTEMD=no', d)} \ STRIP=/bin/true \ WITH_DOCS=no \ "
Signature · 1 line
2.18.0
Re: [meta-networking][PATCH 10/17] mosquitto: Make enabling systemd also enable build dep on systemd
Quoted 2 lines · NZST Khem Raj
systemd support in mqtt needs system developement headers and libs installed in recipe sysroot
True - sorry about that. I could have reissued the update patch though - I see it's not in master-next, should I do that?
Cheers,
Paul
Signature · 2 lines
Paul Eggleton Intel Open Source Technology Centre
Re: [meta-networking][PATCH 10/17] mosquitto: Make enabling systemd also enable build dep on systemd
No, it's fine.
Quoted 19 lines · Paul Eggleton
Quoted 1 line · NZST Khem Raj
systemd support in mqtt needs system developement headers and libs
installed
Quoted 1 line
in recipe sysroot
True - sorry about that. I could have reissued the update patch though - I see
it's not in master-next, should I do that?Cheers,
Paul--
Paul Eggleton
Intel Open Source Technology Centre
PATCH 11/17 synergy: Upgrade to 1.10.1-release
In reply to Khem Raj--- .../recipes-support/synergy/synergy_git.bb | 27 ++++++------------- 1 file changed, 8 insertions(+), 19 deletions(-)
meta-oe/recipes-support/synergy/synergy_git.bb +8 -19
@@ -1,35 +1,24 @@ SUMMARY = "Synergy - control multiple computers with one keyboard and mouse" HOMEPAGE = "http://synergy-project.org" -LIC_FILES_CHKSUM = "file://LICENSE;md5=d2ba51ca68e055566aade24662f9eb41" +LIC_FILES_CHKSUM = "file://LICENSE;md5=54c1fc8d8bb6776ae501acfb1585e9d6" LICENSE = "GPL-2.0-with-OpenSSL-exception" SECTION = "x11/utils" DEPENDS = "virtual/libx11 libxtst libxinerama curl openssl" -do_unpack_extra[depends] = "unzip-native:do_populate_sysroot" # depends on virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI = "git://github.com/symless/synergy.git;protocol=http" +SRC_URI = "git://github.com/symless/synergy-core;protocol=https;nobranch=1" -# Version 1.8.8-stable -SRCREV ?= "c30301e23424db1125664da17deb8c3aa6aec52d" -PV = "1.8.8+${SRCPV}" +# Version 1.10.1-stable +SRCREV ?= "1b4c076127687aceac931d269e898beaac1cad9f" +PV = "1.10.1+git${SRCPV}" S = "${WORKDIR}/git" inherit cmake distro_features_check -do_unpack_extra() { - cd ${S}/ext - for file in *.zip; do - fname="${file##*/}" - unzip $file -d ${fname%.*} - done -} -addtask unpack_extra after do_unpack before do_patch - -do_install() { - install -d ${D}/usr/bin - install -m 0755 ${S}/bin/synergy* ${D}/usr/bin/ -} +EXTRA_OECMAKE += "-DSYNERGY_BUILD_LEGACY_GUI=OFF" + +FILES_${PN} += "${datadir}/icons/hicolor"
Signature · 1 line
2.18.0
PATCH 12/17 ipsec-tools: Depend on openssl10
In reply to Khem Raj--- .../recipes-support/ipsec-tools/ipsec-tools_0.8.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.2.bb +1 -1
@@ -5,7 +5,7 @@ SECTION = "net" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://src/libipsec/pfkey.c;beginline=6;endline=31;md5=bc9b7ff40beff19fe6bc6aef26bd2b24" -DEPENDS = "virtual/kernel openssl readline flex-native bison-native" +DEPENDS = "virtual/kernel openssl10 readline flex-native bison-native" PACKAGE_ARCH = "${MACHINE_ARCH}"
Signature · 1 line
2.18.0
PATCH 13/17 android-tools: Depend on openssl10
In reply to Khem Raj--- .../recipes-devtools/android-tools/android-tools_5.1.1.r37.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb +1 -1
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \ file://${COMMON_LICENSE_DIR}/BSD-2-Clause;md5=8bef8e6712b1be5aa76af1ebde9d6378 \ file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9 \ " -DEPENDS = "libbsd libpcre openssl zlib libcap" +DEPENDS = "libbsd libpcre openssl10 zlib libcap" ANDROID_MIRROR = "android.googlesource.com" CORE_REPO = "${ANDROID_MIRROR}/platform/system/core"
Signature · 1 line
2.18.0
PATCH 14/17 oscam: Depend on openssl10
In reply to Khem Raj--- meta-multimedia/recipes-dvb/oscam/oscam_svn.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-multimedia/recipes-dvb/oscam/oscam_svn.bb +1 -1
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.streamboard.tv/oscam/" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -DEPENDS = "libusb1 openssl pcsc-lite" +DEPENDS = "libusb1 openssl10 pcsc-lite" SRC_URI = "svn://www.streamboard.tv/svn/oscam;module=trunk;protocol=http \ file://0001-include-sys-sysmacros.h-for-major-minor-definitions.patch \
Signature · 1 line
2.18.0
PATCH 15/17 ipmitool: Fix build with OpenSSL 1.1.x
In reply to Khem Raj--- .../0001-Migrate-to-openssl-1.1.patch | 152 ++++++++++++++++++ .../ipmitool/ipmitool_1.8.18.bb | 4 +- 2 files changed, 155 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-kernel/ipmitool/ipmitool/0001-Migrate-to-openssl-1.1.patch
meta-oe/recipes-kernel/ipmitool/ipmitool/0001-Migrate-to-openssl-1.1.patch new file +152 -0
@@ -0,0 +1,152 @@ +From c9dcb6afef9c343d070aaff208d11a997a45a105 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Wed, 5 Sep 2018 22:19:38 -0700 +Subject: [PATCH] Migrate to openssl 1.1 + +Upstream-Status: Backport [https://sourceforge.net/p/ipmitool/source/ci/1664902525a1c3771b4d8b3ccab7ea1ba6b2bdd1/] + +Signed-off-by: Khem Raj <[email protected]> +--- + src/plugins/lanplus/lanplus_crypt_impl.c | 50 ++++++++++++++---------- + 1 file changed, 29 insertions(+), 21 deletions(-) + +diff --git a/src/plugins/lanplus/lanplus_crypt_impl.c b/src/plugins/lanplus/lanplus_crypt_impl.c +index d5fac37..9652a5e 100644 +--- a/src/plugins/lanplus/lanplus_crypt_impl.c ++++ b/src/plugins/lanplus/lanplus_crypt_impl.c +@@ -164,11 +164,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv, + uint8_t * output, + uint32_t * bytes_written) + { +- EVP_CIPHER_CTX ctx; +- EVP_CIPHER_CTX_init(&ctx); +- EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv); +- EVP_CIPHER_CTX_set_padding(&ctx, 0); +- ++ EVP_CIPHER_CTX *ctx = NULL; + + *bytes_written = 0; + +@@ -182,6 +178,14 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv, + printbuf(input, input_length, "encrypting this data"); + } + ++ ctx = EVP_CIPHER_CTX_new(); ++ if (ctx == NULL) { ++ lprintf(LOG_DEBUG, "ERROR: EVP_CIPHER_CTX_new() failed"); ++ return; ++ } ++ EVP_CIPHER_CTX_init(ctx); ++ EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv); ++ EVP_CIPHER_CTX_set_padding(ctx, 0); + + /* + * The default implementation adds a whole block of padding if the input +@@ -191,28 +195,28 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv, + assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0); + + +- if(!EVP_EncryptUpdate(&ctx, output, (int *)bytes_written, input, input_length)) ++ if(!EVP_EncryptUpdate(ctx, output, (int *)bytes_written, input, input_length)) + { + /* Error */ + *bytes_written = 0; +- return; + } + else + { + uint32_t tmplen; + +- if(!EVP_EncryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen)) ++ if(!EVP_EncryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen)) + { ++ /* Error */ + *bytes_written = 0; +- return; /* Error */ + } + else + { + /* Success */ + *bytes_written += tmplen; +- EVP_CIPHER_CTX_cleanup(&ctx); + } + } ++ /* performs cleanup and free */ ++ EVP_CIPHER_CTX_free(ctx); + } + + +@@ -239,11 +243,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv, + uint8_t * output, + uint32_t * bytes_written) + { +- EVP_CIPHER_CTX ctx; +- EVP_CIPHER_CTX_init(&ctx); +- EVP_DecryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv); +- EVP_CIPHER_CTX_set_padding(&ctx, 0); +- ++ EVP_CIPHER_CTX *ctx = NULL; + + if (verbose >= 5) + { +@@ -252,12 +252,20 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv, + printbuf(input, input_length, "decrypting this data"); + } + +- + *bytes_written = 0; + + if (input_length == 0) + return; + ++ ctx = EVP_CIPHER_CTX_new(); ++ if (ctx == NULL) { ++ lprintf(LOG_DEBUG, "ERROR: EVP_CIPHER_CTX_new() failed"); ++ return; ++ } ++ EVP_CIPHER_CTX_init(ctx); ++ EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv); ++ EVP_CIPHER_CTX_set_padding(ctx, 0); ++ + /* + * The default implementation adds a whole block of padding if the input + * data is perfectly aligned. We would like to keep that from happening. +@@ -266,33 +274,33 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv, + assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0); + + +- if (!EVP_DecryptUpdate(&ctx, output, (int *)bytes_written, input, input_length)) ++ if (!EVP_DecryptUpdate(ctx, output, (int *)bytes_written, input, input_length)) + { + /* Error */ + lprintf(LOG_DEBUG, "ERROR: decrypt update failed"); + *bytes_written = 0; +- return; + } + else + { + uint32_t tmplen; + +- if (!EVP_DecryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen)) ++ if (!EVP_DecryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen)) + { ++ /* Error */ + char buffer[1000]; + ERR_error_string(ERR_get_error(), buffer); + lprintf(LOG_DEBUG, "the ERR error %s", buffer); + lprintf(LOG_DEBUG, "ERROR: decrypt final failed"); + *bytes_written = 0; +- return; /* Error */ + } + else + { + /* Success */ + *bytes_written += tmplen; +- EVP_CIPHER_CTX_cleanup(&ctx); + } + } ++ /* performs cleanup and free */ ++ EVP_CIPHER_CTX_free(ctx); + + if (verbose >= 5) + {
meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.18.bb +3 -1
@@ -22,7 +22,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9aa91e13d644326bf281924212862184" DEPENDS = "openssl readline ncurses" -SRC_URI = "${SOURCEFORGE_MIRROR}/ipmitool/ipmitool-${PV}.tar.bz2" +SRC_URI = "${SOURCEFORGE_MIRROR}/ipmitool/ipmitool-${PV}.tar.bz2 \ + file://0001-Migrate-to-openssl-1.1.patch \ + " SRC_URI[md5sum] = "bab7ea104c7b85529c3ef65c54427aa3" SRC_URI[sha256sum] = "0c1ba3b1555edefb7c32ae8cd6a3e04322056bc087918f07189eeedfc8b81e01"
Signature · 1 line
2.18.0
PATCH 16/17 vboxguestdrivers: Update to 5.2.18
In reply to Khem Raj* Fix build with 4.18 kernel
---
.../vboxguestdrivers/kernel-4.18.patch | 33 +++++++++++++++++++
...rs_5.2.8.bb => vboxguestdrivers_5.2.18.bb} | 6 ++--
2 files changed, 36 insertions(+), 3 deletions(-)
create mode 100644 meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/kernel-4.18.patch
rename meta-oe/recipes-support/vboxguestdrivers/{vboxguestdrivers_5.2.8.bb => vboxguestdrivers_5.2.18.bb} (94%)meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/kernel-4.18.patch new file +33 -0
@@ -0,0 +1,33 @@ +Description: Fix build failure with new kernel 4.18 +Author: Gianfranco Costamagna <[email protected]> + +Upstream-Status:Pending +Signed-off-by: Khem Raj <[email protected]> +Index: vbox_module/vboxsf/utils.c +=================================================================== +--- vbox_module.orig/vboxsf/utils.c ++++ vbox_module/vboxsf/utils.c +@@ -50,7 +50,11 @@ static void sf_timespec_from_ftime(RTTIM + RTTimeSpecSetNano(ts, t); + } + #else /* >= 2.6.0 */ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 18, 0) + static void sf_ftime_from_timespec(struct timespec *tv, RTTIMESPEC *ts) ++#else ++static void sf_ftime_from_timespec(struct timespec64 *tv, RTTIMESPEC *ts) ++#endif + { + int64_t t = RTTimeSpecGetNano(ts); + int64_t nsec; +@@ -60,7 +64,11 @@ static void sf_ftime_from_timespec(struc + tv->tv_nsec = nsec; + } + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 18, 0) + static void sf_timespec_from_ftime(RTTIMESPEC *ts, struct timespec *tv) ++#else ++static void sf_timespec_from_ftime(RTTIMESPEC *ts, struct timespec64 *tv) ++#endif + { + int64_t t = (int64_t)tv->tv_nsec + (int64_t)tv->tv_sec * 1000000000; + RTTimeSpecSetNano(ts, t);
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.18.bb renamed from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.8.bb +3 -3
@@ -13,10 +13,10 @@ VBOX_NAME = "VirtualBox-${PV}" SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \ file://Makefile.utils \ + file://kernel-4.18.patch \ " - -SRC_URI[md5sum] = "e731ea9c5c31096ec4c2a3bfba26665c" -SRC_URI[sha256sum] = "ee2759d47b0b4ac81b8b671c9485c87fb2db12c097b3e7e69b94c1291a8084e8" +SRC_URI[md5sum] = "d8e291525b84569356773eef507c49ce" +SRC_URI[sha256sum] = "ed0a7efd56c7f39fae79c7ec3321473da412ef0d7914457b66f42679d513efcf" S = "${WORKDIR}/vbox_module"
Signature · 1 line
2.18.0
PATCH 17/17 python-m2crypto: Ignore WCHAR_MAX and WCHAR_MIN when on musl
In reply to Khem RajThis fixes the build until we upgrade to swig 4.0 where this is fixed
--- .../recipes-devtools/python/python-m2crypto.inc | 9 +++------ .../m2crypto-0.26.4-gcc_macros.patch | 16 ++++++++++++---- 2 files changed, 15 insertions(+), 10 deletions(-)
meta-python/recipes-devtools/python/python-m2crypto.inc +3 -6
@@ -19,10 +19,11 @@ inherit pypi siteinfo DEPENDS += "openssl swig-native" RDEPENDS_${PN} += "python-typing" -DISTUTILS_BUILD_ARGS += "build_ext --openssl=${STAGING_DIR_HOST} -I${STAGING_INCDIR}" -DISTUTILS_INSTALL_ARGS += "build_ext --openssl=${STAGING_DIR_HOST}" +DISTUTILS_BUILD_ARGS += "build_ext --openssl=${STAGING_EXECPREFIXDIR} -I${STAGING_INCDIR}" +DISTUTILS_INSTALL_ARGS += "build_ext --openssl=${STAGING_EXECPREFIXDIR}" SWIG_FEATURES_x86 = "-D__i386__" +SWIG_FEATURES_x32 = "-D__ILP32__" SWIG_FEATURES ?= "-D__${HOST_ARCH}__" export SWIG_FEATURES
@@ -51,7 +52,3 @@ do_configure_prepend() { } BBCLASSEXTEND = "native" - -# http://errors.yoctoproject.org/Errors/Details/184714/ -# SWIG/_m2crypto.i:10: Error: Unable to find 'gcc_macros.h' -CLEANBROKEN = "1"
meta-python/recipes-devtools/python/python-m2crypto/m2crypto-0.26.4-gcc_macros.patch +12 -4
@@ -4,16 +4,19 @@ Index: M2Crypto-0.30.1/SWIG/_m2crypto.i =================================================================== --- M2Crypto-0.30.1.orig/SWIG/_m2crypto.i +++ M2Crypto-0.30.1/SWIG/_m2crypto.i -@@ -7,7 +7,7 @@ - * Copyright (c) 2009-2010 Heikki Toivonen. All rights reserved. +@@ -8,6 +8,11 @@ * */ -- + +%import "gcc_macros.h" ++ ++%ignore WCHAR_MAX; ++%ignore WCHAR_MIN; ++ %module(threads=1) m2crypto /* We really don't need threadblock (PyGILState_Ensure() etc.) anywhere. Disable threadallow as well, only enable it for operations likely to -@@ -15,11 +15,6 @@ +@@ -15,11 +20,6 @@ %nothreadblock; %nothreadallow;
@@ -25,3 +28,8 @@ Index: M2Crypto-0.30.1/SWIG/_m2crypto.i %{ #ifdef _WIN32 #define _WINSOCKAPI_ +@@ -95,4 +95,3 @@ static PyObject *x509_store_verify_cb_fu + %constant int encrypt = 1; + %constant int decrypt = 0; + #endif +-
Signature · 1 line
2.18.0