diff options
Diffstat (limited to 'meta-oe/recipes-support')
768 files changed, 18888 insertions, 40369 deletions
diff --git a/meta-oe/recipes-support/ace-cloud-editor/ace-cloud-editor_git.bb b/meta-oe/recipes-support/ace-cloud-editor/ace-cloud-editor_git.bb index 4ea6c8a295..6d64ab71bf 100644 --- a/meta-oe/recipes-support/ace-cloud-editor/ace-cloud-editor_git.bb +++ b/meta-oe/recipes-support/ace-cloud-editor/ace-cloud-editor_git.bb @@ -4,12 +4,12 @@ SUMMARY = "Ace is a code editor written in JavaScript. This repository has only LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=794d11c5219c59c9efa2487c2b4066b2" -SRC_URI = "git://github.com/ajaxorg/ace-builds.git;protocol=https" +SRC_URI = "git://github.com/ajaxorg/ace-builds.git;protocol=https;branch=master" -PV = "02.07.17+git${SRCPV}" +PV = "02.07.17+git" SRCREV = "812e2c56aed246931a667f16c28b096e34597016" -FILES_${PN} = "${datadir}/ace-builds" +FILES:${PN} = "${datadir}/ace-builds" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/anthy/anthy/2ch_t.patch b/meta-oe/recipes-support/anthy/anthy/2ch_t.patch index bf9bdb63d7..a0d3f9c25e 100644 --- a/meta-oe/recipes-support/anthy/anthy/2ch_t.patch +++ b/meta-oe/recipes-support/anthy/anthy/2ch_t.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + source: shamelessly stolen from debian ;-) purpose: add some entries particularly useful in Japanese 2channel anonymous website (at least that is my understanding ;-)) diff --git a/meta-oe/recipes-support/anthy/anthy/native-helpers.patch b/meta-oe/recipes-support/anthy/anthy/native-helpers.patch index 47ce007b7f..0b2df01aba 100644 --- a/meta-oe/recipes-support/anthy/anthy/native-helpers.patch +++ b/meta-oe/recipes-support/anthy/anthy/native-helpers.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + upstream: not applicable author: pH5 comment: Stage the native anthy helpers mkfiledic, mkdepgraph, mkworddic, diff --git a/meta-oe/recipes-support/anthy/anthy/not_build_elc.patch b/meta-oe/recipes-support/anthy/anthy/not_build_elc.patch index 1c5c494003..bedb5e0498 100644 --- a/meta-oe/recipes-support/anthy/anthy/not_build_elc.patch +++ b/meta-oe/recipes-support/anthy/anthy/not_build_elc.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + upstream: not applicable source: stolen from debian diff --git a/meta-oe/recipes-support/anthy/anthy/target-helpers.patch b/meta-oe/recipes-support/anthy/anthy/target-helpers.patch index d22c3562a5..fc5c72c051 100644 --- a/meta-oe/recipes-support/anthy/anthy/target-helpers.patch +++ b/meta-oe/recipes-support/anthy/anthy/target-helpers.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + diff -Nurp anthy-9100h.org/calctrans/Makefile.am anthy-9100h/calctrans/Makefile.am --- anthy-9100h.org/calctrans/Makefile.am 2007-10-27 23:02:59.000000000 +0900 +++ anthy-9100h/calctrans/Makefile.am 2014-11-11 17:14:42.152999991 +0900 diff --git a/meta-oe/recipes-support/anthy/anthy_9100h.bb b/meta-oe/recipes-support/anthy/anthy_9100h.bb index a65d324eae..f2bf52cdbc 100644 --- a/meta-oe/recipes-support/anthy/anthy_9100h.bb +++ b/meta-oe/recipes-support/anthy/anthy_9100h.bb @@ -1,43 +1,44 @@ DESCRIPTION="Anthy is a system for Japanese input method. It converts Hiragana text to Kana Kanji mixed text." -AUTHOR = "Anthy Developers <anthy-dev@lists.sourceforge.jp>" HOMEPAGE = "http://anthy.sourceforge.jp" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=11f384074d8e93e263b5664ef08a411a" +LICENSE = "LGPL-2.1-only & GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=11f384074d8e93e263b5664ef08a411a \ + file://alt-cannadic/COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b \ +" SRC_URI = "http://osdn.dl.sourceforge.jp/anthy/37536/anthy-9100h.tar.gz \ file://not_build_elc.patch \ file://2ch_t.patch \ " -SRC_URI_append_class-target = "file://target-helpers.patch" -SRC_URI_append_class-native = "file://native-helpers.patch" +SRC_URI:append:class-target = " file://target-helpers.patch" +SRC_URI:append:class-native = " file://native-helpers.patch" SRC_URI[md5sum] = "1f558ff7ed296787b55bb1c6cf131108" SRC_URI[sha256sum] = "d256f075f018b4a3cb0d165ed6151fda4ba7db1621727e0eb54569b6e2275547" -DEPENDS_class-target = "anthy-native" -RDEPENDS_${PN}_class-target = "libanthy0" +DEPENDS:class-target = "anthy-native" +RDEPENDS:${PN}:class-target = "libanthy0" inherit autotools pkgconfig PACKAGES += "${PN}-el libanthy0 libanthy-dev" -FILES_${PN}-dbg += "${libdir}/.debug" -FILES_libanthy0 = "${libdir}/libanthy.so.* \ +FILES:${PN}-dbg += "${libdir}/.debug" +FILES:libanthy0 = "${libdir}/libanthy.so.* \ ${libdir}/libanthydic.so.* \ ${libdir}/libanthyinput.so.* \ " -FILES_libanthy-dev = "${libdir}/libanthy*.la \ +FILES:libanthy-dev = "${libdir}/libanthy*.la \ ${libdir}/libanthy*.a \ ${libdir}/libanthy*.so \ ${includedir}/anthy \ ${libdir}/pkgconfig/anthy.pc \ " -FILES_${PN}-el = "${datadir}/emacs/*" -FILES_${PN} = "${datadir}/* \ +FILES:${PN}-el = "${datadir}/emacs/*" +FILES:${PN} = "${datadir}/* \ ${bindir}/* \ ${sysconfdir}/anthy-conf \ " diff --git a/meta-oe/recipes-support/asio/asio_1.12.2.bb b/meta-oe/recipes-support/asio/asio_1.12.2.bb deleted file mode 100644 index 35f875fdc3..0000000000 --- a/meta-oe/recipes-support/asio/asio_1.12.2.bb +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION = "Asio is a cross-platform C++ library for network and low-level \ - I/O programming that provides developers with a consistent asynchronous \ - model using a modern C++ approach." -AUTHOR = "Christopher M. Kohlhoff (chris at kohlhoff dot com)" -HOMEPAGE = "http://think-async.com/Asio" -SECTION = "libs" -LICENSE = "BSL-1.0" - -DEPENDS = "openssl" - -SRC_URI = "${SOURCEFORGE_MIRROR}/asio/${BP}.tar.bz2" - -inherit autotools - -ALLOW_EMPTY_${PN} = "1" - -LIC_FILES_CHKSUM = "file://COPYING;md5=3e73f311a3af69e6df275e8c3b1c09b5" - -SRC_URI[md5sum] = "312e53385e2daad10f08d57f91ad3431" -SRC_URI[sha256sum] = "4e27dcb37456ba707570334b91f4798721111ed67b69915685eac141895779aa" - -SRC_URI = "${SOURCEFORGE_MIRROR}/asio/${BP}.tar.bz2" - -PACKAGECONFIG ??= "boost" - -PACKAGECONFIG[boost] = "--with-boost,--without-boost,boost" diff --git a/meta-oe/recipes-support/asio/asio_1.30.2.bb b/meta-oe/recipes-support/asio/asio_1.30.2.bb new file mode 100644 index 0000000000..6930381ecd --- /dev/null +++ b/meta-oe/recipes-support/asio/asio_1.30.2.bb @@ -0,0 +1,25 @@ +SUMMARY = "Asio is C++ library for network and low-level I/O programming" +DESCRIPTION = "Asio is a cross-platform C++ library for network and low-level \ + I/O programming that provides developers with a consistent asynchronous \ + model using a modern C++ approach." +HOMEPAGE = "http://think-async.com/Asio" +SECTION = "libs" +LICENSE = "BSL-1.0" + +DEPENDS = "openssl" + +SRC_URI = "${SOURCEFORGE_MIRROR}/asio/${BP}.tar.bz2" + +inherit autotools + +ALLOW_EMPTY:${PN} = "1" + +LIC_FILES_CHKSUM = "file://COPYING;md5=2bfc909e030aeafefa72f764165b8d07" + +SRC_URI[sha256sum] = "9f12cef05c0477eace9c68ccabd19f9e3a04b875d4768c323714cbd3a5fa3c2b" + +PACKAGECONFIG ??= "boost" + +PACKAGECONFIG[boost] = "--with-boost=${STAGING_LIBDIR},--without-boost,boost" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/atop/atop_2.4.0.bb b/meta-oe/recipes-support/atop/atop_2.4.0.bb index 5bde965196..4b0e74227b 100644 --- a/meta-oe/recipes-support/atop/atop_2.4.0.bb +++ b/meta-oe/recipes-support/atop/atop_2.4.0.bb @@ -10,7 +10,7 @@ utilization, priority, username, state, and exit code." HOMEPAGE = "http://www.atoptool.nl" SECTION = "console/utils" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" DEPENDS = "ncurses zlib" @@ -24,6 +24,8 @@ SRC_URI = "http://www.atoptool.nl/download/${BP}.tar.gz \ SRC_URI[md5sum] = "1077da884ed94f2bc3c81ac3ab970436" SRC_URI[sha256sum] = "be1c010a77086b7d98376fce96514afcd73c3f20a8d1fe01520899ff69a73d69" +CVE_STATUS[CVE-2011-3618] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions." + do_compile() { oe_runmake all } @@ -33,24 +35,28 @@ do_install() { make DESTDIR=${D} VERS=${PV} SYSDPATH=${systemd_system_unitdir} \ PMPATHD=${systemd_unitdir}/system-sleep systemdinstall install -d ${D}${sysconfdir}/tmpfiles.d - install -m 644 ${WORKDIR}/volatiles.atop.conf ${D}${sysconfdir}/tmpfiles.d/atop.conf + install -m 644 ${UNPACKDIR}/volatiles.atop.conf ${D}${sysconfdir}/tmpfiles.d/atop.conf rm -f ${D}${systemd_system_unitdir}/atopacct.service else make DESTDIR=${D} VERS=${PV} sysvinstall install -d ${D}${sysconfdir}/default/volatiles - install -m 644 ${WORKDIR}/volatiles.99_atop ${D}${sysconfdir}/default/volatiles/99_atop + install -m 644 ${UNPACKDIR}/volatiles.99_atop ${D}${sysconfdir}/default/volatiles/99_atop rm -f ${D}${sysconfdir}/init.d/atopacct fi + # /var/log/atop will be created in runtime + rm -rf ${D}${localstatedir}/log + rmdir --ignore-fail-on-non-empty ${D}${localstatedir} + # remove atopacct related files rm -rf ${D}${sbindir} ${D}${mandir}/man8 } inherit systemd -SYSTEMD_SERVICE_${PN} = "atop.service atopgpu.service" +SYSTEMD_SERVICE:${PN} = "atop.service atopgpu.service" SYSTEMD_AUTO_ENABLE = "disable" -FILES_${PN} += "${systemd_unitdir}/system-sleep" +FILES:${PN} += "${systemd_unitdir}/system-sleep" -RDEPENDS_${PN} = "procps" +RDEPENDS:${PN} = "procps" diff --git a/meta-oe/recipes-support/augeas/augeas.inc b/meta-oe/recipes-support/augeas/augeas.inc deleted file mode 100644 index 1bbd181c38..0000000000 --- a/meta-oe/recipes-support/augeas/augeas.inc +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "Augeas configuration API" -HOMEPAGE = "http://augeas.net/" -BUGTRACKER = "https://fedorahosted.org/augeas/report/1" - -LICENSE = "LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=bbb461211a33b134d42ed5ee802b37ff" - -SRC_URI = "http://download.augeas.net/${BP}.tar.gz \ - file://sepbuildfix.patch \ - " - -DEPENDS = "readline libxml2" - -inherit autotools pkgconfig - -PACKAGES =+ "${PN}-lenses lib${BPN}" - -FILES_${PN}-lenses = "${datadir}/augeas/lenses" -FILES_lib${BPN} = "${libdir}/lib*${SOLIBS}" - -RDEPENDS_lib${BPN} += "${PN}-lenses" -RRECOMMENDS_lib${BPN} += "${PN}" - -LEAD_SONAME = "libaugeas.so" - -do_install_append() { - rm -fr ${D}${datadir}/vim -} - -PACKAGECONFIG ??= "" -PACKAGECONFIG[libselinux] = "--with-selinux,--without-selinux,libselinux" - -EXTRA_AUTORECONF += "-I ${S}/gnulib/m4" diff --git a/meta-oe/recipes-support/augeas/augeas/0001-src-internal-Use-__GLIBC__-to-check-for-GNU-extentio.patch b/meta-oe/recipes-support/augeas/augeas/0001-src-internal-Use-__GLIBC__-to-check-for-GNU-extentio.patch new file mode 100644 index 0000000000..9424be2aa6 --- /dev/null +++ b/meta-oe/recipes-support/augeas/augeas/0001-src-internal-Use-__GLIBC__-to-check-for-GNU-extentio.patch @@ -0,0 +1,34 @@ +From e5ccf769c2dc7283b56a597fffdb5dc1558e3ce8 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 3 Sep 2022 01:23:28 -0700 +Subject: [PATCH] src/internal: Use __GLIBC__ to check for GNU extention + implementation + +__USE_GNU is defined by _GNU_SOURCE and configure explicitly sets this +macro and it does have meaning on musl too, where it may have some level +of GNU compatibility but strerror_r is not one of them. Therefore we +have to check for libc implementation for this to be sure. + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/internal.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/internal.c b/src/internal.c +index ef83b71..fb326fa 100644 +--- a/src/internal.c ++++ b/src/internal.c +@@ -431,7 +431,7 @@ char *cleanpath(char *path) { + + const char *xstrerror(int errnum, char *buf, size_t len) { + #ifdef HAVE_STRERROR_R +-# ifdef __USE_GNU ++# ifdef __GLIBC__ + /* Annoying linux specific API contract */ + return strerror_r(errnum, buf, len); + # else +-- +2.37.3 + diff --git a/meta-oe/recipes-support/augeas/augeas_1.12.0.bb b/meta-oe/recipes-support/augeas/augeas_1.12.0.bb index d32c4691d2..2c6d4cdc88 100644 --- a/meta-oe/recipes-support/augeas/augeas_1.12.0.bb +++ b/meta-oe/recipes-support/augeas/augeas_1.12.0.bb @@ -1,4 +1,36 @@ -require augeas.inc +SUMMARY = "Augeas configuration API" +HOMEPAGE = "http://augeas.net/" +BUGTRACKER = "https://fedorahosted.org/augeas/report/1" +LICENSE = "LGPL-2.1-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=bbb461211a33b134d42ed5ee802b37ff" + +SRC_URI = "http://download.augeas.net/${BP}.tar.gz \ + file://sepbuildfix.patch \ + file://0001-src-internal-Use-__GLIBC__-to-check-for-GNU-extentio.patch \ + " SRC_URI[md5sum] = "74f1c7b8550f4e728486091f6b907175" SRC_URI[sha256sum] = "321942c9cc32185e2e9cb72d0a70eea106635b50269075aca6714e3ec282cb87" + +DEPENDS = "readline libxml2" + +inherit autotools pkgconfig + +PACKAGES =+ "${PN}-lenses lib${BPN}" + +FILES:${PN}-lenses = "${datadir}/augeas/lenses" +FILES:lib${BPN} = "${libdir}/lib*${SOLIBS}" + +RDEPENDS:lib${BPN} += "${PN}-lenses" +RRECOMMENDS:lib${BPN} += "${PN}" + +LEAD_SONAME = "libaugeas.so" + +do_install:append() { + rm -fr ${D}${datadir}/vim +} + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)}" +PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux" + +EXTRA_AUTORECONF += "-I ${S}/gnulib/m4" diff --git a/meta-oe/recipes-support/avro/avro-c++/0001-Remove-cpp-unittest-compilation.patch b/meta-oe/recipes-support/avro/avro-c++/0001-Remove-cpp-unittest-compilation.patch new file mode 100644 index 0000000000..bcfafdda55 --- /dev/null +++ b/meta-oe/recipes-support/avro/avro-c++/0001-Remove-cpp-unittest-compilation.patch @@ -0,0 +1,86 @@ +From 6be1c45e1f7ee78499bdca76c25ec23a61317134 Mon Sep 17 00:00:00 2001 +From: Rui Costa <rui.ms.costa@ctw.bmwgroup.com> +Date: Wed, 20 Mar 2024 14:58:27 +0000 +Subject: [PATCH] Remove cpp unittest compilation + +Upstream-Status: Inappropriate [oe-specific] + +--- + lang/c++/CMakeLists.txt | 61 ----------------------------------------- + 1 file changed, 61 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4a3793152..d94ba42d3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -131,70 +131,9 @@ set_target_properties (avrocpp_s PROPERTIES + target_link_libraries (avrocpp ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES}) + target_include_directories(avrocpp PRIVATE ${SNAPPY_INCLUDE_DIR}) + +-add_executable (precompile test/precompile.cc) +- +-target_link_libraries (precompile avrocpp_s ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES}) +- +-macro (gen file ns) +- add_custom_command (OUTPUT ${file}.hh +- COMMAND avrogencpp +- -p - +- -i ${CMAKE_CURRENT_SOURCE_DIR}/jsonschemas/${file} +- -o ${file}.hh -n ${ns} -U +- DEPENDS avrogencpp ${CMAKE_CURRENT_SOURCE_DIR}/jsonschemas/${file}) +- add_custom_target (${file}_hh DEPENDS ${file}.hh) +-endmacro (gen) +- +-gen (empty_record empty) +-gen (bigrecord testgen) +-gen (bigrecord_r testgen_r) +-gen (bigrecord2 testgen2) +-gen (tweet testgen3) +-gen (union_array_union uau) +-gen (union_map_union umu) +-gen (union_conflict uc) +-gen (recursive rec) +-gen (reuse ru) +-gen (circulardep cd) +-gen (tree1 tr1) +-gen (tree2 tr2) +-gen (crossref cr) +-gen (primitivetypes pt) +-gen (cpp_reserved_words cppres) +- + add_executable (avrogencpp impl/avrogencpp.cc) + target_link_libraries (avrogencpp avrocpp_s ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES}) + +-enable_testing() +- +-macro (unittest name) +- add_executable (${name} test/${name}.cc) +- target_link_libraries (${name} avrocpp ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES}) +- add_test (NAME ${name} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +- COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${name}) +-endmacro (unittest) +- +-unittest (buffertest) +-unittest (unittest) +-unittest (SchemaTests) +-unittest (LargeSchemaTests) +-unittest (CodecTests) +-unittest (StreamTests) +-unittest (SpecificTests) +-unittest (DataFileTests) +-unittest (JsonTests) +-unittest (AvrogencppTests) +-unittest (CompilerTests) +-unittest (AvrogencppTestReservedWords) +- +-add_dependencies (AvrogencppTestReservedWords cpp_reserved_words_hh) +- +-add_dependencies (AvrogencppTests bigrecord_hh bigrecord_r_hh bigrecord2_hh +- tweet_hh +- union_array_union_hh union_map_union_hh union_conflict_hh +- recursive_hh reuse_hh circulardep_hh tree1_hh tree2_hh crossref_hh +- primitivetypes_hh empty_record_hh) +- + include (InstallRequiredSystemLibraries) + + set (CPACK_PACKAGE_FILE_NAME "avrocpp-${AVRO_VERSION_MAJOR}") diff --git a/meta-oe/recipes-support/avro/avro-c++/0002-Add-package-configuration-files.patch b/meta-oe/recipes-support/avro/avro-c++/0002-Add-package-configuration-files.patch new file mode 100644 index 0000000000..437a3fa138 --- /dev/null +++ b/meta-oe/recipes-support/avro/avro-c++/0002-Add-package-configuration-files.patch @@ -0,0 +1,84 @@ +From 86aa3f2333a9b8e6f1c631e6d5cb7296b6e8380b Mon Sep 17 00:00:00 2001 +From: Rui Costa <rui.ms.costa@ctw.bmwgroup.com> +Date: Fri, 22 Mar 2024 13:27:38 +0000 +Subject: [PATCH] Add package configuration files + +Upstream-Status: Pending + +--- + lang/c++/CMakeLists.txt | 45 ++++++++++++++++++++++++------ + lang/c++/cmake/AvroCppConfig.cmake | 5 ++++ + 2 files changed, 42 insertions(+), 8 deletions(-) + create mode 100644 lang/c++/cmake/AvroCppConfig.cmake + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d94ba42d3..4748b111d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -140,14 +140,18 @@ set (CPACK_PACKAGE_FILE_NAME "avrocpp-${AVRO_VERSION_MAJOR}") + + include (CPack) + +-install (TARGETS avrocpp avrocpp_s +- LIBRARY DESTINATION lib +- ARCHIVE DESTINATION lib +- RUNTIME DESTINATION lib) +- +-install (TARGETS avrogencpp RUNTIME DESTINATION bin) +- +-install (DIRECTORY api/ DESTINATION include/avro ++install (TARGETS avrocpp ++ EXPORT AvroCppTargets ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ INCLUDES DESTINATION include) ++ ++install (TARGETS avrogencpp ++ EXPORT AvroCppTargets ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) ++ ++install (DIRECTORY api/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/avro + FILES_MATCHING PATTERN *.hh) + + if (NOT CMAKE_BUILD_TYPE) +@@ -155,3 +159,28 @@ if (NOT CMAKE_BUILD_TYPE) + "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." + FORCE) + endif (NOT CMAKE_BUILD_TYPE) ++ ++# Create cmake config files ++include(CMakePackageConfigHelpers) ++write_basic_package_version_file( ++ "${CMAKE_CURRENT_BINARY_DIR}/AvroCppConfigVersion.cmake" ++ VERSION ${AVRO_VERSION_MAJOR}.${AVRO_VERSION_MINOR}.${AVRO_VERSION_PATCH} ++ COMPATIBILITY AnyNewerVersion ++) ++ ++configure_file(cmake/AvroCppConfig.cmake ++ "${CMAKE_CURRENT_BINARY_DIR}/AvroCppConfig.cmake" ++ COPYONLY ++) ++ ++set(ConfigPackageLocation ${CMAKE_INSTALL_LIBDIR}/cmake/avrocpp) ++install(EXPORT AvroCppTargets ++ FILE AvroCppTargets.cmake ++ NAMESPACE AvroCpp:: ++ DESTINATION ${ConfigPackageLocation} ++) ++install(FILES ++ "cmake/AvroCppConfig.cmake" ++ "${CMAKE_CURRENT_BINARY_DIR}/AvroCppConfigVersion.cmake" ++ DESTINATION ${ConfigPackageLocation} ++ COMPONENT Devel) +diff --git a/cmake/AvroCppConfig.cmake b/cmake/AvroCppConfig.cmake +new file mode 100644 +index 000000000..deb8aaa31 +--- /dev/null ++++ b/cmake/AvroCppConfig.cmake +@@ -0,0 +1,5 @@ ++include(CMakeFindDependencyMacro) ++find_dependency(Boost 1.38 REQUIRED ++ COMPONENTS filesystem iostreams program_options regex system) ++ ++include("${CMAKE_CURRENT_LIST_DIR}/AvroCppTargets.cmake") diff --git a/meta-oe/recipes-support/avro/avro-c++/0003-Update-CXX-standard-to-CXX14.patch b/meta-oe/recipes-support/avro/avro-c++/0003-Update-CXX-standard-to-CXX14.patch new file mode 100644 index 0000000000..3e65cb7a72 --- /dev/null +++ b/meta-oe/recipes-support/avro/avro-c++/0003-Update-CXX-standard-to-CXX14.patch @@ -0,0 +1,24 @@ +From 66c08ade24e4472b5af5dca48097ed9a2ec035ec Mon Sep 17 00:00:00 2001 +From: Rui Costa <rui.ms.costa@ctw.bmwgroup.com> +Date: Fri, 5 Apr 2024 11:33:51 +0000 +Subject: [PATCH] Update CXX standard to CXX14 + +Upstream-Status: Inappropriate [oe-specific] + +--- + lang/c++/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4748b111d..1e45c13d5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -21,7 +21,7 @@ cmake_minimum_required (VERSION 3.1) + set (CMAKE_LEGACY_CYGWIN_WIN32 0) + + if (NOT DEFINED CMAKE_CXX_STANDARD) +- set(CMAKE_CXX_STANDARD 11) ++ set(CMAKE_CXX_STANDARD 14) + endif() + + set(CMAKE_CXX_STANDARD_REQUIRED ON) diff --git a/meta-oe/recipes-support/avro/avro-c++_1.11.3.bb b/meta-oe/recipes-support/avro/avro-c++_1.11.3.bb new file mode 100644 index 0000000000..6ec25bdd2b --- /dev/null +++ b/meta-oe/recipes-support/avro/avro-c++_1.11.3.bb @@ -0,0 +1,22 @@ +SUMMARY = "Apache Avro data serialization system." +HOMEPAGE = "https://avro.apache.org/" +SECTION = "libs" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=43abf34d8b9908494f83c55d213a7f89" + +DEPENDS = "boost zlib xz" + +BRANCH = "branch-1.11" +SRCREV = "35ff8b997738e4d983871902d47bfb67b3250734" +SRC_URI = "git://github.com/apache/avro;branch=${BRANCH};protocol=https \ + file://0001-Remove-cpp-unittest-compilation.patch \ + file://0002-Add-package-configuration-files.patch \ + file://0003-Update-CXX-standard-to-CXX14.patch \ + " + +S = "${WORKDIR}/git/lang/c++" + +inherit cmake pkgconfig + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/avro/avro-c/0001-avro-c-Fix-build-with-clang-compiler.patch b/meta-oe/recipes-support/avro/avro-c/0001-avro-c-Fix-build-with-clang-compiler.patch deleted file mode 100644 index 01235d8ef3..0000000000 --- a/meta-oe/recipes-support/avro/avro-c/0001-avro-c-Fix-build-with-clang-compiler.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 518bb8ccfb3f3fc143fbd571782f3e40573d01b5 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 10 Apr 2017 09:15:04 -0700 -Subject: [PATCH] avro-c: Fix build with clang compiler - -Clang advertizes itself to be compatible with gcc 4.2.1 -while that was true several years ago, it now supports -a lot more newer features, the test to just check gcc -version should be supplanted with clang check as well -so atomic support in clang can be asserted as well - -Fixes - -lang/c/src/avro/refcount.h:301:2: error: "No atomic implementation!" - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - lang/c/src/avro/refcount.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/lang/c/src/avro/refcount.h b/lang/c/src/avro/refcount.h -index 69afa4fc..d76ba057 100644 ---- a/lang/c/src/avro/refcount.h -+++ b/lang/c/src/avro/refcount.h -@@ -118,7 +118,8 @@ avro_refcount_dec(volatile int *refcount) - * GCC intrinsics - */ - --#elif (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) > 40500 -+#elif (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) > 40500 \ -+|| defined(__clang__) - - static inline void - avro_refcount_set(volatile int *refcount, int value) --- -2.12.2 - diff --git a/meta-oe/recipes-support/avro/avro-c_1.11.3.bb b/meta-oe/recipes-support/avro/avro-c_1.11.3.bb new file mode 100644 index 0000000000..bb7f53e459 --- /dev/null +++ b/meta-oe/recipes-support/avro/avro-c_1.11.3.bb @@ -0,0 +1,17 @@ +SUMMARY = "Apache Avro data serialization system." +HOMEPAGE = "https://avro.apache.org/" +SECTION = "libs" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=6d502b41f76179fc84e536236f359cae" + +DEPENDS = "jansson zlib xz" + +BRANCH = "branch-1.11" +SRCREV = "35ff8b997738e4d983871902d47bfb67b3250734" +SRC_URI = "git://github.com/apache/avro;branch=${BRANCH};protocol=https \ + " + +S = "${WORKDIR}/git/lang/c" + +inherit cmake pkgconfig diff --git a/meta-oe/recipes-support/avro/avro-c_1.8.1.bb b/meta-oe/recipes-support/avro/avro-c_1.8.1.bb deleted file mode 100644 index 276fe2b5ae..0000000000 --- a/meta-oe/recipes-support/avro/avro-c_1.8.1.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "Apache Avro data serialization system." -HOMEPAGE = "http://apr.apache.org/" -SECTION = "libs" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=73bdf70f268f0b3b9c5a83dd7a6f3324" - -DEPENDS = "jansson zlib xz" -PV .= "+git${SRCPV}" - -SRCREV = "4b3677c32b879e0e7f717eb95f9135ac654da760" -SRC_URI = "git://github.com/apache/avro \ - file://0001-avro-c-Fix-build-with-clang-compiler.patch;patchdir=../../ \ -" - -S = "${WORKDIR}/git/lang/c" - -LDFLAGS_append_libc-uclibc = " -lm" - -inherit cmake diff --git a/meta-oe/recipes-support/bdwgc/bdwgc_8.0.4.bb b/meta-oe/recipes-support/bdwgc/bdwgc_8.2.6.bb index 905f95396a..a5a7a63657 100644 --- a/meta-oe/recipes-support/bdwgc/bdwgc_8.0.4.bb +++ b/meta-oe/recipes-support/bdwgc/bdwgc_8.2.6.bb @@ -16,29 +16,22 @@ DESCRIPTION = "The Boehm-Demers-Weiser conservative garbage collector can be\ by replacing malloc with GC_malloc calls, replacing realloc with GC_realloc\ calls, and removing free calls." -HOMEPAGE = "http://www.hboehm.info/gc/" +HOMEPAGE = "https://www.hboehm.info/gc/" SECTION = "devel" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://README.QUICK;md5=81b447d779e278628c843aef92f088fa" +LIC_FILES_CHKSUM = "file://README.QUICK;md5=dd27361ad00943bb27bc3e0589037075" -SRCREV = "d3dede3ce4462cd82a15f161af797ca51654546a" -SRC_URI = "git://github.com/ivmai/bdwgc.git;branch=release-8_0 \ - " +DEPENDS = "libatomic-ops" -FILES_${PN}-doc = "${datadir}" +SRCREV = "e340b2e869e02718de9c9d7fa440ef4b35785388" +SRC_URI = "git://github.com/ivmai/bdwgc.git;branch=release-8_2;protocol=https" S = "${WORKDIR}/git" -ARM_INSTRUCTION_SET = "arm" - inherit autotools pkgconfig -# by default use external libatomic-ops -PACKAGECONFIG ??= "libatomic-ops" -PACKAGECONFIG[libatomic-ops] = "--with-libatomic-ops=yes,--with-libatomic-ops=no,libatomic-ops" - -EXTRA_OECONF += "--enable-cpluscplus" +EXTRA_OECONF += "--enable-cplusplus" -CFLAGS_append_libc-musl = " -D_GNU_SOURCE -DNO_GETCONTEXT -DSEARCH_FOR_DATA_START -DUSE_MMAP -DHAVE_DL_ITERATE_PHDR" +FILES:${PN}-doc = "${datadir}" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/boost-sml/boost-sml_1.1.11.bb b/meta-oe/recipes-support/boost-sml/boost-sml_1.1.11.bb new file mode 100644 index 0000000000..a48195a15d --- /dev/null +++ b/meta-oe/recipes-support/boost-sml/boost-sml_1.1.11.bb @@ -0,0 +1,25 @@ +SUMMARY = "[Boost::ext].SML (State Machine Language)" +DESCRIPTION = "Your scalable C++14 one header only State Machine Library with no dependencies" +HOMEPAGE = "https://github.com/boost-ext/sml" +BUGTRACKER = "https://github.com/boost-ext/sml/issues" +SECTION = "libs" +LICENSE = "BSL-1.0" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=e4224ccaecb14d942c71d31bef20d78c" + +DEPENDS += "boost qemu-native" + +SRC_URI = "git://github.com/boost-ext/sml.git;protocol=https;branch=master" +SRCREV = "b7df6180d20422b2724d26007aebb24066f2a6a9" + +S = "${WORKDIR}/git" + +inherit cmake + +# Building benchmarks takes a lot of time and requires additional headers (euml2.hpp) +# Building examples fail with gcc-12 +EXTRA_OECMAKE:append = " -DSML_BUILD_BENCHMARKS:bool=OFF -DSML_BUILD_EXAMPLES=OFF" + +# [boost::ext].XML is a header only C++ library, so the main package will be empty. +ALLOW_EMPTY:${PN} = "1" + +BBCLASSEXTEND = "nativesdk" diff --git a/meta-oe/recipes-support/btop/btop_1.3.2.bb b/meta-oe/recipes-support/btop/btop_1.3.2.bb new file mode 100644 index 0000000000..c473bf0a35 --- /dev/null +++ b/meta-oe/recipes-support/btop/btop_1.3.2.bb @@ -0,0 +1,23 @@ +SUMMARY = "Resource monitor that shows usage and stats for processor, memory, disks, network and processes." +HOMEPAGE = "https://github.com/aristocratos/btop" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" +SECTION = "console/utils" + +SRC_URI = "git://github.com/aristocratos/btop.git;protocol=https;branch=main" +SRCREV = "fd2a2acdad6fbaad76846cb5e802cf2ae022d670" + +S = "${WORKDIR}/git" + +inherit cmake + +FILES:${PN} += " \ + ${datadir}/icons \ + ${datadir}/icons/hicolor \ + ${datadir}/icons/hicolor/48x48 \ + ${datadir}/icons/hicolor/scalable \ + ${datadir}/icons/hicolor/48x48/apps \ + ${datadir}/icons/hicolor/48x48/apps/btop.png \ + ${datadir}/icons/hicolor/scalable/apps \ + ${datadir}/icons/hicolor/scalable/apps/btop.svg \ +" diff --git a/meta-oe/recipes-support/c-ares/c-ares/run-ptest b/meta-oe/recipes-support/c-ares/c-ares/run-ptest new file mode 100644 index 0000000000..66ffd53889 --- /dev/null +++ b/meta-oe/recipes-support/c-ares/c-ares/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh +./arestest --gtest_filter=-*.Live* --gtest_print_time=0 | sed -E '/^\[ RUN/d ; s/\[ OK \]/PASS: / ; s/\[ DISABLED \]/SKIP: / ; s/\[ FAILED \]/FAIL: /' + diff --git a/meta-oe/recipes-support/c-ares/c-ares_1.27.0.bb b/meta-oe/recipes-support/c-ares/c-ares_1.27.0.bb new file mode 100644 index 0000000000..d0f5b30eb7 --- /dev/null +++ b/meta-oe/recipes-support/c-ares/c-ares_1.27.0.bb @@ -0,0 +1,30 @@ +# Copyright (c) 2012-2014 LG Electronics, Inc. +SUMMARY = "c-ares is a C library that resolves names asynchronously." +HOMEPAGE = "http://daniel.haxx.se/projects/c-ares/" +SECTION = "libs" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=fdbc58a6da11a9f68aa73c453818decc" + +SRC_URI = "https://c-ares.org/download/${BPN}-${PV}.tar.gz \ + file://run-ptest" +SRC_URI[sha256sum] = "0a72be66959955c43e2af2fbd03418e82a2bd5464604ec9a62147e37aceb420b" + +PACKAGECONFIG ?= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" +PACKAGECONFIG[manpages] = "" +PACKAGECONFIG[tests] = "-DCARES_BUILD_TESTS=ON,-DCARES_BUILD_TESTS=OFF,googletest" + +inherit cmake manpages pkgconfig ptest + +EXTRA_OECMAKE = "-DCARES_STATIC=${@ 'ON' if d.getVar('DISABLE_STATIC') == '' else 'OFF' }" + +do_install_ptest () { + install -d ${D}${PTEST_PATH} + install -m 0755 ${B}/bin/arestest ${D}${PTEST_PATH} + install -m 0755 ${UNPACKDIR}/run-ptest ${D}${PTEST_PATH} +} + +PACKAGE_BEFORE_PN = "${PN}-utils" + +FILES:${PN}-utils = "${bindir}" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/c-periphery/c-periphery_2.4.2.bb b/meta-oe/recipes-support/c-periphery/c-periphery_2.4.2.bb new file mode 100644 index 0000000000..8e38517448 --- /dev/null +++ b/meta-oe/recipes-support/c-periphery/c-periphery_2.4.2.bb @@ -0,0 +1,21 @@ +SUMMARY = "C-Periphery lib used to access GPIO, LED, PWM, SPI, I2C, MMIO, Serial" +DESCRIPTION = "A C library for peripheral I/O (GPIO, LED, PWM, SPI, I2C, MMIO, Serial) in Linux" + +HOMEPAGE = "https://github.com/vsergeev/c-periphery" + +SECTION = "libs" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=be30d45bdc453f70a494c149c2168289" + +SRC_URI = "git://github.com/vsergeev/c-periphery;protocol=https;branch=master" +SRCREV = "91f9678d2a35a3af3c633f20165bdde8bea32209" + +S = "${WORKDIR}/git" + +inherit cmake + +EXTRA_OECMAKE = "-DBUILD_SHARED_LIBS=ON" + +BBCLASSEXTEND = "native nativesdk" + diff --git a/meta-oe/recipes-support/canonical-multitouch/frame_2.5.0.bb b/meta-oe/recipes-support/canonical-multitouch/frame_2.5.0.bb index da1a2a36f1..bf62e8416e 100644 --- a/meta-oe/recipes-support/canonical-multitouch/frame_2.5.0.bb +++ b/meta-oe/recipes-support/canonical-multitouch/frame_2.5.0.bb @@ -2,16 +2,21 @@ SUMMARY = "Frame handles simultaneous touches" HOMEPAGE = "https://launchpad.net/frame" -LICENSE = "GPLv3 & LGPLv3" +LICENSE = "GPL-3.0-only & LGPL-3.0-only" LIC_FILES_CHKSUM = " \ file://COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02 \ file://COPYING.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ " -inherit autotools pkgconfig +inherit autotools pkgconfig features_check + +REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'opengl', '', d)}" SRC_URI = "https://launchpad.net/${BPN}/trunk/v${PV}/+download/${BPN}-${PV}.tar.gz \ file://pessimizing-move.patch" + +UPSTREAM_CHECK_URI = "https://launchpad.net/frame/trunk" + SRC_URI[md5sum] = "02baa941091c5d198cd1623b3ad36e68" SRC_URI[sha256sum] = "cfb9ab52cdccd926f1822a457264d0014c7eb9f4600a72626063dd073b26256f" @@ -19,6 +24,6 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" PACKAGECONFIG[x11] = "--enable-x11, --disable-x11, libxi xext virtual/xserver" PACKAGE_BEFORE_PN += "${PN}-test" -FILES_${PN}-test = "${bindir}/frame-test*" +FILES:${PN}-test = "${bindir}/frame-test*" SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" diff --git a/meta-oe/recipes-support/canonical-multitouch/geis/0001-libgeis-Compare-the-first-character-of-string-to-nul.patch b/meta-oe/recipes-support/canonical-multitouch/geis/0001-libgeis-Compare-the-first-character-of-string-to-nul.patch index 3b3acab245..4a9d25f326 100644 --- a/meta-oe/recipes-support/canonical-multitouch/geis/0001-libgeis-Compare-the-first-character-of-string-to-nul.patch +++ b/meta-oe/recipes-support/canonical-multitouch/geis/0001-libgeis-Compare-the-first-character-of-string-to-nul.patch @@ -13,6 +13,8 @@ fixes Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + libgeis/geis_v1.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/canonical-multitouch/geis/0001-provide-function-declaration-with-prototypes.patch b/meta-oe/recipes-support/canonical-multitouch/geis/0001-provide-function-declaration-with-prototypes.patch new file mode 100644 index 0000000000..ddad1404f9 --- /dev/null +++ b/meta-oe/recipes-support/canonical-multitouch/geis/0001-provide-function-declaration-with-prototypes.patch @@ -0,0 +1,690 @@ +From 05fe9751dfb370b0fb726e95bc36674468116db4 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 2 Sep 2022 16:57:51 -0700 +Subject: [PATCH] provide function declaration with prototypes + +Fixes build with clang-15+ + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + libgeis/backend/grail/geis_grail_window_grab.c | 2 +- + libgeis/backend/grail/geis_ugsubscription_store.c | 2 +- + libgeis/backend/grail/geis_ugsubscription_store.h | 2 +- + libgeis/backend/test_fixture/geis_backend_test_fixture.c | 4 ++-- + libgeis/geis.c | 2 +- + libgeis/geis_backend_multiplexor.c | 4 ++-- + libgeis/geis_backend_multiplexor.h | 2 +- + libgeis/geis_class.c | 2 +- + libgeis/geis_class.h | 2 +- + libgeis/geis_device.c | 2 +- + libgeis/geis_device.h | 2 +- + libgeis/geis_event_queue.c | 2 +- + libgeis/geis_event_queue.h | 2 +- + libgeis/geis_filter.c | 2 +- + libgeis/geis_filter.h | 2 +- + libgeis/geis_filterable.c | 2 +- + libgeis/geis_filterable.h | 2 +- + libgeis/geis_frame.c | 2 +- + libgeis/geis_frame.h | 2 +- + libgeis/geis_group.c | 2 +- + libgeis/geis_group.h | 2 +- + libgeis/geis_region.c | 2 +- + libgeis/geis_region.h | 2 +- + libgeis/geis_touch.c | 2 +- + libgeis/geis_touch.h | 2 +- + libgeis/server/geis_dbus_client_proxy.c | 2 +- + libgeis/server/geis_dbus_proxy_box.c | 2 +- + libgeis/server/geis_dbus_proxy_box.h | 2 +- + libs/geis-dbus/geis_dbus_dispatcher.c | 2 +- + libs/geis-util/geis_logging.c | 2 +- + testsuite/geis1/check_gesture_attrs.c | 2 +- + testsuite/geis1/check_gesture_types.c | 2 +- + testsuite/geis1/check_instance.c | 2 +- + testsuite/geis1/check_subscription.c | 2 +- + testsuite/geis2/check_attr.c | 2 +- + testsuite/geis2/check_class.c | 2 +- + testsuite/geis2/check_config.c | 2 +- + testsuite/geis2/check_device.c | 2 +- + testsuite/geis2/check_error_codes.c | 2 +- + testsuite/geis2/check_event.c | 2 +- + testsuite/geis2/check_filter.c | 2 +- + testsuite/geis2/check_frame.c | 2 +- + testsuite/geis2/check_geis_new.c | 2 +- + testsuite/geis2/check_general_types.c | 2 +- + testsuite/geis2/check_region.c | 2 +- + testsuite/geis2/check_subscription.c | 2 +- + tools/geis-server/geis-server.c | 2 +- + 47 files changed, 49 insertions(+), 49 deletions(-) + +diff --git a/libgeis/backend/grail/geis_grail_window_grab.c b/libgeis/backend/grail/geis_grail_window_grab.c +index 003adee..f8480ac 100644 +--- a/libgeis/backend/grail/geis_grail_window_grab.c ++++ b/libgeis/backend/grail/geis_grail_window_grab.c +@@ -49,7 +49,7 @@ static const GeisFloat _geis_grail_window_grab_store_growth_factor = 1.7; + + + static GeisGrailWindowGrabStore +-_window_grab_allocate() ++_window_grab_allocate(void) + { + GeisGrailWindowGrabStore wgs = malloc(sizeof(struct GeisGrailWindowGrabStore)); + if (!wgs) +diff --git a/libgeis/backend/grail/geis_ugsubscription_store.c b/libgeis/backend/grail/geis_ugsubscription_store.c +index bb1f0bb..cb7e620 100644 +--- a/libgeis/backend/grail/geis_ugsubscription_store.c ++++ b/libgeis/backend/grail/geis_ugsubscription_store.c +@@ -42,7 +42,7 @@ static const GeisFloat _geis_grail_ugsubscription_store_growth_factor = 1.7; + * Creates a new, empty grail subscription store. + */ + GeisUGSubscriptionStore +-geis_ugsubscription_store_new() ++geis_ugsubscription_store_new(void) + { + GeisUGSubscriptionStore store = geis_bag_new(sizeof(struct GeisUGSubscription), + _geis_grail_ugsubscription_store_default_size, +diff --git a/libgeis/backend/grail/geis_ugsubscription_store.h b/libgeis/backend/grail/geis_ugsubscription_store.h +index a93e1b6..06273ef 100644 +--- a/libgeis/backend/grail/geis_ugsubscription_store.h ++++ b/libgeis/backend/grail/geis_ugsubscription_store.h +@@ -41,7 +41,7 @@ typedef GeisBag GeisUGSubscriptionStore; + * @returns a pointer to a valid store, or NULL to indicate failure. + */ + GeisUGSubscriptionStore +-geis_ugsubscription_store_new(); ++geis_ugsubscription_store_new(void); + + /** + * Destroys a grail subscription store. +diff --git a/libgeis/backend/test_fixture/geis_backend_test_fixture.c b/libgeis/backend/test_fixture/geis_backend_test_fixture.c +index 5912acb..099cde4 100644 +--- a/libgeis/backend/test_fixture/geis_backend_test_fixture.c ++++ b/libgeis/backend/test_fixture/geis_backend_test_fixture.c +@@ -434,7 +434,7 @@ _token_free_subscription_pdata(GeisBackendToken gbtoken GEIS_UNUSED, + } + + __attribute__((constructor)) +-static void _register_test_fixture() ++static void _register_test_fixture(void) + { + geis_register_backend(GEIS_INIT_MOCK_BACKEND, + sizeof(struct GeisBackendTestFixture), +@@ -444,6 +444,6 @@ static void _register_test_fixture() + + /* A dummy routine to force linkage of this module without dlopening it */ + void +-geis_include_backend_test_fixture() ++geis_include_backend_test_fixture(void) + { + } +diff --git a/libgeis/geis.c b/libgeis/geis.c +index 4290d19..3f7bd12 100644 +--- a/libgeis/geis.c ++++ b/libgeis/geis.c +@@ -402,7 +402,7 @@ geis_filterable_attribute_foreach(Geis geis, + * Creates a new empty Geis API instance. + */ + static Geis +-geis_new_empty() ++geis_new_empty(void) + { + geis_error_clear(NULL); + Geis geis = calloc(1, sizeof(struct _Geis)); +diff --git a/libgeis/geis_backend_multiplexor.c b/libgeis/geis_backend_multiplexor.c +index 3f80080..0f76198 100644 +--- a/libgeis/geis_backend_multiplexor.c ++++ b/libgeis/geis_backend_multiplexor.c +@@ -60,7 +60,7 @@ struct _GeisBackendMultiplexor + * Creates a new container for callback info. + */ + static CallbackInfoBag +-_callback_info_bag_new() ++_callback_info_bag_new(void) + { + CallbackInfoBag cbib = calloc(1, sizeof(struct CallbackInfoBag)); + if (!cbib) +@@ -209,7 +209,7 @@ _callback_info_bag_release(CallbackInfoBag cbib, int fd) + * Creates a new backend multiplexor. + */ + GeisBackendMultiplexor +-geis_backend_multiplexor_new() ++geis_backend_multiplexor_new(void) + { + GeisBackendMultiplexor mx = calloc(1, sizeof(struct _GeisBackendMultiplexor)); + if (!mx) +diff --git a/libgeis/geis_backend_multiplexor.h b/libgeis/geis_backend_multiplexor.h +index ff4c318..8e7102e 100644 +--- a/libgeis/geis_backend_multiplexor.h ++++ b/libgeis/geis_backend_multiplexor.h +@@ -74,7 +74,7 @@ typedef void (*GeisBackendFdEventCallback)(int fd, + /** + * Constructs a new back end multiplexor. + */ +-GeisBackendMultiplexor geis_backend_multiplexor_new(); ++GeisBackendMultiplexor geis_backend_multiplexor_new(void); + + /** + * A reasonable default value for the max_events_per_pump parameter to +diff --git a/libgeis/geis_class.c b/libgeis/geis_class.c +index e889e4b..5c26a87 100644 +--- a/libgeis/geis_class.c ++++ b/libgeis/geis_class.c +@@ -46,7 +46,7 @@ static const int gesture_class_bag_growth_constant = 2; + * Creates a new class bag, + */ + GeisGestureClassBag +-geis_gesture_class_bag_new() ++geis_gesture_class_bag_new(void) + { + GeisGestureClassBag bag = calloc(1, sizeof(struct _GeisGestureClassBag)); + if (!bag) +diff --git a/libgeis/geis_class.h b/libgeis/geis_class.h +index 1d60998..724c353 100644 +--- a/libgeis/geis_class.h ++++ b/libgeis/geis_class.h +@@ -35,7 +35,7 @@ typedef struct _GeisGestureClassBag *GeisGestureClassBag; + /** + * Creates a new class bag, + */ +-GeisGestureClassBag geis_gesture_class_bag_new(); ++GeisGestureClassBag geis_gesture_class_bag_new(void); + + /** + * Destroys a gesture class bag. +diff --git a/libgeis/geis_device.c b/libgeis/geis_device.c +index 1f61fc1..ff3216b 100644 +--- a/libgeis/geis_device.c ++++ b/libgeis/geis_device.c +@@ -44,7 +44,7 @@ static const int device_bag_growth_constant = 2; + + + GeisDeviceBag +-geis_device_bag_new() ++geis_device_bag_new(void) + { + GeisDeviceBag bag = calloc(1, sizeof(struct _GeisDeviceBag)); + if (!bag) +diff --git a/libgeis/geis_device.h b/libgeis/geis_device.h +index c411e54..707943b 100644 +--- a/libgeis/geis_device.h ++++ b/libgeis/geis_device.h +@@ -35,7 +35,7 @@ typedef struct _GeisDeviceBag *GeisDeviceBag; + /** + * Creates a new device bag, + */ +-GeisDeviceBag geis_device_bag_new(); ++GeisDeviceBag geis_device_bag_new(void); + + /** + * Destroys a device bag. +diff --git a/libgeis/geis_event_queue.c b/libgeis/geis_event_queue.c +index 0b7d0fb..f357683 100644 +--- a/libgeis/geis_event_queue.c ++++ b/libgeis/geis_event_queue.c +@@ -50,7 +50,7 @@ struct _GeisEventQueue + * Creates a new Geis Event queue. + */ + GeisEventQueue +-geis_event_queue_new() ++geis_event_queue_new(void) + { + GeisEventQueue queue = calloc(1, sizeof(struct _GeisEventQueue)); + if (!queue) +diff --git a/libgeis/geis_event_queue.h b/libgeis/geis_event_queue.h +index e4c186d..5f3da1d 100644 +--- a/libgeis/geis_event_queue.h ++++ b/libgeis/geis_event_queue.h +@@ -41,7 +41,7 @@ typedef struct _GeisEventQueue *GeisEventQueue; + /** + * Creates a new Geis Event queue. + */ +-GeisEventQueue geis_event_queue_new(); ++GeisEventQueue geis_event_queue_new(void); + + /** + * Destroys a Geis Event queue. +diff --git a/libgeis/geis_filter.c b/libgeis/geis_filter.c +index 4fe5da6..83d65a8 100644 +--- a/libgeis/geis_filter.c ++++ b/libgeis/geis_filter.c +@@ -57,7 +57,7 @@ static GeisSize s_filter_oid = 0; + * Creates a new filter bag, + */ + GeisFilterBag +-geis_filter_bag_new() ++geis_filter_bag_new(void) + { + GeisFilterBag bag = calloc(1, sizeof(struct _GeisFilterBag)); + if (!bag) +diff --git a/libgeis/geis_filter.h b/libgeis/geis_filter.h +index 7b613bf..f825bb7 100644 +--- a/libgeis/geis_filter.h ++++ b/libgeis/geis_filter.h +@@ -42,7 +42,7 @@ typedef GeisFilter *GeisFilterIterator; + /** + * Creates a new filter bag, + */ +-GeisFilterBag geis_filter_bag_new(); ++GeisFilterBag geis_filter_bag_new(void); + + /** + * Destroys a filter bag. +diff --git a/libgeis/geis_filterable.c b/libgeis/geis_filterable.c +index 57bd4ac..5fb4b0c 100644 +--- a/libgeis/geis_filterable.c ++++ b/libgeis/geis_filterable.c +@@ -40,7 +40,7 @@ struct FilterableAttributeBag + * Constructs a new filterable attribute bag. + */ + FilterableAttributeBag +-geis_filterable_attribute_bag_new() ++geis_filterable_attribute_bag_new(void) + { + FilterableAttributeBag bag = calloc(1, sizeof(struct FilterableAttributeBag)); + if (!bag) +diff --git a/libgeis/geis_filterable.h b/libgeis/geis_filterable.h +index 6d400fc..63c563d 100644 +--- a/libgeis/geis_filterable.h ++++ b/libgeis/geis_filterable.h +@@ -86,7 +86,7 @@ geis_filterable_attribute_init(GeisFilterableAttribute fa, + * Constructs a new filterable attribute bag. + */ + FilterableAttributeBag +-geis_filterable_attribute_bag_new(); ++geis_filterable_attribute_bag_new(void); + + /** + * Destroys a filterable attribute bag. +diff --git a/libgeis/geis_frame.c b/libgeis/geis_frame.c +index ebe11a1..068d9aa 100644 +--- a/libgeis/geis_frame.c ++++ b/libgeis/geis_frame.c +@@ -57,7 +57,7 @@ struct _GeisFrameSet + * Creates a new, empty frame set. + */ + GeisFrameSet +-geis_frameset_new() ++geis_frameset_new(void) + { + GeisFrameSet frameset = calloc(1, sizeof(struct _GeisFrameSet)); + if (!frameset) +diff --git a/libgeis/geis_frame.h b/libgeis/geis_frame.h +index e0d1eb6..4a4b0ba 100644 +--- a/libgeis/geis_frame.h ++++ b/libgeis/geis_frame.h +@@ -32,7 +32,7 @@ typedef struct _GeisFrameSet *GeisFrameSet; + /** + * Creates a new, empty frame set. + */ +-GeisFrameSet geis_frameset_new(); ++GeisFrameSet geis_frameset_new(void); + + /** + * Destroys a frame set and all framees contained in it. +diff --git a/libgeis/geis_group.c b/libgeis/geis_group.c +index 0829bd4..4c51a39 100644 +--- a/libgeis/geis_group.c ++++ b/libgeis/geis_group.c +@@ -42,7 +42,7 @@ struct _GeisGroupSet + * Creates a new, empty group set. + */ + GeisGroupSet +-geis_groupset_new() ++geis_groupset_new(void) + { + GeisGroupSet groupset = calloc(1, sizeof(struct _GeisGroupSet)); + if (!groupset) +diff --git a/libgeis/geis_group.h b/libgeis/geis_group.h +index 76e0efc..c44ce62 100644 +--- a/libgeis/geis_group.h ++++ b/libgeis/geis_group.h +@@ -31,7 +31,7 @@ + /** + * Creates a new, empty group set. + */ +-GeisGroupSet geis_groupset_new(); ++GeisGroupSet geis_groupset_new(void); + + /** + * Destroys a group set and all groups contained in it. +diff --git a/libgeis/geis_region.c b/libgeis/geis_region.c +index fc8cc1e..18181cb 100644 +--- a/libgeis/geis_region.c ++++ b/libgeis/geis_region.c +@@ -52,7 +52,7 @@ static const int region_bag_growth_constant = 2; + * Constructs a region bag. + */ + GeisRegionBag +-geis_region_bag_new() ++geis_region_bag_new(void) + { + GeisRegionBag bag = calloc(1, sizeof(struct _GeisRegionBag)); + if (!bag) +diff --git a/libgeis/geis_region.h b/libgeis/geis_region.h +index 53a52b8..18d908f 100644 +--- a/libgeis/geis_region.h ++++ b/libgeis/geis_region.h +@@ -49,7 +49,7 @@ typedef struct _GeisRegionBag *GeisRegionBag; + /** + * Creates a new region bag. + */ +-GeisRegionBag geis_region_bag_new(); ++GeisRegionBag geis_region_bag_new(void); + + /** + * Destroys a region bag. +diff --git a/libgeis/geis_touch.c b/libgeis/geis_touch.c +index 74d1b3e..be0f1a7 100644 +--- a/libgeis/geis_touch.c ++++ b/libgeis/geis_touch.c +@@ -43,7 +43,7 @@ struct _GeisTouchSet + * Creates a new, empty touch set. + */ + GeisTouchSet +-geis_touchset_new() ++geis_touchset_new(void) + { + GeisTouchSet touchset = calloc(1, sizeof(struct _GeisTouchSet)); + if (!touchset) +diff --git a/libgeis/geis_touch.h b/libgeis/geis_touch.h +index 62af610..b64c755 100644 +--- a/libgeis/geis_touch.h ++++ b/libgeis/geis_touch.h +@@ -30,7 +30,7 @@ + /** + * Creates a new, empty touch set. + */ +-GeisTouchSet geis_touchset_new(); ++GeisTouchSet geis_touchset_new(void); + + /** + * Destroys a touch set and all touches contained in it. +diff --git a/libgeis/server/geis_dbus_client_proxy.c b/libgeis/server/geis_dbus_client_proxy.c +index 3f1af47..65f229b 100644 +--- a/libgeis/server/geis_dbus_client_proxy.c ++++ b/libgeis/server/geis_dbus_client_proxy.c +@@ -52,7 +52,7 @@ struct GeisDBusClientProxy + * failure. + */ + GeisDBusClientProxy +-_client_proxy_allocate() ++_client_proxy_allocate(void) + { + GeisDBusClientProxy proxy = calloc(1, sizeof(struct GeisDBusClientProxy)); + return proxy; +diff --git a/libgeis/server/geis_dbus_proxy_box.c b/libgeis/server/geis_dbus_proxy_box.c +index 4c7752a..f129bc3 100644 +--- a/libgeis/server/geis_dbus_proxy_box.c ++++ b/libgeis/server/geis_dbus_proxy_box.c +@@ -49,7 +49,7 @@ struct GeisDBusProxyBox + * Constructs a %GeisDBusProxyBox. + */ + GeisDBusProxyBox +-geis_dbus_proxy_box_new() ++geis_dbus_proxy_box_new(void) + { + GeisDBusProxyBox box = calloc(1, sizeof(struct GeisDBusProxyBox)); + if (!box) +diff --git a/libgeis/server/geis_dbus_proxy_box.h b/libgeis/server/geis_dbus_proxy_box.h +index d8a70f5..47e84b7 100644 +--- a/libgeis/server/geis_dbus_proxy_box.h ++++ b/libgeis/server/geis_dbus_proxy_box.h +@@ -47,7 +47,7 @@ typedef struct GeisDBusProxyBoxNode *GeisDBusProxyBoxIterator; + * @returns a valid %GeisDBusProxyBox or NULL on failure. + */ + GeisDBusProxyBox +-geis_dbus_proxy_box_new(); ++geis_dbus_proxy_box_new(void); + + /** + * Destroys a %GeisDBusProxyBox. +diff --git a/libs/geis-dbus/geis_dbus_dispatcher.c b/libs/geis-dbus/geis_dbus_dispatcher.c +index 10c4134..d8a3f9d 100644 +--- a/libs/geis-dbus/geis_dbus_dispatcher.c ++++ b/libs/geis-dbus/geis_dbus_dispatcher.c +@@ -82,7 +82,7 @@ struct GeisDBusDispatcher + * assumption that if you're creating a bag you're going to use it. + */ + static GeisDBusWatchBag +-_geis_dbus_watch_bag_new() ++_geis_dbus_watch_bag_new(void) + { + GeisDBusWatchBag bag = calloc(1, sizeof(struct GeisDBusWatchBag)); + if (!bag) +diff --git a/libs/geis-util/geis_logging.c b/libs/geis-util/geis_logging.c +index a02077b..030a591 100644 +--- a/libs/geis-util/geis_logging.c ++++ b/libs/geis-util/geis_logging.c +@@ -31,7 +31,7 @@ static const char *error_marker = "error"; + + + static int +-reporting_level() ++reporting_level(void) + { + char *level = getenv("GEIS_DEBUG"); + if (level) +diff --git a/testsuite/geis1/check_gesture_attrs.c b/testsuite/geis1/check_gesture_attrs.c +index 2228d2f..d990c7c 100644 +--- a/testsuite/geis1/check_gesture_attrs.c ++++ b/testsuite/geis1/check_gesture_attrs.c +@@ -169,7 +169,7 @@ END_TEST + + + Suite * +-geis1_gesture_attrs_new() ++geis1_gesture_attrs_new(void) + { + Suite *s = suite_create("geis1_gesture_attrs"); + TCase *test; +diff --git a/testsuite/geis1/check_gesture_types.c b/testsuite/geis1/check_gesture_types.c +index 3492062..980f8fb 100644 +--- a/testsuite/geis1/check_gesture_types.c ++++ b/testsuite/geis1/check_gesture_types.c +@@ -62,7 +62,7 @@ START_TEST(gesture_types) + END_TEST + + Suite * +-geis1_gesture_types_new() ++geis1_gesture_types_new(void) + { + Suite *s = suite_create("geis1_gesture_types"); + TCase *test; +diff --git a/testsuite/geis1/check_instance.c b/testsuite/geis1/check_instance.c +index ac897ab..584abfd 100644 +--- a/testsuite/geis1/check_instance.c ++++ b/testsuite/geis1/check_instance.c +@@ -44,7 +44,7 @@ END_TEST + + + Suite * +-geis1_instance_suite_new() ++geis1_instance_suite_new(void) + { + TCase *create; + Suite *s = suite_create("geis1_instance_suite"); +diff --git a/testsuite/geis1/check_subscription.c b/testsuite/geis1/check_subscription.c +index 0797337..e69c332 100644 +--- a/testsuite/geis1/check_subscription.c ++++ b/testsuite/geis1/check_subscription.c +@@ -146,7 +146,7 @@ END_TEST + + + Suite * +-geis1_subscription_new() ++geis1_subscription_new(void) + { + Suite *s = suite_create("geis1_subscription"); + TCase *test; +diff --git a/testsuite/geis2/check_attr.c b/testsuite/geis2/check_attr.c +index 9e01219..58c8ebc 100644 +--- a/testsuite/geis2/check_attr.c ++++ b/testsuite/geis2/check_attr.c +@@ -42,7 +42,7 @@ END_TEST + + /* boilerplate */ + Suite * +-geis2_attr_suite_new() ++geis2_attr_suite_new(void) + { + Suite *s = suite_create("geis2_attr"); + +diff --git a/testsuite/geis2/check_class.c b/testsuite/geis2/check_class.c +index ca7accd..b60d827 100644 +--- a/testsuite/geis2/check_class.c ++++ b/testsuite/geis2/check_class.c +@@ -92,7 +92,7 @@ END_TEST + + /* boilerplate */ + Suite * +-geis2_gesture_class_suite_new() ++geis2_gesture_class_suite_new(void) + { + TCase *gesture_class; + TCase *usage; +diff --git a/testsuite/geis2/check_config.c b/testsuite/geis2/check_config.c +index a9fc9c1..03b3137 100644 +--- a/testsuite/geis2/check_config.c ++++ b/testsuite/geis2/check_config.c +@@ -48,7 +48,7 @@ END_TEST + + /* boilerplate */ + Suite * +-geis2_config_suite_new() ++geis2_config_suite_new(void) + { + Suite *s = suite_create("geis2_configuration"); + +diff --git a/testsuite/geis2/check_device.c b/testsuite/geis2/check_device.c +index 8b3b7be..9583cb5 100644 +--- a/testsuite/geis2/check_device.c ++++ b/testsuite/geis2/check_device.c +@@ -99,7 +99,7 @@ END_TEST + + /* boilerplate */ + Suite * +-geis2_device_suite_new() ++geis2_device_suite_new(void) + { + TCase *device; + TCase *usage; +diff --git a/testsuite/geis2/check_error_codes.c b/testsuite/geis2/check_error_codes.c +index 9c7508d..57e7fc7 100644 +--- a/testsuite/geis2/check_error_codes.c ++++ b/testsuite/geis2/check_error_codes.c +@@ -20,7 +20,7 @@ END_TEST + + /* boilerplate */ + Suite * +-geis2_error_codes_suite_new() ++geis2_error_codes_suite_new(void) + { + Suite *s = suite_create("geis2_error_codes"); + +diff --git a/testsuite/geis2/check_event.c b/testsuite/geis2/check_event.c +index 8ecda1d..c752a30 100644 +--- a/testsuite/geis2/check_event.c ++++ b/testsuite/geis2/check_event.c +@@ -43,7 +43,7 @@ END_TEST + + /* boilerplate */ + Suite * +-geis2_event_suite_new() ++geis2_event_suite_new(void) + { + Suite *s = suite_create("geis2_event"); + +diff --git a/testsuite/geis2/check_filter.c b/testsuite/geis2/check_filter.c +index 3272a2a..afa23e5 100644 +--- a/testsuite/geis2/check_filter.c ++++ b/testsuite/geis2/check_filter.c +@@ -67,7 +67,7 @@ END_TEST + + /* boilerplate */ + Suite * +-geis2_filter_suite_new() ++geis2_filter_suite_new(void) + { + TCase *filter; + TCase *usage; +diff --git a/testsuite/geis2/check_frame.c b/testsuite/geis2/check_frame.c +index dce6faf..3ea3db0 100644 +--- a/testsuite/geis2/check_frame.c ++++ b/testsuite/geis2/check_frame.c +@@ -172,7 +172,7 @@ END_TEST + + /* boilerplate */ + Suite * +-geis2_gesture_frame_suite_new() ++geis2_gesture_frame_suite_new(void) + { + Suite *s = suite_create("geis2_gesture_frame"); + TCase *gesture_frame; +diff --git a/testsuite/geis2/check_geis_new.c b/testsuite/geis2/check_geis_new.c +index 1fb8de2..36cd3e9 100644 +--- a/testsuite/geis2/check_geis_new.c ++++ b/testsuite/geis2/check_geis_new.c +@@ -32,7 +32,7 @@ END_TEST + + /* boilerplate */ + Suite * +-geis2_geis_new_suite_new() ++geis2_geis_new_suite_new(void) + { + Suite *s = suite_create("geis2_geis_init"); + +diff --git a/testsuite/geis2/check_general_types.c b/testsuite/geis2/check_general_types.c +index 79e29bb..0f463d4 100644 +--- a/testsuite/geis2/check_general_types.c ++++ b/testsuite/geis2/check_general_types.c +@@ -20,7 +20,7 @@ END_TEST + + /* boilerplate */ + Suite * +-geis2_general_types_suite_new() ++geis2_general_types_suite_new(void) + { + Suite *s = suite_create("geis2_general_types"); + TCase *create; +diff --git a/testsuite/geis2/check_region.c b/testsuite/geis2/check_region.c +index 3e64e0c..606350a 100644 +--- a/testsuite/geis2/check_region.c ++++ b/testsuite/geis2/check_region.c +@@ -48,7 +48,7 @@ END_TEST + + /* boilerplate */ + Suite * +-geis2_region_suite_new() ++geis2_region_suite_new(void) + { + Suite *s = suite_create("geis2_region"); + TCase *creation; +diff --git a/testsuite/geis2/check_subscription.c b/testsuite/geis2/check_subscription.c +index a45c4ad..17a6779 100644 +--- a/testsuite/geis2/check_subscription.c ++++ b/testsuite/geis2/check_subscription.c +@@ -161,7 +161,7 @@ END_TEST + + /* boilerplate */ + Suite * +-geis2_subscription_suite_new() ++geis2_subscription_suite_new(void) + { + TCase *create; + TCase *usage; +diff --git a/tools/geis-server/geis-server.c b/tools/geis-server/geis-server.c +index 97c8b99..6600d8f 100644 +--- a/tools/geis-server/geis-server.c ++++ b/tools/geis-server/geis-server.c +@@ -23,7 +23,7 @@ + + + int +-main() ++main(void) + { + GeisStatus status; + +-- +2.37.3 + diff --git a/meta-oe/recipes-support/canonical-multitouch/geis/fix-indentation-for-gcc6.patch b/meta-oe/recipes-support/canonical-multitouch/geis/fix-indentation-for-gcc6.patch index 389e1b3fd7..7f55ed9eaf 100644 --- a/meta-oe/recipes-support/canonical-multitouch/geis/fix-indentation-for-gcc6.patch +++ b/meta-oe/recipes-support/canonical-multitouch/geis/fix-indentation-for-gcc6.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + --- geis-2.2.17/libgeis/geis_subscription.c.orig 2016-06-17 12:04:21.062938443 -0400 +++ geis-2.2.17/libgeis/geis_subscription.c 2016-06-17 12:05:02.934939172 -0400 @@ -237,9 +237,10 @@ diff --git a/meta-oe/recipes-support/canonical-multitouch/geis_2.2.17.bb b/meta-oe/recipes-support/canonical-multitouch/geis_2.2.17.bb index 9362a5c110..139649b975 100644 --- a/meta-oe/recipes-support/canonical-multitouch/geis_2.2.17.bb +++ b/meta-oe/recipes-support/canonical-multitouch/geis_2.2.17.bb @@ -7,7 +7,7 @@ system-wide input gesture recognition mechanism." HOMEPAGE = "https://launchpad.net/geis" -LICENSE = "GPLv3 & LGPLv3" +LICENSE = "GPL-3.0-only & LGPL-3.0-only" LIC_FILES_CHKSUM = " \ file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6 \ file://COPYING.GPL;md5=f27defe1e96c2e1ecd4e0c9be8967949 \ @@ -15,21 +15,25 @@ LIC_FILES_CHKSUM = " \ inherit autotools pkgconfig python3native lib_package features_check -REQUIRED_DISTRO_FEATURES = "x11" +REQUIRED_DISTRO_FEATURES = "x11 opengl" DEPENDS += "grail dbus-glib python3 virtual/libx11 libxext libxi libxcb dbus frame" SRC_URI = "https://launchpad.net/${BPN}/trunk/${PV}/+download/${BPN}-${PV}.tar.xz \ file://fix-indentation-for-gcc6.patch \ file://0001-libgeis-Compare-the-first-character-of-string-to-nul.patch \ + file://0001-provide-function-declaration-with-prototypes.patch \ " + +UPSTREAM_CHECK_URI = "https://launchpad.net/geis/trunk" + SRC_URI[md5sum] = "2ff9d76a3ea5794516bb02c9d1924faf" SRC_URI[sha256sum] = "8a60f5683852094038904e690d23cc5a90a980fc52da67f0f28890baa25c70eb" EXTRA_OECONF = "--disable-integration-tests" -FILES_${PN}-bin = "${bindir}" -RDEPENDS_${PN}-bin = " \ +FILES:${PN}-bin = "${bindir}" +RDEPENDS:${PN}-bin = " \ python3-compression \ python3-core \ python3-crypt \ @@ -42,14 +46,14 @@ RDEPENDS_${PN}-bin = " \ python3-threading \ " -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/geisview \ - ${libdir}/${PYTHON_DIR}/site-packages/geis* \ - ${libdir}/${PYTHON_DIR}/site-packages/_*.so \ + ${PYTHON_SITEPACKAGES_DIR}/geis* \ + ${PYTHON_SITEPACKAGES_DIR}/_*.so \ " -FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/.debug" +FILES:${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/.debug" -FILES_${PN}-dev += "${libdir}/${PYTHON_DIR}/site-packages/_*.la" +FILES:${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/_*.la" -FILES_${PN}-staticdev += "${libdir}/${PYTHON_DIR}/site-packages/_*.a" +FILES:${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/_*.a" diff --git a/meta-oe/recipes-support/canonical-multitouch/grail_3.1.1.bb b/meta-oe/recipes-support/canonical-multitouch/grail_3.1.1.bb index 22fd0f48e2..067052c036 100644 --- a/meta-oe/recipes-support/canonical-multitouch/grail_3.1.1.bb +++ b/meta-oe/recipes-support/canonical-multitouch/grail_3.1.1.bb @@ -2,23 +2,28 @@ SUMMARY = "Gesture Recognition And Instantiation Library" HOMEPAGE = "https://launchpad.net/grail" -LICENSE = "GPLv3 & LGPLv3" +LICENSE = "GPL-3.0-only & LGPL-3.0-only" LIC_FILES_CHKSUM = " \ file://COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02 \ file://COPYING.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ " -inherit autotools pkgconfig +inherit autotools pkgconfig features_check DEPENDS = "frame" -CXXFLAGS_append_toolchain-clang = " -Wno-pessimizing-move" +CXXFLAGS:append:toolchain-clang = " -Wno-pessimizing-move" SRC_URI = "https://launchpad.net/${BPN}/trunk/${PV}/+download/${BPN}-${PV}.tar.bz2" + +UPSTREAM_CHECK_URI = "https://launchpad.net/grail/trunk" + SRC_URI[md5sum] = "0df1b3ec6167920f310e2effe6e2ad44" SRC_URI[sha256sum] = "5eed1f650f042481daa3a2de5e7d43261fe343b2a1b1e240f3b7fc26572c9df3" +REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'opengl', '', d)}" + PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" PACKAGECONFIG[x11] = "--with-x11, --without-x11, libxi" PACKAGE_BEFORE_PN += "${PN}-test" -FILES_${PN}-test = "${bindir}/grail-test*" +FILES:${PN}-test = "${bindir}/grail-test*" SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" diff --git a/meta-oe/recipes-support/ccid/ccid/0001-Add-build-rule-for-README.patch b/meta-oe/recipes-support/ccid/ccid/0001-Add-build-rule-for-README.patch index 586ff18c32..e39e7ddd3d 100644 --- a/meta-oe/recipes-support/ccid/ccid/0001-Add-build-rule-for-README.patch +++ b/meta-oe/recipes-support/ccid/ccid/0001-Add-build-rule-for-README.patch @@ -1,22 +1,24 @@ +From c82680a21c7411ba63e5815786eeb471720faa29 Mon Sep 17 00:00:00 2001 +From: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> +Date: Wed, 6 Nov 2019 20:10:09 +0800 Subject: [PATCH] Add build rule for README. fix do_configure error: Makefile.am: required file `./README' not found +Upstream-Status: Pending Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> + --- Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.am b/Makefile.am -index 49574a3..a5a7c2a 100644 +index e77c4c4..fd77ecd 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -26,3 +26,4 @@ libtool: $(LIBTOOL_DEPS) +@@ -27,3 +27,4 @@ libtool: $(LIBTOOL_DEPS) ChangeLog: git log --stat --decorate=short > $@ +README: README.md --- -2.7.4 - diff --git a/meta-oe/recipes-support/ccid/ccid/no-dep-on-libfl.patch b/meta-oe/recipes-support/ccid/ccid/no-dep-on-libfl.patch deleted file mode 100644 index 477cc31ad2..0000000000 --- a/meta-oe/recipes-support/ccid/ccid/no-dep-on-libfl.patch +++ /dev/null @@ -1,18 +0,0 @@ -No need to link with libfl. - -Upstream-Status: Pending -Signed-off-by: Jacob Kroon <jacob.kroon@mikrodidakt.se> - -Index: ccid-1.4.8/src/Makefile.am -=================================================================== ---- ccid-1.4.8.orig/src/Makefile.am -+++ ccid-1.4.8/src/Makefile.am -@@ -53,7 +53,7 @@ PROVIDED_BY_PCSC = debug.c - endif - - libccid_la_SOURCES = $(COMMON) $(USB) $(TOKEN_PARSER) $(PROVIDED_BY_PCSC) $(T1) --libccid_la_LIBADD = $(LEXLIB) $(LIBUSB_LIBS) $(PTHREAD_LIBS) -+libccid_la_LIBADD = $(LIBUSB_LIBS) $(PTHREAD_LIBS) - libccid_la_CFLAGS = $(PCSC_CFLAGS) $(LIBUSB_CFLAGS) $(PTHREAD_CFLAGS) \ - $(SYMBOL_VISIBILITY) -D$(CCID_VERSION) -DSIMCLIST_NO_DUMPRESTORE - libccid_la_LDFLAGS = -avoid-version diff --git a/meta-oe/recipes-support/ccid/ccid_1.4.31.bb b/meta-oe/recipes-support/ccid/ccid_1.4.31.bb deleted file mode 100644 index de07bfd23c..0000000000 --- a/meta-oe/recipes-support/ccid/ccid_1.4.31.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "Generic USB CCID smart card reader driver" -HOMEPAGE = "https://ccid.apdu.fr/" -LICENSE = "LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" - -DEPENDS = "virtual/libusb0 pcsc-lite" -RDEPENDS_${PN} = "pcsc-lite" - -SRC_URI = "https://ccid.apdu.fr/files/ccid-${PV}.tar.bz2 \ - file://no-dep-on-libfl.patch \ - file://0001-Add-build-rule-for-README.patch \ -" - -SRC_URI[md5sum] = "e4690f3362f95adb2332fd47a2b08212" -SRC_URI[sha256sum] = "6b48d7b6e4390e038d25630f8664fe81618ab00f232d6efbe0e3cc6df28ce8f7" - -inherit autotools pkgconfig - -FILES_${PN} += "${libdir}/pcsc/" -FILES_${PN}-dbg += "${libdir}/pcsc/drivers/*/*/*/.debug" diff --git a/meta-oe/recipes-support/ccid/ccid_1.5.5.bb b/meta-oe/recipes-support/ccid/ccid_1.5.5.bb new file mode 100644 index 0000000000..e76881916e --- /dev/null +++ b/meta-oe/recipes-support/ccid/ccid_1.5.5.bb @@ -0,0 +1,18 @@ +SUMMARY = "Generic USB CCID smart card reader driver" +HOMEPAGE = "https://ccid.apdu.fr/" +LICENSE = "LGPL-2.1-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" + +DEPENDS = "autoconf-archive-native virtual/libusb0 pcsc-lite" +RDEPENDS:${PN} = "pcsc-lite" + +SRC_URI = "https://ccid.apdu.fr/files/ccid-${PV}.tar.bz2 \ + file://0001-Add-build-rule-for-README.patch \ +" + +SRC_URI[sha256sum] = "194708f75fe369d45dd7c15e8b3e8a7db8b49cfc5557574ca2a2e76ef12ca0ca" + +inherit autotools pkgconfig + +FILES:${PN} += "${libdir}/pcsc/" +FILES:${PN}-dbg += "${libdir}/pcsc/drivers/*/*/*/.debug" diff --git a/meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.0.bb b/meta-oe/recipes-support/ceres-solver/ceres-solver_2.2.0.bb index ac463038aa..18db0721de 100644 --- a/meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.0.bb +++ b/meta-oe/recipes-support/ceres-solver/ceres-solver_2.2.0.bb @@ -1,18 +1,25 @@ 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" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3585a26c9cd9ec0cb36a7d65542878ca" DEPENDS = "libeigen glog" -SRC_URI = "git://github.com/ceres-solver/ceres-solver.git" -SRCREV = "facb199f3eda902360f9e1d5271372b7e54febe1" +SRC_URI = "git://github.com/ceres-solver/ceres-solver.git;branch=master;protocol=https" +SRCREV = "85331393dc0dff09f6fb9903ab0c4bfa3e134b01" S = "${WORKDIR}/git" inherit cmake +do_configure:prepend() { + # otherwise https://github.com/ceres-solver/ceres-solver/blob/0b748597889f460764f6c980a00c6f502caa3875/cmake/AddGerritCommitHook.cmake#L68 + # will try to fetch https://ceres-solver-review.googlesource.com/tools/hooks/commit-msg durind do_configure + # which sometimes gets stuck (as there is no TIMEOUT set in DOWNLOAD) + # and we really don't need Gerrit's Change-Id tags when just building this + touch ${S}/.git/hooks/commit-msg +} + # We don't want path to eigen3 in ceres-solver RSS to be # used by components which use CeresConfig.cmake from their # own RSS @@ -29,6 +36,6 @@ 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})" +RDEPENDS:${PN}-dev = "" +RRECOMMENDS:${PN}-dev = "${PN}-staticdev" +RRECOMMENDS:${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" diff --git a/meta-oe/recipes-support/ckermit/ckermit/0001-Fix-function-prototype-errors.patch b/meta-oe/recipes-support/ckermit/ckermit/0001-Fix-function-prototype-errors.patch new file mode 100644 index 0000000000..306a2ee52a --- /dev/null +++ b/meta-oe/recipes-support/ckermit/ckermit/0001-Fix-function-prototype-errors.patch @@ -0,0 +1,106 @@ +From f73eade85b7a1b93f7b9ef6ca9ead9d2441f8f84 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 31 Aug 2022 19:01:38 -0700 +Subject: [PATCH] Fix function prototype errors + +Clang 15 is strict, therefore ensure that right headers are pulled in +and also right function prototypes are used. + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + ckcmai.c | 4 ++++ + ckucmd.c | 2 +- + ckucmd.h | 2 -- + ckucon.c | 2 +- + ckufio.c | 2 +- + ckuusx.c | 2 +- + 6 files changed, 8 insertions(+), 6 deletions(-) + +diff --git a/ckcmai.c b/ckcmai.c +index a5640e5..a4e322d 100644 +--- a/ckcmai.c ++++ b/ckcmai.c +@@ -561,6 +561,10 @@ ACKNOWLEDGMENTS: + #include "ckntap.h" + #endif /* NT */ + ++#ifndef VMS ++#include <time.h> /* time() */ ++#endif ++ + #ifndef NOSERVER + /* Text message definitions.. each should be 256 chars long, or less. */ + #ifdef MINIX +diff --git a/ckucmd.c b/ckucmd.c +index 274dc2d..730f20d 100644 +--- a/ckucmd.c ++++ b/ckucmd.c +@@ -7356,7 +7356,7 @@ cmdgetc(timelimit) int timelimit; { /* Get a character from the tty. */ + Returns 0 or greater always. + */ + int +-cmdconchk() { ++cmdconchk(void) { + int x = 0, y; + y = pushc ? 1 : 0; /* Have command character pushed? */ + #ifdef OS2 +diff --git a/ckucmd.h b/ckucmd.h +index 7cd4ced..5c43cc4 100644 +--- a/ckucmd.h ++++ b/ckucmd.h +@@ -280,9 +280,7 @@ _PROTOTYP( int cmdsquo, (int) ); + _PROTOTYP( int cmdgquo, (void) ); + _PROTOTYP( char * ckcvtdate, (char *, int) ); + _PROTOTYP( int cmdgetc, (int)); +-#ifndef NOARROWKEYS + _PROTOTYP( int cmdconchk, (void) ); +-#endif /* NOARROWKEYS */ + + #ifdef CK_RECALL + _PROTOTYP( char * cmgetcmd, (char *) ); +diff --git a/ckucon.c b/ckucon.c +index 50ceb7e..954719e 100644 +--- a/ckucon.c ++++ b/ckucon.c +@@ -39,8 +39,8 @@ _PROTOTYP( static VOID concld, (void) ); + + #ifdef NEXT + #undef NSIG +-#include <sys/wait.h> /* For wait() */ + #endif /* NEXT */ ++#include <sys/wait.h> /* For wait() */ + + #include <signal.h> /* Signals */ + +diff --git a/ckufio.c b/ckufio.c +index b5bfaae..2a8d4e5 100644 +--- a/ckufio.c ++++ b/ckufio.c +@@ -142,8 +142,8 @@ _PROTOTYP( int parser, ( int ) ); + + #ifdef UNIX /* Pointer arg to wait() allowed */ + #define CK_CHILD /* Assume this is safe in all UNIX */ ++#include <sys/wait.h> /* wait() API */ + #endif /* UNIX */ +- + extern int binary, recursive, stathack; + #ifdef CK_CTRLZ + extern int eofmethod; +diff --git a/ckuusx.c b/ckuusx.c +index d332bed..253f992 100644 +--- a/ckuusx.c ++++ b/ckuusx.c +@@ -9144,7 +9144,7 @@ char *s; /* a string */ + #ifndef CK_CURPOS + /* Dummies for when cursor control is not supported */ + int +-ck_curpos(row, col) { ++ck_curpos(int row, int col) { + return(-1); + } + +-- +2.37.3 + diff --git a/meta-oe/recipes-support/ckermit/ckermit_302.bb b/meta-oe/recipes-support/ckermit/ckermit_302.bb index abeeeccd1d..1ee776cefe 100644 --- a/meta-oe/recipes-support/ckermit/ckermit_302.bb +++ b/meta-oe/recipes-support/ckermit/ckermit_302.bb @@ -8,7 +8,9 @@ SECTION = "console/network" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING.TXT;md5=932ca542d6c6cb8a59a0bcd76ab67cc3" -SRC_URI = "http://www.kermitproject.org/ftp/kermit/archives/cku${PV}.tar.gz;subdir=${BPN}-${PV}" +SRC_URI = "http://www.kermitproject.org/ftp/kermit/archives/cku${PV}.tar.gz;subdir=${BPN}-${PV} \ + file://0001-Fix-function-prototype-errors.patch \ + " SRC_URI[md5sum] = "eac4dbf18b45775e4cdee5a7c74762b0" SRC_URI[sha256sum] = "0d5f2cd12bdab9401b4c836854ebbf241675051875557783c332a6a40dac0711" @@ -43,7 +45,7 @@ do_compile () { -DNORESEND -DNOAUTODL -DNOSTREAMING -DNOHINTS -DNOCKXYZ -DNOLEARN \ -DNOMKDIR -DNOPERMS -DNOCKTIMERS -DNOCKREGEX -DNOREALPATH \ -DCK_SMALL -DNOLOGDIAL -DNORENAME -DNOWHATAMI \ - -DNOARROWKEYS" + -DNOARROWKEYS -DMAINTYPE=int" } do_install () { diff --git a/meta-oe/recipes-support/cli11/cli11/0001-Do-not-download-the-catch-framework-during-configure.patch b/meta-oe/recipes-support/cli11/cli11/0001-Do-not-download-the-catch-framework-during-configure.patch new file mode 100644 index 0000000000..7e6611b6a8 --- /dev/null +++ b/meta-oe/recipes-support/cli11/cli11/0001-Do-not-download-the-catch-framework-during-configure.patch @@ -0,0 +1,41 @@ +From 93557d5c5acf9ebb2c0fa708658e1d36621dd23a Mon Sep 17 00:00:00 2001 +From: Wang Mingyu <wangmy@fujitsu.com> +Date: Wed, 7 Sep 2022 10:05:15 +0900 +Subject: [PATCH] Do not download the catch framework during configure. + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> +--- + tests/CMakeLists.txt | 15 --------------- + 1 file changed, 15 deletions(-) + +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index 80c4f6a..ae210db 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -74,21 +74,6 @@ if(Catch2_FOUND) + endif() + message(STATUS "Found Catch2") + target_link_libraries(catch_main PUBLIC Catch2::Catch2) +-else() +- message(STATUS "Downloading Catch2") +- +- # FetchContent would be better, but requires newer CMake. +- file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/catch2") +- set(url https://github.com/philsquared/Catch/releases/download/v2.13.7/catch.hpp) +- file( +- DOWNLOAD ${url} "${CMAKE_CURRENT_BINARY_DIR}/catch2/catch.hpp" +- STATUS status +- EXPECTED_HASH SHA256=ea379c4a3cb5799027b1eb451163dff065a3d641aaba23bf4e24ee6b536bd9bc) +- list(GET status 0 error) +- if(error) +- message(FATAL_ERROR "Could not download ${url}, and Catch2 not found on your system.") +- endif() +- target_include_directories(catch_main PUBLIC "${CMAKE_CURRENT_BINARY_DIR}") + endif() + + # Target must already exist +-- +2.25.1 + diff --git a/meta-oe/recipes-support/cli11/cli11_1.8.0.bb b/meta-oe/recipes-support/cli11/cli11_1.8.0.bb deleted file mode 100644 index 404545d5e7..0000000000 --- a/meta-oe/recipes-support/cli11/cli11_1.8.0.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "C++11 command line parser" -DESCRIPTION = "A command line parser for C++11 and beyond that provides a rich feature set with a simple and intuitive interface." -HOMEPAGE = "https://github.com/CLIUtils/CLI11" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=b73927b18d5c6cd8d2ed28a6ad539733" -SRCREV = "13becaddb657eacd090537719a669d66d393b8b2" -PV .= "+git${SRCPV}" - -SRC_URI += "gitsm://github.com/CLIUtils/CLI11 \ - file://0001-Add-CLANG_TIDY-check.patch \ - " - -S = "${WORKDIR}/git" - -inherit cmake -inherit ptest - -EXTRA_OECMAKE += "-DCLANG_TIDY=OFF" -DEPENDS += "boost" - -# cli11 is a header only C++ library, so the main package will be empty. -RDEPENDS_${PN}-dev = "" diff --git a/meta-oe/recipes-support/cli11/cli11_2.3.2.bb b/meta-oe/recipes-support/cli11/cli11_2.3.2.bb new file mode 100644 index 0000000000..ef3c951bbf --- /dev/null +++ b/meta-oe/recipes-support/cli11/cli11_2.3.2.bb @@ -0,0 +1,26 @@ +SUMMARY = "C++11 command line parser" +DESCRIPTION = "A command line parser for C++11 and beyond that provides a rich feature set with a simple and intuitive interface." +HOMEPAGE = "https://github.com/CLIUtils/CLI11" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=afb20fe5f67e21074b10b864d9563c11" +SRCREV = "291c58789c031208f08f4f261a858b5b7083e8e2" +PV .= "+git" + +SRC_URI += "gitsm://github.com/CLIUtils/CLI11;branch=main;protocol=https \ + https://github.com/philsquared/Catch/releases/download/v2.13.7/catch.hpp \ + file://0001-Do-not-download-the-catch-framework-during-configure.patch" + +SRC_URI[sha256sum] = "ea379c4a3cb5799027b1eb451163dff065a3d641aaba23bf4e24ee6b536bd9bc" +S = "${WORKDIR}/git" + +do_configure:prepend() { + mkdir -p ${S}/tests/catch2 + cp ${DL_DIR}/catch.hpp ${S}/tests/catch2/catch.hpp +} + +inherit cmake + +# cli11 is a header only C++ library, so the main package will be empty. +RDEPENDS:${PN}-dev = "" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/cli11/files/0001-Add-CLANG_TIDY-check.patch b/meta-oe/recipes-support/cli11/files/0001-Add-CLANG_TIDY-check.patch deleted file mode 100644 index 02b3c9bd7e..0000000000 --- a/meta-oe/recipes-support/cli11/files/0001-Add-CLANG_TIDY-check.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 902b251fd8d6408ee6623e7a92692948cf90187d Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 12 Feb 2019 13:22:21 -0800 -Subject: [PATCH] Add CLANG_TIDY check - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7073a0b..2dd2c02 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -60,7 +60,7 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) - endif() - endif() - -- if(CMAKE_VERSION VERSION_GREATER 3.6) -+ if(CMAKE_VERSION VERSION_GREATER 3.6 AND CLANG_TIDY) - # Add clang-tidy if available - option(CLANG_TIDY_FIX "Perform fixes for Clang-Tidy" OFF) - find_program( diff --git a/meta-oe/recipes-support/cmark/cmark_git.bb b/meta-oe/recipes-support/cmark/cmark_0.31.0.bb index f74a39b500..ce8b4cd493 100644 --- a/meta-oe/recipes-support/cmark/cmark_git.bb +++ b/meta-oe/recipes-support/cmark/cmark_0.31.0.bb @@ -3,12 +3,10 @@ HOMEPAGE = "https://github.com/commonmark/cmark" LICENSE = "BSD-2-Clause & MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=81f9cae6293cc0345a9144b78152ab62" -SRC_URI = "git://github.com/commonmark/cmark.git" -SRCREV = "8daa6b1495124f0b67e6034130e12d7be83e38bd" +SRC_URI = "git://github.com/commonmark/cmark.git;branch=master;protocol=https" +SRCREV = "8fbf029685482827828b5858444157052f1b0a5f" S = "${WORKDIR}/git" -PV = "0.29.0" - inherit cmake lib_package EXTRA_OECMAKE += " \ diff --git a/meta-oe/recipes-support/colord/colord-native.bb b/meta-oe/recipes-support/colord/colord-native.bb index 845041cc43..64dd94a9ed 100644 --- a/meta-oe/recipes-support/colord/colord-native.bb +++ b/meta-oe/recipes-support/colord/colord-native.bb @@ -1,8 +1,8 @@ require ${BPN}.inc -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}-native:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}-native:" -inherit meson native +inherit meson pkgconfig native DEPENDS += " \ meson-native \ diff --git a/meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch b/meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch index 278b90e076..aae2be8c1e 100644 --- a/meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch +++ b/meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch @@ -89,11 +89,11 @@ index a5e2328..dec509a 100644 +} + diff --git a/lib/colord/cd-icc.c b/lib/colord/cd-icc.c -index f231814..2c8fe77 100644 +index 8beec43..398ff7a 100644 --- a/lib/colord/cd-icc.c +++ b/lib/colord/cd-icc.c -@@ -3094,68 +3094,6 @@ out: - return ret; +@@ -3114,68 +3114,6 @@ cd_icc_create_default (CdIcc *icc, GError **error) + return cd_icc_create_default_full (icc, CD_ICC_LOAD_FLAGS_NONE, error); } -/** diff --git a/meta-oe/recipes-support/colord/colord.bb b/meta-oe/recipes-support/colord/colord.bb index df86708e2b..e300222518 100644 --- a/meta-oe/recipes-support/colord/colord.bb +++ b/meta-oe/recipes-support/colord/colord.bb @@ -1,10 +1,10 @@ require ${BPN}.inc -inherit meson gobject-introspection gsettings gettext bash-completion systemd features_check useradd +inherit meson gobject-introspection gsettings gettext bash-completion systemd features_check useradd pkgconfig # polkit and gobject-introspection are mandatory and cannot be configured REQUIRED_DISTRO_FEATURES = "polkit gobject-introspection-data" -UNKNOWN_CONFIGURE_WHITELIST_append = " introspection" +GIR_MESON_OPTION = "" DEPENDS += " \ ${BPN}-native \ @@ -28,18 +28,18 @@ EXTRA_OEMESON = " \ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" PACKAGECONFIG[systemd] = "-Dsystemd=true, -Dsystemd=false, systemd" -SYSTEMD_SERVICE_${PN} = "colord.service" +SYSTEMD_SERVICE:${PN} = "colord.service" -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/dbus-1 \ ${datadir}/polkit-1 \ ${datadir}/glib-2.0 \ ${datadir}/color \ ${systemd_user_unitdir} \ - ${libdir}/tmpfiles.d \ + ${nonarch_libdir}/tmpfiles.d \ ${libdir}/colord-plugins \ ${libdir}/colord-sensors \ " USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--system --user-group -d /var/lib/colord -s /bin/false colord" +USERADD_PARAM:${PN} = "--system --user-group -d /var/lib/colord -s /bin/false colord" diff --git a/meta-oe/recipes-support/colord/colord.inc b/meta-oe/recipes-support/colord/colord.inc index 7497fed51e..0ae1a30fe6 100644 --- a/meta-oe/recipes-support/colord/colord.inc +++ b/meta-oe/recipes-support/colord/colord.inc @@ -1,13 +1,12 @@ SUMMARY = "Making color management just work" HOMEPAGE = "https://www.freedesktop.org/software/colord/" -LICENSE = "GPLv2 & LGPLv2.1" +LICENSE = "GPL-2.0-only & LGPL-2.1-only" LIC_FILES_CHKSUM = " \ file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://meson.build;beginline=3;endline=3;md5=f42198707d793be58b274d34fd5238c3 \ " -PV = "1.4.4" +PV = "1.4.6" SRC_URI = "https://www.freedesktop.org/software/colord/releases/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "32c2709a6002d9ee750483aaed6379c8" -SRC_URI[sha256sum] = "9a0fe80160bf88efddb582a9fc0169f56065276dc3882c47dddb9eecd048c0a5" +SRC_URI[sha256sum] = "7407631a27bfe5d1b672e7ae42777001c105d860b7b7392283c8c6300de88e6f" diff --git a/meta-oe/recipes-support/composefs/composefs_1.0.3.bb b/meta-oe/recipes-support/composefs/composefs_1.0.3.bb new file mode 100644 index 0000000000..38fc8d2675 --- /dev/null +++ b/meta-oe/recipes-support/composefs/composefs_1.0.3.bb @@ -0,0 +1,33 @@ +SUMMARY = "Tools to handle creating and mounting composefs images" +DESCRIPTION = "The composefs project combines several underlying Linux \ +features to provide a very flexible mechanism to support read-only mountable \ +filesystem trees, stacking on top of an underlying "lower" Linux filesystem." +HOMEPAGE = "https://github.com/containers/composefs" +LICENSE = "GPL-3.0-or-later & LGPL-2.0-or-later & Apache-2.0" +LIC_FILES_CHKSUM = "\ + file://BSD-2-Clause.txt;md5=121c8a0a8fa5961a26b7863034ebcce8 \ + file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING.LESSERv3;md5=6a6a8e020838b23406c81b19c1d46df6 \ + file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ + file://COPYINGv3;md5=d32239bcb673463ab874e80d47fae504 \ + file://LICENSE.Apache-2.0;md5=3b83ef96387f14655fc854ddc3c6bd57 \ +" + +PV .= "+git${SRCPV}" +SRCREV = "ecef20c18c81943bd17b489ad1484f361b99c792" +SRC_URI = "git://github.com/containers/composefs.git;protocol=https;branch=main" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig + +DEPENDS = "openssl" + +EXTRA_OECONF += " \ + --disable-man \ + --without-fuse \ +" + +LDFLAGS:append:class-native = " -pthread" + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/consolation/consolation_0.0.9.bb b/meta-oe/recipes-support/consolation/consolation_0.0.9.bb new file mode 100644 index 0000000000..17981b6e9b --- /dev/null +++ b/meta-oe/recipes-support/consolation/consolation_0.0.9.bb @@ -0,0 +1,29 @@ +SUMMARY = "copy-paste for the Linux console" +DESCRIPTION = "Consolation is a daemon that provides copy-paste and scrolling \ +support to the Linux console. It is based on the libinput library and \ +supports all pointer devices and settings provided by this library. Similar \ +software include gpm and jamd." +HOMEPAGE = "https://salsa.debian.org/consolation-team/consolation" +SECTION = "console/utils" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://LICENSE;md5=7df9eea2f4dfdda489c116099e6fc062" + +DEPENDS = " \ + libevdev \ + libinput \ + udev \ +" + +SRC_URI = "git://salsa.debian.org/consolation-team/consolation.git;branch=master" +SRCREV = "5ef08f0cd6ede62de14de477b74fc3611108c676" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig systemd + +do_install:append() { + install -d ${D}${systemd_system_unitdir} + install -m 644 ${B}/consolation.service ${D}${systemd_system_unitdir} +} + +SYSTEMD_SERVICE:${PN} = "consolation.service" diff --git a/meta-oe/recipes-support/cpp-netlib/cpp-netlib/a53f123040998744602f190944464af0e159ea19.patch b/meta-oe/recipes-support/cpp-netlib/cpp-netlib/a53f123040998744602f190944464af0e159ea19.patch new file mode 100644 index 0000000000..c93b76619c --- /dev/null +++ b/meta-oe/recipes-support/cpp-netlib/cpp-netlib/a53f123040998744602f190944464af0e159ea19.patch @@ -0,0 +1,30 @@ +From a53f123040998744602f190944464af0e159ea19 Mon Sep 17 00:00:00 2001 +From: jjll <jjll@gmv.com> +Date: Wed, 6 Sep 2023 20:47:41 +0200 +Subject: [PATCH] Compatibility with boost 1.83 + +Upstream-Status: Backport [https://github.com/cpp-netlib/cpp-netlib/pull/902] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + libs/network/src/server_request_parsers_impl.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/boost/network/protocol/http/server/impl/parsers.ipp ++++ b/boost/network/protocol/http/server/impl/parsers.ipp +@@ -13,6 +13,7 @@ + #include <tuple> + #include <boost/fusion/include/std_tuple.hpp> + #include <boost/network/protocol/http/message/header.hpp> ++#include <boost/regex/pending/unicode_iterator.hpp> + + #ifdef BOOST_NETWORK_NO_LIB + #ifndef BOOST_NETWORK_INLINE +@@ -32,7 +33,7 @@ typedef std::basic_string<uint32_t> u32_ + template <> // <typename Attrib, typename T, typename Enable> + struct assign_to_container_from_value<std::string, u32_string, void> { + static void call(u32_string const& val, std::string& attr) { +- u32_to_u8_iterator<u32_string::const_iterator> begin = val.begin(), ++ boost::u32_to_u8_iterator<u32_string::const_iterator> begin = val.begin(), + end = val.end(); + for (; begin != end; ++begin) attr += *begin; + } diff --git a/meta-oe/recipes-support/cpp-netlib/cpp-netlib_git.bb b/meta-oe/recipes-support/cpp-netlib/cpp-netlib_git.bb new file mode 100644 index 0000000000..bda5177fc4 --- /dev/null +++ b/meta-oe/recipes-support/cpp-netlib/cpp-netlib_git.bb @@ -0,0 +1,30 @@ +DESCRIPTION = "Modern C++ network programming libraries." + +# This library provides general purpose network functionality such as +# socket communication to agent libraries. It was designed to be merged +# into boost at some point and follows similar header library approach +# for most functionality. + +SECTION = "libs" +LICENSE = "BSL-1.0 & MIT & Python-2.0" +LIC_FILES_CHKSUM = "file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c" +PV = "0.13.0" + +SRCREV = "31d304cdf52b485f465ada433d8905171b61cbff" +SRC_URI = "\ + git://github.com/cpp-netlib/cpp-netlib.git;protocol=https;branch=0.13-release \ + file://a53f123040998744602f190944464af0e159ea19.patch \ +" + +S = "${WORKDIR}/git" + +inherit cmake pkgconfig + +DEPENDS = "zlib boost openssl" + +EXTRA_OECMAKE:append = " -DCPP-NETLIB_BUILD_TESTS=OFF -DCPP-NETLIB_BUILD_EXAMPLES=OFF" + +do_install:append() { + sed -i -e 's|${RECIPE_SYSROOT}||g' ${D}${libdir}/cmake/cppnetlib/cppnetlibConfig.cmake + sed -i -e 's|${RECIPE_SYSROOT}||g' ${D}${libdir}/cmake/cppnetlib/cppnetlibTargets-noconfig.cmake +} diff --git a/meta-oe/recipes-support/cpprest/cpprest/disable-float-tests.patch b/meta-oe/recipes-support/cpprest/cpprest/disable-float-tests.patch index 3ff7f0dd31..b956db22fd 100644 --- a/meta-oe/recipes-support/cpprest/cpprest/disable-float-tests.patch +++ b/meta-oe/recipes-support/cpprest/cpprest/disable-float-tests.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Description: new toolchain might have increased the float precision Author: Gianfranco Costamagna <locutusofborg@debian.org> Last-Update: 2017-10-28 diff --git a/meta-oe/recipes-support/cpprest/cpprest/disable-outside-tests.patch b/meta-oe/recipes-support/cpprest/cpprest/disable-outside-tests.patch index 5232e2a1d8..961eaf7646 100644 --- a/meta-oe/recipes-support/cpprest/cpprest/disable-outside-tests.patch +++ b/meta-oe/recipes-support/cpprest/cpprest/disable-outside-tests.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Description: Debian forbids calls to external websites. Author: Gianfranco Costamagna <locutus@debian.org> @@ -54,7 +56,7 @@ Index: cpprest/Release/tests/functional/websockets/client/authentication_tests.c =================================================================== --- cpprest.orig/Release/tests/functional/websockets/client/authentication_tests.cpp +++ cpprest/Release/tests/functional/websockets/client/authentication_tests.cpp -@@ -93,6 +93,7 @@ +@@ -93,6 +93,7 @@ SUITE(authentication_tests) return false; } @@ -62,46 +64,15 @@ Index: cpprest/Release/tests/functional/websockets/client/authentication_tests.c TEST(ssl_test) { websocket_client client; -@@ -127,6 +128,7 @@ +@@ -127,6 +128,7 @@ SUITE(authentication_tests) throw; } } + */ - // These tests are specific to our websocketpp based implementation. - #if !defined(__cplusplus_winrt) -@@ -159,12 +161,14 @@ - } - } - -+ /* - // Test specifically for server SignalR team hit interesting cases with. - TEST(sni_with_older_server_test) - { - websocket_client client; - sni_test_impl(client); - } -+ */ - - // WinRT doesn't expose option for disabling. - // No stable server is available to reliably test this. -@@ -194,6 +198,7 @@ - } - } - -+ /* - // Winrt doesn't allow explicitly setting server host for SNI. - TEST(sni_explicit_hostname) - { -@@ -204,6 +209,7 @@ - websocket_client client(config); - sni_test_impl(client); - } -+ */ - void handshake_error_test_impl(const ::utility::string_t& host) { -@@ -225,11 +231,11 @@ +@@ -148,11 +150,11 @@ SUITE(authentication_tests) } } @@ -114,13 +85,13 @@ Index: cpprest/Release/tests/functional/websockets/client/authentication_tests.c - TEST(cert_expired) { handshake_error_test_impl(U("wss://expired.badssl.com/")); } + //TEST(cert_expired) { handshake_error_test_impl(U("wss://expired.badssl.com/")); } - #endif + } // SUITE(authentication_tests) Index: cpprest/Release/tests/functional/http/client/connections_and_errors.cpp =================================================================== --- cpprest.orig/Release/tests/functional/http/client/connections_and_errors.cpp +++ cpprest/Release/tests/functional/http/client/connections_and_errors.cpp -@@ -406,6 +406,7 @@ +@@ -408,6 +408,7 @@ } #endif @@ -128,7 +99,7 @@ Index: cpprest/Release/tests/functional/http/client/connections_and_errors.cpp // Try to connect to a server on a closed port and cancel the operation. TEST_FIXTURE(uri_address, cancel_bad_port) { -@@ -437,6 +438,7 @@ +@@ -439,6 +440,7 @@ VERIFY_THROWS_HTTP_ERROR_CODE(t.get(), std::errc::operation_canceled); } @@ -136,3 +107,23 @@ Index: cpprest/Release/tests/functional/http/client/connections_and_errors.cpp } // SUITE(connections_and_errors) +--- cpprest-2.10.16.orig/Release/tests/functional/http/client/redirect_tests.cpp ++++ cpprest-2.10.16/Release/tests/functional/http/client/redirect_tests.cpp +@@ -159,7 +159,7 @@ SUITE(redirect_tests) + VERIFY_NO_THROWS(reply.get()); + } + } +- ++/* + TEST(does_not_follow_https_to_http_by_default) + { + handle_timeout([] { +@@ -182,7 +182,7 @@ SUITE(redirect_tests) + ); + }); + } +- ++*/ + TEST_FIXTURE(uri_address, follows_permanent_redirect) + { + #if USING_WINHTTP diff --git a/meta-oe/recipes-support/cpprest/cpprest_2.10.14.bb b/meta-oe/recipes-support/cpprest/cpprest_2.10.19.bb index 53f6469b28..aec7286404 100644 --- a/meta-oe/recipes-support/cpprest/cpprest_2.10.14.bb +++ b/meta-oe/recipes-support/cpprest/cpprest_2.10.19.bb @@ -5,14 +5,14 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${S}/license.txt;md5=a2e15b954769218ff912468eecd6a02f" DEPENDS = "openssl websocketpp zlib boost brotli" -EXTRA_OECMAKE = "-DCPPREST_EXPORT_DIR=cmake -DCPPREST_EXCLUDE_BROTLI=OFF -DWERROR=OFF" +EXTRA_OECMAKE = "-DCPPREST_EXPORT_DIR=cmake/cpprestsdk -DCPPREST_EXCLUDE_BROTLI=OFF -DWERROR=OFF" SRC_URI = "git://github.com/Microsoft/cpprestsdk.git;protocol=https;branch=master \ file://disable-float-tests.patch \ file://disable-outside-tests.patch " -# tag 2.10.14 -SRCREV= "6f602bee67b088a299d7901534af3bce6334ab38" +# tag 2.10.19 +SRCREV= "411a109150b270f23c8c97fa4ec9a0a4a98cdecf" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/cpulimit/cpulimit/0001-Remove-sys-sysctl.h-and-add-missing-libgen.h-include.patch b/meta-oe/recipes-support/cpulimit/cpulimit/0001-Remove-sys-sysctl.h-and-add-missing-libgen.h-include.patch new file mode 100644 index 0000000000..50d0342ec7 --- /dev/null +++ b/meta-oe/recipes-support/cpulimit/cpulimit/0001-Remove-sys-sysctl.h-and-add-missing-libgen.h-include.patch @@ -0,0 +1,41 @@ +From 41cfba0840f58555593fd4bee07db77221043e0b Mon Sep 17 00:00:00 2001 +From: Portia <stephensportia@gmail.com> +Date: Sun, 1 May 2022 12:43:35 +1000 +Subject: [PATCH] Remove sys/sysctl.h and add missing libgen.h include + +- sys/sysctl.h has been deprecated and should be removed +- Adds missing libgen.h include when calling basename() + +Upstream-Status: Inactive-Upstream [2015] +Signed-off-by: Portia <stephensportia@gmail.com> +--- + src/cpulimit.c | 1 - + src/process_group.c | 1 + + 2 files changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/cpulimit.c b/src/cpulimit.c +index 50eabea..5b0ec49 100644 +--- a/src/cpulimit.c ++++ b/src/cpulimit.c +@@ -38,7 +38,6 @@ + #include <string.h> + #include <sys/stat.h> + #include <sys/time.h> +-#include <sys/sysctl.h> + #include <sys/resource.h> + #include <sys/types.h> + #include <sys/wait.h> +diff --git a/src/process_group.c b/src/process_group.c +index 06d73a6..d4f6fab 100644 +--- a/src/process_group.c ++++ b/src/process_group.c +@@ -24,6 +24,7 @@ + #include <limits.h> + #include <sys/time.h> + #include <signal.h> ++#include <libgen.h> + + #include <assert.h> + +-- +2.25.1 diff --git a/meta-oe/recipes-support/cpulimit/cpulimit_0.2.bb b/meta-oe/recipes-support/cpulimit/cpulimit_0.2.bb new file mode 100644 index 0000000000..f88d3b6ca1 --- /dev/null +++ b/meta-oe/recipes-support/cpulimit/cpulimit_0.2.bb @@ -0,0 +1,23 @@ +SUMMARY = "cpulimit is a tool which limits the CPU usage of a process" +DESCRIPTION = "cpulimit is a simple program that attempts to limit the CPU usage of a process (expressed in percentage, not in CPU time). This is useful to control batch jobs, when you don't want them to eat too much CPU. It does not act on the nice value or other priority stuff, but on the real CPU usage. Besides it is able to adapt itself to the overall system load, dynamically and quickly." +HOMEPAGE = "http://cpulimit.sourceforge.net" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://LICENSE;md5=86c1c0d961a437e529db93aa3bb32dc4" +SRCREV ?= "f4d2682804931e7aea02a869137344bb5452a3cd" + +SRC_URI = "git://github.com/opsengine/cpulimit.git;protocol=https;branch=master \ + file://0001-Remove-sys-sysctl.h-and-add-missing-libgen.h-include.patch \ + " + +S = "${WORKDIR}/git" + +do_compile() { + oe_runmake all +} +do_install() { + install -d ${D}${sbindir} + install -m 0755 ${B}/src/${BPN} ${D}${sbindir}/ +} + +CFLAGS += "-D_GNU_SOURCE ${LDFLAGS}" + diff --git a/meta-oe/recipes-support/crucible/crucible_2023.11.02.bb b/meta-oe/recipes-support/crucible/crucible_2023.11.02.bb new file mode 100644 index 0000000000..4247263b5a --- /dev/null +++ b/meta-oe/recipes-support/crucible/crucible_2023.11.02.bb @@ -0,0 +1,20 @@ +SUMMARY = "Utility that provides userspace support for reading and writing to the i.MX fuses" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=201414b6610203caed355323b1ab3116" + +GO_IMPORT = "github.com/usbarmory/crucible" +SRC_URI = "git://${GO_IMPORT}.git;protocol=https;branch=master;destsuffix=${GO_SRCURI_DESTSUFFIX}" + +GO_INSTALL = "\ + ${GO_IMPORT}/cmd/crucible \ + ${GO_IMPORT}/cmd/habtool \ +" +SRCREV = "dec27cd4e0e0db106c0a21d429c04ca8d36bbdd5" + +export GOPROXY = "https://proxy.golang.org,direct" +# Workaround for network access issue during compile step. +# This needs to be fixed in the recipes buildsystem so that +# it can be accomplished during do_fetch task. +do_compile[network] = "1" + +inherit go-mod diff --git a/meta-oe/recipes-support/ctapi-common/ctapi-common_1.1-14.bb b/meta-oe/recipes-support/ctapi-common/ctapi-common_1.1-14.bb index 3a049e76da..90db08544d 100644 --- a/meta-oe/recipes-support/ctapi-common/ctapi-common_1.1-14.bb +++ b/meta-oe/recipes-support/ctapi-common/ctapi-common_1.1-14.bb @@ -2,16 +2,15 @@ SUMMARY = "Common files and packaging infrastructure for CT-API modules" HOMEPAGE = "http://fedoraproject.org/" SECTION = "System Environment/Libraries" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://../ctapi-common.LICENSE;md5=8744cd52545ecb45befebd0da6f70f0a" +LIC_FILES_CHKSUM = "file://${UNPACKDIR}/ctapi-common.LICENSE;md5=8744cd52545ecb45befebd0da6f70f0a" -SRC_URI = "http://ftp.riken.jp/Linux/fedora/releases/23/Everything/source/SRPMS/c/${BPN}-${PV}.fc23.src.rpm;extract=ctapi-common.LICENSE \ - http://ftp.riken.jp/Linux/fedora/releases/23/Everything/source/SRPMS/c/${BPN}-${PV}.fc23.src.rpm;extract=ctapi-common.README" -SRC_URI[md5sum] = "5b7259ef1c8cd9ae801fca7a5cb548c1" +SRC_URI = "https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/23/Everything/source/SRPMS/c/${BPN}-${PV}.fc23.src.rpm;extract=ctapi-common.LICENSE \ + https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/23/Everything/source/SRPMS/c/${BPN}-${PV}.fc23.src.rpm;extract=ctapi-common.README" SRC_URI[sha256sum] = "87a74eb0a66055c34ba2c5c919e74f3211c5950ae1c2cbab967fdf4137f5de91" do_compile() { - install -pm 644 ${WORKDIR}/ctapi-common.LICENSE LICENSE - install -pm 644 ${WORKDIR}/ctapi-common.README README + install -pm 644 ${UNPACKDIR}/ctapi-common.LICENSE LICENSE + install -pm 644 ${UNPACKDIR}/ctapi-common.README README echo ${libdir}/ctapi > ctapi.conf } @@ -20,4 +19,4 @@ do_install() { install -dm 755 ${D}${libdir}/ctapi } -FILES_${PN} += "${libdir}/ctapi" +FILES:${PN} += "${libdir}/ctapi" diff --git a/meta-oe/recipes-support/cyaml/cyaml_1.4.1.bb b/meta-oe/recipes-support/cyaml/cyaml_1.4.1.bb new file mode 100644 index 0000000000..f63348a328 --- /dev/null +++ b/meta-oe/recipes-support/cyaml/cyaml_1.4.1.bb @@ -0,0 +1,27 @@ +SUMMARY = "Cyaml library" +DESCRIPTION = "LibCYAML is a library for reading and writing structured YAML documents." +HOMEPAGE = "https://github.com/tlsa/libcyaml" +SECTION = "libs" +LICENSE = "ISC" +LIC_FILES_CHKSUM = "file://LICENSE;md5=fe6f0e49348c87bddd5d27803dceaaf0" +DEPENDS = " \ + libyaml \ +" +SRCREV = "07ff8654a270ec9b410acd3152b60de9e9f941af" + +SRC_URI = "git://github.com/tlsa/libcyaml.git;protocol=https;branch=main" + +S = "${WORKDIR}/git" + +inherit pkgconfig + +EXTRA_OEMAKE = "'PREFIX=""' 'DESTDIR=${D}' 'CFLAGS=${CFLAGS}' 'LIBDIR=${libdir}' 'INCLUDEDIR=${includedir}' 'VARIANT=release'" + +do_compile() { + oe_runmake +} +do_install() { + oe_runmake install +} + +CFLAGS += "-pedantic -Wall -Wextra -O3 -Iinclude"
\ No newline at end of file diff --git a/meta-oe/recipes-support/daemonize/daemonize_git.bb b/meta-oe/recipes-support/daemonize/daemonize_git.bb index c76632781a..f46dec59fc 100644 --- a/meta-oe/recipes-support/daemonize/daemonize_git.bb +++ b/meta-oe/recipes-support/daemonize/daemonize_git.bb @@ -7,7 +7,7 @@ PV = "1.7.8" inherit autotools SRCREV = "18869a797dab12bf1c917ba3b4782fef484c407c" -SRC_URI = "git://github.com/bmc/daemonize.git \ +SRC_URI = "git://github.com/bmc/daemonize.git;branch=master;protocol=https \ " S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/daemontools/daemontools/0001-Fix-signature-of-main-function.patch b/meta-oe/recipes-support/daemontools/daemontools/0001-Fix-signature-of-main-function.patch new file mode 100644 index 0000000000..4b332a000e --- /dev/null +++ b/meta-oe/recipes-support/daemontools/daemontools/0001-Fix-signature-of-main-function.patch @@ -0,0 +1,209 @@ +From 269f18d5e6698fdd34fec2798f10c6fe072f3cd5 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 1 Sep 2022 23:36:52 -0700 +Subject: [PATCH] Fix signature of main function + +Clang-15 errors out otherewise. +Include needed headers for missing functions + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/chkshsgr.c | 2 +- + src/tai64n.c | 2 +- + src/tai64nlocal.c | 2 +- + src/trycpp.c | 5 +++-- + src/tryflock.c | 4 ++-- + src/trymkffo.c | 2 +- + src/trypoll.c | 3 ++- + src/trysgact.c | 4 ++-- + src/trysgprm.c | 4 ++-- + src/tryshsgr.c | 3 ++- + src/tryulong64.c | 4 ++-- + src/trywaitp.c | 4 ++-- + src/x86cpuid.c | 2 +- + 13 files changed, 22 insertions(+), 19 deletions(-) + +diff --git a/src/chkshsgr.c b/src/chkshsgr.c +index 038afe9..9547a4c 100644 +--- a/src/chkshsgr.c ++++ b/src/chkshsgr.c +@@ -5,7 +5,7 @@ + #include <grp.h> + #include <unistd.h> + +-int main() ++int main(int argc, char *argv[]) + { + gid_t x[4]; + +diff --git a/src/tai64n.c b/src/tai64n.c +index 17bdb82..7096ab3 100644 +--- a/src/tai64n.c ++++ b/src/tai64n.c +@@ -27,7 +27,7 @@ buffer in = BUFFER_INIT(myread,0,inbuf,sizeof inbuf); + + char stamp[TIMESTAMP + 1]; + +-int main() ++int main(int argc, char *argv[]) + { + char ch; + +diff --git a/src/tai64nlocal.c b/src/tai64nlocal.c +index ce16ad8..2435737 100644 +--- a/src/tai64nlocal.c ++++ b/src/tai64nlocal.c +@@ -28,7 +28,7 @@ unsigned long nanosecs; + unsigned long u; + struct tm *t; + +-int main() ++int main(int argc, char *argv[]) + { + char ch; + +diff --git a/src/trycpp.c b/src/trycpp.c +index e4503d4..d96c955 100644 +--- a/src/trycpp.c ++++ b/src/trycpp.c +@@ -1,6 +1,7 @@ + /* Public domain. */ +- +-int main() ++#include <stdio.h> ++#include <stdlib.h> ++int main(int argc, char *argv[]) + { + #ifdef NeXT + printf("nextstep\n"); exit(0); +diff --git a/src/tryflock.c b/src/tryflock.c +index a82ffc2..5ca97d3 100644 +--- a/src/tryflock.c ++++ b/src/tryflock.c +@@ -3,8 +3,8 @@ + #include <sys/types.h> + #include <sys/file.h> + #include <fcntl.h> +- +-main() ++void ++main(int argc, char *argv[]) + { + flock(0,LOCK_EX | LOCK_UN | LOCK_NB); + } +diff --git a/src/trymkffo.c b/src/trymkffo.c +index 9356342..f92414a 100644 +--- a/src/trymkffo.c ++++ b/src/trymkffo.c +@@ -3,7 +3,7 @@ + #include <sys/types.h> + #include <sys/stat.h> + +-void main() ++void main(int argc, char *argv[]) + { + mkfifo("temp-trymkffo",0); + } +diff --git a/src/trypoll.c b/src/trypoll.c +index 6506617..cb888cc 100644 +--- a/src/trypoll.c ++++ b/src/trypoll.c +@@ -3,8 +3,9 @@ + #include <sys/types.h> + #include <fcntl.h> + #include <poll.h> ++#include <unistd.h> + +-int main() ++int main(int argc, char *argv[]) + { + struct pollfd x; + +diff --git a/src/trysgact.c b/src/trysgact.c +index e264ef2..25da013 100644 +--- a/src/trysgact.c ++++ b/src/trysgact.c +@@ -1,8 +1,8 @@ + /* Public domain. */ + + #include <signal.h> +- +-main() ++void ++main(int argc, char *argv[]) + { + struct sigaction sa; + sa.sa_handler = 0; +diff --git a/src/trysgprm.c b/src/trysgprm.c +index a46c82c..5a9491c 100644 +--- a/src/trysgprm.c ++++ b/src/trysgprm.c +@@ -1,8 +1,8 @@ + /* Public domain. */ + + #include <signal.h> +- +-main() ++void ++main(int argc, char *argv[]) + { + sigset_t ss; + +diff --git a/src/tryshsgr.c b/src/tryshsgr.c +index c5ed6d6..d111e40 100644 +--- a/src/tryshsgr.c ++++ b/src/tryshsgr.c +@@ -1,6 +1,7 @@ + /* Public domain. */ + +-int main() ++#include <unistd.h> ++int main(int argc, char *argv[]) + { + short x[4]; + +diff --git a/src/tryulong64.c b/src/tryulong64.c +index 003548a..20a3a40 100644 +--- a/src/tryulong64.c ++++ b/src/tryulong64.c +@@ -1,6 +1,6 @@ + /* Public domain. */ +- +-int main() ++#include <unistd.h> ++int main(int argc, char *argv[]) + { + unsigned long u; + u = 1; +diff --git a/src/trywaitp.c b/src/trywaitp.c +index 319b81f..90bc5aa 100644 +--- a/src/trywaitp.c ++++ b/src/trywaitp.c +@@ -2,8 +2,8 @@ + + #include <sys/types.h> + #include <sys/wait.h> +- +-main() ++void ++main(int argc, char *argv[]) + { + waitpid(0,0,0); + } +diff --git a/src/x86cpuid.c b/src/x86cpuid.c +index f81c593..1cb1ea6 100644 +--- a/src/x86cpuid.c ++++ b/src/x86cpuid.c +@@ -7,7 +7,7 @@ void nope() + exit(1); + } + +-int main() ++int main(int argc, char *argv[]) + { + unsigned long x[4]; + unsigned long y[4]; +-- +2.37.3 + diff --git a/meta-oe/recipes-support/daemontools/daemontools/0001-daemontools-Fix-QA-Issue.patch b/meta-oe/recipes-support/daemontools/daemontools/0001-daemontools-Fix-QA-Issue.patch index 30e37cb1d3..139ff30f2e 100644 --- a/meta-oe/recipes-support/daemontools/daemontools/0001-daemontools-Fix-QA-Issue.patch +++ b/meta-oe/recipes-support/daemontools/daemontools/0001-daemontools-Fix-QA-Issue.patch @@ -9,6 +9,8 @@ ERROR: daemontools-0.76-r0 do_package_qa: QA Issue: No GNU_HASH in the elf binar Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> --- +Upstream-Status: Pending + src/conf-ld | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/daemontools/daemontools/0001-daemontools-native-Fix-a-warning.patch b/meta-oe/recipes-support/daemontools/daemontools/0001-daemontools-native-Fix-a-warning.patch deleted file mode 100644 index 8d9577d5ff..0000000000 --- a/meta-oe/recipes-support/daemontools/daemontools/0001-daemontools-native-Fix-a-warning.patch +++ /dev/null @@ -1,26 +0,0 @@ -From a43a3327ccd4b06a3bcf0c87d518a97c6b39ac02 Mon Sep 17 00:00:00 2001 -From: Lei Maohui <leimaohui@cn.fujitsu.com> -Date: Sat, 6 Aug 2016 02:09:53 +0900 -Subject: [PATCH] daemontools: Fix a warning - -To fix the warning as following: - -WARNING: daemontools-native-0.76-r0 do_populate_sysroot: File '/build-poky/tmp/sysroots/x86_64-linux/usr/bin/chkshsgr' from daemontools-native was already stripped, this will prevent future debugging! - -Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> ---- - src/conf-ld | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/conf-ld b/src/conf-ld -index 59a0de7..1d0518a 100644 ---- a/src/conf-ld -+++ b/src/conf-ld -@@ -1,3 +1,3 @@ --gcc -s -+gcc - - This will be used to link .o files into an executable. --- -2.7.4 - diff --git a/meta-oe/recipes-support/daemontools/daemontools/0001-error.h-include-errno.h-instead-of-extern-int.diff b/meta-oe/recipes-support/daemontools/daemontools/0001-error.h-include-errno.h-instead-of-extern-int.diff index ce1959782a..b5eb7d8b1a 100644 --- a/meta-oe/recipes-support/daemontools/daemontools/0001-error.h-include-errno.h-instead-of-extern-int.diff +++ b/meta-oe/recipes-support/daemontools/daemontools/0001-error.h-include-errno.h-instead-of-extern-int.diff @@ -4,6 +4,8 @@ Date: Wed, 12 Dec 2007 13:44:15 +0000 Subject: [PATCH] error.h: '#include <errno.h>' instead of 'extern int errno;' --- +Upstream-Status: Pending + daemontools-0.76/src/error.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/meta-oe/recipes-support/daemontools/daemontools/0002-supervise.c-.-supervise-may-be-a-symlink-if-it-s-da.diff b/meta-oe/recipes-support/daemontools/daemontools/0002-supervise.c-.-supervise-may-be-a-symlink-if-it-s-da.diff index 73dce90726..16a0148546 100644 --- a/meta-oe/recipes-support/daemontools/daemontools/0002-supervise.c-.-supervise-may-be-a-symlink-if-it-s-da.diff +++ b/meta-oe/recipes-support/daemontools/daemontools/0002-supervise.c-.-supervise-may-be-a-symlink-if-it-s-da.diff @@ -4,6 +4,8 @@ Date: Sun, 24 Feb 2008 10:54:26 +0000 Subject: [PATCH] supervise.c: ./supervise may be a symlink, if it's dangling, create link target --- +Upstream-Status: Pending + daemontools-0.76/src/supervise.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/meta-oe/recipes-support/daemontools/daemontools/cross-compile.patch b/meta-oe/recipes-support/daemontools/daemontools/cross-compile.patch index f164c2d10d..98d4a5e45b 100644 --- a/meta-oe/recipes-support/daemontools/daemontools/cross-compile.patch +++ b/meta-oe/recipes-support/daemontools/daemontools/cross-compile.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + make sure it can be compiled for cross target 1. never try to compile target binary by native gcc @@ -30,7 +32,7 @@ diff -Nurp daemontools-0.76.orig/src/Makefile daemontools-0.76/src/Makefile hasshsgr.h: chkshsgr choose compile hasshsgr.h1 hasshsgr.h2 load \ tryshsgr.c warn-shsgr - ./chkshsgr || ( cat warn-shsgr; exit 1 ) -+ chkshsgr || ( cat warn-shsgr; exit 1 ) ++ echo "Warning: We can not run test on cross target. - ignoring ./chkshsgr || ( cat warn-shsgr; exit 1 )" ./choose clr tryshsgr hasshsgr.h1 hasshsgr.h2 > hasshsgr.h haswaitp.h: choose compile haswaitp.h1 haswaitp.h2 load trywaitp.c @@ -39,7 +41,7 @@ diff -Nurp daemontools-0.76.orig/src/Makefile daemontools-0.76/src/Makefile readproctitle rts.tests setlock setuidgid softlimit supervise svc \ svok svscan svscanboot svstat tai64n tai64nlocal - env - /bin/sh rts.tests 2>&1 | cat -v > rts -+ echo "Warning: We can not run test on cross target." ++ echo "Warning: We can not run test on cross target. - ignoring env - /bin/sh rts.tests 2>&1 | cat -v > rts" scan_ulong.o: compile scan.h scan_ulong.c ./compile scan_ulong.c diff --git a/meta-oe/recipes-support/daemontools/daemontools/warnings.patch b/meta-oe/recipes-support/daemontools/daemontools/warnings.patch new file mode 100644 index 0000000000..5c9c7114b9 --- /dev/null +++ b/meta-oe/recipes-support/daemontools/daemontools/warnings.patch @@ -0,0 +1,76 @@ +Upstream-Status: Pending + +Fixup misc warnings + +Patch by RiverRat + +http://bugs.gentoo.org/124487 + +--- a/src/chkshsgr.c ++++ b/src/chkshsgr.c +@@ -1,10 +1,13 @@ + /* Public domain. */ + ++#include <sys/types.h> ++#include <stdlib.h> ++#include <grp.h> + #include <unistd.h> + + int main() + { +- short x[4]; ++ gid_t x[4]; + + x[0] = x[1] = 0; + if (getgroups(1,x) == 0) if (setgroups(1,x) == -1) _exit(1); +--- a/src/matchtest.c ++++ b/src/matchtest.c +@@ -1,3 +1,4 @@ ++#include <unistd.h> + #include "match.h" + #include "buffer.h" + #include "str.h" +--- a/src/multilog.c ++++ b/src/multilog.c +@@ -1,3 +1,4 @@ ++#include <stdio.h> + #include <unistd.h> + #include <sys/types.h> + #include <sys/stat.h> +--- a/src/prot.c ++++ b/src/prot.c +@@ -1,5 +1,8 @@ + /* Public domain. */ + ++#include <sys/types.h> ++#include <unistd.h> ++#include <grp.h> + #include "hasshsgr.h" + #include "prot.h" + +--- a/src/seek_set.c ++++ b/src/seek_set.c +@@ -1,6 +1,7 @@ + /* Public domain. */ + + #include <sys/types.h> ++#include <unistd.h> + #include "seek.h" + + #define SET 0 /* sigh */ +--- a/src/supervise.c ++++ b/src/supervise.c +@@ -1,3 +1,4 @@ ++#include <stdio.h> + #include <unistd.h> + #include <sys/types.h> + #include <sys/stat.h> +--- a/src/pathexec_run.c ++++ b/src/pathexec_run.c +@@ -1,5 +1,6 @@ + /* Public domain. */ + ++#include <unistd.h> + #include "error.h" + #include "stralloc.h" + #include "str.h" diff --git a/meta-oe/recipes-support/daemontools/daemontools_0.76.bb b/meta-oe/recipes-support/daemontools/daemontools_0.76.bb index 35251cb8dc..a35b54e3bc 100644 --- a/meta-oe/recipes-support/daemontools/daemontools_0.76.bb +++ b/meta-oe/recipes-support/daemontools/daemontools_0.76.bb @@ -15,22 +15,21 @@ SECTION = "System/Servers" LIC_FILES_CHKSUM = "file://src/prot.c;beginline=1;endline=1;md5=96964cadf07e8f8c1e2ffb3b507dd647" LICENSE = "PD" -SRC_URI = "http://cr.yp.to/daemontools/${BPN}-${PV}.tar.gz \ - file://0001-error.h-include-errno.h-instead-of-extern-int.diff \ - file://0002-supervise.c-.-supervise-may-be-a-symlink-if-it-s-da.diff " - -SRC_URI_append_class-target = "file://cross-compile.patch \ - file://0001-daemontools-Fix-QA-Issue.patch " +DEPENDS += "coreutils" -SRC_URI_append_class-native = "file://0001-daemontools-native-Fix-a-warning.patch " +SRC_URI = "http://cr.yp.to/daemontools/${BPN}-${PV}.tar.gz \ + file://0001-error.h-include-errno.h-instead-of-extern-int.diff \ + file://0002-supervise.c-.-supervise-may-be-a-symlink-if-it-s-da.diff \ + file://cross-compile.patch \ + file://0001-daemontools-Fix-QA-Issue.patch \ + file://warnings.patch \ + file://0001-Fix-signature-of-main-function.patch \ +" SRC_URI[md5sum] = "1871af2453d6e464034968a0fbcb2bfc" SRC_URI[sha256sum] = "a55535012b2be7a52dcd9eccabb9a198b13be50d0384143bd3b32b8710df4c1f" -S = "${WORKDIR}/admin/${BPN}-${PV}" - -DEPENDS += "daemontools-native" -DEPENDS_class-native = "" +S = "${WORKDIR}/admin/${BP}" do_compile() { ./package/compile @@ -40,12 +39,10 @@ do_install() { install -d ${D}/${bindir} } -do_install_append_class-native() { - install -m 755 ${S}/compile/chkshsgr ${D}/${bindir} -} - -do_install_append_class-target() { +do_install:append:class-target() { install -m755 ${S}/command/* ${D}/${bindir} } -BBCLASSEXTEND = "native" +inherit update-alternatives +ALTERNATIVE_PRIORITY = "100" +ALTERNATIVE:${PN} = "svc svok" diff --git a/meta-oe/recipes-support/dc/double-conversion_3.3.0.bb b/meta-oe/recipes-support/dc/double-conversion_3.3.0.bb new file mode 100644 index 0000000000..a8fd88a9ad --- /dev/null +++ b/meta-oe/recipes-support/dc/double-conversion_3.3.0.bb @@ -0,0 +1,41 @@ +SUMMARY = "Double conversion libraries" +DESCRIPTION = "This provides binary-decimal and decimal-binary routines for IEEE doubles." +HOMEPAGE = "https://github.com/google/double-conversion.git" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1ea35644f0ec0d9767897115667e901f" + + +S = "${WORKDIR}/git" + +SRC_URI = " \ + git://github.com/google/double-conversion.git;protocol=https;branch=master \ + file://run-ptest \ +" +SRCREV = "4f7a25d8ced8c7cf6eee6fd09d6788eaa23c9afe" + +inherit cmake ptest + +EXTRA_OECMAKE = "-DBUILD_SHARED_LIBS=ON" + +# These ptest use ctest (provided by cmake) +RDEPENDS:${PN}-ptest += "cmake" +# Build tests only if ptest is enabled +EXTRA_OECMAKE += "${@bb.utils.contains('PTEST_ENABLED', '1', '-DBUILD_TESTING=ON', '', d)}" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/test + cp -rf ${B}/test ${D}${PTEST_PATH} + install -m 0644 ${B}/CTestTestfile.cmake ${D}${PTEST_PATH}/ + files=" + CTestTestfile.cmake + test/CTestTestfile.cmake + test/cmake_install.cmake + test/cctest/CTestTestfile.cmake + test/cctest/cmake_install.cmake + " + for file in $files; do + sed -i -e "s|${B}|${PTEST_PATH}|g" -e "s|${S}|${PTEST_PATH}|g" -e "s|${WORKDIR}/recipe-sysroot-native||g" "${D}${PTEST_PATH}/${file}" + done + +} diff --git a/meta-oe/recipes-support/dc/files/run-ptest b/meta-oe/recipes-support/dc/files/run-ptest new file mode 100644 index 0000000000..9240a3f851 --- /dev/null +++ b/meta-oe/recipes-support/dc/files/run-ptest @@ -0,0 +1,23 @@ +#!/bin/sh + +# This script runs tests taken from the github CI for the Double-Conversion library. +# For more information, please see: https://github.com/google/double-conversion/blob/master/.github/workflows/ci.yml#L60 + +# Count the number of failed tests +NUM_FAILS=0 + +# Run all tests using ctest +ctest -V + +# VCount the number of failed tests by checking the LastTest.log file generated by ctest +NUM_FAILS=$(grep -c "Failed" Testing/Temporary/LastTest.log) + +# Run the tests directly as well, just in case we forgot to add it to ctest +test/cctest/cctest +if [ $? -ne 0 ]; then + # If the test failed, increment the number of failed tests + NUM_FAILS=$(expr $NUM_FAILS + 1) +fi + +# Return the number of failed tests +exit $NUM_FAILS diff --git a/meta-oe/recipes-support/debsums/debsums_2.2.2.bb b/meta-oe/recipes-support/debsums/debsums_2.2.2.bb deleted file mode 100644 index 13f20eb944..0000000000 --- a/meta-oe/recipes-support/debsums/debsums_2.2.2.bb +++ /dev/null @@ -1,54 +0,0 @@ -SUMMARY = "Miscellaneous utilities specific to Debian" -SUMMARY_${PN}-cron = "Cron scripts to control automatic debsum checking" -DESCRIPTION = "A tool for verification of installed package files against \ -MD5 checksums debsums can verify the integrity of installed package files \ -against MD5 checksums installed by the package, or generated from a .deb \ -archive." -DESCRIPTION_${PN}-cron = "Cron scripts to control automatic system integrity \ -checking via debsums." -SECTION = "base" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://debian/copyright;md5=770d751553e6559e9eaefd2e11ccf7e9" - -SRC_URI = "http://snapshot.debian.org/archive/debian/20170530T212108Z/pool/main/d/debsums/debsums_2.2.2.tar.xz" -SRC_URI[md5sum] = "82b0710855a7e5212d4358163a269e79" -SRC_URI[sha256sum] = "aa61896f93a6bbfe0161c21dcd67529ae8e1ec8c3ccf244523c52c4ad8253d97" - -# the package is taken from snapshots.debian.org; that source is static and goes stale -# so we check the latest upstream from a directory that does get updated -UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/d/${BPN}/" - -inherit perlnative gettext - -do_install() { - install -d ${D}/${sysconfdir}/cron.daily ${D}/${sysconfdir}/cron.weekly - install -d ${D}/${sysconfdir}/cron.monthly ${D}${sbindir} ${D}${bindir} - install -d ${D}${mandir}/man1 ${D}${mandir}/man8 - install -m 0755 debsums ${D}${bindir}/ - install -m 0755 rdebsums ${D}${bindir}/ - install -m 0755 debsums_init ${D}${sbindir} - install -m 0644 man/debsums.1 ${D}${mandir}/man1/ - install -m 0644 man/rdebsums.1 ${D}${mandir}/man1/ - install -m 0644 man/debsums_init.8 ${D}${mandir}/man8/ - install -m 0644 debian/cron.daily \ - ${D}/${sysconfdir}/cron.daily/debsums - install -m 0644 debian/cron.weekly \ - ${D}/${sysconfdir}/cron.weekly/debsums - install -m 0644 debian/cron.monthly \ - ${D}/${sysconfdir}/cron.monthly/debsums - # Must exist, defaults to empty. - touch ${D}/${sysconfdir}/debsums-ignore -} - -PACKAGES =+ "${PN}-cron" - -RDEPENDS_${PN} = "dpkg dpkg-perl libfile-fnmatch-perl perl \ - perl-module-constant perl-module-digest-md5 \ - perl-module-errno perl-module-fcntl \ - perl-module-file-basename perl-module-file-copy \ - perl-module-file-find perl-module-file-glob \ - perl-module-file-path perl-module-file-spec \ - perl-module-file-temp perl-module-getopt-long \ - perl-module-posix" - -FILES_${PN}-cron = "${sysconfdir}/cron.*" diff --git a/meta-oe/recipes-support/devmem2/devmem2.bb b/meta-oe/recipes-support/devmem2/devmem2.bb deleted file mode 100644 index 9bd1eb73d7..0000000000 --- a/meta-oe/recipes-support/devmem2/devmem2.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "Simple program to read/write from/to any location in memory" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://devmem2.c;endline=38;md5=a9eb9f3890384519f435aedf986297cf" -PR = "r7" - -SRC_URI = "http://www.free-electrons.com/pub/mirror/devmem2.c;downloadfilename=devmem2-new.c \ - file://devmem2-fixups-2.patch;apply=yes;striplevel=0 \ - file://0001-devmem.c-ensure-word-is-32-bit-and-add-support-for-6.patch" - -S = "${WORKDIR}" - -CFLAGS += "-DFORCE_STRICT_ALIGNMENT" - -python do_unpack_append() { - os.rename("devmem2-new.c", "devmem2.c") -} - -do_compile() { - ${CC} -o devmem2 devmem2.c ${CFLAGS} ${LDFLAGS} -} - -do_install() { - install -d ${D}${bindir} - install devmem2 ${D}${bindir} -} - -SRC_URI[md5sum] = "e23f236e94be4c429aa1ceac0f01544b" -SRC_URI[sha256sum] = "3b15515693bae1ebd14d914e46d388edfec2175829ea1576a7a0c8606ebbe639" diff --git a/meta-oe/recipes-support/devmem2/devmem2/0001-devmem.c-ensure-word-is-32-bit-and-add-support-for-6.patch b/meta-oe/recipes-support/devmem2/devmem2/0001-devmem.c-ensure-word-is-32-bit-and-add-support-for-6.patch deleted file mode 100644 index 2a57f29891..0000000000 --- a/meta-oe/recipes-support/devmem2/devmem2/0001-devmem.c-ensure-word-is-32-bit-and-add-support-for-6.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 1360a907879dd24041797a3b709d49aeac2ab444 Mon Sep 17 00:00:00 2001 -From: Denys Dmytriyenko <denys@ti.com> -Date: Tue, 29 May 2018 16:55:42 -0400 -Subject: [PATCH] devmem.c: ensure word is 32-bit and add support for 64-bit - long - -Signed-off-by: Denys Dmytriyenko <denys@ti.com> ---- - devmem2.c | 23 +++++++++++++++++------ - 1 file changed, 17 insertions(+), 6 deletions(-) - -diff --git a/devmem2.c b/devmem2.c -index 5845381..68131b2 100644 ---- a/devmem2.c -+++ b/devmem2.c -@@ -39,6 +39,7 @@ - - #include <stdio.h> - #include <stdlib.h> -+#include <stdint.h> - #include <unistd.h> - #include <string.h> - #include <errno.h> -@@ -69,7 +70,7 @@ int main(int argc, char **argv) { - if(argc < 2) { - fprintf(stderr, "\nUsage:\t%s { address } [ type [ data ] ]\n" - "\taddress : memory address to act upon\n" -- "\ttype : access operation type : [b]yte, [h]alfword, [w]ord\n" -+ "\ttype : access operation type : [b]yte, [h]alfword, [w]ord, [l]ong\n" - "\tdata : data to be written\n\n", - argv[0]); - exit(1); -@@ -103,9 +104,14 @@ int main(int argc, char **argv) { - read_result = *((unsigned short *) virt_addr); - break; - case 'w': -- data_size = sizeof(unsigned long); -+ data_size = sizeof(uint32_t); - virt_addr = fixup_addr(virt_addr, data_size); -- read_result = *((unsigned long *) virt_addr); -+ read_result = *((uint32_t *) virt_addr); -+ break; -+ case 'l': -+ data_size = sizeof(uint64_t); -+ virt_addr = fixup_addr(virt_addr, data_size); -+ read_result = *((uint64_t *) virt_addr); - break; - default: - fprintf(stderr, "Illegal data type '%c'.\n", access_type); -@@ -129,9 +135,14 @@ int main(int argc, char **argv) { - read_result = *((unsigned short *) virt_addr); - break; - case 'w': -- virt_addr = fixup_addr(virt_addr, sizeof(unsigned long)); -- *((unsigned long *) virt_addr) = write_val; -- read_result = *((unsigned long *) virt_addr); -+ virt_addr = fixup_addr(virt_addr, sizeof(uint32_t)); -+ *((uint32_t *) virt_addr) = write_val; -+ read_result = *((uint32_t *) virt_addr); -+ break; -+ case 'l': -+ virt_addr = fixup_addr(virt_addr, sizeof(uint64_t)); -+ *((uint64_t *) virt_addr) = write_val; -+ read_result = *((uint64_t *) virt_addr); - break; - } - sprintf(fmt_str, "Write at address 0x%%08lX (%%p): 0x%%0%dlX, " --- -2.7.4 - diff --git a/meta-oe/recipes-support/devmem2/devmem2/devmem2-fixups-2.patch b/meta-oe/recipes-support/devmem2/devmem2/devmem2-fixups-2.patch deleted file mode 100644 index 4517797fc7..0000000000 --- a/meta-oe/recipes-support/devmem2/devmem2/devmem2-fixups-2.patch +++ /dev/null @@ -1,91 +0,0 @@ ---- devmem2.c 2004-08-05 01:55:25.000000000 +0200 -+++ devmem2_modif.c 2011-01-13 15:48:37.798799784 +0100 -@@ -45,12 +45,16 @@ - #define MAP_SIZE 4096UL - #define MAP_MASK (MAP_SIZE - 1) - -+static inline void *fixup_addr(void *addr, size_t size); -+ - int main(int argc, char **argv) { - int fd; - void *map_base, *virt_addr; -- unsigned long read_result, writeval; -+ unsigned long read_result, write_val; - off_t target; - int access_type = 'w'; -+ char fmt_str[128]; -+ size_t data_size; - - if(argc < 2) { - fprintf(stderr, "\nUsage:\t%s { address } [ type [ data ] ]\n" -@@ -79,38 +83,51 @@ - virt_addr = map_base + (target & MAP_MASK); - switch(access_type) { - case 'b': -+ data_size = sizeof(unsigned char); -+ virt_addr = fixup_addr(virt_addr, data_size); - read_result = *((unsigned char *) virt_addr); - break; - case 'h': -+ data_size = sizeof(unsigned short); -+ virt_addr = fixup_addr(virt_addr, data_size); - read_result = *((unsigned short *) virt_addr); - break; - case 'w': -+ data_size = sizeof(unsigned long); -+ virt_addr = fixup_addr(virt_addr, data_size); - read_result = *((unsigned long *) virt_addr); - break; - default: - fprintf(stderr, "Illegal data type '%c'.\n", access_type); - exit(2); - } -- printf("Value at address 0x%X (%p): 0x%X\n", target, virt_addr, read_result); -+ sprintf(fmt_str, "Read at address 0x%%08lX (%%p): 0x%%0%dlX\n", 2*data_size); -+ printf(fmt_str, (unsigned long)target, virt_addr, read_result); - fflush(stdout); - - if(argc > 3) { -- writeval = strtoul(argv[3], 0, 0); -+ write_val = strtoul(argv[3], 0, 0); - switch(access_type) { - case 'b': -- *((unsigned char *) virt_addr) = writeval; -+ virt_addr = fixup_addr(virt_addr, sizeof(unsigned char)); -+ *((unsigned char *) virt_addr) = write_val; - read_result = *((unsigned char *) virt_addr); - break; - case 'h': -- *((unsigned short *) virt_addr) = writeval; -+ virt_addr = fixup_addr(virt_addr, sizeof(unsigned short)); -+ *((unsigned short *) virt_addr) = write_val; - read_result = *((unsigned short *) virt_addr); - break; - case 'w': -- *((unsigned long *) virt_addr) = writeval; -+ virt_addr = fixup_addr(virt_addr, sizeof(unsigned long)); -+ *((unsigned long *) virt_addr) = write_val; - read_result = *((unsigned long *) virt_addr); - break; - } -- printf("Written 0x%X; readback 0x%X\n", writeval, read_result); -+ sprintf(fmt_str, "Write at address 0x%%08lX (%%p): 0x%%0%dlX, " -+ "readback 0x%%0%dlX\n", 2*data_size, 2*data_size); -+ printf(fmt_str, (unsigned long)target, virt_addr, -+ write_val, read_result); - fflush(stdout); - } - -@@ -119,3 +136,12 @@ - return 0; - } - -+static inline void *fixup_addr(void *addr, size_t size) -+{ -+#ifdef FORCE_STRICT_ALIGNMENT -+ unsigned long aligned_addr = (unsigned long)addr; -+ aligned_addr &= ~(size - 1); -+ addr = (void *)aligned_addr; -+#endif -+ return addr; -+} diff --git a/meta-oe/recipes-support/devmem2/devmem2_2.0.bb b/meta-oe/recipes-support/devmem2/devmem2_2.0.bb new file mode 100644 index 0000000000..aee6bfe3da --- /dev/null +++ b/meta-oe/recipes-support/devmem2/devmem2_2.0.bb @@ -0,0 +1,19 @@ +SUMMARY = "Simple program to read/write from/to any location in memory" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://devmem2.c;endline=38;md5=a9eb9f3890384519f435aedf986297cf" + +SRC_URI = "git://github.com/denix0/devmem2.git;protocol=https;branch=main" +SRCREV = "5b395a946894eb4f4ef5d07c80a50a88573a541e" + +S = "${WORKDIR}/git" + +CFLAGS += "-DFORCE_STRICT_ALIGNMENT" + +do_compile() { + ${CC} -o devmem2 devmem2.c ${CFLAGS} ${LDFLAGS} +} + +do_install() { + install -d ${D}${bindir} + install devmem2 ${D}${bindir} +} diff --git a/meta-oe/recipes-support/dfu-util/dfu-util-native_0.9.bb b/meta-oe/recipes-support/dfu-util/dfu-util-native_0.11.bb index 76faefefbb..4641b0181a 100644 --- a/meta-oe/recipes-support/dfu-util/dfu-util-native_0.9.bb +++ b/meta-oe/recipes-support/dfu-util/dfu-util-native_0.11.bb @@ -1,6 +1,6 @@ require dfu-util_${PV}.bb -inherit native deploy +inherit deploy native DEPENDS = "libusb1-native" @@ -8,7 +8,6 @@ PACKAGECONFIG ??= "" PACKAGECONFIG[static] = "CFLAGS='${CFLAGS} -pthread -static',," -do_deploy[sstate-outputdirs] = "${DEPLOY_DIR_TOOLS}" do_deploy() { install -m 0755 src/dfu-util ${DEPLOYDIR}/dfu-util-${PV} rm -f ${DEPLOYDIR}/dfu-util @@ -16,3 +15,10 @@ do_deploy() { } addtask deploy before do_package after do_install + +# cleandirs should possibly be in deploy.bbclass but we need it +do_deploy[cleandirs] = "${DEPLOYDIR}" +# clear stamp-extra-info since MACHINE_ARCH is normally put there by +# deploy.bbclass +do_deploy[stamp-extra-info] = "" + diff --git a/meta-oe/recipes-support/dfu-util/dfu-util_0.9.bb b/meta-oe/recipes-support/dfu-util/dfu-util_0.11.bb index 8a2ac69347..17547ca83f 100644 --- a/meta-oe/recipes-support/dfu-util/dfu-util_0.9.bb +++ b/meta-oe/recipes-support/dfu-util/dfu-util_0.11.bb @@ -1,13 +1,11 @@ DESCRIPTION = "USB Device Firmware Upgrade utility" -AUTHOR = "Harald Welte <laforge@openmoko.org>" HOMEPAGE = "http://dfu-util.sourceforge.net" SECTION = "devel" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "libusb1" SRC_URI = "http://dfu-util.sourceforge.net/releases/${BP}.tar.gz" -SRC_URI[md5sum] = "233bb1e08ef4b405062445d84e28fde6" -SRC_URI[sha256sum] = "36428c6a6cb3088cad5a3592933385253da5f29f2effa61518ee5991ea38f833" +SRC_URI[sha256sum] = "b4b53ba21a82ef7e3d4c47df2952adf5fa494f499b6b0b57c58c5d04ae8ff19e" inherit autotools pkgconfig diff --git a/meta-oe/recipes-support/dhex/dhex_0.69.bb b/meta-oe/recipes-support/dhex/dhex_0.69.bb index cfbb2caaf6..3cc870481f 100644 --- a/meta-oe/recipes-support/dhex/dhex_0.69.bb +++ b/meta-oe/recipes-support/dhex/dhex_0.69.bb @@ -1,9 +1,10 @@ SUMMARY = "dhex is a hex editor that includes a diff mode" SECTION = "console/utils" +HOMEPAGE = "http://www.dettus.net/dhex/" DEPENDS = "ncurses" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://README.txt;beginline=229;endline=241;md5=6f252a421b65bcecf624382ba3c899da" SRC_URI = "http://www.dettus.net/dhex/dhex_0.69.tar.gz" diff --git a/meta-oe/recipes-support/digitemp/digitemp_3.7.2.bb b/meta-oe/recipes-support/digitemp/digitemp_3.7.2.bb index 9fcc278d35..6565097334 100644 --- a/meta-oe/recipes-support/digitemp/digitemp_3.7.2.bb +++ b/meta-oe/recipes-support/digitemp/digitemp_3.7.2.bb @@ -1,10 +1,10 @@ SUMMARY = "read temperature sensors in a 1-Wire net" SECTION = "util" DEPENDS = "libusb1" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=44fee82a1d2ed0676cf35478283e0aa0" -SRC_URI = "git://github.com/bcl/digitemp" +SRC_URI = "git://github.com/bcl/digitemp;branch=master;protocol=https" SRCREV = "a162e63aad35358aab325388f3d5e88121606419" diff --git a/meta-oe/recipes-support/dool/dool_1.3.2.bb b/meta-oe/recipes-support/dool/dool_1.3.2.bb new file mode 100644 index 0000000000..f7e403018c --- /dev/null +++ b/meta-oe/recipes-support/dool/dool_1.3.2.bb @@ -0,0 +1,23 @@ +SUMMARY = "Dool is a Python3 compatible fork of Dstat" +DESCRIPTION = "Dool is a command line tool to monitor many aspects of your system: \ +CPU, Memory, Network, Load Average, etc. It also includes a robust plug-in architecture \ +to allow monitoring other system metrics." +HOMEPAGE = "http://dag.wiee.rs/home-made/dstat" +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1ebbd3e34237af26da5dc08a4e440464" + +DEPENDS += "asciidoc-native xmlto-native" +RDEPENDS:${PN} += "python3-core python3-misc python3-resource python3-shell python3-six python3-unixadmin" + +SRC_URI = "git://github.com/scottchiefbaker/dool.git;branch=master;protocol=https \ + " + +SRCREV = "b2862905be841232c9e36ce1e059d3fe34ef0cdf" + +S = "${WORKDIR}/git" + +do_install() { + oe_runmake 'DESTDIR=${D}' install +} + + diff --git a/meta-oe/recipes-support/driverctl/driverctl_0.115.bb b/meta-oe/recipes-support/driverctl/driverctl_0.115.bb new file mode 100644 index 0000000000..970844f982 --- /dev/null +++ b/meta-oe/recipes-support/driverctl/driverctl_0.115.bb @@ -0,0 +1,26 @@ +SUMMARY = "driverctl is a device driver control utility for Linux" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +REQUIRED_DISTRO_FEATURES = "systemd" + +DEPENDS = "systemd" +RDEPENDS:${PN} += "bash bash-completion" + +SRC_URI = "git://gitlab.com/driverctl/driverctl.git;branch=master;protocol=https" +SRCREV = "2ba60536eb20ca0a6a751bd8b6501dba84ec45d3" + +S = "${WORKDIR}/git" + +inherit pkgconfig systemd features_check + +do_install () { + oe_runmake install DESTDIR=${D} +} + +FILES:${PN} += " \ + ${libdir} \ + ${datadir} \ + ${systemd_system_unitdir} \ +" + diff --git a/meta-oe/recipes-support/dstat/dstat_0.7.4.bb b/meta-oe/recipes-support/dstat/dstat_0.7.4.bb deleted file mode 100644 index 8eb7157405..0000000000 --- a/meta-oe/recipes-support/dstat/dstat_0.7.4.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "versatile resource statics tool" -DESCRIPTION = "Dstat is a versatile replacement for vmstat, iostat, netstat and ifstat. \ -Dstat overcomes some of their limitations and adds some extra features, more counters \ -and flexibility. Dstat is handy for monitoring systems during performance tuning tests, \ -benchmarks or troubleshooting." -HOMEPAGE = "http://dag.wiee.rs/home-made/dstat" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -DEPENDS += "asciidoc-native xmlto-native" - -SRC_URI = "git://github.com/dagwieers/dstat.git" - -SRCREV = "6f5db0aed26bf8cf2700d4ffe90a9bd3436ac728" - -S = "${WORKDIR}/git" - -do_install() { - oe_runmake 'DESTDIR=${D}' install -} - -RDEPENDS_${PN} += "python-core python-misc python-resource python-shell python-unixadmin" diff --git a/meta-oe/recipes-support/edid-decode/edid-decode_git.bb b/meta-oe/recipes-support/edid-decode/edid-decode_git.bb new file mode 100644 index 0000000000..6eaec800ca --- /dev/null +++ b/meta-oe/recipes-support/edid-decode/edid-decode_git.bb @@ -0,0 +1,18 @@ +SUMMARY = "Decode EDID data in human-readable format" +DESCRIPTION = "edid-decode decodes EDID monitor description data in human-readable format." +HOMEPAGE = "https://hverkuil.home.xs4all.nl/edid-decode/edid-decode.html" + +SECTION = "console/utils" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=2ef696d66c156139232201f223c22592" + +SRC_URI= "git://git.linuxtv.org/edid-decode.git;protocol=https;branch=master" +SRCREV = "5920bf2a756b2f748c49ff6a08b9f421026473c5" +PV = "0.0+git" +S = "${WORKDIR}/git" + +do_install() { + oe_runmake 'DESTDIR=${D}' install +} + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/eject/eject/eject-timeout.patch b/meta-oe/recipes-support/eject/eject/eject-timeout.patch index de8146f32a..4511e17069 100644 --- a/meta-oe/recipes-support/eject/eject/eject-timeout.patch +++ b/meta-oe/recipes-support/eject/eject/eject-timeout.patch @@ -1,6 +1,6 @@ allow a longer timeout -Upstream-Status: Backport +Upstream-Status: Backport Signed-off-by: Morgan Little <morgan.little@windriver.com> diff --git a/meta-oe/recipes-support/eject/eject_2.1.5.bb b/meta-oe/recipes-support/eject/eject_2.1.5.bb index dec2e7ab4c..dd5489e7db 100644 --- a/meta-oe/recipes-support/eject/eject_2.1.5.bb +++ b/meta-oe/recipes-support/eject/eject_2.1.5.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Eject allows removable media (typically a CD-ROM, floppy disk, tape, or JAZ or ZIP disk) to be ejected under software control." HOMEPAGE = "http://eject.sourceforge.net/" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" inherit autotools gettext update-alternatives @@ -18,9 +18,8 @@ SRC_URI[sha256sum] = "ef9f7906484cfde4ba223b2682a37058f9a3c7d3bb1adda7a34a67402e S = "${WORKDIR}/${BPN}" -PR = "r1" -do_compile_prepend() { +do_compile:prepend() { # PO subdir must be in build directory if [ ! ${S} = ${B} ]; then mkdir -p ${B}/po @@ -28,11 +27,11 @@ do_compile_prepend() { fi } -ALTERNATIVE_${PN} = "volname eject" +ALTERNATIVE:${PN} = "volname eject" ALTERNATIVE_LINK_NAME[volname] = "${bindir}/volname" ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject" ALTERNATIVE_PRIORITY[volname] = "100" ALTERNATIVE_PRIORITY[eject] = "100" -ALTERNATIVE_${PN}-doc = "eject.1" +ALTERNATIVE:${PN}-doc = "eject.1" ALTERNATIVE_LINK_NAME[eject.1] = "${mandir}/man1/eject.1" diff --git a/meta-oe/recipes-support/emacs/emacs_29.1.bb b/meta-oe/recipes-support/emacs/emacs_29.1.bb new file mode 100644 index 0000000000..5cbe4551c0 --- /dev/null +++ b/meta-oe/recipes-support/emacs/emacs_29.1.bb @@ -0,0 +1,311 @@ +SUMMARY = "Emacs is the extensible, customizable, self-documenting real-time display editor" +HOMEPAGE = "https://www.gnu.org/software/emacs/" + +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" + +SRC_URI = "https://ftp.gnu.org/pub/gnu/emacs/emacs-${PV}.tar.xz \ + " +SRC_URI:append:class-target = " \ + file://use-emacs-native-tools-for-cross-compiling.patch \ + file://avoid-running-host-binaries-for-sanity.patch \ +" + +SRC_URI[sha256sum] = "d2f881a5cc231e2f5a03e86f4584b0438f83edd7598a09d24a21bd8d003e2e01" + +CVE_STATUS[CVE-2007-6109] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions." + +PACKAGECONFIG[gnutls] = "--with-gnutls=yes,--with-gnutls=no,gnutls" +PACKAGECONFIG[kerberos] = "--with-kerberos=yes,--with-kerberos=no,krb5" +PACKAGECONFIG[libgmp] = "--with-libgmp=yes,--with-libgmp=no,gmp" +PACKAGECONFIG[selinux] = "--with-selinux=yes,--with-selinux=no,libselinux" + +PACKAGECONFIG ??= "gnutls kerberos libgmp" + +# We could use --without-all but its better to +# split it into several packages (size of minimal doesnt change) +EXTRA_OECONF = " --with-x=no --with-dumping=none --disable-build-details" + +# Disable seccomp, as its a default dependency for gnutls but it doesnt work when cross-compiling emacs +EXTRA_OECONF:append = " ${@bb.utils.contains('PACKAGECONFIG', 'gnutls', 'ac_cv_have_decl_SECCOMP_FILTER_FLAG_TSYNC=no ac_cv_have_decl_SECCOMP_SET_MODE_FILTER=no', '', d)}" + + +DEPENDS = "ncurses" +DEPENDS:append:class-target = " emacs-native" + +inherit autotools mime-xdg pkgconfig + + +# Create the required native tools for the target build +do_compile:class-native (){ + cd ${B}/lib-src + oe_runmake make-docfile + oe_runmake make-fingerprint + cd ${B}/src + oe_runmake bootstrap-emacs +} + +do_install:class-native(){ + install -d ${D}${bindir} + install -m 755 ${B}/lib-src/make-docfile ${D}/${bindir}/ + install -m 755 ${B}/lib-src/make-fingerprint ${D}/${bindir}/ + install -m 755 ${B}/src/bootstrap-emacs ${D}/${bindir}/ +} + +do_compile:prepend:class-target () { + # export EMACS env variables for the native tools to use to allow calling bootstrap-emacs + export EMACSLOADPATH=${S}/lisp + export EMACSDATA=${S}/etc +} + + +do_install:prepend:class-target(){ + # export EMACS env variables for the native tools to use to allow calling bootstrap-emacs + export EMACSLOADPATH=${S}/lisp + export EMACSDATA=${S}/etc +} + +# Remove build host references to avoid target pollution +do_compile:prepend () { + sed -i -e 's|${TMPDIR}||g' ${B}/src/config.h + sed -i -e 's|${B}||g' ${B}/src/epaths.h +} + +do_install:append(){ + # Delete systemd stuff, extend using DISTRO_FEATURES? + rm -rf ${D}/${libdir} + # Extra stuff which isnt needed + rm -rf ${D}/${datadir}/metainfo + rm -rf ${D}/${datadir}/info + # Emacs copies files to ${D} while building, which were unpacked + # by a different user, we need to restore those + chown -R root:root ${D}${datadir} +} + +# Use a similar strategy to how we build python: +# Create three packages +# minimal - A working lisp based text editor +# base - What would probably work for most +# full - A fully working emacs +# The lists of files are long but are worth it +# Installing "emacs" installs the base package +PACKAGE_BEFORE_PN = "${PN}-minimal ${PN}-base ${PN}-full" +RPROVIDES:${PN}-base = "${PN}" +RDEPENDS:${PN}-base:class-target = "${PN}-minimal" +RDEPENDS:${PN}-full:class-target = "${PN}" + + +# A minimal version of emacs that works +# These are kept sorted in alphabetical order +FILES:${PN}-minimal = " \ + ${bindir}/emacs* \ + ${datadir}/${BPN}/${PV}/etc/charsets/ \ + ${datadir}/${BPN}/${PV}/lisp/abbrev.elc \ + ${datadir}/${BPN}/${PV}/lisp/bindings.elc \ + ${datadir}/${BPN}/${PV}/lisp/buff-menu.elc \ + ${datadir}/${BPN}/${PV}/lisp/button.elc \ + ${datadir}/${BPN}/${PV}/lisp/case-table.elc \ + ${datadir}/${BPN}/${PV}/lisp/composite.elc \ + ${datadir}/${BPN}/${PV}/lisp/cus-face.elc \ + ${datadir}/${BPN}/${PV}/lisp/cus-start.elc \ + ${datadir}/${BPN}/${PV}/lisp/custom.elc \ + ${datadir}/${BPN}/${PV}/lisp/disp-table.elc \ + ${datadir}/${BPN}/${PV}/lisp/electric.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/backquote.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/byte-opt.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/byte-run.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/bytecomp.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/cconv.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/cl-generic.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/cl-lib.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/cl-macs.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/cl-preloaded.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/cl-seq.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/debug-early.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/easy-mmode.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/easymenu.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/eldoc.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/float-sup.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/gv.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/inline.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/lisp-mode.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/lisp.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/macroexp.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/map-ynp.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/map.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/nadvice.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/oclosure.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/pcase.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/regexp-opt.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/rmc.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/rx.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/seq.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/shorthands.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/subr-x.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/syntax.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/tabulated-list.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/timer.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/vc/warnings.elc \ + ${datadir}/${BPN}/${PV}/lisp/env.elc \ + ${datadir}/${BPN}/${PV}/lisp/epa-hook.elc \ + ${datadir}/${BPN}/${PV}/lisp/facemenu.elc \ + ${datadir}/${BPN}/${PV}/lisp/faces.elc \ + ${datadir}/${BPN}/${PV}/lisp/files.elc \ + ${datadir}/${BPN}/${PV}/lisp/font-core.elc \ + ${datadir}/${BPN}/${PV}/lisp/font-lock.elc \ + ${datadir}/${BPN}/${PV}/lisp/format.elc \ + ${datadir}/${BPN}/${PV}/lisp/frame.elc \ + ${datadir}/${BPN}/${PV}/lisp/help.elc \ + ${datadir}/${BPN}/${PV}/lisp/image.elc \ + ${datadir}/${BPN}/${PV}/lisp/indent.elc \ + ${datadir}/${BPN}/${PV}/lisp/international/characters.elc \ + ${datadir}/${BPN}/${PV}/lisp/international/charprop.el \ + ${datadir}/${BPN}/${PV}/lisp/international/charscript.elc \ + ${datadir}/${BPN}/${PV}/lisp/international/cp51932.elc \ + ${datadir}/${BPN}/${PV}/lisp/international/emoji-zwj.elc \ + ${datadir}/${BPN}/${PV}/lisp/international/eucjp-ms.elc \ + ${datadir}/${BPN}/${PV}/lisp/international/iso-transl.elc \ + ${datadir}/${BPN}/${PV}/lisp/international/mule-cmds.elc \ + ${datadir}/${BPN}/${PV}/lisp/international/mule-conf.elc \ + ${datadir}/${BPN}/${PV}/lisp/international/mule.elc \ + ${datadir}/${BPN}/${PV}/lisp/international/uni*.el \ + ${datadir}/${BPN}/${PV}/lisp/isearch.elc \ + ${datadir}/${BPN}/${PV}/lisp/jit-lock.elc \ + ${datadir}/${BPN}/${PV}/lisp/jka-cmpr-hook.elc \ + ${datadir}/${BPN}/${PV}/lisp/jka-compr.elc \ + ${datadir}/${BPN}/${PV}/lisp/keymap.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/burmese.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/cham.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/chinese.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/cyrillic.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/czech.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/english.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/ethiopic.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/european.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/georgian.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/greek.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/hebrew.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/indian.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/indonesian.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/japanese.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/khmer.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/korean.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/lao.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/misc-lang.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/philippine.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/romanian.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/sinhala.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/slovak.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/tai-viet.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/thai.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/tibetan.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/utf-8-lang.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/vietnamese.elc \ + ${datadir}/${BPN}/${PV}/lisp/ldefs-boot.el \ + ${datadir}/${BPN}/${PV}/lisp/loaddefs.el \ + ${datadir}/${BPN}/${PV}/lisp/loadup.el \ + ${datadir}/${BPN}/${PV}/lisp/menu-bar.elc \ + ${datadir}/${BPN}/${PV}/lisp/minibuffer.elc \ + ${datadir}/${BPN}/${PV}/lisp/mouse.elc \ + ${datadir}/${BPN}/${PV}/lisp/newcomment.elc \ + ${datadir}/${BPN}/${PV}/lisp/obarray.elc \ + ${datadir}/${BPN}/${PV}/lisp/paren.elc \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/elisp-mode.elc \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/prog-mode.elc \ + ${datadir}/${BPN}/${PV}/lisp/register.elc \ + ${datadir}/${BPN}/${PV}/lisp/replace.elc \ + ${datadir}/${BPN}/${PV}/lisp/rfn-eshadow.elc \ + ${datadir}/${BPN}/${PV}/lisp/select.elc \ + ${datadir}/${BPN}/${PV}/lisp/simple.elc \ + ${datadir}/${BPN}/${PV}/lisp/startup.elc \ + ${datadir}/${BPN}/${PV}/lisp/subr.elc \ + ${datadir}/${BPN}/${PV}/lisp/tab-bar.elc \ + ${datadir}/${BPN}/${PV}/lisp/term/tty-colors.elc \ + ${datadir}/${BPN}/${PV}/lisp/term/xterm.elc \ + ${datadir}/${BPN}/${PV}/lisp/textmodes/fill.elc \ + ${datadir}/${BPN}/${PV}/lisp/textmodes/page.elc \ + ${datadir}/${BPN}/${PV}/lisp/textmodes/paragraphs.elc \ + ${datadir}/${BPN}/${PV}/lisp/textmodes/text-mode.elc \ + ${datadir}/${BPN}/${PV}/lisp/thingatpt.elc \ + ${datadir}/${BPN}/${PV}/lisp/tooltip.elc \ + ${datadir}/${BPN}/${PV}/lisp/uniquify.elc \ + ${datadir}/${BPN}/${PV}/lisp/vc/ediff-hook.elc \ + ${datadir}/${BPN}/${PV}/lisp/vc/vc-hooks.elc \ + ${datadir}/${BPN}/${PV}/lisp/version.elc \ + ${datadir}/${BPN}/${PV}/lisp/widget.elc \ + ${datadir}/${BPN}/${PV}/lisp/window.elc \ + ${prefix}/libexec \ +" + +# What works for "most" is relative, but this can be easily extended if needed +FILES:${PN}-base = " \ + ${datadir}/${BPN}/${PV}/etc/e \ + ${datadir}/${BPN}/${PV}/etc/forms \ + ${datadir}/${BPN}/${PV}/etc/srecode \ + ${datadir}/${BPN}/${PV}/etc/themes/adwaita-theme.el \ + ${datadir}/${BPN}/${PV}/etc/themes/deeper-blue-theme.el \ + ${datadir}/${BPN}/${PV}/etc/themes/light-blue-theme.el \ + ${datadir}/${BPN}/${PV}/etc/themes/misterioso-theme.el \ + ${datadir}/${BPN}/${PV}/etc/themes/tango-theme.el \ + ${datadir}/${BPN}/${PV}/etc/themes/wheatgrass-theme.el \ + ${datadir}/${BPN}/${PV}/etc/themes/wombat-theme.el \ + ${datadir}/${BPN}/${PV}/lisp/ansi-color.elc \ + ${datadir}/${BPN}/${PV}/lisp/auth-source.elc \ + ${datadir}/${BPN}/${PV}/lisp/calendar/iso8601.elc \ + ${datadir}/${BPN}/${PV}/lisp/calendar/parse-time.elc \ + ${datadir}/${BPN}/${PV}/lisp/calendar/time-date.elc \ + ${datadir}/${BPN}/${PV}/lisp/cedet \ + ${datadir}/${BPN}/${PV}/lisp/comint.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/cl-lib.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/cl-macs.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/cl-seq.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/eieio-core.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/eieio.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/inline.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/pcase.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/ring.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/smie.elc \ + ${datadir}/${BPN}/${PV}/lisp/files-x.elc \ + ${datadir}/${BPN}/${PV}/lisp/format-spec.elc \ + ${datadir}/${BPN}/${PV}/lisp/json.elc \ + ${datadir}/${BPN}/${PV}/lisp/ls-lisp.elc \ + ${datadir}/${BPN}/${PV}/lisp/net/tramp-compat.elc \ + ${datadir}/${BPN}/${PV}/lisp/net/tramp-integration.elc \ + ${datadir}/${BPN}/${PV}/lisp/net/tramp-loaddefs.el \ + ${datadir}/${BPN}/${PV}/lisp/net/tramp-sh.elc \ + ${datadir}/${BPN}/${PV}/lisp/net/tramp.elc \ + ${datadir}/${BPN}/${PV}/lisp/net/trampver.elc \ + ${datadir}/${BPN}/${PV}/lisp/password-cache.elc \ + ${datadir}/${BPN}/${PV}/lisp/pcomplete.elc \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/*asm* \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/*perl* \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/cc-align.elc \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/cc-cmds.elc \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/cc-defs.elc \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/cc-engine.elc \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/cc-fonts.elc \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/cc-guess.elc \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/cc-menus.elc \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/cc-mode.elc \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/cc-styles.elc \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/cc-vars.elc \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/cpp* \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/executable* \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/make* \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/prog* \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/python* \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/sh-script* \ + ${datadir}/${BPN}/${PV}/lisp/shell.elc \ + ${datadir}/${BPN}/${PV}/lisp/subdirs.el \ + ${datadir}/${BPN}/${PV}/site-lisp/ \ +" + +# Restore FILES for the full package to catch everything left +FILES:${PN}-full = "${FILES:${PN}}" +FILES:${PN}-full:append = " ${datadir}/icons" + + +# The following does NOT build a native emacs. +# It only builds some parts of it that are +# required to by the build for target emacs. +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/emacs/files/avoid-running-host-binaries-for-sanity.patch b/meta-oe/recipes-support/emacs/files/avoid-running-host-binaries-for-sanity.patch new file mode 100644 index 0000000000..719ee4bce9 --- /dev/null +++ b/meta-oe/recipes-support/emacs/files/avoid-running-host-binaries-for-sanity.patch @@ -0,0 +1,38 @@ +Upstream-Status: Inappropriate [OE-Specific] + +Emacs introduced a sanity-check for the build artifacts, where it +runs the newly built emacs to perform some checks. + +This is not going to work for us since we are cross-compiling, +we need to avoid running target binaries on the host + +Signed-off-by: Alejandro Hernandez Samaniego <alejandro@enedino.org> + +Index: emacs-29.1/Makefile.in +=================================================================== +--- emacs-29.1.orig/Makefile.in ++++ emacs-29.1/Makefile.in +@@ -416,19 +416,10 @@ advice-on-failure: + @exit ${exit-status} + + sanity-check: +- @[ -f .no-advice-on-failure ] && exit 0; true +- @v=$$(src/emacs${EXEEXT} --batch --eval \ +- '(progn (defun f (n) (if (= 0 n) 1 (* n (f (- n 1))))) (princ (f 10)))' \ +- 2> /dev/null); \ +- [ "X$$v" = "X3628800" ] && exit 0; \ +- echo >&2 '***'; \ +- echo >&2 '*** '"\"make ${make-target}\" succeeded, but Emacs is not functional."; \ +- echo >&2 '***'; \ +- cat Makefile | \ +- sed -n '/^# ADVICE-ON-FAILURE-BEGIN:${make-target}/,$${p;/^# ADVICE-ON-FAILURE-END:${make-target}/q;};' | \ +- sed 's/^# /*** /' | grep -v '^\*\*\* ADVICE-ON-FAILURE-' >&2; \ +- echo >&2 '***'; \ +- exit 1 ++# The Makefile will try to call the newly built emacs to perform some checks ++# this is not going to work since it was (probably) built for a different architecture. ++# Avoid calling target binaries from the host and simply assume our build artifacts work. ++ exit 0 + + .PHONY: all ${SUBDIR} blessmail epaths-force epaths-force-w32 epaths-force-ns-self-contained etc-emacsver + diff --git a/meta-oe/recipes-support/emacs/files/use-emacs-native-tools-for-cross-compiling.patch b/meta-oe/recipes-support/emacs/files/use-emacs-native-tools-for-cross-compiling.patch new file mode 100644 index 0000000000..df5e4bd258 --- /dev/null +++ b/meta-oe/recipes-support/emacs/files/use-emacs-native-tools-for-cross-compiling.patch @@ -0,0 +1,106 @@ +Upstream-Status: Inappropriate [OE-Specific] + +When building emacs, it builds some tools for the HOST +that are then used to build for target, such as +make-fingerprint and make-docfile and bootstrap-emacs, +this needs to be adapted to be used by bitbake, otherwise +the compiled executables arent compatible with the HOST. + +We also need to be able to use emacs env variables to +control how bootstrap-emacs is used when cross-compiling. + +Use the above mentioned tools provided by the native +version of the recipe instead. + +Signed-off-by: Alejandro Enedino Hernandez Samaniego <alejandro@enedino.org> + +Index: emacs-29.1/src/Makefile.in +=================================================================== +--- emacs-29.1.orig/src/Makefile.in ++++ emacs-29.1/src/Makefile.in +@@ -1,3 +1,4 @@ ++ + ### @configure_input@ + + # Copyright (C) 1985, 1987-1988, 1993-1995, 1999-2023 Free Software +@@ -508,7 +509,7 @@ ifeq ($(CHECK_STRUCTS),true) + pdumper.o: dmpstruct.h + endif + dmpstruct.h: $(srcdir)/dmpstruct.awk +-dmpstruct.h: $(libsrc)/make-fingerprint$(EXEEXT) $(dmpstruct_headers) ++dmpstruct.h: $(dmpstruct_headers) + $(AM_V_GEN)POSIXLY_CORRECT=1 awk -f $(srcdir)/dmpstruct.awk \ + $(dmpstruct_headers) > $@ + +@@ -610,8 +611,7 @@ SYSTEM_TYPE = @SYSTEM_TYPE@ + ## Strictly speaking, emacs does not depend directly on all of $lisp, + ## since not all pieces are used on all platforms. But DOC depends + ## on all of $lisp, and emacs depends on DOC, so it is ok to use $lisp here. +-emacs$(EXEEXT): temacs$(EXEEXT) \ +- lisp.mk $(etc)/DOC $(lisp) \ ++emacs$(EXEEXT): lisp.mk $(etc)/DOC $(lisp) \ + $(lispsource)/international/charprop.el ${charsets} + ifeq ($(SYSTEM_TYPE),cygwin) + find ${top_builddir} -name '*.eln' | rebase -v -O -T - +@@ -654,7 +654,7 @@ endif + $(etc)/DOC: $(libsrc)/make-docfile$(EXEEXT) $(doc_obj) + $(AM_V_GEN)$(MKDIR_P) $(etc) + $(AM_V_at)rm -f $(etc)/DOC +- $(AM_V_at)$(libsrc)/make-docfile -d $(srcdir) \ ++ make-docfile -d $(srcdir) \ + $(SOME_MACHINE_OBJECTS) $(doc_obj) > $(etc)/DOC + + $(libsrc)/make-docfile$(EXEEXT) $(libsrc)/make-fingerprint$(EXEEXT): \ +@@ -671,7 +671,7 @@ buildobj.h: Makefile + GLOBAL_SOURCES = $(base_obj:.o=.c) $(NS_OBJC_OBJ:.o=.m) + + gl-stamp: $(libsrc)/make-docfile$(EXEEXT) $(GLOBAL_SOURCES) +- $(AM_V_GLOBALS)$(libsrc)/make-docfile -d $(srcdir) -g $(doc_obj) > globals.tmp ++ make-docfile -d $(srcdir) -g $(doc_obj) > globals.tmp + $(AM_V_at)$(top_srcdir)/build-aux/move-if-change globals.tmp globals.h + $(AM_V_at)echo timestamp > $@ + +@@ -685,7 +685,7 @@ $(LIBEGNU_ARCHIVE): $(config_h) + $(MAKE) -C $(dir $@) all + + ifeq ($(HAVE_PDUMPER),yes) +-MAKE_PDUMPER_FINGERPRINT = $(libsrc)/make-fingerprint$(EXEEXT) ++MAKE_PDUMPER_FINGERPRINT = make-fingerprint + else + MAKE_PDUMPER_FINGERPRINT = + endif +Index: emacs-29.1/lisp/Makefile.in +=================================================================== +--- emacs-29.1.orig/lisp/Makefile.in ++++ emacs-29.1/lisp/Makefile.in +@@ -53,7 +53,7 @@ FIND_DELETE = @FIND_DELETE@ + # We never change directory before running Emacs, so a relative file + # name is fine, and makes life easier. If we need to change + # directory, we can use emacs --chdir. +-EMACS = ../src/emacs${EXEEXT} ++EMACS = bootstrap-emacs + + # Command line flags for Emacs. + +@@ -109,7 +109,7 @@ MAIN_FIRST = ./emacs-lisp/eieio.el ./ema + ./org/oc.el ./org/ol.el ./emacs-lisp/cl-lib.el + + # Prevent any settings in the user environment causing problems. +-unexport EMACSDATA EMACSDOC EMACSLOADPATH EMACSPATH ++unexport EMACSDOC EMACSPATH + + # The actual Emacs command run in the targets below. + emacs = '$(EMACS)' $(EMACSOPT) +Index: emacs-29.1/Makefile.in +=================================================================== +--- emacs-29.1.orig/Makefile.in ++++ emacs-29.1/Makefile.in +@@ -328,7 +328,7 @@ GLIB_COMPILE_SCHEMAS = glib-compile-sche + TRANSFORM = @program_transform_name@ + + # Prevent any settings in the user environment causing problems. +-unexport EMACSDATA EMACSDOC EMACSLOADPATH EMACSPATH ++unexport EMACSDOC EMACSPATH + + # What emacs should be called when installed. + EMACS_NAME = `echo emacs | sed '$(TRANSFORM)'` diff --git a/meta-oe/recipes-support/enca/enca/0001-Do-not-use-MKTEMP_PROG-in-cross-build.patch b/meta-oe/recipes-support/enca/enca/0001-Do-not-use-MKTEMP_PROG-in-cross-build.patch new file mode 100644 index 0000000000..32fa239084 --- /dev/null +++ b/meta-oe/recipes-support/enca/enca/0001-Do-not-use-MKTEMP_PROG-in-cross-build.patch @@ -0,0 +1,30 @@ +From c6a59d512706978e8c67f9a2d84ec650f8763368 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 8 May 2023 18:02:52 -0700 +Subject: [PATCH] Do not use $MKTEMP_PROG in cross-build + +$MKTEMP_PROG points to native location which could be absolute path that +wont exist on target rootfs. Therefore use it from PATH + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 4852a2f..d23b384 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -186,7 +186,7 @@ ye_PATH_LOCALE_ALIAS + + dnl Random filename generation in scripts + if test -n "$MKTEMP_PROG"; then +- SHELL_RANDOM_FILENAME='`'$MKTEMP_PROG' /tmp/enca-$$-XXXXXXXX`' ++ SHELL_RANDOM_FILENAME='`mktemp /tmp/enca-$$-XXXXXXXX`' + else + SHELL_RANDOM_FILENAME='/tmp/enca-$$-$RANDOM' + fi +-- +2.40.1 + diff --git a/meta-oe/recipes-support/enca/enca/configure-hack.patch b/meta-oe/recipes-support/enca/enca/configure-hack.patch deleted file mode 100644 index 85abcdcf02..0000000000 --- a/meta-oe/recipes-support/enca/enca/configure-hack.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- enca-1.9/configure.ac.orig 2006-02-15 00:57:39.000000000 -0800 -+++ enca-1.9/configure.ac 2006-02-15 00:57:46.000000000 -0800 -@@ -92,9 +92,6 @@ - dnl And for gtk-doc - gtk_CHECK_GTK_DOC - --dnl Check for good random number sources --AC_CHECK_FILES(/dev/random /dev/urandom /dev/srandom /dev/arandom) -- - dnl Dirty path hack. Helps some people with badly set up search paths. - if test "$prefix" = "NONE"; then - LDFLAGS="$LDFLAGS -L$ac_default_prefix/lib" diff --git a/meta-oe/recipes-support/enca/enca/configure-remove-dumbness.patch b/meta-oe/recipes-support/enca/enca/configure-remove-dumbness.patch deleted file mode 100644 index 6f6f3e320e..0000000000 --- a/meta-oe/recipes-support/enca/enca/configure-remove-dumbness.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- enca-1.9/configure.ac.orig 2006-06-29 15:30:44.000000000 +0100 -+++ enca-1.9/configure.ac 2006-06-29 15:31:41.000000000 +0100 -@@ -92,14 +92,15 @@ - dnl And for gtk-doc - gtk_CHECK_GTK_DOC - --dnl Dirty path hack. Helps some people with badly set up search paths. --if test "$prefix" = "NONE"; then -- LDFLAGS="$LDFLAGS -L$ac_default_prefix/lib" -- CPPFLAGS="$CPPFLAGS -I$ac_default_prefix/include" --else -- LDFLAGS="$LDFLAGS -L$prefix/lib" -- CPPFLAGS="$CPPFLAGS -I$prefix/include" --fi -+# This is really dumb code -+#dnl Dirty path hack. Helps some people with badly set up search paths. -+#if test "$prefix" = "NONE"; then -+# LDFLAGS="$LDFLAGS -L$ac_default_prefix/lib" -+# CPPFLAGS="$CPPFLAGS -I$ac_default_prefix/include" -+#else -+# LDFLAGS="$LDFLAGS -L$prefix/lib" -+# CPPFLAGS="$CPPFLAGS -I$prefix/include" -+#fi - - dnl Checks for libraries. - ye_CHECK_LIBM diff --git a/meta-oe/recipes-support/enca/enca/dont-run-tests.patch b/meta-oe/recipes-support/enca/enca/dont-run-tests.patch index 321d1e6201..1d0170bd73 100644 --- a/meta-oe/recipes-support/enca/enca/dont-run-tests.patch +++ b/meta-oe/recipes-support/enca/enca/dont-run-tests.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Index: enca-1.9/Makefile.am =================================================================== --- enca-1.9.orig/Makefile.am 2005-11-24 11:21:32.000000000 +0100 diff --git a/meta-oe/recipes-support/enca/enca/libenca-003-iconv.patch b/meta-oe/recipes-support/enca/enca/libenca-003-iconv.patch index dbf0fb8ea7..2112d8cfab 100644 --- a/meta-oe/recipes-support/enca/enca/libenca-003-iconv.patch +++ b/meta-oe/recipes-support/enca/enca/libenca-003-iconv.patch @@ -8,6 +8,8 @@ This patch come straight from the Buildroot source tree. Signed-off-by: Bernd Kuhls <berndkuhls@hotmail.com> Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com> --- +Upstream-Status: Pending + m4/libiconv.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -17,12 +19,12 @@ index fc8c6f8..3a59549 100644 +++ b/m4/libiconv.m4 @@ -17,7 +17,7 @@ AC_REQUIRE([AC_C_CONST])dnl dnl - + dnl Use standard iconv test -AM_ICONV +m4_pattern_allow([AM_ICONV]) - CONVERTOR_LIBS="$CONVERTOR_LIBS $LIBICONV" - + CONVERTER_LIBS="$CONVERTER_LIBS $LIBICONV" + dnl Compile iconvcap.c and run it to determine what encodings iconv actually -- 1.9.3 diff --git a/meta-oe/recipes-support/enca/enca/makefile-remove-tools.patch b/meta-oe/recipes-support/enca/enca/makefile-remove-tools.patch index accfbccd6b..756745d839 100644 --- a/meta-oe/recipes-support/enca/enca/makefile-remove-tools.patch +++ b/meta-oe/recipes-support/enca/enca/makefile-remove-tools.patch @@ -1,7 +1,8 @@ ---- enca-1.9/Makefile.am.orig 2006-06-29 15:34:55.000000000 +0100 -+++ enca-1.9/Makefile.am 2006-06-29 15:35:20.000000000 +0100 -@@ -1,8 +1,8 @@ - # @(#) $Id: Makefile.am,v 1.35 2005/11/24 10:21:32 yeti Exp $ +Upstream-Status: Pending + +--- enca-1.19/Makefile.am.orig 2006-06-29 15:34:55.000000000 +0100 ++++ enca-1.19/Makefile.am 2006-06-29 15:35:20.000000000 +0100 +@@ -1,7 +1,7 @@ if MAINTAINER_MODE -SUBDIRS = tools data script lib src devel-docs test +SUBDIRS = data script lib src devel-docs test diff --git a/meta-oe/recipes-support/enca/enca_1.9.bb b/meta-oe/recipes-support/enca/enca_1.19.bb index bf19843b2f..774f05f7c4 100644 --- a/meta-oe/recipes-support/enca/enca_1.9.bb +++ b/meta-oe/recipes-support/enca/enca_1.19.bb @@ -1,30 +1,27 @@ SUMMARY = "Enca is an Extremely Naive Charset Analyser" SECTION = "libs" -HOMEPAGE = "http://trific.ath.cx/software/enca/" +HOMEPAGE = "https://cihar.com/software/enca/" DEPENDS += "gettext-native" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=24b9569831c46d4818450b55282476b4" -SRC_URI = "http://www.sourcefiles.org/Networking/Tools/Miscellanenous/enca-${PV}.tar.bz2 \ - file://configure-hack.patch \ +SRC_URI = "https://dl.cihar.com/enca/enca-${PV}.tar.gz \ file://dont-run-tests.patch \ - file://configure-remove-dumbness.patch \ file://makefile-remove-tools.patch \ - file://libenca-003-iconv.patch " - -SRC_URI[md5sum] = "b3581e28d68d452286fb0bfe58bed3b3" -SRC_URI[sha256sum] = "02acfef2b24a9c842612da49338138311f909f1cd33933520c07b8b26c410f4d" + file://libenca-003-iconv.patch \ + file://0001-Do-not-use-MKTEMP_PROG-in-cross-build.patch" +SRC_URI[sha256sum] = "4c305cc59f3e57f2cfc150a6ac511690f43633595760e1cb266bf23362d72f8a" inherit autotools -do_configure_prepend() { +do_configure:prepend() { # remove failing test which checks for something that isn't even used sed -i -e '/ye_FUNC_SCANF_MODIF_SIZE_T/d' ${S}/configure.ac } -do_configure_append() { +do_configure:append() { sed -i s:-I/usr/include::g ${B}/Makefile sed -i s:-I/usr/include::g ${B}/*/Makefile } diff --git a/meta-oe/recipes-support/enchant/enchant2_2.2.3.bb b/meta-oe/recipes-support/enchant/enchant2_2.2.3.bb deleted file mode 100644 index 42150c88f3..0000000000 --- a/meta-oe/recipes-support/enchant/enchant2_2.2.3.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "Enchant Spell checker API Library v2" -SECTION = "libs" -HOMEPAGE = "https://abiword.github.io/enchant/" -LICENSE = "LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=a916467b91076e631dd8edb7424769c7" - -DEPENDS = "glib-2.0" - -inherit autotools pkgconfig - -SRC_URI = "https://github.com/AbiWord/enchant/releases/download/v${PV}/enchant-${PV}.tar.gz" -SRC_URI[md5sum] = "4b8abb58e00e93363591b3f5ea4f52d5" -SRC_URI[sha256sum] = "abd8e915675cff54c0d4da5029d95c528362266557c61c7149d53fa069b8076d" - -S = "${WORKDIR}/enchant-${PV}" - -EXTRA_OEMAKE = "pkgdatadir=${datadir}/enchant-2" - -PACKAGECONFIG ??= "hunspell" -PACKAGECONFIG[aspell] = "--with-aspell,--without-aspell,aspell,aspell" -PACKAGECONFIG[hunspell] = "--with-hunspell,--without-hunspell,hunspell,hunspell" - -FILES_${PN} += " \ - ${datadir}/enchant-2 \ - ${libdir}/enchant-2 \ -" diff --git a/meta-oe/recipes-support/epeg/epeg/0001-configure-Fix-checks-for-libjpeg-and-libexif.patch b/meta-oe/recipes-support/epeg/epeg/0001-configure-Fix-checks-for-libjpeg-and-libexif.patch new file mode 100644 index 0000000000..1568fe96e1 --- /dev/null +++ b/meta-oe/recipes-support/epeg/epeg/0001-configure-Fix-checks-for-libjpeg-and-libexif.patch @@ -0,0 +1,32 @@ +From 4e0c62634b0db6dbad0d41377bb71a8012abd75b Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 1 Sep 2022 12:56:54 -0700 +Subject: [PATCH] configure: Fix checks for libjpeg and libexif + +Use the functions from the respective library instead of using main +function which is not part of library + +Upstream-Status: Submitted [https://github.com/mattes/epeg/pull/27] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index a4f6ebd..e474b1d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -31,8 +31,8 @@ AC_SUBST(version_info) + dnl AC_CHECK_FUNCS(fmemopen) + dnl AC_CHECK_FUNCS(open_memstream) + +-AC_CHECK_LIB([jpeg], [main], [], [echo "libjpeg library not found. Please install it before proceeding"; exit -1]) +-AC_CHECK_LIB([exif], [main], [], [echo "libexif library not found. Please install it before proceeding"; exit -1]) ++AC_CHECK_LIB([jpeg], [jpeg_simple_progression], [], [echo "libjpeg library not found. Please install it before proceeding"; exit -1]) ++AC_CHECK_LIB([exif], [exif_data_new_from_file], [], [echo "libexif library not found. Please install it before proceeding"; exit -1]) + + my_includes="" + my_libs="-ljpeg -lexif" +-- +2.37.3 + diff --git a/meta-oe/recipes-support/epeg/epeg_git.bb b/meta-oe/recipes-support/epeg/epeg_git.bb index 6b23bbf78c..e5277b1579 100644 --- a/meta-oe/recipes-support/epeg/epeg_git.bb +++ b/meta-oe/recipes-support/epeg/epeg_git.bb @@ -5,8 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e7732a9290ea1e4b034fdc15cf49968d \ file://COPYING-PLAIN;md5=f59cacc08235a546b0c34a5422133035" DEPENDS = "jpeg libexif" -SRC_URI = "git://github.com/mattes/epeg.git" -SRCREV = "337f55346425fbf2d283e794b702318ef2a74bcb" +SRC_URI = "git://github.com/mattes/epeg.git;branch=master;protocol=https \ + file://0001-configure-Fix-checks-for-libjpeg-and-libexif.patch \ + " +SRCREV = "9a175cd67eaa61fe45413d8da82da72936567047" S = "${WORKDIR}/git" inherit autotools pkgconfig diff --git a/meta-oe/recipes-support/espeak/espeak_1.48.04.bb b/meta-oe/recipes-support/espeak/espeak_1.48.04.bb index 78f8f85c96..147a8069fa 100644 --- a/meta-oe/recipes-support/espeak/espeak_1.48.04.bb +++ b/meta-oe/recipes-support/espeak/espeak_1.48.04.bb @@ -1,11 +1,12 @@ DESCRIPTION = "eSpeak is a compact open source software speech synthesizer" SECTION = "base" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://License.txt;md5=cb7a20edb4c9f5f478de6523dcd7362c" SRC_URI = "http://downloads.sourceforge.net/espeak/espeak-1.48.04-source.zip \ file://0001-Fix-build-of-shared-library-on-architectures-needing.patch \ file://0002-tr_languages-cast-string_ordinal-init-values.patch \ + file://0001-Drop-using-register-keyword-for-storage-classifier.patch \ " SRC_URI[md5sum] = "cadd7482eaafe9239546bdc09fa244c3" SRC_URI[sha256sum] = "bf9a17673adffcc28ff7ea18764f06136547e97bbd9edf2ec612f09b207f0659" @@ -19,7 +20,7 @@ inherit siteinfo qemu CXXFLAGS += "-DUSE_PORTAUDIO" TARGET_CC_ARCH += "${LDFLAGS}" -FILES_${PN} += "${datadir}/espeak-data" +FILES:${PN} += "${datadir}/espeak-data" do_configure() { # "speak" binary, a TTS engine, uses portaudio in either APIs V18 or V19, use V19 @@ -64,4 +65,4 @@ do_install() { cp -R --no-dereference --preserve=mode,links ${S}/espeak-data/* ${D}${datadir}/espeak-data } -RDEPENDS_${PN} = "portaudio-v19" +RDEPENDS:${PN} = "portaudio-v19" diff --git a/meta-oe/recipes-support/espeak/files/0001-Drop-using-register-keyword-for-storage-classifier.patch b/meta-oe/recipes-support/espeak/files/0001-Drop-using-register-keyword-for-storage-classifier.patch new file mode 100644 index 0000000000..d9c0d08ec9 --- /dev/null +++ b/meta-oe/recipes-support/espeak/files/0001-Drop-using-register-keyword-for-storage-classifier.patch @@ -0,0 +1,38 @@ +From bad6131463275bd8013a82c28fb0b27e882bc801 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 18 Jan 2023 16:07:35 -0800 +Subject: [PATCH] Drop using 'register' keyword for storage classifier + +Its gone from C++17 and newer + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/klatt.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/klatt.cpp b/src/klatt.cpp +index b15f77c..9c51bc5 100755 +--- a/src/klatt.cpp ++++ b/src/klatt.cpp +@@ -167,7 +167,7 @@ Output = (rnz.a * input) + (rnz.b * oldin1) + (rnz.c * oldin2) + #ifdef deleted + static double antiresonator(resonator_ptr r, double input) + { +- register double x = (double)r->a * (double)input + (double)r->b * (double)r->p1 + (double)r->c * (double)r->p2; ++ double x = (double)r->a * (double)input + (double)r->b * (double)r->p1 + (double)r->c * (double)r->p2; + r->p2 = (double)r->p1; + r->p1 = (double)input; + return (double)x; +@@ -176,7 +176,7 @@ static double antiresonator(resonator_ptr r, double input) + + static double antiresonator2(resonator_ptr r, double input) + { +- register double x = (double)r->a * (double)input + (double)r->b * (double)r->p1 + (double)r->c * (double)r->p2; ++ double x = (double)r->a * (double)input + (double)r->b * (double)r->p1 + (double)r->c * (double)r->p2; + r->p2 = (double)r->p1; + r->p1 = (double)input; + +-- +2.39.1 + diff --git a/meta-oe/recipes-support/espeak/files/0001-Fix-build-of-shared-library-on-architectures-needing.patch b/meta-oe/recipes-support/espeak/files/0001-Fix-build-of-shared-library-on-architectures-needing.patch index 2590e15841..144c30a62f 100644 --- a/meta-oe/recipes-support/espeak/files/0001-Fix-build-of-shared-library-on-architectures-needing.patch +++ b/meta-oe/recipes-support/espeak/files/0001-Fix-build-of-shared-library-on-architectures-needing.patch @@ -10,6 +10,8 @@ patch doesn't affect such architectures. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- +Upstream-Status: Pending + src/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/evemu-tools/evemu-tools_git.bb b/meta-oe/recipes-support/evemu-tools/evemu-tools_git.bb new file mode 100644 index 0000000000..491f10dda0 --- /dev/null +++ b/meta-oe/recipes-support/evemu-tools/evemu-tools_git.bb @@ -0,0 +1,21 @@ +SUMMARY = "Kernel evdev device emulation" +DESCRIPTION = "The evemu library and tools are used to describe devices, record data, create devices and replay data from kernel evdev devices." +HOMEPAGE = "https://www.freedesktop.org/wiki/Evemu" + +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02" + +DEPENDS = "libevdev" + +SRCREV = "86a5627dbeac8d9d9bc34326a758d6a477e876e4" +SRC_URI = "git://git@gitlab.freedesktop.org/libevdev/evemu.git;protocol=https;branch=master" + +S = "${WORKDIR}/git" +PV = "2.7.0+git" + +inherit autotools pkgconfig + +PACKAGES =+ "${PN}-python" +FILES:${PN}-python = "${libdir}/python*/site-packages/*" +RDEPENDS:${PN}-python = "python3" + diff --git a/meta-oe/recipes-support/exiv2/exiv2_0.27.1.bb b/meta-oe/recipes-support/exiv2/exiv2_0.27.1.bb deleted file mode 100644 index 97116ee2d1..0000000000 --- a/meta-oe/recipes-support/exiv2/exiv2_0.27.1.bb +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "Exif, Iptc and XMP metadata manipulation library and tools" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=625f055f41728f84a8d7938acc35bdc2" - -DEPENDS = "zlib expat" - -SRC_URI = "https://exiv2.org/releases/${BPN}-${PV}-Source.tar.gz" -SRC_URI[md5sum] = "56d064517ae5903dd963b84514a121c1" -SRC_URI[sha256sum] = "f125286980fd1bcb28e188c02a93946951c61e10784720be2301b661a65b3081" - -S = "${WORKDIR}/${BPN}-${PV}-Source" - -inherit cmake gettext diff --git a/meta-oe/recipes-support/exiv2/exiv2_0.28.0.bb b/meta-oe/recipes-support/exiv2/exiv2_0.28.0.bb new file mode 100644 index 0000000000..958810cf7a --- /dev/null +++ b/meta-oe/recipes-support/exiv2/exiv2_0.28.0.bb @@ -0,0 +1,19 @@ +SUMMARY = "Exif, Iptc and XMP metadata manipulation library and tools" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=625f055f41728f84a8d7938acc35bdc2" + +DEPENDS = "zlib expat brotli libinih" + +SRC_URI = "https://github.com/Exiv2/${BPN}/releases/download/v${PV}/${BP}-Source.tar.gz" +SRC_URI[sha256sum] = "89af3b5ef7277753ef7a7b5374ae017c6b9e304db3b688f1948e73e103491f3d" +# Once patch is obsolete (project should be aware due to PRs), dos2unix can be removed either +# inherit dos2unix +S = "${WORKDIR}/${BP}-Source" + +inherit cmake gettext + +do_install:append:class-target() { + # reproducibility: remove build host path + sed -i ${D}${libdir}/cmake/exiv2/exiv2Config.cmake \ + -e 's:${STAGING_DIR_HOST}::g' +} diff --git a/meta-oe/recipes-support/farsight/libnice_0.1.16.bb b/meta-oe/recipes-support/farsight/libnice_0.1.16.bb deleted file mode 100644 index 7bd6478d4c..0000000000 --- a/meta-oe/recipes-support/farsight/libnice_0.1.16.bb +++ /dev/null @@ -1,40 +0,0 @@ -SUMMARY = "Interactive Connectivity Establishment library" -DESCRIPTION = "Libnice is an implementation of the IETF's draft Interactive Connectivity Establishment standard (ICE)." -HOMEPAGE = "http://nice.freedesktop.org/wiki/" - -LICENSE = "LGPLv2.1 & MPLv1.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=9c42325015702feda4f4d2f19a55b767 \ - file://COPYING.LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ - file://COPYING.MPL;md5=3c617710e51cdbe0fc00716f056dfb1a \ -" - -SRC_URI = "http://nice.freedesktop.org/releases/libnice-${PV}.tar.gz" -SRC_URI[md5sum] = "5ad936c43d3c6d33117b2c64982f2fd9" -SRC_URI[sha256sum] = "06b678066f94dde595a4291588ed27acd085ee73775b8c4e8399e28c01eeefdf" - -DEPENDS = "glib-2.0 gnutls" - -PACKAGECONFIG ??= "gstreamer1.0" -PACKAGECONFIG[gupnp] = "--enable-gupnp,--disable-gupnp,gupnp-igd" -PACKAGECONFIG[gstreamer1.0] = "--with-gstreamer,--without-gstreamer,gstreamer1.0 gstreamer1.0-plugins-base" - -inherit autotools pkgconfig gtk-doc gobject-introspection - -EXTRA_OECONF += "--without-gstreamer-0.10" - -FILES_${PN} += "${libdir}/gstreamer-1.0/*.so" -FILES_${PN}-dev += "${libdir}/gstreamer-1.0/*.la" -FILES_${PN}-staticdev += "${libdir}/gstreamer-1.0/*.a" -FILES_${PN}-dbg += "${libdir}/gstreamer-1.0/.debug" - -do_configure_prepend() { - mkdir ${S}/m4 || true -} - -do_compile_append() { - for i in $(find ${B} -name "*.pc") ; do - sed -i -e s:${STAGING_DIR_TARGET}::g \ - -e s:/${TARGET_SYS}::g \ - $i - done -} diff --git a/meta-oe/recipes-support/fbset/fbset-2.1/makefile.patch b/meta-oe/recipes-support/fbset/fbset-2.1/makefile.patch index 82b1c61e9c..730bb7a965 100644 --- a/meta-oe/recipes-support/fbset/fbset-2.1/makefile.patch +++ b/meta-oe/recipes-support/fbset/fbset-2.1/makefile.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + --- fbset-2.1/Makefile.orig 2006-05-28 04:04:27.412095480 +0200 +++ fbset-2.1/Makefile 2006-05-28 04:14:05.379231120 +0200 @@ -2,7 +2,7 @@ diff --git a/meta-oe/recipes-support/fbset/fbset-modes.bb b/meta-oe/recipes-support/fbset/fbset-modes.bb index b768553323..fcaf31795b 100644 --- a/meta-oe/recipes-support/fbset/fbset-modes.bb +++ b/meta-oe/recipes-support/fbset/fbset-modes.bb @@ -4,18 +4,19 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" PV = "0.1.0" -PR = "r6" SRC_URI = "file://fb.modes" -S = "${WORKDIR}" + +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" do_install() { install -d ${D}${sysconfdir} - install -m 0644 ${WORKDIR}/fb.modes ${D}${sysconfdir} + install -m 0644 ${UNPACKDIR}/fb.modes ${D}${sysconfdir} } # fb.modes file is MACHINE_ARCH, base.bbclass correctly changes it to MACHINE_ARCH, but too late for allarch.bbclass # to disable "all" behavior (found when comparing qemuarm and qemux86 signatures) PACKAGE_ARCH = "${MACHINE_ARCH}" -CONFFILES_${PN} = "${sysconfdir}/fb.modes" +CONFFILES:${PN} = "${sysconfdir}/fb.modes" diff --git a/meta-oe/recipes-support/fbset/fbset_2.1.bb b/meta-oe/recipes-support/fbset/fbset_2.1.bb index fbf834da18..690fee0df3 100644 --- a/meta-oe/recipes-support/fbset/fbset_2.1.bb +++ b/meta-oe/recipes-support/fbset/fbset_2.1.bb @@ -7,14 +7,13 @@ SUMMARY = "The fbset console tool" HOMEPAGE = "http://users.telenet.be/geertu/Linux/fbdev/" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://fbset.c;endline=19;md5=bf326f82cdfcac391af208f019c5603f" -RRECOMMENDS_${PN} = "fbset-modes" +RRECOMMENDS:${PN} = "fbset-modes" DEPENDS = "bison-native flex-native" -PR = "r4" -SRC_URI = "http://ftp.debian.org/debian/pool/main/f/fbset/fbset_2.1.orig.tar.gz \ +SRC_URI = "${DEBIAN_MIRROR}/main/f/fbset/fbset_2.1.orig.tar.gz \ file://makefile.patch \ file://fbset-2.1-fix-makefile-dep.patch \ file://0001-fbset-including-asm-types.h-is-needed-on-all-linux-s.patch \ @@ -29,7 +28,7 @@ do_install() { install -m 0644 ${B}/*.8 ${D}${datadir}/man/man8 } -ALTERNATIVE_fbset = "fbset" +ALTERNATIVE:fbset = "fbset" ALTERNATIVE_LINK_NAME[fbset] = "${sbindir}/fbset" ALTERNATIVE_TARGET[fbset] = "${sbindir}/fbset.real" ALTERNATIVE_PRIORITY[fbset] = "55" diff --git a/meta-oe/recipes-support/fftw/fftw/install-bench.patch b/meta-oe/recipes-support/fftw/fftw/install-bench.patch new file mode 100644 index 0000000000..237c1c0c5c --- /dev/null +++ b/meta-oe/recipes-support/fftw/fftw/install-bench.patch @@ -0,0 +1,43 @@ +Upstream-Status: Pending + +--- ./tests/Makefile.am.orig 2021-03-23 11:45:12.756371739 -0400 ++++ ./tests/Makefile.am 2021-03-23 19:29:19.692180793 -0400 +@@ -1,21 +1,21 @@ + AM_CPPFLAGS = -I $(top_srcdir) +-noinst_PROGRAMS = bench ++bin_PROGRAMS = bench@PREC_SUFFIX@ + EXTRA_DIST = check.pl README + + if THREADS +-bench_CFLAGS = $(PTHREAD_CFLAGS) ++bench@PREC_SUFFIX@_CFLAGS = $(PTHREAD_CFLAGS) + if !COMBINED_THREADS + LIBFFTWTHREADS = $(top_builddir)/threads/libfftw3@PREC_SUFFIX@_threads.la + endif + else + if OPENMP +-bench_CFLAGS = $(OPENMP_CFLAGS) ++bench@PREC_SUFFIX@_CFLAGS = $(OPENMP_CFLAGS) + LIBFFTWTHREADS = $(top_builddir)/threads/libfftw3@PREC_SUFFIX@_omp.la + endif + endif + +-bench_SOURCES = bench.c hook.c fftw-bench.c fftw-bench.h +-bench_LDADD = $(LIBFFTWTHREADS) \ ++bench@PREC_SUFFIX@_SOURCES = bench.c hook.c fftw-bench.c fftw-bench.h ++bench@PREC_SUFFIX@_LDADD = $(LIBFFTWTHREADS) \ + $(top_builddir)/libfftw3@PREC_SUFFIX@.la \ + $(top_builddir)/libbench2/libbench2.a $(THREADLIBS) + +--- ./tools/Makefile.am.orig 2021-03-24 08:22:31.845581620 -0400 ++++ ./tools/Makefile.am 2021-03-24 08:24:26.454053573 -0400 +@@ -24,7 +24,7 @@ + endif + + fftw@PREC_SUFFIX@_wisdom_SOURCES = fftw-wisdom.c +-fftw@PREC_SUFFIX@_wisdom_LDADD = $(top_builddir)/tests/bench-bench.o \ +-$(top_builddir)/tests/bench-fftw-bench.o $(LIBFFTWTHREADS) \ ++fftw@PREC_SUFFIX@_wisdom_LDADD = $(top_builddir)/tests/bench@PREC_SUFFIX@-bench.o \ ++$(top_builddir)/tests/bench@PREC_SUFFIX@-fftw-bench.o $(LIBFFTWTHREADS) \ + $(top_builddir)/libfftw3@PREC_SUFFIX@.la \ + $(top_builddir)/libbench2/libbench2.a $(THREADLIBS) diff --git a/meta-oe/recipes-support/fftw/fftw/run-ptest b/meta-oe/recipes-support/fftw/fftw/run-ptest new file mode 100644 index 0000000000..4d19057975 --- /dev/null +++ b/meta-oe/recipes-support/fftw/fftw/run-ptest @@ -0,0 +1,27 @@ +#!/bin/sh + +cd fftw +/usr/bin/perl -w ./check.pl -r -c=30 -v `pwd`/bench +fftw_result=$? +cd ../fftwf +/usr/bin/perl -w ./check.pl -r -c=30 -v `pwd`/benchf +fftwf_result=$? +cd ../fftwl +/usr/bin/perl -w ./check.pl -r -c=30 -v `pwd`/benchl +fftwl_result=$? + +if [ $fftw_result = "0" ]; then + echo "PASS: fftw" +else + echo "FAIL: fftw" +fi +if [ $fftwf_result = "0" ]; then + echo "PASS: fftwf" +else + echo "FAIL: fftwf" +fi +if [ $fftwl_result = "0" ]; then + echo "PASS: fftwl" +else + echo "FAIL: fftwl" +fi diff --git a/meta-oe/recipes-support/fftw/fftw_3.3.8.bb b/meta-oe/recipes-support/fftw/fftw_3.3.10.bb index d9e0ea3409..af7117da7b 100644 --- a/meta-oe/recipes-support/fftw/fftw_3.3.8.bb +++ b/meta-oe/recipes-support/fftw/fftw_3.3.10.bb @@ -1,16 +1,17 @@ DESCRIPTION = "FFTW" SECTION = "libs" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" SRC_URI = " \ http://www.fftw.org/fftw-${PV}.tar.gz \ file://0001-NEON-autodetection-segfaults-assume-neon-present.patch \ + file://install-bench.patch \ + file://run-ptest \ " -SRC_URI[md5sum] = "8aac833c943d8e90d51b697b27d4384d" -SRC_URI[sha256sum] = "6113262f6e92c5bd474f2875fa1b01054c4ad5040f6b0da7c03c98821d9ae303" +SRC_URI[sha256sum] = "56c932549852cddcfafdab3820b0200c7742675be92179e59e6215b340e26467" -inherit autotools pkgconfig +inherit autotools pkgconfig ptest # we had multiple recipes in the past PROVIDES = "fftwl fftwf" @@ -22,8 +23,8 @@ CFLAGS += "-D_GNU_SOURCE" # neon is optional for arm version < 8 -> check tune features FFTW_NEON = "${@bb.utils.contains('TUNE_FEATURES', 'neon', '--enable-neon', '', d)}" # neon is suppored for arm version = 8 -> enable -FFTW_NEON_aarch64 = "--enable-neon" -FFTW_NEON_class-native = "" +FFTW_NEON:aarch64 = "--enable-neon" +FFTW_NEON:class-native = "" do_configure() { # configure fftw @@ -54,6 +55,7 @@ do_configure() { do_compile() { for lib in fftw fftwl fftwf; do cd ${WORKDIR}/build-$lib + test -n "${TOOLCHAIN_OPTIONS}" && sed -i -e 's|${TOOLCHAIN_OPTIONS}||g' config.h autotools_do_compile done } @@ -65,19 +67,37 @@ do_install() { done } +do_install_ptest() { + for lib in fftw fftwl fftwf; do + install -d ${D}${PTEST_PATH}/$lib + install -m 0755 ${S}/tests/check.pl ${D}${PTEST_PATH}/$lib + cd ${WORKDIR}/build-$lib + if [ $lib = "fftw" ]; then + mv ${D}${bindir}/bench ${D}${PTEST_PATH}/$lib + fi + if [ $lib = "fftwl" ]; then + mv ${D}${bindir}/benchl ${D}${PTEST_PATH}/$lib + fi + if [ $lib = "fftwf" ]; then + mv ${D}${bindir}/benchf ${D}${PTEST_PATH}/$lib + fi + done +} PACKAGES =+ "libfftw libfftwl libfftwf" -FILES_libfftw = "${libdir}/libfftw3.so.* ${libdir}/libfftw3_*.so.*" -FILES_libfftwl = "${libdir}/libfftw3l.so.* ${libdir}/libfftw3l_*.so.*" -FILES_libfftwf = "${libdir}/libfftw3f.so.* ${libdir}/libfftw3f_*.so.*" +FILES:libfftw = "${libdir}/libfftw3.so.* ${libdir}/libfftw3_*.so.*" +FILES:libfftwl = "${libdir}/libfftw3l.so.* ${libdir}/libfftw3l_*.so.*" +FILES:libfftwf = "${libdir}/libfftw3f.so.* ${libdir}/libfftw3f_*.so.*" PACKAGES =+ "fftw-wisdom fftwl-wisdom fftwf-wisdom fftw-wisdom-to-conf" -FILES_fftw-wisdom = "${bindir}/fftw-wisdom" -FILES_fftwl-wisdom = "${bindir}/fftwl-wisdom" -FILES_fftwf-wisdom = "${bindir}/fftwf-wisdom" -FILES_fftw-wisdom-to-conf = "${bindir}/fftw-wisdom-to-conf" +FILES:fftw-wisdom = "${bindir}/fftw-wisdom" +FILES:fftwl-wisdom = "${bindir}/fftwl-wisdom" +FILES:fftwf-wisdom = "${bindir}/fftwf-wisdom" +FILES:fftw-wisdom-to-conf = "${bindir}/fftw-wisdom-to-conf" -FILES_${PN}-dev += "${libdir}/cmake" -RDEPENDS_${PN}-dev = "libfftw libfftwl libfftwf" +FILES:${PN}-dev += "${libdir}/cmake" +RDEPENDS:${PN}-dev = "libfftw libfftwl libfftwf" +RDEPENDS:${PN}-ptest += "perl" +RDEPENDS:${PN}-ptest:remove = "fftw" -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/fltk/fltk-native.bb b/meta-oe/recipes-support/fltk/fltk-native.bb index 2636287e3a..3e8e2cdf77 100644 --- a/meta-oe/recipes-support/fltk/fltk-native.bb +++ b/meta-oe/recipes-support/fltk/fltk-native.bb @@ -2,6 +2,8 @@ require ${BPN}.inc DEPENDS = "zlib-native jpeg-native libpng-native libxext-native libxft-native" +SRC_URI += "file://fltk-native-link-libdl.patch" + inherit native EXTRA_OECMAKE += " \ @@ -9,13 +11,13 @@ EXTRA_OECMAKE += " \ -DOPTION_USE_THREADS=OFF \ -DOPTION_USE_XDBE=OFF \ -DOPTION_USE_XFT=OFF \ - -DOPTION_BUILD_EXAMPLES=OFF \ + -DFLTK_BUILD_TEST=OFF \ -DOPTION_USE_XINERAMA=OFF \ -DOPTION_USE_XFIXES=OFF \ -DOPTION_USE_XCURSOR=OFF \ " -do_install_append() { +do_install:append() { # make sure native fltk-config is not used accidentaly rm -f ${D}${bindir}/fltk-config } diff --git a/meta-oe/recipes-support/fltk/fltk.bb b/meta-oe/recipes-support/fltk/fltk.bb index 0d033f3610..82007c4cf4 100644 --- a/meta-oe/recipes-support/fltk/fltk.bb +++ b/meta-oe/recipes-support/fltk/fltk.bb @@ -2,17 +2,15 @@ require ${BPN}.inc DEPENDS = "alsa-lib zlib jpeg libpng libxext libxft" -inherit features_check binconfig lib_package gtk-icon-cache mime +inherit features_check binconfig lib_package gtk-icon-cache mime mime-xdg REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI += " \ - file://0003-CMake-build-Force-shared-libs-with-unsuffixed-names.patch \ - file://0004-Fix-build-error-when-enable-package-config-examples.patch \ -" +SRC_URI += "file://0003-fluid-CMakeLists.txt-Do-not-export-fluid-target.patch" EXTRA_OECMAKE = " \ -DOPTION_BUILD_SHARED_LIBS=ON \ -DOPTION_USE_THREADS=ON \ + -DFLTK_BUILD_TEST=OFF \ -DOPTION_USE_XDBE=ON \ -DOPTION_USE_XFT=ON \ -DFLTK_CONFIG_PATH=${libdir}/cmake \ @@ -20,30 +18,31 @@ EXTRA_OECMAKE = " \ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)}" -PACKAGECONFIG[examples] = "-DOPTION_BUILD_EXAMPLES=ON,-DOPTION_BUILD_EXAMPLES=OFF,fltk-native" PACKAGECONFIG[cairo] = "-DOPTION_CAIRO=ON,-DOPTION_CAIRO=OFF,cairo" PACKAGECONFIG[opengl] = "-DOPTION_USE_GL=ON,-DOPTION_USE_GL=OFF,virtual/libgl" PACKAGECONFIG[xinerama] = "-DOPTION_USE_XINERAMA=ON,-DOPTION_USE_XINERAMA=OFF,libxinerama" PACKAGECONFIG[xfixes] = "-DOPTION_USE_XFIXES=ON,-DOPTION_USE_XFIXES=OFF,libxfixes" PACKAGECONFIG[xcursor] = "-DOPTION_USE_XCURSOR=ON,-DOPTION_USE_XCURSOR=OFF,libxcursor" -do_install_append() { - sed -i -e 's,${STAGING_DIR_HOST},,g' ${D}${bindir}/fltk-config +do_install:append() { + sed -i -e 's,${TMPDIR},,g' ${D}${bindir}/fltk-config + sed -i -e 's,${TMPDIR},,g' ${D}${datadir}/fltk/UseFLTK.cmake + sed -i -e 's,${TMPDIR},,g' ${D}${datadir}/fltk/FLTK-Targets.cmake } -python populate_packages_prepend () { +python populate_packages:prepend () { if (d.getVar('DEBIAN_NAMES')): - d.setVar('PKG_${BPN}', 'libfltk${PV}') + d.setVar('PKG:${BPN}', 'libfltk${PV}') } LEAD_SONAME = "libfltk.so" # .desktop / icons / mime only necessary for fluid app -FILES_${PN}-bin += " \ +FILES:${PN}-bin += " \ ${datadir}/applications \ ${datadir}/icons \ ${datadir}/mime \ " # cmake files -FILES_${PN}-dev += "${datadir}/fltk" +FILES:${PN}-dev += "${datadir}/fltk" diff --git a/meta-oe/recipes-support/fltk/fltk.inc b/meta-oe/recipes-support/fltk/fltk.inc index 97a1fbfc7e..b1bc83578f 100644 --- a/meta-oe/recipes-support/fltk/fltk.inc +++ b/meta-oe/recipes-support/fltk/fltk.inc @@ -1,7 +1,7 @@ SUMMARY = "FLTK is a cross-platform C++ GUI toolkit" HOMEPAGE = "http://www.fltk.org" SECTION = "libs" -LICENSE = "LGPLv2 & FLTK" +LICENSE = "LGPL-2.0-only & FLTK" LIC_FILES_CHKSUM = "file://COPYING;md5=f6b26344a24a941a01a5b0826e80b5ca" SRC_URI = " \ @@ -11,9 +11,8 @@ SRC_URI = " \ file://0002-always-build-fluid-and-export-pointers.patch \ " -PV = "1.3.5" -SRC_URI[md5sum] = "0de2b45a1896be2b4a8cafae89b84248" -SRC_URI[sha256sum] = "2933c72400f9e7c0f4c3a81a1ce98bc9582b2a3edc44b8597ccd26e240e32c3c" +PV = "1.3.8" +SRC_URI[sha256sum] = "1d9832409fc08c908c64ab40ad9fd8b0e8af5d203651eb9690b810f41e2f412d" inherit cmake pkgconfig diff --git a/meta-oe/recipes-support/fltk/fltk/0001-Fl_Preferences.cxx-do-not-use-dlopen-in-case-glibc-s.patch b/meta-oe/recipes-support/fltk/fltk/0001-Fl_Preferences.cxx-do-not-use-dlopen-in-case-glibc-s.patch index e6e68a0cb8..d1cbb35479 100644 --- a/meta-oe/recipes-support/fltk/fltk/0001-Fl_Preferences.cxx-do-not-use-dlopen-in-case-glibc-s.patch +++ b/meta-oe/recipes-support/fltk/fltk/0001-Fl_Preferences.cxx-do-not-use-dlopen-in-case-glibc-s.patch @@ -18,6 +18,8 @@ Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> --- +Upstream-Status: Pending + src/Fl_Preferences.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/fltk/fltk/0002-always-build-fluid-and-export-pointers.patch b/meta-oe/recipes-support/fltk/fltk/0002-always-build-fluid-and-export-pointers.patch index cca977c66d..0d91aab3a1 100644 --- a/meta-oe/recipes-support/fltk/fltk/0002-always-build-fluid-and-export-pointers.patch +++ b/meta-oe/recipes-support/fltk/fltk/0002-always-build-fluid-and-export-pointers.patch @@ -1,6 +1,6 @@ From 16010cb1a69ea2326d8102b7f1e34b65aca4b278 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Tue, 28 Feb 2017 01:20:42 +0100 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Sat, 22 May 2021 12:33:15 +0200 Subject: [PATCH] always build fluid and export pointers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -8,24 +8,24 @@ Content-Transfer-Encoding: 8bit Upstream-Status: Inappropriate [embedded specific] -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> --- CMake/export.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMake/export.cmake b/CMake/export.cmake -index 968186a..95e04eb 100644 +index 6e8bc5d..71b6f6c 100644 --- a/CMake/export.cmake +++ b/CMake/export.cmake -@@ -21,7 +21,7 @@ - # final config and export +@@ -20,7 +20,7 @@ ####################################################################### + # Set the fluid executable path --if(CMAKE_CROSSCOMPILING) -+if(FALSE) - find_file(FLUID_PATH - NAMES fluid fluid.exe - PATHS ENV PATH +-if (CMAKE_CROSSCOMPILING) ++if (FALSE) + find_file(FLUID_PATH + NAMES fluid fluid.exe + PATHS ENV PATH -- -2.9.3 +2.31.1 diff --git a/meta-oe/recipes-support/fltk/fltk/0003-CMake-build-Force-shared-libs-with-unsuffixed-names.patch b/meta-oe/recipes-support/fltk/fltk/0003-CMake-build-Force-shared-libs-with-unsuffixed-names.patch deleted file mode 100644 index 1f2f8aecf7..0000000000 --- a/meta-oe/recipes-support/fltk/fltk/0003-CMake-build-Force-shared-libs-with-unsuffixed-names.patch +++ /dev/null @@ -1,41 +0,0 @@ -From bc38fb41044503c9debf5710910c51dd29674b6a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> -Date: Fri, 15 Dec 2017 22:14:01 +0100 -Subject: [PATCH] CMake build: Force shared libs with unsuffixed names -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -For windows build sake CMake complains when a project wants to build shared and -static libraries with same name. This caused the authors of fltk to generate -libraries with names suffixed by '_SHARED' when building fltk with cmake - -autotools builds do not suffix. - -Reasons to build shared libs with correct names: - -* Shared libraries are the preferred choice for embedded devices -* There are projects (e.g yoshimi) expecting shared libraries with unsuffixed - names - as created by autotools build. These projects link against static - libraries by accident causing unusable binaries. - -Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> ---- - CMake/macros.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMake/macros.cmake b/CMake/macros.cmake -index 4def62d..ab675f0 100644 ---- a/CMake/macros.cmake -+++ b/CMake/macros.cmake -@@ -49,7 +49,7 @@ macro(FL_ADD_LIBRARY LIBNAME LIBTYPE LIBFILES) - PROPERTIES - VERSION ${FLTK_VERSION_FULL} - SOVERSION ${FLTK_VERSION_MAJOR}.${FLTK_VERSION_MINOR} -- PREFIX "lib" # for MSVC static/shared coexistence -+ OUTPUT_NAME ${LIBNAME} CLEAN_DIRECT_OUTPUT 1 - ) - endif (${LIBTYPE} STREQUAL "SHARED") - --- -2.9.5 - diff --git a/meta-oe/recipes-support/fltk/fltk/0003-fluid-CMakeLists.txt-Do-not-export-fluid-target.patch b/meta-oe/recipes-support/fltk/fltk/0003-fluid-CMakeLists.txt-Do-not-export-fluid-target.patch new file mode 100644 index 0000000000..72bb48a32c --- /dev/null +++ b/meta-oe/recipes-support/fltk/fltk/0003-fluid-CMakeLists.txt-Do-not-export-fluid-target.patch @@ -0,0 +1,42 @@ +From b6985abcb03fb09685da4044963e8f085035b208 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Thu, 19 Aug 2021 08:06:45 +0200 +Subject: [PATCH] fluid/CMakeLists.txt: Do not export fluid target +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +It does not work for us: The executable 'fluid' is not installed in +receipe-sysroot. So fltk cmake config contains an invalid reference. +Consumers of fltk using cmake will fail during configure for this invalid +reference with something like: + +| CMake Error at <...>/recipe-sysroot/usr/share/fltk/FLTK-Targets.cmake:129 (message): +| The imported target "fluid" references the file +| +| "<...>/recipe-sysroot/usr/bin/fluid" +| +| but this file does not exist. + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + fluid/CMakeLists.txt | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/fluid/CMakeLists.txt b/fluid/CMakeLists.txt +index 472c84c..f971121 100644 +--- a/fluid/CMakeLists.txt ++++ b/fluid/CMakeLists.txt +@@ -86,7 +86,6 @@ if (APPLE AND (NOT OPTION_APPLE_X11)) + install (TARGETS fluid DESTINATION ${FLTK_BINDIR}) + else() + install (TARGETS fluid +- EXPORT FLTK-Targets + RUNTIME DESTINATION ${FLTK_BINDIR} + LIBRARY DESTINATION ${FLTK_LIBDIR} + ARCHIVE DESTINATION ${FLTK_LIBDIR} +-- +2.31.1 + diff --git a/meta-oe/recipes-support/fltk/fltk/0004-Fix-build-error-when-enable-package-config-examples.patch b/meta-oe/recipes-support/fltk/fltk/0004-Fix-build-error-when-enable-package-config-examples.patch deleted file mode 100644 index 974c02fe61..0000000000 --- a/meta-oe/recipes-support/fltk/fltk/0004-Fix-build-error-when-enable-package-config-examples.patch +++ /dev/null @@ -1,182 +0,0 @@ -Fix build error when enable package config examples. - -Upstream-Status: Backport [https://github.com/fltk/fltk/commit/16774dd] - -Signed-off-by: Kai Kang <kai.kang@windriver.com> - - -From 16774ddc4e000c89e560fde0ced8be9814ef041e Mon Sep 17 00:00:00 2001 -From: Albrecht Schlosser <albrechts.fltk@online.de> -Date: Wed, 8 Feb 2017 02:06:52 +0000 -Subject: [PATCH] Rename test/help demo program to test/help_dialog. - -This change avoids a name conflict with CMake's auto-generated target 'help' -for "Unix Makefiles", "Ninja", and supposedly other generators as well. - - -git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12171 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 ---- - CMake/macros.cmake | 5 ----- - documentation/src/examples.dox | 8 +++---- - test/CMakeLists.txt | 27 +++++++++++++++++++---- - test/demo.menu | 2 +- - test/{help.cxx => help_dialog.cxx} | 6 ++--- - test/{help-test.html => help_dialog.html} | 0 - 6 files changed, 31 insertions(+), 17 deletions(-) - rename test/{help.cxx => help_dialog.cxx} (88%) - rename test/{help-test.html => help_dialog.html} (100%) - -diff --git a/CMake/macros.cmake b/CMake/macros.cmake -index 5b0d0fa..7134fcb 100644 ---- a/CMake/macros.cmake -+++ b/CMake/macros.cmake -@@ -90,11 +90,6 @@ function(CREATE_EXAMPLE NAME SOURCES LIBRARIES) - - set (tname ${NAME}) # target name - -- # rename reserved target name "help" (CMake 2.8.12 and later) -- if (${tname} MATCHES "^help$") -- set (tname "test_help") -- endif (${tname} MATCHES "^help$") -- - foreach(src ${SOURCES}) - if ("${src}" MATCHES "\\.fl$") - list(APPEND flsrcs ${src}) -diff --git a/documentation/src/examples.dox b/documentation/src/examples.dox -index 5105b7b..7961b02 100644 ---- a/documentation/src/examples.dox -+++ b/documentation/src/examples.dox -@@ -60,7 +60,7 @@ you build FLTK, unlike those in the 'test' directory shown below. - </tr> - <tr> - <td> \ref examples_hello </td> --<td> \ref examples_help </td> -+<td> \ref examples_help_dialog </td> - <td> \ref examples_iconize </td> - <td> \ref examples_image </td> - <td> \ref examples_inactive </td> -@@ -326,13 +326,13 @@ easily under FLTK. - tiny demo shows how little is needed to get a functioning application - running with FLTK. Quite impressive, I'd say. - --\subsection examples_help help -+\subsection examples_help_dialog help_dialog - - \par --\c help displays the built-in FLTK help browser. The -+\c help_dialog displays the built-in FLTK help browser. The - Fl_Help_Dialog understands a subset of html and renders - various image formats. This widget makes it easy to provide help --pages to the user without depending on the operating system's -+pages to the user without depending on the operating system's - html browser. - - \subsection examples_iconize iconize -diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt -index 22ec9ab..4caffa5 100644 ---- a/test/CMakeLists.txt -+++ b/test/CMakeLists.txt -@@ -1,3 +1,22 @@ -+# -+# "$Id$" -+# -+# CMakeLists.txt used to build test and demo apps by the CMake build system -+# -+# Copyright 2004-2017 by Bill Spitzak and others. -+# -+# This library is free software. Distribution and use rights are outlined in -+# the file "COPYING" which should have been included with this file. If this -+# file is missing or damaged, see the license at: -+# -+# http://www.fltk.org/COPYING.php -+# -+# Please report all bugs and problems on the following page: -+# -+# http://www.fltk.org/str.php -+# -+####################################################################### -+ - set(EXECUTABLE_OUTPUT_PATH ${FLTK_BINARY_DIR}/bin/examples) - - ####################################################################### -@@ -64,7 +83,7 @@ CREATE_EXAMPLE(file_chooser file_chooser.cxx "fltk;fltk_images") - CREATE_EXAMPLE(fonts fonts.cxx fltk) - CREATE_EXAMPLE(forms forms.cxx "fltk;fltk_forms") - CREATE_EXAMPLE(hello hello.cxx fltk) --CREATE_EXAMPLE(help help.cxx "fltk;fltk_images") -+CREATE_EXAMPLE(help_dialog help_dialog.cxx "fltk;fltk_images") - CREATE_EXAMPLE(icon icon.cxx fltk) - CREATE_EXAMPLE(iconize iconize.cxx fltk) - CREATE_EXAMPLE(image image.cxx fltk) -@@ -134,7 +153,7 @@ endif(FLTK_HAVE_CAIRO) - # Note: this is incomplete as of 11 Feb 2015 - # Todo: currently all files are copied, but some of them need configuration: - # - demo.menu: fluid can't be started (wrong path) --# - demo.menu: help (help-test.html) can't find its images (not copied) -+# - demo.menu: help_dialog (help_dialog.html) can't find its images (not copied) - # - maybe more ... - - # prepare for a "better" test file installation path -@@ -149,11 +168,11 @@ configure_file(demo.menu ${TESTFILE_PATH}/demo.menu COPYONLY) - - # use target directory only to avoid redundancy - configure_file(rgb.txt ${TESTFILE_PATH} COPYONLY) --configure_file(help-test.html ${TESTFILE_PATH} COPYONLY) -+configure_file(help_dialog.html ${TESTFILE_PATH} COPYONLY) - configure_file(browser.cxx ${TESTFILE_PATH} COPYONLY) - configure_file(editor.cxx ${TESTFILE_PATH} COPYONLY) - if(APPLE AND NOT OPTION_APPLE_X11) - configure_file(browser.cxx "${TESTFILE_PATH}/browser.app/Contents/Resources/browser.cxx" COPYONLY) - configure_file(rgb.txt ${TESTFILE_PATH}/colbrowser.app/Contents/Resources/rgb.txt COPYONLY) -- configure_file(help-test.html ${TESTFILE_PATH}/help.app/Contents/Resources/help-test.html COPYONLY) -+ configure_file(help_dialog.html ${TESTFILE_PATH}/help_dialog.app/Contents/Resources/help_dialog.html COPYONLY) - endif(APPLE AND NOT OPTION_APPLE_X11) -diff --git a/test/demo.menu b/test/demo.menu -index 337a71c..97e522a 100644 ---- a/test/demo.menu -+++ b/test/demo.menu -@@ -77,7 +77,7 @@ - @o:Font Tests...:@of - @of:Fonts:fonts - @of:UTF-8:utf8 -- @o:HelpDialog:help -+ @o:HelpDialog:help_dialog - @o:Input Choice:input_choice - @o:Preferences:preferences - @o:Threading:threads -diff --git a/test/help.cxx b/test/help_dialog.cxx -similarity index 88% -rename from test/help.cxx -rename to test/help_dialog.cxx -index f5c51d6..7866641 100644 ---- a/test/help.cxx -+++ b/test/help_dialog.cxx -@@ -3,7 +3,7 @@ - // - // Fl_Help_Dialog test program. - // --// Copyright 1999-2010 by Easy Software Products. -+// Copyright 2011-2017 by Bill Spitzak and others. - // - // This library is free software. Distribution and use rights are outlined in - // the file "COPYING" which should have been included with this file. If this -@@ -46,13 +46,13 @@ main(int argc, // I - Number of command-line arguments - strcpy(buf, argv[0]); - char *slash = strrchr(buf, '/'); - if (slash) -- strcpy(slash, "/../Resources/help-test.html"); -+ strcpy(slash, "/../Resources/help_dialog.html"); - help->load(buf); - - #else - - if (argc <= 1) -- help->load("help-test.html"); -+ help->load("help_dialog.html"); - else - help->load(argv[1]); - -diff --git a/test/help-test.html b/test/help_dialog.html -similarity index 100% -rename from test/help-test.html -rename to test/help_dialog.html diff --git a/meta-oe/recipes-support/fltk/fltk/disable_test.patch b/meta-oe/recipes-support/fltk/fltk/disable_test.patch index 1f5fd25e04..fe8be5a652 100644 --- a/meta-oe/recipes-support/fltk/fltk/disable_test.patch +++ b/meta-oe/recipes-support/fltk/fltk/disable_test.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + --- a/Makefile.orig 2015-11-26 15:35:31.485357862 +0800 +++ b/Makefile 2015-11-26 15:35:37.037357764 +0800 @@ -18,7 +18,7 @@ diff --git a/meta-oe/recipes-support/fltk/fltk/fltk-native-link-libdl.patch b/meta-oe/recipes-support/fltk/fltk/fltk-native-link-libdl.patch new file mode 100644 index 0000000000..e140ce2166 --- /dev/null +++ b/meta-oe/recipes-support/fltk/fltk/fltk-native-link-libdl.patch @@ -0,0 +1,44 @@ +Upstream-Status: Inappropriate [cross build specific] + +It fails to build fltk-native on Ubuntu 20.04 with glibc 2.31: + +| /path_to/tmp/hosttools/ld: lib/libfltk.a(Fl_Native_File_Chooser.cxx.o): in function `fl_dlopen(char const*, char const*)': +| Fl_Native_File_Chooser.cxx:(.text+0x61a): undefined reference to `dlopen' +| /path_to/tmp/hosttools/ld: lib/libfltk.a(Fl_Native_File_Chooser.cxx.o): in function `Fl_GTK_File_Chooser::probe_for_GTK_libs()': +| Fl_Native_File_Chooser.cxx:(.text+0xf92): undefined reference to `dlerror' + +The original fix in fltk-native recipe does not work any more because '-ldl' +appears before lib/libfltk.a and causes dlopen() unresolved. The reason why it +doesn't fail on other hosts is that the functions dlopen(), dlerror() etc. have +been moved to libc.so since glibc 2.34 via the commits in glibc: + +0c1c3a771e dlfcn: Move dlopen into libc +add8d7ea01 dlfcn: Move dlvsym into libc +6dfc0207eb dlfcn: Move dlinfo into libc +492560a32e dlfcn: Move dladdr1 into libc +6a1ed32789 dlfcn: Move dlmopen into libc +77f876c0e3 dlfcn: Move dlsym into libc +602252b553 dlfcn: Move dladdr into libc +d8cce17d2a dlfcn: Move dlclose into libc + +Append 'dl' to fltk link items explictly to fix the error. + +Signed-off-by: Kai Kang <kai.kang@windriver.com> + +--- + src/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index d153b1c..0fe5c11 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -306,7 +306,7 @@ endif (USE_XFT) + ####################################################################### + + FL_ADD_LIBRARY (fltk STATIC "${STATIC_FILES}") +-target_link_libraries (fltk ${OPTIONAL_LIBS}) ++target_link_libraries (fltk ${OPTIONAL_LIBS} dl) + + ####################################################################### + diff --git a/meta-oe/recipes-support/fmt/fmt_6.0.0.bb b/meta-oe/recipes-support/fmt/fmt_10.2.1.bb index c35c77b125..1437eb4803 100644 --- a/meta-oe/recipes-support/fmt/fmt_6.0.0.bb +++ b/meta-oe/recipes-support/fmt/fmt_10.2.1.bb @@ -2,14 +2,15 @@ SUMMARY = "open-source formatting library for C++" DESCRIPTION = "{fmt} is an open-source formatting library for C++. It can be used as a safe and fast alternative to (s)printf and iostreams." HOMEPAGE = "https://fmt.dev" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=af88d758f75f3c5c48a967501f24384b" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b9257785fc4f3803a4b71b76c1412729" -SRC_URI += "git://github.com/fmtlib/fmt" -SRCREV = "7512a55aa3ae309587ca89668ef9ec4074a51a1f" +SRC_URI = "git://github.com/fmtlib/fmt;branch=10.x;protocol=https" +SRCREV = "e69e5f977d458f2650bb346dadf2ad30c5320281" S = "${WORKDIR}/git" inherit cmake -inherit ptest EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/freerdp/freerdp/0001-Fix-const-qualifier-error.patch b/meta-oe/recipes-support/freerdp/freerdp/0001-Fix-const-qualifier-error.patch new file mode 100644 index 0000000000..87a456d16d --- /dev/null +++ b/meta-oe/recipes-support/freerdp/freerdp/0001-Fix-const-qualifier-error.patch @@ -0,0 +1,57 @@ +From 761b4df04a141cc8c9507c741e4046c6c6b00491 Mon Sep 17 00:00:00 2001 +From: Wang Mingyu <wangmy@fujitsu.com> +Date: Mon, 11 Sep 2023 09:00:39 +0000 +Subject: [PATCH] Fix const qualifier error + +Fixes clang error +error: incompatible function pointer types assigning to 'OBJECT_NEW_FN' (aka 'void *(*)(void *)') from 'void *(const void *)' [-Wincompatible-function-pointer-types] +| obj->fnObjectNew = uwac_event_clone; +| ^ ~~~~~~~~~~~~~~~~ + +https://github.com/FreeRDP/FreeRDP/commit/6e3c00725aae99d03a0baa65430eceddebd9dee8 +Upstream-Status: Backport + +Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> +--- + libfreerdp/codec/rfx.c | 4 ++-- + winpr/include/winpr/collections.h | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/libfreerdp/codec/rfx.c b/libfreerdp/codec/rfx.c +index ccbc5af..eec7365 100644 +--- a/libfreerdp/codec/rfx.c ++++ b/libfreerdp/codec/rfx.c +@@ -153,7 +153,7 @@ static void rfx_tile_init(void* obj) + } + } + +-static void* rfx_decoder_tile_new(void* val) ++static void* rfx_decoder_tile_new(const void* val) + { + RFX_TILE* tile = NULL; + WINPR_UNUSED(val); +@@ -184,7 +184,7 @@ static void rfx_decoder_tile_free(void* obj) + } + } + +-static void* rfx_encoder_tile_new(void* val) ++static void* rfx_encoder_tile_new(const void* val) + { + WINPR_UNUSED(val); + return calloc(1, sizeof(RFX_TILE)); +diff --git a/winpr/include/winpr/collections.h b/winpr/include/winpr/collections.h +index 807f011..b8c8d9d 100644 +--- a/winpr/include/winpr/collections.h ++++ b/winpr/include/winpr/collections.h +@@ -36,7 +36,7 @@ extern "C" + { + #endif + +- typedef void* (*OBJECT_NEW_FN)(void* val); ++ typedef void* (*OBJECT_NEW_FN)(const void* val); + typedef void (*OBJECT_INIT_FN)(void* obj); + typedef void (*OBJECT_UNINIT_FN)(void* obj); + typedef void (*OBJECT_FREE_FN)(void* obj); +-- +2.34.1 + diff --git a/meta-oe/recipes-support/freerdp/freerdp/0001-Fixed-compilation-warnings-in-ainput-channel.patch b/meta-oe/recipes-support/freerdp/freerdp/0001-Fixed-compilation-warnings-in-ainput-channel.patch new file mode 100644 index 0000000000..62600cddab --- /dev/null +++ b/meta-oe/recipes-support/freerdp/freerdp/0001-Fixed-compilation-warnings-in-ainput-channel.patch @@ -0,0 +1,72 @@ +From 130094de3244d5039e463e1142e1ec487c1104ef Mon Sep 17 00:00:00 2001 +From: Armin Novak <armin.novak@thincast.com> +Date: Tue, 22 Feb 2022 12:05:08 +0100 +Subject: [PATCH] Fixed compilation warnings in ainput channel + +Upstream-Status: Backport [130094de3 Fixed compilation warnings in ainput channel] +Signed-off-by: Martin Jansa <martin.jansa@gmail.com> +--- + channels/ainput/server/ainput_main.c | 18 ++++++++++++------ + 1 file changed, 12 insertions(+), 6 deletions(-) + +diff --git a/channels/ainput/server/ainput_main.c b/channels/ainput/server/ainput_main.c +index bc1737ee1..17d2ec681 100644 +--- a/channels/ainput/server/ainput_main.c ++++ b/channels/ainput/server/ainput_main.c +@@ -192,7 +192,7 @@ static UINT ainput_server_recv_mouse_event(ainput_server* ainput, wStream* s) + + static HANDLE ainput_server_get_channel_handle(ainput_server* ainput) + { +- BYTE* buffer = NULL; ++ void* buffer = NULL; + DWORD BytesReturned = 0; + HANDLE ChannelEvent = NULL; + +@@ -389,7 +389,7 @@ ainput_server_context* ainput_server_context_new(HANDLE vcm) + goto fail; + return &ainput->context; + fail: +- ainput_server_context_free(ainput); ++ ainput_server_context_free(&ainput->context); + return NULL; + } + +@@ -496,17 +496,23 @@ UINT ainput_server_context_poll_int(ainput_server_context* context) + break; + case AINPUT_OPENED: + { +- BYTE* buffer = NULL; ++ union ++ { ++ BYTE* pb; ++ void* pv; ++ } buffer; + DWORD BytesReturned = 0; + +- if (WTSVirtualChannelQuery(ainput->ainput_channel, WTSVirtualChannelReady, &buffer, ++ buffer.pv = NULL; ++ ++ if (WTSVirtualChannelQuery(ainput->ainput_channel, WTSVirtualChannelReady, &buffer.pv, + &BytesReturned) != TRUE) + { + WLog_ERR(TAG, "WTSVirtualChannelReady failed,"); + } + else + { +- if (*buffer != 0) ++ if (*buffer.pb != 0) + { + error = ainput_server_send_version(ainput); + if (error) +@@ -518,7 +524,7 @@ UINT ainput_server_context_poll_int(ainput_server_context* context) + else + error = CHANNEL_RC_OK; + } +- WTSFreeMemory(buffer); ++ WTSFreeMemory(buffer.pv); + } + break; + case AINPUT_VERSION_SENT: +-- +2.43.0 + diff --git a/meta-oe/recipes-support/freerdp/freerdp/0001-Fixed-compilation-warnings.patch b/meta-oe/recipes-support/freerdp/freerdp/0001-Fixed-compilation-warnings.patch new file mode 100644 index 0000000000..7fae2703f8 --- /dev/null +++ b/meta-oe/recipes-support/freerdp/freerdp/0001-Fixed-compilation-warnings.patch @@ -0,0 +1,27 @@ +From 75fa1fa5bd5ef2350390564245fd0984209ac092 Mon Sep 17 00:00:00 2001 +From: akallabeth <akallabeth@posteo.net> +Date: Mon, 4 Jul 2022 14:34:46 +0200 +Subject: [PATCH] Fixed compilation warnings + +Upstream-Status: Backport [https://github.com/FreeRDP/FreeRDP/commit/2da280b8a1748052b70b3f5a1ef0d8e932c33adc] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + client/X11/xf_graphics.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/client/X11/xf_graphics.c b/client/X11/xf_graphics.c +index 5aa1fd48b..fe81e0ed9 100644 +--- a/client/X11/xf_graphics.c ++++ b/client/X11/xf_graphics.c +@@ -438,7 +438,7 @@ static BOOL xf_Pointer_New(rdpContext* context, rdpPointer* pointer) + + #endif + fail: +- WLog_DBG(TAG, "%s: %ld", __func__, rc ? pointer : -1); ++ WLog_DBG(TAG, "%s: %p", __func__, rc ? pointer : NULL); + return rc; + } + +-- +2.45.0 + diff --git a/meta-oe/recipes-support/freerdp/freerdp/0002-Do-not-install-tools-a-CMake-targets.patch b/meta-oe/recipes-support/freerdp/freerdp/0002-Do-not-install-tools-a-CMake-targets.patch new file mode 100644 index 0000000000..2e5e6a4240 --- /dev/null +++ b/meta-oe/recipes-support/freerdp/freerdp/0002-Do-not-install-tools-a-CMake-targets.patch @@ -0,0 +1,45 @@ +From 0ddaeae351295e48365657482f165652051bbca2 Mon Sep 17 00:00:00 2001 +From: Andreas Cord-Landwehr <cordlandwehr@kde.org> +Date: Wed, 17 Jan 2024 20:00:58 +0100 +Subject: [PATCH] Do not install tools a CMake targets + +The cli tools are installed manually and thus are missing in the sysroot +folder. Do not export their targets because they do not exist and make +CMake fail when searching for the library. + +Upstream-Status: Inappropriate +Signed-off-by: Andreas Cord-Landwehr <cordlandwehr@kde.org> +--- + winpr/tools/hash-cli/CMakeLists.txt | 2 +- + winpr/tools/makecert-cli/CMakeLists.txt | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/winpr/tools/hash-cli/CMakeLists.txt b/winpr/tools/hash-cli/CMakeLists.txt +index 9f8c7a8a0..b6d048fec 100644 +--- a/winpr/tools/hash-cli/CMakeLists.txt ++++ b/winpr/tools/hash-cli/CMakeLists.txt +@@ -43,7 +43,7 @@ set(${MODULE_PREFIX}_LIBS winpr) + + target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS}) + +-install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT tools EXPORT WinPRTargets) ++install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT tools) + + if (WITH_DEBUG_SYMBOLS AND MSVC) + install(FILES ${CMAKE_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT symbols) +diff --git a/winpr/tools/makecert-cli/CMakeLists.txt b/winpr/tools/makecert-cli/CMakeLists.txt +index 48fda5b5e..c7cf4bfaf 100644 +--- a/winpr/tools/makecert-cli/CMakeLists.txt ++++ b/winpr/tools/makecert-cli/CMakeLists.txt +@@ -46,7 +46,7 @@ target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS} winpr) + + set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "WinPR/Tools") + +-install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT tools EXPORT WinPRTargets) ++install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT tools) + if (WITH_DEBUG_SYMBOLS AND MSVC) + install(FILES ${CMAKE_PDB_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT symbols) + endif() +-- +2.40.1 + diff --git a/meta-oe/recipes-support/freerdp/freerdp/winpr-makecert-Build-with-install-RPATH.patch b/meta-oe/recipes-support/freerdp/freerdp/winpr-makecert-Build-with-install-RPATH.patch index 0f6f575d02..914f08087b 100644 --- a/meta-oe/recipes-support/freerdp/freerdp/winpr-makecert-Build-with-install-RPATH.patch +++ b/meta-oe/recipes-support/freerdp/freerdp/winpr-makecert-Build-with-install-RPATH.patch @@ -9,6 +9,8 @@ Update it for 2.0.0. Signed-off-by: Manuel Bachmann <manuel.bachmann@iot.bzh> Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> --- +Upstream-Status: Pending + winpr/tools/makecert-cli/CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-oe/recipes-support/freerdp/freerdp3_3.5.1.bb b/meta-oe/recipes-support/freerdp/freerdp3_3.5.1.bb new file mode 100644 index 0000000000..b6974af739 --- /dev/null +++ b/meta-oe/recipes-support/freerdp/freerdp3_3.5.1.bb @@ -0,0 +1,61 @@ +DESCRIPTION = "FreeRDP RDP client & server library" +HOMEPAGE = "http://www.freerdp.com" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +DEPENDS = "openssl libusb1 uriparser cairo icu pkcs11-helper zlib jpeg" + +inherit pkgconfig cmake + +SRCREV = "eda5c99686e15327f2f37b9cadf307e852b96adf" +SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;branch=master;protocol=https" + +S = "${WORKDIR}/git" + +PACKAGECONFIG ??= " \ + ${@bb.utils.filter('DISTRO_FEATURES', 'pam pulseaudio wayland x11', d)} \ + ${@bb.utils.contains('LICENSE_FLAGS_ACCEPTED', 'commercial', 'ffmpeg', '', d)} \ + gstreamer cups pcsc \ +" + +EXTRA_OECMAKE = " \ + -DRDTK_FORCE_STATIC_BUILD=ON \ + -DUWAC_FORCE_STATIC_BUILD=ON \ + -DWITH_ADD=ON \ + -DWITH_BINARY_VERSIONING=ON \ + -DWITH_CHANNELS=ON \ + -DWITH_CLIENT_CHANNELS=ON \ + -DWITH_JPEG=ON \ + -DWITH_PKCS11=ON \ + -DWITH_SERVER_CHANNELS=ON \ + -DWITH_SERVER=ON \ + -DPKG_CONFIG_RELOCATABLE=OFF \ + -DWITH_ALSA=OFF \ + -DWITH_CLIENT_SDL=OFF \ + -DWITH_SAMPLE=OFF \ + " + +X11_DEPS = "virtual/libx11 libxinerama libxext libxcursor libxv libxi libxrender libxfixes libxdamage libxrandr libxkbfile" +PACKAGECONFIG[x11] = "-DWITH_X11=ON -DWITH_XINERAMA=ON -DWITH_XEXT=ON -DWITH_XCURSOR=ON -DWITH_XV=ON -DWITH_XI=ON -DWITH_XRENDER=ON -DWITH_XFIXES=ON -DWITH_XDAMAGE=ON -DWITH_XRANDR=ON -DWITH_XKBFILE=ON,-DWITH_X11=OFF -DWITH_SHADOW=OFF,${X11_DEPS}" +PACKAGECONFIG[wayland] = "-DWITH_WAYLAND=ON,-DWITH_WAYLAND=OFF,wayland wayland-native libxkbcommon" +PACKAGECONFIG[pam] = "-DWITH_PAM=ON,-DWITH_PAM=OFF,libpam" +PACKAGECONFIG[pulseaudio] = "-DWITH_PULSEAUDIO=ON,-DWITH_PULSEAUDIO=OFF,pulseaudio" +PACKAGECONFIG[gstreamer] = "-DWITH_GSTREAMER_1_0=ON,-DWITH_GSTREAMER_1_0=OFF,gstreamer1.0 gstreamer1.0-plugins-base" +PACKAGECONFIG[cups] = "-DWITH_CUPS=ON,-DWITH_CUPS=OFF,cups" +PACKAGECONFIG[fuse] = "-DWITH_FUSE=ON,-DWITH_FUSE=OFF,fuse3,fuse3" +PACKAGECONFIG[pcsc] = "-DWITH_PCSC=ON,-DWITH_PCSC=OFF,pcsc-lite" +PACKAGECONFIG[manpages] = "-DWITH_MANPAGES=ON,-DWITH_MANPAGES=OFF, libxslt-native docbook-xsl-stylesheets-native" +PACKAGECONFIG[ffmpeg] = "-DWITH_DSP_FFMPEG=ON -DWITH_FFMPEG=ON -DWITH_SWSCALE=ON, -DWITH_DSP_FFMPEG=OFF -DWITH_FFMPEG=OFF -DWITH_SWSCALE=OFF,ffmpeg" +PACKAGECONFIG[krb5] = "-DWITH_KRB5=ON -DWITH_KRB5_NO_NTLM_FALLBACK=OFF,-DWITH_KRB5=OFF,krb5" +PACKAGECONFIG[openh264] = "-DWITH_OPENH264=ON,-DWITH_OPENH264=OFF,openh264" +PACKAGECONFIG[opencl] = "-DWITH_OPENCL=ON,-DWITH_OPENCL=OFF,opencl-icd-loader" +PACKAGECONFIG[lame] = "-DWITH_LAME=ON,-DWITH_LAME=OFF,lame" +PACKAGECONFIG[faad] = "-DWITH_FAAD=ON,-DWITH_FAAD=OFF,faad2" +PACKAGECONFIG[faac] = "-DWITH_FAAC=ON,-DWITH_FAAC=OFF,faac" + +do_configure:append() { + sed -i -e 's|${WORKDIR}||g' ${B}/include/freerdp/buildflags.h + sed -i -e 's|${WORKDIR}||g' ${B}/winpr/include/winpr/buildflags.h +} + +FILES:${PN} += "${datadir}" diff --git a/meta-oe/recipes-support/freerdp/freerdp_git.bb b/meta-oe/recipes-support/freerdp/freerdp_2.11.7.bb index 373c4979fd..ee4d4530d6 100644 --- a/meta-oe/recipes-support/freerdp/freerdp_git.bb +++ b/meta-oe/recipes-support/freerdp/freerdp_2.11.7.bb @@ -3,83 +3,91 @@ DESCRIPTION = "FreeRDP RDP client & server library" HOMEPAGE = "http://www.freerdp.com" -DEPENDS = "openssl alsa-lib pcsc-lite" +DEPENDS = "openssl alsa-lib libusb1" SECTION = "net" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" inherit pkgconfig cmake gitpkgv -PV = "2.0.0+gitr${SRCPV}" +PE = "1" PKGV = "${GITPKGVTAG}" -# 2.0.0-rc4 -SRCREV = "e21b72c95f857817b4b32b5ef5406355c005a9e8" -SRC_URI = "git://github.com/FreeRDP/FreeRDP.git \ - file://winpr-makecert-Build-with-install-RPATH.patch \ -" +SRCREV = "efa899d3deb8595a29fabb2a2251722f9d7e0d7f" +SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;branch=stable-2.0;protocol=https \ + file://winpr-makecert-Build-with-install-RPATH.patch \ + file://0001-Fixed-compilation-warnings.patch \ + file://0001-Fix-const-qualifier-error.patch \ + file://0002-Do-not-install-tools-a-CMake-targets.patch \ + file://0001-Fixed-compilation-warnings-in-ainput-channel.patch \ + " S = "${WORKDIR}/git" EXTRA_OECMAKE += " \ -DWITH_ALSA=ON \ - -DWITH_PCSC=ON \ -DWITH_FFMPEG=OFF \ -DWITH_CUNIT=OFF \ -DWITH_NEON=OFF \ -DBUILD_STATIC_LIBS=OFF \ -DCMAKE_POSITION_INDEPENDANT_CODE=ON \ -DWITH_MANPAGES=OFF \ + -DPROXY_PLUGINDIR=${libdir}/freerdp/proxy/plugins \ " PACKAGECONFIG ??= " \ ${@bb.utils.filter('DISTRO_FEATURES', 'directfb pam pulseaudio wayland x11', d)}\ - gstreamer cups \ + gstreamer cups pcsc server \ " X11_DEPS = "virtual/libx11 libxinerama libxext libxcursor libxv libxi libxrender libxfixes libxdamage libxrandr libxkbfile" PACKAGECONFIG[x11] = "-DWITH_X11=ON -DWITH_XINERAMA=ON -DWITH_XEXT=ON -DWITH_XCURSOR=ON -DWITH_XV=ON -DWITH_XI=ON -DWITH_XRENDER=ON -DWITH_XFIXES=ON -DWITH_XDAMAGE=ON -DWITH_XRANDR=ON -DWITH_XKBFILE=ON,-DWITH_X11=OFF,${X11_DEPS}" -PACKAGECONFIG[wayland] = "-DWITH_WAYLAND=ON,-DWITH_WAYLAND=OFF,wayland" +PACKAGECONFIG[wayland] = "-DWITH_WAYLAND=ON,-DWITH_WAYLAND=OFF,wayland wayland-native libxkbcommon" PACKAGECONFIG[directfb] = "-DWITH_DIRECTFB=ON,-DWITH_DIRECTFB=OFF,directfb" PACKAGECONFIG[pam] = "-DWITH_PAM=ON,-DWITH_PAM=OFF,libpam" +PACKAGECONFIG[pcsc] = "-DWITH_PCSC=ON,-DWITH_PCSC=OFF,pcsc-lite" PACKAGECONFIG[pulseaudio] = "-DWITH_PULSEAUDIO=ON,-DWITH_PULSEAUDIO=OFF,pulseaudio" PACKAGECONFIG[gstreamer] = "-DWITH_GSTREAMER_1_0=ON,-DWITH_GSTREAMER_1_0=OFF,gstreamer1.0 gstreamer1.0-plugins-base" PACKAGECONFIG[cups] = "-DWITH_CUPS=ON,-DWITH_CUPS=OFF,cups" +PACKAGECONFIG[server] = "-DWITH_SERVER=ON,-DWITH_SERVER=OFF" PACKAGES =+ "libfreerdp" LEAD_SONAME = "libfreerdp.so" -FILES_libfreerdp = "${libdir}/lib*${SOLIBS}" +FILES:libfreerdp = "${libdir}/lib*${SOLIBS}" PACKAGES_DYNAMIC += "^libfreerdp-plugin-.*" +do_configure:append() { + sed -i -e 's|${WORKDIR}||g' ${B}/buildflags.h +} + # we will need winpr-makecert to generate TLS certificates -do_install_append () { +do_install:append () { install -d ${D}${bindir} install -m755 winpr/tools/makecert-cli/winpr-makecert ${D}${bindir} - rm -rf ${D}${libdir}/cmake rm -rf ${D}${libdir}/freerdp } -python populate_packages_prepend () { +python populate_packages:prepend () { freerdp_root = d.expand('${libdir}/freerdp') - do_split_packages(d, freerdp_root, '^(audin_.*)\.so$', + do_split_packages(d, freerdp_root, r'^(audin_.*)\.so$', output_pattern='libfreerdp-plugin-%s', description='FreeRDP plugin %s', prepend=True, extra_depends='libfreerdp-plugin-audin') - do_split_packages(d, freerdp_root, '^(rdpsnd_.*)\.so$', + do_split_packages(d, freerdp_root, r'^(rdpsnd_.*)\.so$', output_pattern='libfreerdp-plugin-%s', description='FreeRDP plugin %s', prepend=True, extra_depends='libfreerdp-plugin-rdpsnd') - do_split_packages(d, freerdp_root, '^(tsmf_.*)\.so$', + do_split_packages(d, freerdp_root, r'^(tsmf_.*)\.so$', output_pattern='libfreerdp-plugin-%s', description='FreeRDP plugin %s', prepend=True, extra_depends='libfreerdp-plugin-tsmf') - do_split_packages(d, freerdp_root, '^([^-]*)\.so$', + do_split_packages(d, freerdp_root, r'^([^-]*)\.so$', output_pattern='libfreerdp-plugin-%s', description='FreeRDP plugin %s', prepend=True, extra_depends='') diff --git a/meta-oe/recipes-support/function2/function2_4.0.0.bb b/meta-oe/recipes-support/function2/function2_4.2.4.bb index 556a25aa14..98d05f6e25 100644 --- a/meta-oe/recipes-support/function2/function2_4.0.0.bb +++ b/meta-oe/recipes-support/function2/function2_4.2.4.bb @@ -3,10 +3,10 @@ DESCRIPTION = "Provides improved implementations of std::function." HOMEPAGE = "https://naios.github.io/function2" LICENSE = "BSL-1.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c" -SRCREV = "d2acdb6c3c7612a6133cd03464ef941161258f4e" -PV .= "+git${SRCPV}" +SRCREV = "a354bd093d2b6e50c9325dbce84d20b4e77aabc6" +PV .= "+git" -SRC_URI += "gitsm://github.com/Naios/function2" +SRC_URI += "gitsm://github.com/Naios/function2;branch=master;protocol=https" S = "${WORKDIR}/git" @@ -14,7 +14,7 @@ inherit cmake inherit ptest # Installs some data to incorrect top-level /usr directory -do_install_append() { +do_install:append() { mkdir -p ${D}/${datadir}/function2 mv ${D}/${prefix}/Readme.md ${D}/${datadir}/function2/ mv ${D}/${prefix}/LICENSE.txt ${D}/${datadir}/function2/ diff --git a/meta-oe/recipes-support/fuse/fuse3/fuse3.conf b/meta-oe/recipes-support/fuse/fuse3/fuse3.conf new file mode 100644 index 0000000000..a517c488f3 --- /dev/null +++ b/meta-oe/recipes-support/fuse/fuse3/fuse3.conf @@ -0,0 +1 @@ +fuse diff --git a/meta-oe/recipes-support/fuse/fuse3/run-ptest b/meta-oe/recipes-support/fuse/fuse3/run-ptest new file mode 100644 index 0000000000..b63c4de0d9 --- /dev/null +++ b/meta-oe/recipes-support/fuse/fuse3/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' diff --git a/meta-oe/recipes-support/fuse/fuse3_3.16.2.bb b/meta-oe/recipes-support/fuse/fuse3_3.16.2.bb new file mode 100644 index 0000000000..47b070557d --- /dev/null +++ b/meta-oe/recipes-support/fuse/fuse3_3.16.2.bb @@ -0,0 +1,98 @@ +SUMMARY = "Implementation of a fully functional filesystem in a userspace program" +DESCRIPTION = "FUSE (Filesystem in Userspace) is a simple interface for userspace \ + programs to export a virtual filesystem to the Linux kernel. FUSE \ + also aims to provide a secure method for non privileged users to \ + create and mount their own filesystem implementations. \ + " +HOMEPAGE = "https://github.com/libfuse/libfuse" +SECTION = "libs" +LICENSE = "GPL-2.0-only & LGPL-2.0-only" +LIC_FILES_CHKSUM = " \ + file://GPL2.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://LGPL2.txt;md5=4fbd65380cdd255951079008b364516c \ + file://LICENSE;md5=a55c12a2d7d742ecb41ca9ae0a6ddc66 \ +" + +SRC_URI = "https://github.com/libfuse/libfuse/releases/download/fuse-${PV}/fuse-${PV}.tar.gz" +SRC_URI[sha256sum] = "f797055d9296b275e981f5f62d4e32e089614fc253d1ef2985851025b8a0ce87" + +S = "${WORKDIR}/fuse-${PV}" + +UPSTREAM_CHECK_URI = "https://github.com/libfuse/libfuse/releases" +UPSTREAM_CHECK_REGEX = "fuse\-(?P<pver>3(\.\d+)+).tar.xz" + +CVE_PRODUCT = "fuse_project:fuse" + +inherit meson pkgconfig ptest + +SRC_URI += " \ + file://run-ptest \ + file://fuse3.conf \ +" + +RDEPENDS:${PN}-ptest += " \ + python3-pytest \ + python3-looseversion \ + bash \ +" +RRECOMMENDS:${PN}-ptest += " kernel-module-cuse" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/test + install -d ${D}${PTEST_PATH}/example + install -d ${D}${PTEST_PATH}/util + cp -rf ${S}/test/* ${D}${PTEST_PATH}/test/ + + example_excutables=`find ${B}/example -type f -executable` + util_excutables=`find ${B}/util -type f -executable` + test_excutables=`find ${B}/test -type f -executable` + + for e in $example_excutables + do + cp -rf $e ${D}${PTEST_PATH}/example/ + done + + for e in $util_excutables + do + cp -rf $e ${D}${PTEST_PATH}/util/ + done + + for e in $test_excutables + do + cp -rf $e ${D}${PTEST_PATH}/test + done +} + +DEPENDS = "udev" + +PACKAGES =+ "fuse3-utils" + +RPROVIDES:${PN}-dbg += "fuse3-utils-dbg" + +RRECOMMENDS:${PN}:class-target = "kernel-module-fuse fuse3-utils" + +FILES:${PN} += "${libdir}/libfuse3.so.*" +FILES:${PN}-dev += "${libdir}/libfuse3*.la" + +# Forbid auto-renaming to libfuse3-utils +FILES:fuse3-utils = "${bindir} ${base_sbindir}" +DEBIAN_NOAUTONAME:fuse3-utils = "1" +DEBIAN_NOAUTONAME:${PN}-dbg = "1" + +SYSTEMD_SERVICE:${PN} = "" + +do_install:append() { + rm -rf ${D}${base_prefix}/dev + + # systemd class remove the sysv_initddir only if systemd_system_unitdir + # contains anything, but it's not needed if sysvinit is not in DISTRO_FEATURES + if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'false', 'true', d)}; then + rm -rf ${D}${sysconfdir}/init.d/ + fi + + # Install systemd related configuration file + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${sysconfdir}/modules-load.d + install -m 0644 ${UNPACKDIR}/fuse3.conf ${D}${sysconfdir}/modules-load.d + fi +} diff --git a/meta-oe/recipes-support/gd/gd/0001-Fix-deprecared-function-prototypes.patch b/meta-oe/recipes-support/gd/gd/0001-Fix-deprecared-function-prototypes.patch new file mode 100644 index 0000000000..5ac5170721 --- /dev/null +++ b/meta-oe/recipes-support/gd/gd/0001-Fix-deprecared-function-prototypes.patch @@ -0,0 +1,115 @@ +From 6379331cd0647fc6f149f55e4505a9a92e4f159f Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 22 Aug 2022 22:43:26 -0700 +Subject: [PATCH] Fix deprecared function prototypes + +Fixes following errors: +error: a function definition without a prototype is deprecated in all versions of C and is not supported in C2x [-Werror,-Wdeprecated-non-prototype] + +Upstream-Status: Submitted [https://github.com/libgd/libgd/pull/835] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/gd_nnquant.c | 32 +++++++------------------------- + src/gd_tiff.c | 4 +--- + 2 files changed, 8 insertions(+), 28 deletions(-) + +diff --git a/src/gd_nnquant.c b/src/gd_nnquant.c +index 8b9aa794..013f7160 100644 +--- a/src/gd_nnquant.c ++++ b/src/gd_nnquant.c +@@ -112,12 +112,7 @@ typedef struct { + + /* Initialise network in range (0,0,0,0) to (255,255,255,255) and set parameters + ----------------------------------------------------------------------- */ +-static void initnet(nnq, thepic, len, sample, colours) +-nn_quant *nnq; +-unsigned char *thepic; +-int len; +-int sample; +-int colours; ++static void initnet(nn_quant *nnq, unsigned char *thepic, int len, int sample, int colours) + { + register int i; + register int *p; +@@ -163,9 +158,7 @@ static void unbiasnet(nn_quant *nnq) + } + + /* Output colormap to unsigned char ptr in RGBA format */ +-static void getcolormap(nnq, map) +-nn_quant *nnq; +-unsigned char *map; ++static void getcolormap(nn_quant *nnq, unsigned char *map) + { + int i,j; + for(j=0; j < nnq->netsize; j++) { +@@ -232,9 +225,7 @@ static void inxbuild(nn_quant *nnq) + + /* Search for ABGR values 0..255 (after net is unbiased) and return colour index + ---------------------------------------------------------------------------- */ +-static unsigned int inxsearch(nnq, al,b,g,r) +-nn_quant *nnq; +-register int al, b, g, r; ++static unsigned int inxsearch(nn_quant *nnq, int al, int b, int g, int r) + { + register int i, j, dist, a, bestd; + register int *p; +@@ -306,9 +297,7 @@ register int al, b, g, r; + + /* Search for biased ABGR values + ---------------------------- */ +-static int contest(nnq, al,b,g,r) +-nn_quant *nnq; +-register int al,b,g,r; ++static int contest(nn_quant *nnq, int al, int b, int g, int r) + { + /* finds closest neuron (min dist) and updates freq */ + /* finds best neuron (min dist-bias) and returns position */ +@@ -362,9 +351,7 @@ register int al,b,g,r; + /* Move neuron i towards biased (a,b,g,r) by factor alpha + ---------------------------------------------------- */ + +-static void altersingle(nnq, alpha,i,al,b,g,r) +-nn_quant *nnq; +-register int alpha,i,al,b,g,r; ++static void altersingle(nn_quant *nnq, int alpha, int i,int al, int b, int g, int r) + { + register int *n; + +@@ -382,10 +369,7 @@ register int alpha,i,al,b,g,r; + /* Move adjacent neurons by precomputed alpha*(1-((i-j)^2/[r]^2)) in radpower[|i-j|] + --------------------------------------------------------------------------------- */ + +-static void alterneigh(nnq, rad,i,al,b,g,r) +-nn_quant *nnq; +-int rad,i; +-register int al,b,g,r; ++static void alterneigh(nn_quant *nnq, int rad, int i, int al,int b,int g, int r) + { + register int j,k,lo,hi,a; + register int *p, *q; +@@ -429,9 +413,7 @@ register int al,b,g,r; + /* Main Learning Loop + ------------------ */ + +-static void learn(nnq, verbose) /* Stu: N.B. added parameter so that main() could control verbosity. */ +-nn_quant *nnq; +-int verbose; ++static void learn(nn_quant *nnq, int verbose) /* Stu: N.B. added parameter so that main() could control verbosity. */ + { + register int i,j,al,b,g,r; + int radius,rad,alpha,step,delta,samplepixels; +diff --git a/src/gd_tiff.c b/src/gd_tiff.c +index 7f72b610..3d90e61a 100644 +--- a/src/gd_tiff.c ++++ b/src/gd_tiff.c +@@ -446,9 +446,7 @@ BGD_DECLARE(void) gdImageTiffCtx(gdImagePtr image, gdIOCtx *out) + } + + /* Check if we are really in 8bit mode */ +-static int checkColorMap(n, r, g, b) +-int n; +-uint16_t *r, *g, *b; ++static int checkColorMap(int n, uint16_t *r, uint16_t *g, uint16_t *b) + { + while (n-- > 0) + if (*r++ >= 256 || *g++ >= 256 || *b++ >= 256) diff --git a/meta-oe/recipes-support/gd/gd/0001-annotate.c-gdft.c-Replace-strncpy-with-memccpy-to-fi.patch b/meta-oe/recipes-support/gd/gd/0001-annotate.c-gdft.c-Replace-strncpy-with-memccpy-to-fi.patch deleted file mode 100644 index c377b370e1..0000000000 --- a/meta-oe/recipes-support/gd/gd/0001-annotate.c-gdft.c-Replace-strncpy-with-memccpy-to-fi.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 85c7694a5cf34597909bdd1ca6931b0f99904c2e Mon Sep 17 00:00:00 2001 -From: Robert Yang <liezhi.yang@windriver.com> -Date: Tue, 19 Jun 2018 00:40:49 -0700 -Subject: [PATCH] annotate.c/gdft.c: Replace strncpy with memccpy to fix - -Wstringop-truncation. - -Fixed for gcc8: -git/src/gdft.c:1699:2: error: 'strncpy' output truncated before terminating nul copying as many bytes from a string as its length [-Werror=stringop-truncation] - -Upstream-Status: Submitted [https://github.com/libgd/libgd/pull/442] - -Signed-off-by: Robert Yang <liezhi.yang@windriver.com> ---- - src/annotate.c | 2 +- - src/gdft.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/annotate.c b/src/annotate.c -index 00aaf49..17df813 100644 ---- a/src/annotate.c -+++ b/src/annotate.c -@@ -104,7 +104,7 @@ int main(int argc, char *argv[]) - fprintf(stderr, "Font maximum length is 1024, %d given\n", font_len); - goto badLine; - } -- strncpy(font, st, font_len); -+ memcpy(font, st, font_len); - } - } else if(!strcmp(st, "align")) { - char *st = strtok(0, " \t\r\n"); -diff --git a/src/gdft.c b/src/gdft.c -index 9fa8295..81dbe41 100644 ---- a/src/gdft.c -+++ b/src/gdft.c -@@ -1696,7 +1696,7 @@ static char * font_path(char **fontpath, char *name_list) - gdFree(path); - return "could not alloc full list of fonts"; - } -- strncpy(fontlist, name_list, name_list_len); -+ memcpy(fontlist, name_list, name_list_len); - fontlist[name_list_len] = 0; - - /* --- -2.10.2 - diff --git a/meta-oe/recipes-support/gd/gd/CVE-2018-1000222.patch b/meta-oe/recipes-support/gd/gd/CVE-2018-1000222.patch deleted file mode 100644 index 25924d1aa0..0000000000 --- a/meta-oe/recipes-support/gd/gd/CVE-2018-1000222.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 4b1e18a00ce7c4b7e6919c3b3109a034393b805a Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Sat, 14 Jul 2018 13:54:08 -0400 -Subject: [PATCH] bmp: check return value in gdImageBmpPtr - -Closes #447. - -(cherry picked from commit ac16bdf2d41724b5a65255d4c28fb0ec46bc42f5) - -Upstream-Status: Backport [https://github.com/libgd/libgd/commit/4b1e18a00ce7c4b7e6919c3b3109a034393b805a] -CVE: CVE-2018-1000222 -Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> ---- - src/gd_bmp.c | 17 ++++++++++++++--- - 1 file changed, 14 insertions(+), 3 deletions(-) - -diff --git a/src/gd_bmp.c b/src/gd_bmp.c -index ccafdcd..d625da1 100644 ---- a/src/gd_bmp.c -+++ b/src/gd_bmp.c -@@ -48,6 +48,8 @@ static int bmp_read_4bit(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t *info, bmp - static int bmp_read_8bit(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t *info, bmp_hdr_t *header); - static int bmp_read_rle(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t *info); - -+static int _gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression); -+ - #define BMP_DEBUG(s) - - static int gdBMPPutWord(gdIOCtx *out, int w) -@@ -88,8 +90,10 @@ BGD_DECLARE(void *) gdImageBmpPtr(gdImagePtr im, int *size, int compression) - void *rv; - gdIOCtx *out = gdNewDynamicCtx(2048, NULL); - if (out == NULL) return NULL; -- gdImageBmpCtx(im, out, compression); -- rv = gdDPExtractData(out, size); -+ if (!_gdImageBmpCtx(im, out, compression)) -+ rv = gdDPExtractData(out, size); -+ else -+ rv = NULL; - out->gd_free(out); - return rv; - } -@@ -142,6 +146,11 @@ BGD_DECLARE(void) gdImageBmp(gdImagePtr im, FILE *outFile, int compression) - compression - whether to apply RLE or not. - */ - BGD_DECLARE(void) gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression) -+{ -+ _gdImageBmpCtx(im, out, compression); -+} -+ -+static int _gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression) - { - int bitmap_size = 0, info_size, total_size, padding; - int i, row, xpos, pixel; -@@ -149,6 +158,7 @@ BGD_DECLARE(void) gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression) - unsigned char *uncompressed_row = NULL, *uncompressed_row_start = NULL; - FILE *tmpfile_for_compression = NULL; - gdIOCtxPtr out_original = NULL; -+ int ret = 1; - - /* No compression if its true colour or we don't support seek */ - if (im->trueColor) { -@@ -326,6 +336,7 @@ BGD_DECLARE(void) gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression) - out_original = NULL; - } - -+ ret = 0; - cleanup: - if (tmpfile_for_compression) { - #ifdef _WIN32 -@@ -339,7 +350,7 @@ cleanup: - if (out_original) { - out_original->gd_free(out_original); - } -- return; -+ return ret; - } - - static int compress_row(unsigned char *row, int length) --- -2.17.1 - diff --git a/meta-oe/recipes-support/gd/gd/CVE-2019-6978.patch b/meta-oe/recipes-support/gd/gd/CVE-2019-6978.patch deleted file mode 100644 index 9beb23e834..0000000000 --- a/meta-oe/recipes-support/gd/gd/CVE-2019-6978.patch +++ /dev/null @@ -1,299 +0,0 @@ -From 553702980ae89c83f2d6e254d62cf82e204956d0 Mon Sep 17 00:00:00 2001 -From: "Christoph M. Becker" <cmbecker69@gmx.de> -Date: Thu, 17 Jan 2019 11:54:55 +0100 -Subject: [PATCH] Fix #492: Potential double-free in gdImage*Ptr() - -Whenever `gdImage*Ptr()` calls `gdImage*Ctx()` and the latter fails, we -must not call `gdDPExtractData()`; otherwise a double-free would -happen. Since `gdImage*Ctx()` are void functions, and we can't change -that for BC reasons, we're introducing static helpers which are used -internally. - -We're adding a regression test for `gdImageJpegPtr()`, but not for -`gdImageGifPtr()` and `gdImageWbmpPtr()` since we don't know how to -trigger failure of the respective `gdImage*Ctx()` calls. - -This potential security issue has been reported by Solmaz Salimi (aka. -Rooney). ---- - src/gd_gif_out.c | 18 +++++++++++++++--- - src/gd_jpeg.c | 20 ++++++++++++++++---- - src/gd_wbmp.c | 21 ++++++++++++++++++--- - tests/jpeg/.gitignore | 1 + - tests/jpeg/CMakeLists.txt | 1 + - tests/jpeg/Makemodule.am | 3 ++- - tests/jpeg/jpeg_ptr_double_free.c | 31 +++++++++++++++++++++++++++++++ - 7 files changed, 84 insertions(+), 11 deletions(-) - create mode 100644 tests/jpeg/jpeg_ptr_double_free.c - -Upstream-Status: Backport [https://github.com/libgd/libgd/commit/553702980ae89c83f2d6e254d62cf82e204956d0] -CVE: CVE-2019-6978 - -Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com> - - -diff --git a/src/gd_gif_out.c b/src/gd_gif_out.c -index 298a581..d5a9534 100644 ---- a/src/gd_gif_out.c -+++ b/src/gd_gif_out.c -@@ -99,6 +99,7 @@ static void char_init(GifCtx *ctx); - static void char_out(int c, GifCtx *ctx); - static void flush_char(GifCtx *ctx); - -+static int _gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out); - - - -@@ -131,8 +132,11 @@ BGD_DECLARE(void *) gdImageGifPtr(gdImagePtr im, int *size) - void *rv; - gdIOCtx *out = gdNewDynamicCtx(2048, NULL); - if (out == NULL) return NULL; -- gdImageGifCtx(im, out); -- rv = gdDPExtractData(out, size); -+ if (!_gdImageGifCtx(im, out)) { -+ rv = gdDPExtractData(out, size); -+ } else { -+ rv = NULL; -+ } - out->gd_free(out); - return rv; - } -@@ -220,6 +224,12 @@ BGD_DECLARE(void) gdImageGif(gdImagePtr im, FILE *outFile) - - */ - BGD_DECLARE(void) gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out) -+{ -+ _gdImageGifCtx(im, out); -+} -+ -+/* returns 0 on success, 1 on failure */ -+static int _gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out) - { - gdImagePtr pim = 0, tim = im; - int interlace, BitsPerPixel; -@@ -231,7 +241,7 @@ BGD_DECLARE(void) gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out) - based temporary image. */ - pim = gdImageCreatePaletteFromTrueColor(im, 1, 256); - if(!pim) { -- return; -+ return 1; - } - tim = pim; - } -@@ -247,6 +257,8 @@ BGD_DECLARE(void) gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out) - /* Destroy palette based temporary image. */ - gdImageDestroy( pim); - } -+ -+ return 0; - } - - -diff --git a/src/gd_jpeg.c b/src/gd_jpeg.c -index fc05842..96ef430 100644 ---- a/src/gd_jpeg.c -+++ b/src/gd_jpeg.c -@@ -117,6 +117,8 @@ static void fatal_jpeg_error(j_common_ptr cinfo) - exit(99); - } - -+static int _gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality); -+ - /* - * Write IM to OUTFILE as a JFIF-formatted JPEG image, using quality - * QUALITY. If QUALITY is in the range 0-100, increasing values -@@ -231,8 +233,11 @@ BGD_DECLARE(void *) gdImageJpegPtr(gdImagePtr im, int *size, int quality) - void *rv; - gdIOCtx *out = gdNewDynamicCtx(2048, NULL); - if (out == NULL) return NULL; -- gdImageJpegCtx(im, out, quality); -- rv = gdDPExtractData(out, size); -+ if (!_gdImageJpegCtx(im, out, quality)) { -+ rv = gdDPExtractData(out, size); -+ } else { -+ rv = NULL; -+ } - out->gd_free(out); - return rv; - } -@@ -253,6 +258,12 @@ void jpeg_gdIOCtx_dest(j_compress_ptr cinfo, gdIOCtx *outfile); - - */ - BGD_DECLARE(void) gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality) -+{ -+ _gdImageJpegCtx(im, outfile, quality); -+} -+ -+/* returns 0 on success, 1 on failure */ -+static int _gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality) - { - struct jpeg_compress_struct cinfo; - struct jpeg_error_mgr jerr; -@@ -287,7 +298,7 @@ BGD_DECLARE(void) gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality) - if(row) { - gdFree(row); - } -- return; -+ return 1; - } - - cinfo.err->emit_message = jpeg_emit_message; -@@ -328,7 +339,7 @@ BGD_DECLARE(void) gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality) - if(row == 0) { - gd_error("gd-jpeg: error: unable to allocate JPEG row structure: gdCalloc returns NULL\n"); - jpeg_destroy_compress(&cinfo); -- return; -+ return 1; - } - - rowptr[0] = row; -@@ -405,6 +416,7 @@ BGD_DECLARE(void) gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality) - jpeg_finish_compress(&cinfo); - jpeg_destroy_compress(&cinfo); - gdFree(row); -+ return 0; - } - - -diff --git a/src/gd_wbmp.c b/src/gd_wbmp.c -index f19a1c9..a49bdbe 100644 ---- a/src/gd_wbmp.c -+++ b/src/gd_wbmp.c -@@ -88,6 +88,8 @@ int gd_getin(void *in) - return (gdGetC((gdIOCtx *)in)); - } - -+static int _gdImageWBMPCtx(gdImagePtr image, int fg, gdIOCtx *out); -+ - /* - Function: gdImageWBMPCtx - -@@ -100,6 +102,12 @@ int gd_getin(void *in) - out - the stream where to write - */ - BGD_DECLARE(void) gdImageWBMPCtx(gdImagePtr image, int fg, gdIOCtx *out) -+{ -+ _gdImageWBMPCtx(image, fg, out); -+} -+ -+/* returns 0 on success, 1 on failure */ -+static int _gdImageWBMPCtx(gdImagePtr image, int fg, gdIOCtx *out) - { - int x, y, pos; - Wbmp *wbmp; -@@ -107,7 +115,7 @@ BGD_DECLARE(void) gdImageWBMPCtx(gdImagePtr image, int fg, gdIOCtx *out) - /* create the WBMP */ - if((wbmp = createwbmp(gdImageSX(image), gdImageSY(image), WBMP_WHITE)) == NULL) { - gd_error("Could not create WBMP\n"); -- return; -+ return 1; - } - - /* fill up the WBMP structure */ -@@ -123,11 +131,15 @@ BGD_DECLARE(void) gdImageWBMPCtx(gdImagePtr image, int fg, gdIOCtx *out) - - /* write the WBMP to a gd file descriptor */ - if(writewbmp(wbmp, &gd_putout, out)) { -+ freewbmp(wbmp); - gd_error("Could not save WBMP\n"); -+ return 1; - } - - /* des submitted this bugfix: gdFree the memory. */ - freewbmp(wbmp); -+ -+ return 0; - } - - /* -@@ -271,8 +283,11 @@ BGD_DECLARE(void *) gdImageWBMPPtr(gdImagePtr im, int *size, int fg) - void *rv; - gdIOCtx *out = gdNewDynamicCtx(2048, NULL); - if (out == NULL) return NULL; -- gdImageWBMPCtx(im, fg, out); -- rv = gdDPExtractData(out, size); -+ if (!_gdImageWBMPCtx(im, fg, out)) { -+ rv = gdDPExtractData(out, size); -+ } else { -+ rv = NULL; -+ } - out->gd_free(out); - return rv; - } -diff --git a/tests/jpeg/.gitignore b/tests/jpeg/.gitignore -index c28aa87..13bcf04 100644 ---- a/tests/jpeg/.gitignore -+++ b/tests/jpeg/.gitignore -@@ -3,5 +3,6 @@ - /jpeg_empty_file - /jpeg_im2im - /jpeg_null -+/jpeg_ptr_double_free - /jpeg_read - /jpeg_resolution -diff --git a/tests/jpeg/CMakeLists.txt b/tests/jpeg/CMakeLists.txt -index 19964b0..a8d8162 100644 ---- a/tests/jpeg/CMakeLists.txt -+++ b/tests/jpeg/CMakeLists.txt -@@ -2,6 +2,7 @@ IF(JPEG_FOUND) - LIST(APPEND TESTS_FILES - jpeg_empty_file - jpeg_im2im -+ jpeg_ptr_double_free - jpeg_null - ) - -diff --git a/tests/jpeg/Makemodule.am b/tests/jpeg/Makemodule.am -index 7e5d317..b89e169 100644 ---- a/tests/jpeg/Makemodule.am -+++ b/tests/jpeg/Makemodule.am -@@ -2,7 +2,8 @@ if HAVE_LIBJPEG - libgd_test_programs += \ - jpeg/jpeg_empty_file \ - jpeg/jpeg_im2im \ -- jpeg/jpeg_null -+ jpeg/jpeg_null \ -+ jpeg/jpeg_ptr_double_free - - if HAVE_LIBPNG - libgd_test_programs += \ -diff --git a/tests/jpeg/jpeg_ptr_double_free.c b/tests/jpeg/jpeg_ptr_double_free.c -new file mode 100644 -index 0000000..df5a510 ---- /dev/null -+++ b/tests/jpeg/jpeg_ptr_double_free.c -@@ -0,0 +1,31 @@ -+/** -+ * Test that failure to convert to JPEG returns NULL -+ * -+ * We are creating an image, set its width to zero, and pass this image to -+ * `gdImageJpegPtr()` which is supposed to fail, and as such should return NULL. -+ * -+ * See also <https://github.com/libgd/libgd/issues/381> -+ */ -+ -+ -+#include "gd.h" -+#include "gdtest.h" -+ -+ -+int main() -+{ -+ gdImagePtr src, dst; -+ int size; -+ -+ src = gdImageCreateTrueColor(1, 10); -+ gdTestAssert(src != NULL); -+ -+ src->sx = 0; /* this hack forces gdImageJpegPtr() to fail */ -+ -+ dst = gdImageJpegPtr(src, &size, 0); -+ gdTestAssert(dst == NULL); -+ -+ gdImageDestroy(src); -+ -+ return gdNumFailures(); -+} --- -2.17.1 - diff --git a/meta-oe/recipes-support/gd/gd_2.2.5.bb b/meta-oe/recipes-support/gd/gd_2.3.3.bb index 35f9bb2516..cc2c1571e6 100644 --- a/meta-oe/recipes-support/gd/gd_2.2.5.bb +++ b/meta-oe/recipes-support/gd/gd_2.3.3.bb @@ -5,21 +5,19 @@ images, and flood fills, and to write out the result as a PNG or JPEG file. \ This is particularly useful in Web applications, where PNG and JPEG are two \ of the formats accepted for inline images by most browsers. Note that gd is not \ a paint program." -HOMEPAGE = "http://libgd.bitbucket.org/" +HOMEPAGE = "http://libgd.github.io/" SECTION = "libs" LICENSE = "GD" -LIC_FILES_CHKSUM = "file://COPYING;md5=07384b3aa2e0d39afca0d6c40286f545" +LIC_FILES_CHKSUM = "file://COPYING;md5=ace63adfdac78400fc30fa22ee9c1bb1" DEPENDS = "freetype libpng jpeg zlib tiff" -SRC_URI = "git://github.com/libgd/libgd.git;branch=GD-2.2 \ - file://0001-annotate.c-gdft.c-Replace-strncpy-with-memccpy-to-fi.patch \ - file://CVE-2018-1000222.patch \ - file://CVE-2019-6978.patch \ - " +SRC_URI = "git://github.com/libgd/libgd.git;nobranch=1;protocol=https \ + file://0001-Fix-deprecared-function-prototypes.patch \ + " -SRCREV = "8255231b68889597d04d451a72438ab92a405aba" +SRCREV = "b5319a41286107b53daa0e08e402aa1819764bdc" S = "${WORKDIR}/git" @@ -36,20 +34,22 @@ EXTRA_OECONF += " --disable-rpath \ EXTRA_OEMAKE = 'LDFLAGS="${LDFLAGS}"' -DEBUG_OPTIMIZATION_append = " -Wno-error=maybe-uninitialized" +DEBUG_OPTIMIZATION:append = " -Wno-error=maybe-uninitialized" -do_install_append() { +do_install:append:class-target() { # cleanup buildpaths from gdlib.pc sed -i -e 's#${STAGING_DIR_HOST}##g' ${D}${libdir}/pkgconfig/gdlib.pc } PACKAGES += "${PN}-tools" -FILES_${PN} = "${libdir}/lib*${SOLIBS}" -FILES_${PN}-tools = "${bindir}/*" +FILES:${PN} = "${libdir}/lib*${SOLIBS}" +FILES:${PN}-tools = "${bindir}/*" PROVIDES += "${PN}-tools" -RPROVIDES_${PN}-tools = "${PN}-tools" -RDEPENDS_${PN}-tools = "perl perl-module-strict" +RPROVIDES:${PN}-tools = "${PN}-tools" +RDEPENDS:${PN}-tools = "perl perl-module-strict" CVE_PRODUCT = "libgd" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/gengetopt/gengetopt_2.23.bb b/meta-oe/recipes-support/gengetopt/gengetopt_2.23.bb new file mode 100644 index 0000000000..4d97b1a419 --- /dev/null +++ b/meta-oe/recipes-support/gengetopt/gengetopt_2.23.bb @@ -0,0 +1,18 @@ +SUMMARY = "skeleton main.c generator" +DESCRIPTION = "Gengetopt is a tool to write command line option parsing code for C programs." +SECTION = "utils" +HOMEPAGE = "https://www.gnu.org/software/gengetopt/gengetopt.html" + +LICENSE = "GPL-3.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=ff95bfe019feaf92f524b73dd79e76eb" + +SRC_URI = "${GNU_MIRROR}/gengetopt/${BPN}-${PV}.tar.xz" + +SRC_URI[md5sum] = "ea165d618640dbdecb42ae4491337965" +SRC_URI[sha256sum] = "b941aec9011864978dd7fdeb052b1943535824169d2aa2b0e7eae9ab807584ac" + +inherit autotools texinfo + +CXXFLAGS += "-std=c++14" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/gflags/gflags_2.2.2.bb b/meta-oe/recipes-support/gflags/gflags_2.2.2.bb index 6eea0c00ec..a9a867b575 100644 --- a/meta-oe/recipes-support/gflags/gflags_2.2.2.bb +++ b/meta-oe/recipes-support/gflags/gflags_2.2.2.bb @@ -3,7 +3,7 @@ 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" +SRC_URI = "git://github.com/gflags/gflags.git;branch=master;protocol=https" SRCREV = "e171aa2d15ed9eb17054558e0b3a6a413bb01067" S = "${WORKDIR}/git" @@ -13,8 +13,8 @@ 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" +FILES:${PN}-bash-completion += "${bindir}/gflags_completions.sh" -RDEPENDS_${PN}-bash-completion = "bash bash-completion" +RDEPENDS:${PN}-bash-completion = "bash bash-completion" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/glog/glog/0001-Change-SleepForMilliseconds-parameter-from-unsigned-.patch b/meta-oe/recipes-support/glog/glog/0001-Change-SleepForMilliseconds-parameter-from-unsigned-.patch new file mode 100644 index 0000000000..3732c62cd0 --- /dev/null +++ b/meta-oe/recipes-support/glog/glog/0001-Change-SleepForMilliseconds-parameter-from-unsigned-.patch @@ -0,0 +1,33 @@ +From 176230435cb4b64ff7f2d97f77a04579ad9ca239 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 18 Feb 2023 13:14:14 -0800 +Subject: [PATCH] Change SleepForMilliseconds parameter from unsigned int -> long + +Fixes following error on 32bit platforms + +src/googletest.h:631:35: error: non-constant-expression cannot be narrowed from type 'unsigned int' to 'long' in initializer list [-Wc++11-narrowing] + const struct timespec req = {0, t * 1000 * 1000}; + ^~~~~~~~~~~~~~~ + +Upstream-Status: Submitted [https://github.com/google/glog/pull/894] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/googletest.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/googletest.h b/src/googletest.h +index 5761361..836b06c 100644 +--- a/src/googletest.h ++++ b/src/googletest.h +@@ -625,7 +625,7 @@ class Thread { + #endif + }; + +-static inline void SleepForMilliseconds(unsigned t) { ++static inline void SleepForMilliseconds(long t) { + #ifndef GLOG_OS_WINDOWS + # if defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 199309L + const struct timespec req = {0, t * 1000 * 1000}; +-- +2.39.2 + diff --git a/meta-oe/recipes-support/glog/glog/0001-Rework-CMake-glog-VERSION-management.patch b/meta-oe/recipes-support/glog/glog/0001-Rework-CMake-glog-VERSION-management.patch deleted file mode 100644 index f41a6c9724..0000000000 --- a/meta-oe/recipes-support/glog/glog/0001-Rework-CMake-glog-VERSION-management.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 4ea11e0d7c0575316a6ccc07a931164ca29c3d2f Mon Sep 17 00:00:00 2001 -From: Corentin Le Molgat <corentinl@google.com> -Date: Mon, 29 Jan 2018 14:59:08 +0100 -Subject: [PATCH] Rework CMake glog VERSION management. - -- Use of Project version properties instead of custom variables -- fix missmatch between VERSION (build version) and SOVERSION (API version) -src: https://cmake.org/cmake/help/latest/prop_tgt/VERSION.html#prop_tgt:VERSION - -Upstream-Status: Backport [https://github.com/google/glog/commit/6b6e38a7d53fe01f42ce34384cf4ba4c50e8cb65] -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - CMakeLists.txt | 23 ++++++++--------------- - 1 file changed, 8 insertions(+), 15 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7415eab..fb4e408 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -8,23 +8,16 @@ if (POLICY CMP0063) - cmake_policy (SET CMP0063 NEW) - endif (POLICY CMP0063) - --project (google-glog) -+project(glog VERSION 0.3.5 LANGUAGES C CXX) - - enable_testing () - --set (GLOG_MAJOR_VERSION 0) --set (GLOG_MINOR_VERSION 3) --set (GLOG_PATCH_VERSION 5) -- --set (GLOG_VERSION -- ${GLOG_MAJOR_VERSION}.${GLOG_MINOR_VERSION}.${GLOG_PATCH_VERSION}) -- - set (CPACK_PACKAGE_NAME glog) - set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "") --set (CPACK_PACKAGE_VERSION_MAJOR ${GLOG_MAJOR_VERSION}) --set (CPACK_PACKAGE_VERSION_MINOR ${GLOG_MINOR_VERSION}) --set (CPACK_PACKAGE_VERSION_PATCH ${GLOG_PATCH_VERSION}) --set (CPACK_PACKAGE_VERSION ${GLOG_VERSION}) -+set (CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR}) -+set (CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR}) -+set (CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH}) -+set (CPACK_PACKAGE_VERSION ${PROJECT_VERSION}) - - option (WITH_GFLAGS "Use gflags" ON) - option (WITH_THREADS "Enable multithreading support" ON) -@@ -406,8 +399,8 @@ if (gflags_FOUND) - endif (NOT BUILD_SHARED_LIBS) - endif (gflags_FOUND) - --set_target_properties (glog PROPERTIES VERSION ${GLOG_MAJOR_VERSION}) --set_target_properties (glog PROPERTIES SOVERSION ${GLOG_VERSION}) -+set_target_properties (glog PROPERTIES VERSION ${PROJECT_VERSION}) -+set_target_properties (glog PROPERTIES SOVERSION ${PROJECT_VERSION_MAJOR}) - - if (WIN32) - target_compile_definitions (glog PUBLIC GLOG_NO_ABBREVIATED_SEVERITIES) -@@ -570,7 +563,7 @@ configure_package_config_file (glog-config.cmake.in - NO_CHECK_REQUIRED_COMPONENTS_MACRO) - - write_basic_package_version_file (glog-config-version.cmake VERSION -- ${GLOG_VERSION} COMPATIBILITY SameMajorVersion) -+ ${PROJECT_VERSION} COMPATIBILITY SameMajorVersion) - - export (TARGETS glog NAMESPACE glog:: FILE glog-targets.cmake) - export (PACKAGE glog) --- -2.17.1 - diff --git a/meta-oe/recipes-support/glog/glog/0002-Find-Libunwind-during-configure.patch b/meta-oe/recipes-support/glog/glog/0002-Find-Libunwind-during-configure.patch deleted file mode 100644 index 15cf67fd2e..0000000000 --- a/meta-oe/recipes-support/glog/glog/0002-Find-Libunwind-during-configure.patch +++ /dev/null @@ -1,120 +0,0 @@ -diff -uNr a/cmake/FindLibunwind.cmake b/cmake/FindLibunwind.cmake ---- a/cmake/FindLibunwind.cmake 1970-01-01 01:00:00.000000000 +0100 -+++ b/cmake/FindLibunwind.cmake 2018-11-20 15:53:48.799078114 +0100 -@@ -0,0 +1,54 @@ -+# - Try to find libunwind -+# Once done this will define -+# -+# Libunwind_FOUND - system has libunwind -+# unwind - cmake target for libunwind -+ -+find_library (UNWIND_LIBRARY NAMES unwind DOC "unwind library") -+include (CheckIncludeFile) -+check_include_file (libunwind.h HAVE_LIBUNWIND_H) -+check_include_file (unwind.h HAVE_UNWIND_H) -+ -+if (CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") -+ set(LIBUNWIND_ARCH "arm") -+elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64") -+ set(LIBUNWIND_ARCH "aarch64") -+elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" OR -+ CMAKE_SYSTEM_PROCESSOR STREQUAL "amd64" OR -+ CMAKE_SYSTEM_PROCESSOR STREQUAL "corei7-64") -+ set(LIBUNWIND_ARCH "x86_64") -+elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^i.86$") -+ set(LIBUNWIND_ARCH "x86") -+elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^ppc64") -+ set(LIBUNWIND_ARCH "ppc64") -+elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^ppc") -+ set(LIBUNWIND_ARCH "ppc32") -+elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^mips") -+ set(LIBUNWIND_ARCH "mips") -+elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^hppa") -+ set(LIBUNWIND_ARCH "hppa") -+elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^ia64") -+ set(LIBUNWIND_ARCH "ia64") -+endif() -+ -+find_library (UNWIND_LIBRARY_PLATFORM NAMES "unwind-${LIBUNWIND_ARCH}" DOC "unwind library platform") -+if (UNWIND_LIBRARY_PLATFORM) -+ set(HAVE_LIB_UNWIND "1") -+endif() -+ -+include(FindPackageHandleStandardArgs) -+# handle the QUIETLY and REQUIRED arguments and set Libunwind_FOUND to TRUE -+# if all listed variables are TRUE -+find_package_handle_standard_args(Libunwind DEFAULT_MSG -+ UNWIND_LIBRARY HAVE_LIBUNWIND_H HAVE_UNWIND_H HAVE_LIB_UNWIND) -+ -+mark_as_advanced (UNWIND_LIBRARY UNWIND_LIBRARY_PLATFORM) -+ -+if (Libunwind_FOUND) -+ add_library(unwind INTERFACE IMPORTED) -+ set_target_properties(unwind PROPERTIES -+ INTERFACE_LINK_LIBRARIES "${UNWIND_LIBRARY};${UNWIND_LIBRARY_PLATFORM}" -+ ) -+else() -+ message("Can't find libunwind library") -+endif() -diff -uNr a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2018-11-20 15:49:07.576278417 +0100 -+++ b/CMakeLists.txt 2018-11-20 15:49:32.106819928 +0100 -@@ -58,7 +58,6 @@ - check_include_file (execinfo.h HAVE_EXECINFO_H) - check_include_file (glob.h HAVE_GLOB_H) - check_include_file (inttypes.h HAVE_INTTYPES_H) --check_include_file (libunwind.h HAVE_LIBUNWIND_H) - check_include_file (memory.h HAVE_MEMORY_H) - check_include_file (pwd.h HAVE_PWD_H) - check_include_file (stdint.h HAVE_STDINT_H) -@@ -74,7 +73,6 @@ - check_include_file (syslog.h HAVE_SYSLOG_H) - check_include_file (ucontext.h HAVE_UCONTEXT_H) - check_include_file (unistd.h HAVE_UNISTD_H) --check_include_file (unwind.h HAVE_UNWIND_H) - - check_include_file_cxx ("ext/hash_map" HAVE_EXT_HASH_MAP) - check_include_file_cxx ("ext/hash_set" HAVE_EXT_HASH_SET) -@@ -109,10 +107,7 @@ - # snprintf as an inline function - check_symbol_exists (snprintf stdio.h HAVE_SNPRINTF) - --check_library_exists (unwind get_static_proc_name "" HAVE_LIB_UNWIND) -- --find_library (UNWIND_LIBRARY NAMES unwind DOC "unwind library") --mark_as_advanced (UNWIND_LIBRARY) -+find_package(Libunwind) - - check_c_source_compiles (" - #include <stdlib.h> -@@ -376,9 +371,9 @@ - - set_target_properties (glog PROPERTIES POSITION_INDEPENDENT_CODE ON) - --if (UNWIND_LIBRARY) -- target_link_libraries (glog PUBLIC ${UNWIND_LIBRARY}) --endif (UNWIND_LIBRARY) -+if (Libunwind_FOUND) -+ target_link_libraries (glog PUBLIC unwind) -+endif (Libunwind_FOUND) - - if (HAVE_PTHREAD) - target_link_libraries (glog PUBLIC ${CMAKE_THREAD_LIBS_INIT}) -@@ -571,6 +566,7 @@ - install (FILES - ${CMAKE_CURRENT_BINARY_DIR}/glog-config.cmake - ${CMAKE_CURRENT_BINARY_DIR}/glog-config-version.cmake -+ ${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindLibunwind.cmake - DESTINATION lib/cmake/glog) - - install (EXPORT glog-targets NAMESPACE glog:: DESTINATION lib/cmake/glog) -diff -uNr a/glog-config.cmake.in b/glog-config.cmake.in ---- a/glog-config.cmake.in 2018-11-20 15:49:07.576278417 +0100 -+++ b/glog-config.cmake.in 2018-11-20 15:52:32.330418489 +0100 -@@ -4,4 +4,6 @@ - - @gflags_DEPENDENCY@ - -+find_dependency (Libunwind) -+ - include ("${CMAKE_CURRENT_LIST_DIR}/glog-targets.cmake") diff --git a/meta-oe/recipes-support/glog/glog/0003-installation-path-fix.patch b/meta-oe/recipes-support/glog/glog/0003-installation-path-fix.patch deleted file mode 100644 index 641f70cb24..0000000000 --- a/meta-oe/recipes-support/glog/glog/0003-installation-path-fix.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff -uNr a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2018-12-05 12:55:59.630792054 +0100 -+++ b/CMakeLists.txt 2018-12-05 13:00:22.922269200 +0100 -@@ -403,10 +403,15 @@ - - set_target_properties (glog PROPERTIES PUBLIC_HEADER "${GLOG_PUBLIC_H}") - -+set (_glog_CMake_BINDIR ${CMAKE_INSTALL_BINDIR}) -+set (_glog_CMake_INCLUDE_DIR ${CMAKE_INSTALL_INCLUDEDIR}) -+set (_glog_CMake_LIBDIR ${CMAKE_INSTALL_LIBDIR}) -+set (_glog_CMake_INSTALLDIR ${_glog_CMake_LIBDIR}/cmake/glog) -+ - target_include_directories (glog BEFORE PUBLIC - "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>" - "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>" -- "$<INSTALL_INTERFACE:include>" -+ "$<INSTALL_INTERFACE:${_glog_CMake_INCLUDE_DIR}>" - PRIVATE ${CMAKE_CURRENT_BINARY_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src) - -@@ -543,10 +548,10 @@ - - install (TARGETS glog - EXPORT glog-targets -- RUNTIME DESTINATION bin -- PUBLIC_HEADER DESTINATION include/glog -- LIBRARY DESTINATION lib -- ARCHIVE DESTINATION lib) -+ RUNTIME DESTINATION ${_glog_CMake_BINDIR} -+ PUBLIC_HEADER DESTINATION ${_glog_CMake_INCLUDE_DIR}/glog -+ LIBRARY DESTINATION ${_glog_CMake_LIBDIR} -+ ARCHIVE DESTINATION ${_glog_CMake_LIBDIR}) - - if (gflags_FOUND) - set (gflags_DEPENDENCY "find_dependency (gflags ${gflags_VERSION})") -@@ -554,7 +559,7 @@ - - configure_package_config_file (glog-config.cmake.in - ${CMAKE_CURRENT_BINARY_DIR}/glog-config.cmake -- INSTALL_DESTINATION lib/cmake/glog -+ INSTALL_DESTINATION ${_glog_CMake_INSTALLDIR} - NO_CHECK_REQUIRED_COMPONENTS_MACRO) - - write_basic_package_version_file (glog-config-version.cmake VERSION -@@ -567,6 +572,7 @@ - ${CMAKE_CURRENT_BINARY_DIR}/glog-config.cmake - ${CMAKE_CURRENT_BINARY_DIR}/glog-config-version.cmake - ${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindLibunwind.cmake -- DESTINATION lib/cmake/glog) -+ DESTINATION ${_glog_CMake_INSTALLDIR}) - --install (EXPORT glog-targets NAMESPACE glog:: DESTINATION lib/cmake/glog) -+install (EXPORT glog-targets NAMESPACE glog:: DESTINATION -+ ${_glog_CMake_INSTALLDIR}) -diff -uNr a/glog-config.cmake.in b/glog-config.cmake.in ---- a/glog-config.cmake.in 2018-12-05 12:55:59.630792054 +0100 -+++ b/glog-config.cmake.in 2018-12-05 13:05:19.547196843 +0100 -@@ -4,6 +4,7 @@ - - @gflags_DEPENDENCY@ - -+list (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") - find_dependency (Libunwind) - - include ("${CMAKE_CURRENT_LIST_DIR}/glog-targets.cmake") diff --git a/meta-oe/recipes-support/glog/glog/libexecinfo.patch b/meta-oe/recipes-support/glog/glog/libexecinfo.patch new file mode 100644 index 0000000000..a791a40dbc --- /dev/null +++ b/meta-oe/recipes-support/glog/glog/libexecinfo.patch @@ -0,0 +1,40 @@ +From 19d00c15710840910a7397252c14d612746631fe Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 8 Mar 2021 14:58:40 -0800 +Subject: [PATCH] Link libexecinfo if its found, this is needed for musl based + systems + +Fixes +ld: libglog.so.0.4.0: undefined reference to `backtrace' +| collect2: error: ld returned 1 exit status + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- + CMakeLists.txt | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 846b444..1553358 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -162,6 +162,7 @@ cmake_pop_check_state () + check_cxx_symbol_exists (snprintf cstdio HAVE_SNPRINTF) + + check_library_exists (dbghelp UnDecorateSymbolName "" HAVE_DBGHELP) ++check_library_exists (execinfo backtrace "" HAVE_EXECINFO) + + check_cxx_source_compiles (" + #include <cstdlib> +@@ -629,6 +630,10 @@ if (Unwind_FOUND) + set (Unwind_DEPENDENCY "find_dependency (Unwind ${Unwind_VERSION})") + endif (Unwind_FOUND) + ++if (HAVE_EXECINFO) ++ target_link_libraries (glog PUBLIC execinfo) ++endif (HAVE_EXECINFO) ++ + if (HAVE_DBGHELP) + target_link_libraries (glog PRIVATE dbghelp) + set (glog_libraries_options_for_static_linking "${glog_libraries_options_for_static_linking} -ldbghelp") diff --git a/meta-oe/recipes-support/glog/glog_0.3.5.bb b/meta-oe/recipes-support/glog/glog_0.3.5.bb deleted file mode 100644 index 3de01ef5b6..0000000000 --- a/meta-oe/recipes-support/glog/glog_0.3.5.bb +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION = "The glog library implements application-level logging. This \ -library provides logging APIs based on C++-style streams and various helper \ -macros." -HOMEPAGE = "https://github.com/google/glog" - -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=dc9db360e0bbd4e46672f3fd91dd6c4b" - -DEPENDS = "libunwind" - -SRC_URI = " \ - git://github.com/google/glog.git;branch=v035 \ - file://0001-Rework-CMake-glog-VERSION-management.patch \ - file://0002-Find-Libunwind-during-configure.patch \ - file://0003-installation-path-fix.patch \ -" - -SRCREV = "a6a166db069520dbbd653c97c2e5b12e08a8bb26" - -S = "${WORKDIR}/git" - -inherit cmake - -RDEPENDS_${PN} += "libunwind" - -EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON" diff --git a/meta-oe/recipes-support/glog/glog_0.6.0.bb b/meta-oe/recipes-support/glog/glog_0.6.0.bb new file mode 100644 index 0000000000..ec39604f44 --- /dev/null +++ b/meta-oe/recipes-support/glog/glog_0.6.0.bb @@ -0,0 +1,43 @@ +DESCRIPTION = "The glog library implements application-level logging. This \ +library provides logging APIs based on C++-style streams and various helper \ +macros." +HOMEPAGE = "https://github.com/google/glog" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=dc9db360e0bbd4e46672f3fd91dd6c4b" + +SRC_URI = " \ + git://github.com/google/glog.git;branch=master;protocol=https \ + file://libexecinfo.patch \ + file://0001-Change-SleepForMilliseconds-parameter-from-unsigned-.patch \ +" + +SRCREV = "b33e3bad4c46c8a6345525fd822af355e5ef9446" + +S = "${WORKDIR}/git" + +inherit cmake + +PACKAGECONFIG ?= "shared unwind 64bit-atomics" +PACKAGECONFIG:remove:riscv64 = "unwind" +PACKAGECONFIG:remove:riscv32 = "unwind 64bit-atomics" +PACKAGECONFIG:remove:mipsarch = "64bit-atomics" +PACKAGECONFIG:remove:armv5 = "64bit-atomics" +PACKAGECONFIG:remove:armv6 = "64bit-atomics" + +PACKAGECONFIG:append:libc-musl:riscv64 = " execinfo" +PACKAGECONFIG:append:libc-musl:riscv32 = " execinfo" + +PACKAGECONFIG[unwind] = "-DWITH_UNWIND=ON,-DWITH_UNWIND=OFF,libunwind,libunwind" +PACKAGECONFIG[execinfo] = ",,libexecinfo" +PACKAGECONFIG[shared] = "-DBUILD_SHARED_LIBS=ON,-DBUILD_SHARED_LIBS=OFF,," +PACKAGECONFIG[64bit-atomics] = ",-DCMAKE_CXX_STANDARD_LIBRARIES='-latomic',," + +do_configure:append() { + # remove WORKDIR info to improve reproducibility + if [ -f "${B}/config.h" ] ; then + sed -i 's/'$(echo ${WORKDIR} | sed 's_/_\\/_g')'/../g' ${B}/config.h + fi +} + +FILES:${PN}-dev += "${datadir}/${BPN}/cmake" diff --git a/meta-oe/recipes-support/gnulib/gnulib_2018-03-07.03.bb b/meta-oe/recipes-support/gnulib/gnulib_202401.bb index 146747eee1..41675d3587 100644 --- a/meta-oe/recipes-support/gnulib/gnulib_2018-03-07.03.bb +++ b/meta-oe/recipes-support/gnulib/gnulib_202401.bb @@ -8,23 +8,20 @@ as a collection of portable idioms to be used in other projects." HOMEPAGE = "http://www.gnu.org/software/gnulib/" SECTION = "devel" -LICENSE = "LGPLv2+" +LICENSE = "LGPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=56a22a6e5bcce45e2c8ac184f81412b5" -SRCREV = "0d6e3307bbdb8df4d56043d5f373eeeffe4cbef3" +SRCREV = "c99c8d491850dc3a6e0b8604a2729d8bc5c0eff1" -SRC_URI = "git://git.sv.gnu.org/gnulib.git \ +SRC_URI = "git://git.savannah.gnu.org/git/gnulib.git;branch=stable-${PV};protocol=https \ " S = "${WORKDIR}/git" -inherit utils - do_install () { - cd ${S} - check_git_config - git checkout master - git clone ${S} ${D}/${datadir}/gnulib + install -d ${D}/${datadir}/gnulib + cp --no-preserve=ownership --recursive ${S}/* ${D}/${datadir}/gnulib/ + cp --no-preserve=ownership --recursive ${S}/.git ${D}/${datadir}/gnulib/ } do_patch[noexec] = "1" diff --git a/meta-oe/recipes-support/googlebenchmark/googlebenchmark/0001-cycleclock-Fix-type-conversion-to-match-function-ret.patch b/meta-oe/recipes-support/googlebenchmark/googlebenchmark/0001-cycleclock-Fix-type-conversion-to-match-function-ret.patch new file mode 100644 index 0000000000..d514cf192b --- /dev/null +++ b/meta-oe/recipes-support/googlebenchmark/googlebenchmark/0001-cycleclock-Fix-type-conversion-to-match-function-ret.patch @@ -0,0 +1,34 @@ +From db704bcc344529039d7fb28be380658625a9c08d Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 28 May 2024 19:34:43 -0700 +Subject: [PATCH] cycleclock: Fix type conversion to match function return type + +fixes build with clang19 + +src/cycleclock.h:208:52: error: implicit conversion changes signedness: 'uint64_t' (aka 'unsigned long long') to 'int64_t' (aka 'long long') [-Werror,-Wsign-conversion] + 208 | return (static_cast<uint64_t>(cycles_hi1) << 32) | cycles_lo; + | ~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~ +1 error generated. + +Upstream-Status: Submitted [https://github.com/google/benchmark/pull/1794] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/cycleclock.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/cycleclock.h b/src/cycleclock.h +index a2584376..f96801c5 100644 +--- a/src/cycleclock.h ++++ b/src/cycleclock.h +@@ -205,7 +205,7 @@ inline BENCHMARK_ALWAYS_INLINE int64_t Now() { + "sub %0, zero, %0\n" + "and %1, %1, %0\n" + : "=r"(cycles_hi0), "=r"(cycles_lo), "=r"(cycles_hi1)); +- return (static_cast<uint64_t>(cycles_hi1) << 32) | cycles_lo; ++ return static_cast<int64_t>((static_cast<uint64_t>(cycles_hi1) << 32) | cycles_lo); + #else + uint64_t cycles; + asm volatile("rdtime %0" : "=r"(cycles)); +-- +2.45.1 + diff --git a/meta-oe/recipes-support/googlebenchmark/googlebenchmark_1.8.4.bb b/meta-oe/recipes-support/googlebenchmark/googlebenchmark_1.8.4.bb new file mode 100644 index 0000000000..34732b42d9 --- /dev/null +++ b/meta-oe/recipes-support/googlebenchmark/googlebenchmark_1.8.4.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "A microbenchmark support library" +HOMEPAGE = "https://github.com/google/benchmark" +SECTION = "libs" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +SRC_URI = "git://github.com/google/benchmark.git;protocol=https;branch=main \ + file://0001-cycleclock-Fix-type-conversion-to-match-function-ret.patch" +SRCREV = "a4cf155615c63e019ae549e31703bf367df5b471" + +S = "${WORKDIR}/git" + +EXTRA_OECMAKE = " \ + -DBUILD_SHARED_LIBS=yes \ + -DBENCHMARK_ENABLE_TESTING=no \ + -DCMAKE_BUILD_TYPE=Release \ +" + +inherit cmake + +FILES:${PN}-dev += "${libdir}/cmake" diff --git a/meta-oe/recipes-support/gosu/gosu_1.17.bb b/meta-oe/recipes-support/gosu/gosu_1.17.bb new file mode 100644 index 0000000000..6a4441fc24 --- /dev/null +++ b/meta-oe/recipes-support/gosu/gosu_1.17.bb @@ -0,0 +1,30 @@ +SUMMARY = "Simple Go-based setuid+setgid+setgroups+exec" +HOMEPAGE = "https://github.com/tianon/gosu" +DESCRIPTION = "This is a simple tool grown out of the simple fact that su and sudo have very strange and often annoying TTY and signal-forwarding behavior." +LICENSE = "Apache-2.0 " +LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +GO_IMPORT = "github.com/tianon/gosu" +SRC_URI = "git://${GO_IMPORT}.git;destsuffix=src/${GO_IMPORT};branch=master;protocol=https \ + git://github.com/moby/sys;name=user;destsuffix=src/github.com/moby/sys;branch=main;protocol=https \ + git://github.com/golang/sys;name=sys;destsuffix=src/golang.org/x/sys;branch=master;protocol=https \ +" +SRCREV = "0d1847490b448a17eb347e5e357f2c0478df87ad" +#v0.1.0 +SRCREV_user = "c0711cde08c8fa33857a2c28721659267f49b5e2" +#v0.1.0 +SRCREV_sys = "95e765b1cc43ac521bd4fd501e00774e34401449" + +SRCREV_FORMAT .= "_user_sys" + +S = "${UNPACKDIR}" +inherit go + +CGO_ENABLED = "1" + +do_compile:prepend() { + # New Go versions has Go modules support enabled by default + export GO111MODULE=off +} + +RDEPENDS:${PN}-dev += "bash" diff --git a/meta-oe/recipes-support/gperftools/gperftools/0001-Support-Atomic-ops-on-clang.patch b/meta-oe/recipes-support/gperftools/gperftools/0001-Support-Atomic-ops-on-clang.patch deleted file mode 100644 index 2fd21c2783..0000000000 --- a/meta-oe/recipes-support/gperftools/gperftools/0001-Support-Atomic-ops-on-clang.patch +++ /dev/null @@ -1,31 +0,0 @@ -From aa0a63209af6813d87255ec3ab339f2dbbf27d6d Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 6 Mar 2017 13:38:46 -0800 -Subject: [PATCH] Support Atomic ops on clang - -clang pretends to be gcc 4.2 which is a lie -it actually supports a lot more features then -gcc 4.2, here it depends on gcc 4.7 to enable -the atomics and fails for clang - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Upstream-Status: Pending - ---- - src/base/atomicops.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/base/atomicops.h b/src/base/atomicops.h -index dac95be..390733c 100644 ---- a/src/base/atomicops.h -+++ b/src/base/atomicops.h -@@ -124,7 +124,7 @@ - #include "base/atomicops-internals-linuxppc.h" - #elif defined(__GNUC__) && defined(__mips__) - #include "base/atomicops-internals-mips.h" --#elif defined(__GNUC__) && GCC_VERSION >= 40700 -+#elif defined(__GNUC__) && GCC_VERSION >= 40700 || defined(__clang__) - #include "base/atomicops-internals-gcc.h" - #elif defined(__clang__) && CLANG_VERSION >= 30400 - #include "base/atomicops-internals-gcc.h" diff --git a/meta-oe/recipes-support/gperftools/gperftools/0001-disbale-heap-checkers-and-debug-allocator-on-musl.patch b/meta-oe/recipes-support/gperftools/gperftools/0001-disbale-heap-checkers-and-debug-allocator-on-musl.patch index ab3ceb964f..2ea54e48c9 100644 --- a/meta-oe/recipes-support/gperftools/gperftools/0001-disbale-heap-checkers-and-debug-allocator-on-musl.patch +++ b/meta-oe/recipes-support/gperftools/gperftools/0001-disbale-heap-checkers-and-debug-allocator-on-musl.patch @@ -12,15 +12,15 @@ Upstream-Status: Pending 1 file changed, 2 insertions(+) diff --git a/configure.ac b/configure.ac -index 70b49a3..8154c5c 100644 +index 68fd51c..4cb71fe 100644 --- a/configure.ac +++ b/configure.ac -@@ -51,6 +51,8 @@ case "$host" in - *-cygwin*) default_enable_heap_checker=no; default_enable_cpu_profiler=no;; - *-freebsd*) default_enable_heap_checker=no;; - *-darwin*) default_enable_heap_checker=no;; +@@ -53,6 +53,8 @@ case "$host" in + need_nanosleep=no;; + *-cygwin*) default_enable_cpu_profiler=no;; + *-linux*) default_enable_heap_checker=yes; heap_checker_supported=yes;; + *-musl*) default_enable_heap_checker=no; default_enable_heap_profiler=no; + default_enable_debugalloc=no; default_enable_libunwind=no; esac - # Currently only backtrace works on s390. + # Currently only backtrace works on s390 and OSX. diff --git a/meta-oe/recipes-support/gperftools/gperftools/0001-fix-build-with-musl-libc.patch b/meta-oe/recipes-support/gperftools/gperftools/0001-fix-build-with-musl-libc.patch deleted file mode 100644 index 49d5c21676..0000000000 --- a/meta-oe/recipes-support/gperftools/gperftools/0001-fix-build-with-musl-libc.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 696674a800cb6d2070897a565b92d7e63022a8f1 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 16 Jul 2017 15:51:28 -0700 -Subject: [PATCH] fix build with musl libc - -Patch from https://github.com/gperftools/gperftools/pull/765/ - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- - configure.ac | 1 + - src/malloc_hook_mmap_linux.h | 8 ++++++-- - 2 files changed, 7 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 497103e..f9efc3e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -188,6 +188,7 @@ AC_HEADER_STDC - AC_CHECK_TYPES([__int64]) # defined in some windows platforms - AC_CHECK_TYPES([struct mallinfo],,, [#include <malloc.h>]) - AC_CHECK_TYPES([Elf32_Versym],,, [#include <elf.h>]) # for vdso_support.h -+AC_CHECK_FUNCS(__sbrk) # for intercepting glibc memory allocator - AC_CHECK_FUNCS(sbrk) # for tcmalloc to get memory - AC_CHECK_FUNCS(geteuid) # for turning off services when run as root - AC_CHECK_FUNCS(fork) # for the pthread_atfork setup -diff --git a/src/malloc_hook_mmap_linux.h b/src/malloc_hook_mmap_linux.h -index 2f6116f..0605855 100755 ---- a/src/malloc_hook_mmap_linux.h -+++ b/src/malloc_hook_mmap_linux.h -@@ -46,6 +46,10 @@ - #include <errno.h> - #include "base/linux_syscall_support.h" - -+#ifndef __GLIBC__ -+typedef off64_t __off64_t; -+#endif -+ - // The x86-32 case and the x86-64 case differ: - // 32b has a mmap2() syscall, 64b does not. - // 64b and 32b have different calling conventions for mmap(). -@@ -168,7 +172,7 @@ extern "C" void* mmap64(void *start, size_t length, int prot, int flags, - return result; - } - --# if !defined(__USE_FILE_OFFSET64) || !defined(__REDIRECT_NTH) -+# if defined(__GLIBC__) && (!defined(__USE_FILE_OFFSET64) || !defined(__REDIRECT_NTH)) - - extern "C" void* mmap(void *start, size_t length, int prot, int flags, - int fd, off_t offset) __THROW { -@@ -206,7 +210,7 @@ extern "C" void* mremap(void* old_addr, size_t old_size, size_t new_size, - return result; - } - --#ifndef __UCLIBC__ -+#if HAVE___SBRK - // libc's version: - extern "C" void* __sbrk(intptr_t increment); - diff --git a/meta-oe/recipes-support/gperftools/gperftools/0001-src-mmap_hook.cc-Fix-build-for-32bit-machine.patch b/meta-oe/recipes-support/gperftools/gperftools/0001-src-mmap_hook.cc-Fix-build-for-32bit-machine.patch new file mode 100644 index 0000000000..1142df0be9 --- /dev/null +++ b/meta-oe/recipes-support/gperftools/gperftools/0001-src-mmap_hook.cc-Fix-build-for-32bit-machine.patch @@ -0,0 +1,59 @@ +From d675808d300278a9e7143428cfecf3fda61cc9a2 Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Thu, 21 Mar 2024 10:59:29 +0000 +Subject: [PATCH] src/mmap_hook.cc: Fix build for 32bit machine + +Fixed build error on 32bit machine: + +../git/src/mmap_hook.cc:309:31: error: static assertion failed + 309 | static_assert(sizeof(int32_t) == sizeof(off_t), ""); + +This is because oe's off_t is 64bit on both 32 and 64bit system, which is the +default value of glibc, so the assertion would be failed on 32bit system, and +remove mmap() and mmap64() to fix the redefined error. + +Upstream-Status: Inappropriate [OE-Specific] + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + src/mmap_hook.cc | 22 ---------------------- + 1 file changed, 22 deletions(-) + +diff --git a/src/mmap_hook.cc b/src/mmap_hook.cc +index 0a0f62f..27425e4 100644 +--- a/src/mmap_hook.cc ++++ b/src/mmap_hook.cc +@@ -302,30 +302,8 @@ void* mmap(void* start, size_t length, int prot, int flags, int fd, off_t off) _ + + #define HOOKED_MMAP + +-#elif defined(DEFINED_DO_MMAP) && defined(__linux__) && !GOOD_LINUX_SYSTEM +-// Linuxes with 32-bit off_t. We're being careful with mmap64 being +-// 64-bit and mmap being 32-bit. +- +-static_assert(sizeof(int32_t) == sizeof(off_t), ""); +- +-extern "C" void* mmap64(void* start, size_t length, int prot, int flags, int fd, int64_t off) +- __THROW ATTRIBUTE_SECTION(malloc_hook); +-extern "C" void* mmap(void* start, size_t length, int prot, int flags, int fd, off_t off) +- __THROW ATTRIBUTE_SECTION(malloc_hook); +- +-void* mmap(void *start, size_t length, int prot, int flags, int fd, off_t off) __THROW { +- return do_mmap_with_hooks(start, length, prot, flags, fd, off); +-} +- +-void* mmap64(void *start, size_t length, int prot, int flags, int fd, int64_t off) __THROW { +- return do_mmap_with_hooks(start, length, prot, flags, fd, off); +-} +- +-#define HOOKED_MMAP +- + #endif // Linux/32-bit off_t case + +- + #ifdef HOOKED_MMAP + + extern "C" int munmap(void* start, size_t length) __THROW ATTRIBUTE_SECTION(malloc_hook); +-- +2.35.5 + diff --git a/meta-oe/recipes-support/gperftools/gperftools/disable_libunwind_aarch64.patch b/meta-oe/recipes-support/gperftools/gperftools/disable_libunwind_aarch64.patch index c3c5784186..15eacc8993 100644 --- a/meta-oe/recipes-support/gperftools/gperftools/disable_libunwind_aarch64.patch +++ b/meta-oe/recipes-support/gperftools/gperftools/disable_libunwind_aarch64.patch @@ -12,11 +12,9 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> configure.ac | 5 +++++ 1 file changed, 5 insertions(+) -diff --git a/configure.ac b/configure.ac -index 8154c5c..063b260 100644 --- a/configure.ac +++ b/configure.ac -@@ -69,6 +69,11 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM(, [return __PPC64__])], +@@ -76,6 +76,11 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM(, [re [default_enable_libunwind=yes default_tcmalloc_pagesize=8]) diff --git a/meta-oe/recipes-support/gperftools/gperftools/ppc-musl.patch b/meta-oe/recipes-support/gperftools/gperftools/ppc-musl.patch new file mode 100644 index 0000000000..800fa3a84f --- /dev/null +++ b/meta-oe/recipes-support/gperftools/gperftools/ppc-musl.patch @@ -0,0 +1,61 @@ +From 328805fd16930deefda400a77e9c2c5d17d04d29 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 13 Mar 2021 00:42:25 -0800 +Subject: [PATCH] Compatibility fixes for musl. + +--- +Upstream-Status: Pending + + src/getpc.h | 4 ++++ + src/stacktrace_powerpc-linux-inl.h | 8 ++++++-- + 2 files changed, 10 insertions(+), 2 deletions(-) + +diff --git a/src/getpc.h b/src/getpc.h +index 87d18b6..c569731 100644 +--- a/src/getpc.h ++++ b/src/getpc.h +@@ -68,6 +68,10 @@ + typedef ucontext ucontext_t; + #endif + ++#if defined(__powerpc__) && !defined(PT_NIP) ++#define PT_NIP 32 ++#endif ++ + namespace tcmalloc { + namespace getpc { + +diff --git a/src/stacktrace_powerpc-linux-inl.h b/src/stacktrace_powerpc-linux-inl.h +index 883e7d2..212bd25 100644 +--- a/src/stacktrace_powerpc-linux-inl.h ++++ b/src/stacktrace_powerpc-linux-inl.h +@@ -186,7 +186,7 @@ static int GET_STACK_TRACE_OR_FRAMES { + ucontext_t uc; + // We don't care about the rest, since the IP value is at 'uc' field. + } *sigframe = reinterpret_cast<signal_frame_64*>(current); +- result[n] = (void*) sigframe->uc.uc_mcontext.gp_regs[PT_NIP]; ++ result[n] = (void*) sigframe->uc.uc_mcontext.gp_regs[32]; + } + #else + if (sigtramp32_vdso && (sigtramp32_vdso == current->return_addr)) { +@@ -196,7 +196,7 @@ static int GET_STACK_TRACE_OR_FRAMES { + mcontext_t mctx; + // We don't care about the rest, since IP value is at 'mctx' field. + } *sigframe = reinterpret_cast<signal_frame_32*>(current); +- result[n] = (void*) sigframe->mctx.gregs[PT_NIP]; ++ result[n] = (void*) sigframe->mctx.gregs[32]; + } else if (sigtramp32_rt_vdso && (sigtramp32_rt_vdso == current->return_addr)) { + struct rt_signal_frame_32 { + char dummy[64 + 16]; +@@ -204,7 +204,11 @@ static int GET_STACK_TRACE_OR_FRAMES { + ucontext_t uc; + // We don't care about the rest, since IP value is at 'uc' field.A + } *sigframe = reinterpret_cast<rt_signal_frame_32*>(current); ++#if defined(__GLIBC__) + result[n] = (void*) sigframe->uc.uc_mcontext.uc_regs->gregs[PT_NIP]; ++#else ++ result[n] = (void*) sigframe->uc.uc_mcontext.gregs[32]; ++#endif + } + #endif + diff --git a/meta-oe/recipes-support/gperftools/gperftools/sgidef.patch b/meta-oe/recipes-support/gperftools/gperftools/sgidef.patch deleted file mode 100644 index 10274a6dec..0000000000 --- a/meta-oe/recipes-support/gperftools/gperftools/sgidef.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 259b420444c52463795b4b582a2ab7511149eea7 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 16 Oct 2017 21:26:40 -0700 -Subject: [PATCH] sgidef.h does not exist on musl and its not needed to compile - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Pending - ---- - src/base/linux_syscall_support.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/base/linux_syscall_support.h b/src/base/linux_syscall_support.h -index 70431ca..b23ca59 100644 ---- a/src/base/linux_syscall_support.h -+++ b/src/base/linux_syscall_support.h -@@ -164,7 +164,7 @@ extern "C" { - #include <endian.h> - #include <fcntl.h> - --#ifdef __mips__ -+#if defined(__mips__) && defined(__glibc__) - /* Include definitions of the ABI currently in use. */ - #include <sgidefs.h> - #endif diff --git a/meta-oe/recipes-support/gperftools/gperftools_2.15.bb b/meta-oe/recipes-support/gperftools/gperftools_2.15.bb new file mode 100644 index 0000000000..bd3b2afaea --- /dev/null +++ b/meta-oe/recipes-support/gperftools/gperftools_2.15.bb @@ -0,0 +1,65 @@ +SUMMARY = "Fast, multi-threaded malloc() and nifty performance analysis tools" +HOMEPAGE = "https://github.com/gperftools/gperftools" +DESCRIPTION = "The gperftools, previously called google-perftools, package contains some \ +utilities to improve and analyze the performance of C++ programs. \ +Included are an optimized thread-caching malloc() and cpu and heap profiling utilities. \ +" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=762732742c73dc6c7fbe8632f06c059a" + +DEPENDS:append:libc-musl = " libucontext" + +SRCREV = "365060c4213a48adb27f63d5dfad41b3dfbdd62e" +SRC_URI = "git://github.com/gperftools/gperftools;branch=master;protocol=https \ + file://0001-disbale-heap-checkers-and-debug-allocator-on-musl.patch \ + file://disable_libunwind_aarch64.patch \ + file://0001-src-mmap_hook.cc-Fix-build-for-32bit-machine.patch \ + " + +SRC_URI:append:libc-musl = " file://ppc-musl.patch" + +inherit autotools + +S = "${WORKDIR}/git" + +# On mips, we have the following error. +# do_page_fault(): sending SIGSEGV to ls for invalid read access from 00000008 +# Segmentation fault (core dumped) +COMPATIBLE_HOST:mipsarch = "null" +COMPATIBLE_HOST:riscv64 = "null" +COMPATIBLE_HOST:riscv32 = "null" + +# Disable thumb1 +# {standard input}: Assembler messages: +# {standard input}:434: Error: lo register required -- `ldr pc,[sp]' +# Makefile:4538: recipe for target 'src/base/libtcmalloc_la-linuxthreads.lo' failed +ARM_INSTRUCTION_SET:armv5 = "arm" +ARM_INSTRUCTION_SET:toolchain-clang:arm = "arm" + +EXTRA_OECONF:append:libc-musl:powerpc64le = " --disable-cpu-profiler" +EXTRA_OECONF:append:libc-musl:powerpc = " --disable-cpu-profiler" +PACKAGECONFIG ?= "libunwind static" +PACKAGECONFIG:remove:arm:libc-musl = "libunwind" +PACKAGECONFIG:remove:riscv64 = "libunwind" +PACKAGECONFIG:remove:riscv32 = "libunwind" + +PACKAGECONFIG[libunwind] = "--enable-libunwind,--disable-libunwind,libunwind" +PACKAGECONFIG[static] = "--enable-static,--disable-static," + +PACKAGE_BEFORE_PN += "libtcmalloc-minimal" +FILES:libtcmalloc-minimal = "${libdir}/libtcmalloc_minimal*${SOLIBS} ${libdir}/libtcmalloc_minimal_debug*${SOLIBS}" + +# pprof tool requires Getopt::long and POSIX perl5 modules. +# Also runs `objdump` on each cpuprofile data file +RDEPENDS:${PN} += " \ + binutils \ + curl \ + perl-module-carp \ + perl-module-cwd \ + perl-module-getopt-long \ + perl-module-overloading \ + perl-module-posix \ +" + +RDEPENDS:${PN} += "libtcmalloc-minimal (= ${EXTENDPKGV})" diff --git a/meta-oe/recipes-support/gperftools/gperftools_2.7.bb b/meta-oe/recipes-support/gperftools/gperftools_2.7.bb deleted file mode 100644 index ee34acec24..0000000000 --- a/meta-oe/recipes-support/gperftools/gperftools_2.7.bb +++ /dev/null @@ -1,44 +0,0 @@ -SUMMARY = "Fast, multi-threaded malloc() and nifty performance analysis tools" -HOMEPAGE = "https://github.com/gperftools/gperftools" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=762732742c73dc6c7fbe8632f06c059a" - -SRCREV = "9608fa3bcf8020d35f59fbf70cd3cbe4b015b972" -SRC_URI = "git://github.com/gperftools/gperftools \ - file://0001-Support-Atomic-ops-on-clang.patch \ - file://0001-fix-build-with-musl-libc.patch \ - file://0001-disbale-heap-checkers-and-debug-allocator-on-musl.patch \ - file://disable_libunwind_aarch64.patch \ - file://sgidef.patch \ - " - -inherit autotools - -S = "${WORKDIR}/git" - -# On mips, we have the following error. -# do_page_fault(): sending SIGSEGV to ls for invalid read access from 00000008 -# Segmentation fault (core dumped) -COMPATIBLE_HOST_mipsarch = "null" -# Disable thumb1 -# {standard input}: Assembler messages: -# {standard input}:434: Error: lo register required -- `ldr pc,[sp]' -# Makefile:4538: recipe for target 'src/base/libtcmalloc_la-linuxthreads.lo' failed -ARM_INSTRUCTION_SET_armv5 = "arm" -ARM_INSTRUCTION_SET_toolchain-clang_arm = "arm" - -PACKAGECONFIG ?= "libunwind static" -PACKAGECONFIG_remove_arm_libc-musl = "libunwind" - -PACKAGECONFIG[libunwind] = "--enable-libunwind,--disable-libunwind,libunwind" -PACKAGECONFIG[static] = "--enable-static,--disable-static," - -PACKAGE_BEFORE_PN += "libtcmalloc-minimal" -FILES_libtcmalloc-minimal = "${libdir}/libtcmalloc_minimal*${SOLIBS} ${libdir}/libtcmalloc_minimal_debug*${SOLIBS}" - -# pprof tool requires Getopt::long and POSIX perl5 modules. -# Also runs `objdump` on each cpuprofile data file -RDEPENDS_${PN} += "binutils perl-module-getopt-long perl-module-posix" - -RDEPENDS_${PN} += "libtcmalloc-minimal (= ${EXTENDPKGV})" - diff --git a/meta-oe/recipes-support/gpm/gpm/0001-Use-sigemptyset-API-instead-of-__sigemptyset.patch b/meta-oe/recipes-support/gpm/gpm/0001-Use-sigemptyset-API-instead-of-__sigemptyset.patch deleted file mode 100644 index a9198166a9..0000000000 --- a/meta-oe/recipes-support/gpm/gpm/0001-Use-sigemptyset-API-instead-of-__sigemptyset.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 52e6cf052b1f938fcca1bc24d578fe0bfd972988 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 25 Jun 2017 07:25:33 -0700 -Subject: [PATCH] Use sigemptyset API instead of __sigemptyset - -__sigemptyset has been removed from glibc public -API headers in upcoming (2.26) release onwards - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Submitted - - src/prog/gpm-root.y | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/src/prog/gpm-root.y b/src/prog/gpm-root.y -index 5126c65..76c896c 100644 ---- a/src/prog/gpm-root.y -+++ b/src/prog/gpm-root.y -@@ -1196,11 +1196,7 @@ int main(int argc, char **argv) - LOG_DAEMON : LOG_USER); - /* reap your zombies */ - childaction.sa_handler=reap_children; --#if defined(__GLIBC__) -- __sigemptyset(&childaction.sa_mask); --#else /* __GLIBC__ */ - sigemptyset(&childaction.sa_mask); --#endif /* __GLIBC__ */ - childaction.sa_flags=0; - sigaction(SIGCHLD,&childaction,NULL); - --- -2.13.1 - diff --git a/meta-oe/recipes-support/gpm/gpm_git.bb b/meta-oe/recipes-support/gpm/gpm_git.bb index 7034d33858..25e5414a35 100644 --- a/meta-oe/recipes-support/gpm/gpm_git.bb +++ b/meta-oe/recipes-support/gpm/gpm_git.bb @@ -4,37 +4,35 @@ for the console and xterm, with sample clients included \ (emacs, etc)." HOMEPAGE = "https://www.nico.schottelius.org/software/gpm" SECTION = "console/utils" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760" PV = "1.99.7+git${SRCREV}" -PR = "r2" -SRCREV = "1fd19417b8a4dd9945347e98dfa97e4cfd798d77" +SRCREV = "e82d1a653ca94aa4ed12441424da6ce780b1e530" DEPENDS = "ncurses bison-native" -SRC_URI = "git://github.com/telmich/gpm;protocol=git \ +SRC_URI = "git://github.com/telmich/gpm;protocol=https;branch=master \ file://init \ file://gpm.service.in \ - file://0001-Use-sigemptyset-API-instead-of-__sigemptyset.patch \ " S = "${WORKDIR}/git" -inherit autotools-brokensep update-rc.d systemd +inherit autotools-brokensep update-rc.d systemd texinfo INITSCRIPT_NAME = "gpm" INITSCRIPT_PARAMS = "defaults" -do_configure_prepend() { +do_configure:prepend() { (cd ${S};./autogen.sh;cd -) } -do_install_append () { +do_install:append () { install -d ${D}${systemd_system_unitdir} - sed 's:@bindir@:${sbindir}:' < ${WORKDIR}/gpm.service.in >${D}${systemd_system_unitdir}/gpm.service - install -D -m 0755 ${WORKDIR}/init ${D}${INIT_D_DIR}/gpm + sed 's:@bindir@:${sbindir}:' < ${UNPACKDIR}/gpm.service.in >${D}${systemd_system_unitdir}/gpm.service + install -D -m 0755 ${UNPACKDIR}/init ${D}${INIT_D_DIR}/gpm ln -s libgpm.so.2 ${D}${libdir}/libgpm.so } -SYSTEMD_SERVICE_${PN} = "gpm.service" +SYSTEMD_SERVICE:${PN} = "gpm.service" diff --git a/meta-oe/recipes-support/gradm/gradm/0001-Makefile-Append-instead-of-overriding-LDFLAGS.patch b/meta-oe/recipes-support/gradm/gradm/0001-Makefile-Append-instead-of-overriding-LDFLAGS.patch index 09a60127a4..5ef39ea33d 100644 --- a/meta-oe/recipes-support/gradm/gradm/0001-Makefile-Append-instead-of-overriding-LDFLAGS.patch +++ b/meta-oe/recipes-support/gradm/gradm/0001-Makefile-Append-instead-of-overriding-LDFLAGS.patch @@ -5,6 +5,8 @@ Subject: [PATCH] Makefile: Append instead of overriding LDFLAGS Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/gradm/gradm/0001-make-Define-SBINDIR-flag.patch b/meta-oe/recipes-support/gradm/gradm/0001-make-Define-SBINDIR-flag.patch new file mode 100644 index 0000000000..1c0f3bfbae --- /dev/null +++ b/meta-oe/recipes-support/gradm/gradm/0001-make-Define-SBINDIR-flag.patch @@ -0,0 +1,69 @@ +From 12bc62ac26df012fc143913b6e046a3cf5127db2 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 23 Apr 2022 09:20:49 -0700 +Subject: [PATCH] make: Define SBINDIR flag + +Provides a facility to control install locations of /sbin elements from +environment + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Makefile | 17 +++++++++-------- + 1 file changed, 9 insertions(+), 8 deletions(-) + +diff --git a/Makefile b/Makefile +index deed94c..9190fe9 100644 +--- a/Makefile ++++ b/Makefile +@@ -25,6 +25,7 @@ MKNOD=/bin/mknod + CC=/usr/bin/gcc + FIND=/usr/bin/find + LIBS := $(shell if [ "`uname -m`" != "sparc64" -a "`uname -m`" != "x86_64" ]; then echo "-lfl" ; else echo "" ; fi) ++SBINDIR=/sbin + OPT_FLAGS := -O2 + # for older versions of grsecurity, comment the above line and uncomment the below: + #OPT_FLAGS := $(shell if [ "`uname -m`" != "sparc64" ] && [ "`uname -m`" != "x86_64" ]; then echo "-O2" ; else echo "-O2 -m64" ; fi) +@@ -136,15 +137,15 @@ lex.learn_pass1.o: lex.learn_pass1.c learn_pass1.tab.h + lex.learn_pass2.o: lex.learn_pass2.c learn_pass2.tab.h + + install: $(GRADM_BIN) gradm.8 policy grlearn +- @mkdir -p $(DESTDIR)/sbin ++ @mkdir -p $(DESTDIR)$(SBINDIR) + @echo "Installing gradm..." +- @$(INSTALL) -m 0755 $(GRADM_BIN) $(DESTDIR)/sbin ++ @$(INSTALL) -m 0755 $(GRADM_BIN) $(DESTDIR)$(SBINDIR) + @if [ -f $(GRADM_PAM) ] ; then \ + echo "Installing gradm_pam..." ; \ +- $(INSTALL) -m 4755 $(GRADM_PAM) $(DESTDIR)/sbin ; \ ++ $(INSTALL) -m 4755 $(GRADM_PAM) $(DESTDIR)$(SBINDIR) ; \ + fi + @echo "Installing grlearn..." +- @$(INSTALL) -m 0700 grlearn $(DESTDIR)/sbin ++ @$(INSTALL) -m 0700 grlearn $(DESTDIR)$(SBINDIR) + @mkdir -p -m 700 $(DESTDIR)$(GRSEC_DIR) + @if [ ! -f $(DESTDIR)$(GRSEC_DIR)/policy ] ; then \ + if [ -f $(DESTDIR)$(GRSEC_DIR)/acl ] ; then \ +@@ -170,15 +171,15 @@ install: $(GRADM_BIN) gradm.8 policy grlearn + echo "KERNEL==\"grsec\", MODE=\"0622\"" >> $(DESTDIR)/etc/udev/rules.d/80-grsec.rules ; \ + echo "LABEL=\"permissions_end\"" >> $(DESTDIR)/etc/udev/rules.d/80-grsec.rules ; \ + fi +- @if [ -f $(DESTDIR)/sbin/udevadm ] ; then \ +- $(DESTDIR)/sbin/udevadm trigger --action=change ; \ ++ @if [ -f $(DESTDIR)$(SBINDIR)/udevadm ] ; then \ ++ $(DESTDIR)$(SBINDIR)/udevadm trigger --action=change ; \ + fi + @echo "Installing gradm manpage..." + @mkdir -p $(DESTDIR)$(MANDIR)/man8 + @$(INSTALL) -m 0644 gradm.8 $(DESTDIR)$(MANDIR)/man8/$(GRADM_BIN).8 +- @if [ -x /sbin/$(GRADM_BIN) ] ; then \ ++ @if [ -x $(SBINDIR)/$(GRADM_BIN) ] ; then \ + if [ -z $(DESTDIR) ] && [ ! -f $(GRSEC_DIR)/pw ] ; then \ +- /sbin/$(GRADM_BIN) -P ; \ ++ $(SBINDIR)/$(GRADM_BIN) -P ; \ + fi \ + fi + @true +-- +2.36.0 + diff --git a/meta-oe/recipes-support/gradm/gradm_3.1-201903191516.bb b/meta-oe/recipes-support/gradm/gradm_3.1-202111052217.bb index 7ed46f82c5..c82b529f96 100644 --- a/meta-oe/recipes-support/gradm/gradm_3.1-201903191516.bb +++ b/meta-oe/recipes-support/gradm/gradm_3.1-202111052217.bb @@ -7,16 +7,16 @@ via a password to the kernel and parsing rules to be passed to the \ kernel" HOMEPAGE = "http://grsecurity.net/index.php" SECTION = "admin" -LICENSE = "GPL-2.0" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=4641e94ec96f98fabc56ff9cc48be14b" DEPENDS = "flex-native bison-native ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" SRC_URI = "http://grsecurity.net/stable/${BP}.tar.gz \ file://0001-Makefile-remove-strip.patch \ file://0001-Makefile-Append-instead-of-overriding-LDFLAGS.patch \ + file://0001-make-Define-SBINDIR-flag.patch \ " -SRC_URI[md5sum] = "5099c715433981d5a3eed8ded7c5bbc0" -SRC_URI[sha256sum] = "d3a0b6383ff97a2054941d71133c737efae66afdd8eef59346c031ae15c75ff3" +SRC_URI[sha256sum] = "2459290f367a47c8a1ce4ea2ec08359799ea33dc15ed4436439596ce88284fb9" S = "${WORKDIR}/gradm" @@ -35,6 +35,7 @@ do_compile() { do_install() { oe_runmake 'CC=${CC}' \ 'DESTDIR=${D}' \ + 'SBINDIR=${base_sbindir}' \ 'LIBS=' \ 'LLEX=${STAGING_BINDIR_NATIVE}/lex' \ 'FLEX=${STAGING_BINDIR_NATIVE}/flex' \ @@ -45,6 +46,6 @@ do_install() { rm -rf ${D}/dev } -pkg_postinst_ontarget_${PN}() { +pkg_postinst_ontarget:${PN}() { /bin/mknod -m 0622 /dev/grsec c 1 13 } diff --git a/meta-oe/recipes-support/gsl/gsl.inc b/meta-oe/recipes-support/gsl/gsl.inc index 40613930b5..d0fa9344eb 100644 --- a/meta-oe/recipes-support/gsl/gsl.inc +++ b/meta-oe/recipes-support/gsl/gsl.inc @@ -1,9 +1,12 @@ DESCRIPTION = "GNU Scientific Library" HOMEPAGE = "http://www.gnu.org/software/gsl/" SECTION = "libs" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" inherit autotools pkgconfig binconfig LEAD_SONAME = "libgsl.so" + +# Uses fpu_control.h which is glibc only header see ieee-utils/fp-gnuppc.c +COMPATIBLE_HOST:libc-musl:powerpc = "null" diff --git a/meta-oe/recipes-support/gsl/gsl_2.6.bb b/meta-oe/recipes-support/gsl/gsl_2.6.bb deleted file mode 100644 index 367a08321e..0000000000 --- a/meta-oe/recipes-support/gsl/gsl_2.6.bb +++ /dev/null @@ -1,5 +0,0 @@ -include gsl.inc - -SRC_URI = "${GNU_MIRROR}/gsl/gsl-${PV}.tar.gz" -SRC_URI[md5sum] = "bda73a3dd5ff2f30b5956764399db6e7" -SRC_URI[sha256sum] = "b782339fc7a38fe17689cb39966c4d821236c28018b6593ddb6fd59ee40786a8" diff --git a/meta-oe/recipes-support/gsl/gsl_2.8.bb b/meta-oe/recipes-support/gsl/gsl_2.8.bb new file mode 100644 index 0000000000..45c776112b --- /dev/null +++ b/meta-oe/recipes-support/gsl/gsl_2.8.bb @@ -0,0 +1,4 @@ +include gsl.inc + +SRC_URI = "${GNU_MIRROR}/gsl/gsl-${PV}.tar.gz" +SRC_URI[sha256sum] = "6a99eeed15632c6354895b1dd542ed5a855c0f15d9ad1326c6fe2b2c9e423190" diff --git a/meta-oe/recipes-support/gsoap/gsoap/0001-Provide-strtod_l-signature-on-non-glibc-linux-musl-s.patch b/meta-oe/recipes-support/gsoap/gsoap/0001-Provide-strtod_l-signature-on-non-glibc-linux-musl-s.patch new file mode 100644 index 0000000000..df27a59ee7 --- /dev/null +++ b/meta-oe/recipes-support/gsoap/gsoap/0001-Provide-strtod_l-signature-on-non-glibc-linux-musl-s.patch @@ -0,0 +1,85 @@ +From 2b7a51556185539a0f9baef0f109e0814933d6b3 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 19 May 2024 17:11:20 -0700 +Subject: [PATCH] Provide strtod_l signature on non-glibc linux ( musl ) + systems + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + gsoap/stdsoap2.c | 5 +++++ + 1 file changed, 5 insertions(+) + +--- a/gsoap/stdsoap2.cpp ++++ b/gsoap/stdsoap2.cpp +@@ -74,6 +74,11 @@ A commercial use license is available fr + + #include "stdsoap2.h" + ++#if defined(__linux__) && !defined(__GLIBC__) ++struct __locale_struct; ++double strtod_l(const char *__restrict, char **__restrict, struct __locale_struct *); ++#endif ++ + #if GSOAP_VERSION != GSOAP_LIB_VERSION + # error "GSOAP VERSION MISMATCH IN LIBRARY: PLEASE REINSTALL PACKAGE" + #endif +@@ -5457,7 +5462,7 @@ tcp_gethostbyname(struct soap *soap, con + { + #if (defined(_AIX43) || defined(TRU64) || defined(HP_UX)) && defined(HAVE_GETHOSTBYNAME_R) + struct hostent_data ht_data; +-#elif (!defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__ANDROID__) || defined(FREEBSD) || defined(__FreeBSD__)) && !defined(SUN_OS) && !defined(__QNX__) && !defined(QNX) && defined(HAVE_GETHOSTBYNAME_R) ++#elif (!defined(__GLIBC__) || (!(~_GNU_SOURCE+1) && !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__ANDROID__) || defined(FREEBSD) || defined(__FreeBSD__)) && !defined(SUN_OS) && !defined(__QNX__) && !defined(QNX) && defined(HAVE_GETHOSTBYNAME_R) + int r; + char *tmpbuf = soap->tmpbuf; + size_t tmplen = sizeof(soap->tmpbuf); +@@ -5490,7 +5495,7 @@ tcp_gethostbyname(struct soap *soap, con + hostent = NULL; + soap->errnum = h_errno; + } +-#elif (!defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__ANDROID__) || defined(FREEBSD) || defined(__FreeBSD__)) && !defined(SUN_OS) && !defined(__QNX__) && !defined(QNX) && defined(HAVE_GETHOSTBYNAME_R) ++#elif (!defined(__GLIBC__) || (!(~_GNU_SOURCE+1) && !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__ANDROID__) || defined(FREEBSD) || defined(__FreeBSD__)) && !defined(SUN_OS) && !defined(__QNX__) && !defined(QNX) && defined(HAVE_GETHOSTBYNAME_R) + while ((r = gethostbyname_r(addr, hostent, tmpbuf, tmplen, &hostent, &soap->errnum)) < 0) + { + if (tmpbuf != soap->tmpbuf) +@@ -23192,7 +23197,7 @@ soap_strerror(struct soap *soap) + { + #ifndef WIN32 + # ifdef HAVE_STRERROR_R +-# if !defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && ((!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600))) ++# if !defined(__GLIBC__) || (!(~_GNU_SOURCE+1) && ((!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600))) + err = strerror_r(err, soap->msgbuf, sizeof(soap->msgbuf)); /* XSI-compliant */ + if (err != 0) + soap_strcpy(soap->msgbuf, sizeof(soap->msgbuf), "unknown error"); +--- a/gsoap/stdsoap2.c ++++ b/gsoap/stdsoap2.c +@@ -74,6 +74,11 @@ A commercial use license is available fr + + #include "stdsoap2.h" + ++#if defined(__linux__) && !defined(__GLIBC__) ++struct __locale_struct; ++double strtod_l(const char *__restrict, char **__restrict, struct __locale_struct *); ++#endif ++ + #if GSOAP_VERSION != GSOAP_LIB_VERSION + # error "GSOAP VERSION MISMATCH IN LIBRARY: PLEASE REINSTALL PACKAGE" + #endif +@@ -5490,7 +5495,7 @@ tcp_gethostbyname(struct soap *soap, con + hostent = NULL; + soap->errnum = h_errno; + } +-#elif (!defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__ANDROID__) || defined(FREEBSD) || defined(__FreeBSD__)) && !defined(SUN_OS) && !defined(__QNX__) && !defined(QNX) && defined(HAVE_GETHOSTBYNAME_R) ++#elif (!defined(__GLIBC__) || (!(~_GNU_SOURCE+1) && !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__ANDROID__) || defined(FREEBSD) || defined(__FreeBSD__)) && !defined(SUN_OS) && !defined(__QNX__) && !defined(QNX) && defined(HAVE_GETHOSTBYNAME_R) + while ((r = gethostbyname_r(addr, hostent, tmpbuf, tmplen, &hostent, &soap->errnum)) < 0) + { + if (tmpbuf != soap->tmpbuf) +@@ -23192,7 +23197,7 @@ soap_strerror(struct soap *soap) + { + #ifndef WIN32 + # ifdef HAVE_STRERROR_R +-# if !defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && ((!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600))) ++# if !defined(__GLIBC__) || (!(~_GNU_SOURCE+1) && ((!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600))) + err = strerror_r(err, soap->msgbuf, sizeof(soap->msgbuf)); /* XSI-compliant */ + if (err != 0) + soap_strcpy(soap->msgbuf, sizeof(soap->msgbuf), "unknown error"); diff --git a/meta-oe/recipes-support/gsoap/gsoap_2.8.95.bb b/meta-oe/recipes-support/gsoap/gsoap_2.8.134.bb index 22a0498921..5528e87e6c 100644 --- a/meta-oe/recipes-support/gsoap/gsoap_2.8.95.bb +++ b/meta-oe/recipes-support/gsoap/gsoap_2.8.134.bb @@ -5,10 +5,9 @@ LICENSE = "GPL-2.0-with-OpenSSL-exception" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4f40a941379143186f9602242c3fb729 \ file://GPLv2_license.txt;md5=a33672dbe491b6517750a0389063508b" -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}2/${BPN}_${PV}.zip \ - " -SRC_URI[md5sum] = "88031646018d60857f21246962d10011" -SRC_URI[sha256sum] = "fe07aa152cd946ef8ebd3f87653f14c1d38efe7c6e6fce8c6f773c4814f79baf" +SRC_URI = "https://prdownloads.sourceforge.net/${BPN}2/${BPN}_${PV}.zip \ + file://0001-Provide-strtod_l-signature-on-non-glibc-linux-musl-s.patch" +SRC_URI[sha256sum] = "63478e555c0ccde0164f055ff605b02805db0abc6712a04bcb14cb617b047218" inherit autotools @@ -16,14 +15,15 @@ BBCLASSEXTEND = "native" S = "${WORKDIR}/${BPN}-2.8" +EXTRA_OECONF += "--enable-ipv6 --enable-c-locale" PARALLEL_MAKE = "" -EXTRA_OEMAKE_class-target = "SOAP=${STAGING_BINDIR_NATIVE}/soapcpp2" +EXTRA_OEMAKE:class-target = "SOAP=${STAGING_BINDIR_NATIVE}/soapcpp2" DEPENDS = "openssl zlib flex bison bison-native" -DEPENDS_append_class-target = " gsoap-native" +DEPENDS:append:class-target = " gsoap-native" -do_install_append() { +do_install:append() { install -d ${D}${libdir} for lib in libgsoapssl libgsoapssl++ libgsoap libgsoapck++ libgsoap++ libgsoapck do @@ -31,12 +31,12 @@ do_install_append() { done } -do_install_class-native() { +do_install:class-native() { oe_runmake DESTDIR=${D} BINDIR=${D}${bindir} install } -FILES_${PN} = "${bindir}/wsdl2h ${bindir}/soapcpp2" -FILES_${PN} += "${datadir}" -FILES_${PN}-staticdev = "${libdir}" -FILES_${PN}-dev = "${includedir}" -RRECOMMENDS_${PN}-dev = "${PN}-staticdev" +FILES:${PN} = "${bindir}/wsdl2h ${bindir}/soapcpp2" +FILES:${PN} += "${datadir}" +FILES:${PN}-staticdev = "${libdir}" +FILES:${PN}-dev = "${includedir}" +RRECOMMENDS:${PN}-dev = "${PN}-staticdev" diff --git a/meta-oe/recipes-support/hddtemp/hddtemp/0001-configure.ac-Rename-to-configure.ac-and-use-external.patch b/meta-oe/recipes-support/hddtemp/hddtemp/0001-configure.ac-Rename-to-configure.ac-and-use-external.patch new file mode 100644 index 0000000000..d2de0bbe61 --- /dev/null +++ b/meta-oe/recipes-support/hddtemp/hddtemp/0001-configure.ac-Rename-to-configure.ac-and-use-external.patch @@ -0,0 +1,703 @@ +From d7e6fe2ac69333c2d943a4b8eb139373d1fb2ce2 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 31 Dec 2019 18:08:09 -0800 +Subject: [PATCH] configure.ac: Rename to configure.ac and use external gettext + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 81 insertions(+) + create mode 100644 configure.ac + +--- /dev/null ++++ b/configure.ac +@@ -0,0 +1,81 @@ ++dnl Process this file with autoconf to produce a configure script. ++ ++# Initialization ++AC_INIT ++AC_CONFIG_SRCDIR([Makefile.am]) ++AC_CONFIG_HEADERS([config.h]) ++ ++# Determine the host and build type. The target is always a PIC. ++AC_CANONICAL_HOST ++ ++AM_INIT_AUTOMAKE(hddtemp, 0.3-beta15) ++ ++dnl Checks for programs. ++AC_PROG_CC ++AC_PROG_INSTALL ++ ++# append the host alias to the tools for cross compiling ++AC_HEADER_STDC ++AC_CHECK_HEADERS(fcntl.h) ++AC_CHECK_HEADERS(iconv.h) ++AC_CHECK_HEADERS(netinet/in.h) ++AC_CHECK_TYPE(in_addr_t, ,[AC_DEFINE_UNQUOTED([in_addr_t], [uint32_t], [Define to 'uint32_t' if <netinet/in.h> does not define.])], [#include <netinet/in.h>]) ++ ++# Checks for typedefs, structures, and compiler characteristics. ++AC_C_CONST ++AC_STRUCT_TM ++ ++dnl internationalization macros ++AM_GNU_GETTEXT([external]) ++ ++AC_CHECK_FUNCS([bindtextdomain textdomain iconv]) ++ ++dnl reasonable guesses for where stuff is installed ++dnl if we don't do that now, the config.h will use ${prefix} ++dnl for DEFAULT_DATABASE_PATH. ++if test "x$prefix" = "xNONE"; then ++ prefix="/usr/local" ++fi ++if test "x$exec_prefix" = "xNONE"; then ++ exec_prefix=$prefix ++fi ++ ++AC_MSG_CHECKING([Location of hddtemp.db]) ++DEFAULT_DATABASE_PATH= ++#db_path=\"`eval echo ${datadir}`/misc/hddtemp.db\" ++db_path=\"/usr/share/misc/hddtemp.db\" ++AC_ARG_WITH(db_path, ++ [ --with-db-path=PATH \ ++ Default location of hddtemp.db file [/usr/share/misc/hddtemp.db]], ++ [ if test -d "$withval"; then ++ AC_MSG_FAILURE([new file name for db-path]) ++ fi ++ DEFAULT_DATABASE_PATH="\"$withval\"" ++ ], ++ [ DEFAULT_DATABASE_PATH="$db_path" ]) ++AC_MSG_RESULT($DEFAULT_DATABASE_PATH) ++AC_DEFINE_UNQUOTED([DEFAULT_DATABASE_PATH], [$DEFAULT_DATABASE_PATH], [Default location of drive info database]) ++ ++#CFLAGS="$CFLAGS -Wall -fomit-frame-pointer -Wcast-align" ++CFLAGS="$CFLAGS -Wall -W -Wcast-align" ++ ++# Substitute configuration variables ++AC_CONFIG_FILES([Makefile \ ++po/Makefile.in \ ++m4/Makefile \ ++src/Makefile \ ++doc/Makefile \ ++]) ++AC_OUTPUT ++ ++AC_MSG_RESULT([ ++ ++hddtemp-$VERSION is now configured for $canonical_host_type ++ ++ Build: $build ++ Host: $host ++ Source directory: $srcdir ++ Installation prefix: $prefix ++ C compiler: $CC $CFLAGS ++ ++]) +--- a/Makefile.am ++++ b/Makefile.am +@@ -12,7 +12,7 @@ EXTRA_DIST = config.rpath autogen.sh \ + README \ + TODO + +-SUBDIRS = intl po m4 src doc ++SUBDIRS = po m4 src doc + + CLEANFILES = *~ + +--- a/configure.in ++++ /dev/null +@@ -1,83 +0,0 @@ +-dnl Process this file with autoconf to produce a configure script. +- +-# Initialization +-AC_INIT +-AC_CONFIG_SRCDIR([Makefile.am]) +-AC_CONFIG_HEADERS([config.h]) +- +-# Determine the host and build type. The target is always a PIC. +-AC_CANONICAL_HOST +- +-AM_INIT_AUTOMAKE(hddtemp, 0.3-beta15) +- +-dnl Checks for programs. +-AC_PROG_CC +-AC_PROG_INSTALL +- +-# append the host alias to the tools for cross compiling +-AC_HEADER_STDC +-AC_CHECK_HEADERS(fcntl.h) +-AC_CHECK_HEADERS(iconv.h) +-AC_CHECK_HEADERS(netinet/in.h) +-AC_CHECK_TYPE(in_addr_t, ,[AC_DEFINE_UNQUOTED([in_addr_t], [uint32_t], [Define to 'uint32_t' if <netinet/in.h> does not define.])], [#include <netinet/in.h>]) +- +-# Checks for typedefs, structures, and compiler characteristics. +-AC_C_CONST +-AC_STRUCT_TM +- +-dnl internationalization macros +-AM_GNU_GETTEXT_VERSION +-AM_GNU_GETTEXT +-#AM_GNU_GETTEXT([external]) +- +-AC_CHECK_FUNCS([bindtextdomain textdomain iconv]) +- +-dnl reasonable guesses for where stuff is installed +-dnl if we don't do that now, the config.h will use ${prefix} +-dnl for DEFAULT_DATABASE_PATH. +-if test "x$prefix" = "xNONE"; then +- prefix="/usr/local" +-fi +-if test "x$exec_prefix" = "xNONE"; then +- exec_prefix=$prefix +-fi +- +-AC_MSG_CHECKING([Location of hddtemp.db]) +-DEFAULT_DATABASE_PATH= +-#db_path=\"`eval echo ${datadir}`/misc/hddtemp.db\" +-db_path=\"/usr/share/misc/hddtemp.db\" +-AC_ARG_WITH(db_path, +- [ --with-db-path=PATH \ +- Default location of hddtemp.db file [/usr/share/misc/hddtemp.db]], +- [ if test -d "$withval"; then +- AC_MSG_FAILURE([new file name for db-path]) +- fi +- DEFAULT_DATABASE_PATH="\"$withval\"" +- ], +- [ DEFAULT_DATABASE_PATH="$db_path" ]) +-AC_MSG_RESULT($DEFAULT_DATABASE_PATH) +-AC_DEFINE_UNQUOTED([DEFAULT_DATABASE_PATH], [$DEFAULT_DATABASE_PATH], [Default location of drive info database]) +- +-#CFLAGS="$CFLAGS -Wall -fomit-frame-pointer -Wcast-align" +-CFLAGS="$CFLAGS -Wall -W -Wcast-align" +- +-# Substitute configuration variables +-AC_CONFIG_FILES([Makefile intl/Makefile \ +-po/Makefile.in \ +-m4/Makefile \ +-src/Makefile \ +-doc/Makefile \ +-]) +-AC_OUTPUT +- +-AC_MSG_RESULT([ +- +-hddtemp-$VERSION is now configured for $canonical_host_type +- +- Build: $build +- Host: $host +- Source directory: $srcdir +- Installation prefix: $prefix +- C compiler: $CC $CFLAGS +- +-]) +--- a/intl/ChangeLog ++++ /dev/null +@@ -1,4 +0,0 @@ +-2005-02-24 GNU <bug-gnu-gettext@gnu.org> +- +- * Version 0.14.2 released. +- +--- a/intl/Makefile.in ++++ /dev/null +@@ -1,500 +0,0 @@ +-# Makefile for directory with message catalog handling library of GNU gettext +-# Copyright (C) 1995-1998, 2000-2005 Free Software Foundation, Inc. +-# +-# This program is free software; you can redistribute it and/or modify it +-# under the terms of the GNU Library General Public License as published +-# by the Free Software Foundation; either version 2, or (at your option) +-# any later version. +-# +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY; without even the implied warranty of +-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +-# Library General Public License for more details. +-# +-# You should have received a copy of the GNU Library General Public +-# License along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, +-# USA. +- +-PACKAGE = @PACKAGE@ +-VERSION = @VERSION@ +- +-SHELL = /bin/sh +- +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ +-top_builddir = .. +-VPATH = $(srcdir) +- +-prefix = @prefix@ +-exec_prefix = @exec_prefix@ +-transform = @program_transform_name@ +-libdir = @libdir@ +-includedir = @includedir@ +-datadir = @datadir@ +-localedir = $(datadir)/locale +-gettextsrcdir = $(datadir)/gettext/intl +-aliaspath = $(localedir) +-subdir = intl +- +-INSTALL = @INSTALL@ +-INSTALL_DATA = @INSTALL_DATA@ +-MKINSTALLDIRS = @MKINSTALLDIRS@ +-mkinstalldirs = $(SHELL) $(MKINSTALLDIRS) +- +-l = @INTL_LIBTOOL_SUFFIX_PREFIX@ +- +-AR = ar +-CC = @CC@ +-LIBTOOL = @LIBTOOL@ +-RANLIB = @RANLIB@ +-YACC = @INTLBISON@ -y -d +-YFLAGS = --name-prefix=__gettext +- +-DEFS = -DLOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" \ +--DLIBDIR=\"$(libdir)\" -DIN_LIBINTL \ +--DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR=\"$(libdir)\" -DNO_XMALLOC \ +--Dset_relocation_prefix=libintl_set_relocation_prefix \ +--Drelocate=libintl_relocate \ +--DDEPENDS_ON_LIBICONV=1 @DEFS@ +-CPPFLAGS = @CPPFLAGS@ +-CFLAGS = @CFLAGS@ +-LDFLAGS = @LDFLAGS@ +-LIBS = @LIBS@ +- +-COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) +- +-HEADERS = \ +- gmo.h \ +- gettextP.h \ +- hash-string.h \ +- loadinfo.h \ +- plural-exp.h \ +- eval-plural.h \ +- localcharset.h \ +- relocatable.h \ +- xsize.h \ +- printf-args.h printf-args.c \ +- printf-parse.h wprintf-parse.h printf-parse.c \ +- vasnprintf.h vasnwprintf.h vasnprintf.c \ +- os2compat.h \ +- libgnuintl.h.in +-SOURCES = \ +- bindtextdom.c \ +- dcgettext.c \ +- dgettext.c \ +- gettext.c \ +- finddomain.c \ +- loadmsgcat.c \ +- localealias.c \ +- textdomain.c \ +- l10nflist.c \ +- explodename.c \ +- dcigettext.c \ +- dcngettext.c \ +- dngettext.c \ +- ngettext.c \ +- plural.y \ +- plural-exp.c \ +- localcharset.c \ +- relocatable.c \ +- langprefs.c \ +- localename.c \ +- log.c \ +- printf.c \ +- osdep.c \ +- os2compat.c \ +- intl-compat.c +-OBJECTS = \ +- bindtextdom.$lo \ +- dcgettext.$lo \ +- dgettext.$lo \ +- gettext.$lo \ +- finddomain.$lo \ +- loadmsgcat.$lo \ +- localealias.$lo \ +- textdomain.$lo \ +- l10nflist.$lo \ +- explodename.$lo \ +- dcigettext.$lo \ +- dcngettext.$lo \ +- dngettext.$lo \ +- ngettext.$lo \ +- plural.$lo \ +- plural-exp.$lo \ +- localcharset.$lo \ +- relocatable.$lo \ +- langprefs.$lo \ +- localename.$lo \ +- log.$lo \ +- printf.$lo \ +- osdep.$lo \ +- intl-compat.$lo +-DISTFILES.common = Makefile.in \ +-config.charset locale.alias ref-add.sin ref-del.sin $(HEADERS) $(SOURCES) +-DISTFILES.generated = plural.c +-DISTFILES.normal = VERSION +-DISTFILES.gettext = COPYING.LIB-2.0 COPYING.LIB-2.1 libintl.glibc \ +-libgnuintl.h_vms Makefile.vms \ +-libgnuintl.h.msvc-static libgnuintl.h.msvc-shared README.woe32 Makefile.msvc +-DISTFILES.obsolete = xopen-msg.sed linux-msg.sed po2tbl.sed.in cat-compat.c \ +-COPYING.LIB-2 gettext.h libgettext.h plural-eval.c libgnuintl.h +- +-all: all-@USE_INCLUDED_LIBINTL@ +-all-yes: libintl.$la libintl.h charset.alias ref-add.sed ref-del.sed +-all-no: all-no-@BUILD_INCLUDED_LIBINTL@ +-all-no-yes: libgnuintl.$la +-all-no-no: +- +-libintl.a libgnuintl.a: $(OBJECTS) +- rm -f $@ +- $(AR) cru $@ $(OBJECTS) +- $(RANLIB) $@ +- +-libintl.la libgnuintl.la: $(OBJECTS) +- $(LIBTOOL) --mode=link \ +- $(CC) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) $(LDFLAGS) -o $@ \ +- $(OBJECTS) @LTLIBICONV@ @INTL_MACOSX_LIBS@ $(LIBS) -lc \ +- -version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \ +- -rpath $(libdir) \ +- -no-undefined +- +-# Libtool's library version information for libintl. +-# Before making a gettext release, the gettext maintainer must change this +-# according to the libtool documentation, section "Library interface versions". +-# Maintainers of other packages that include the intl directory must *not* +-# change these values. +-LTV_CURRENT=7 +-LTV_REVISION=1 +-LTV_AGE=4 +- +-.SUFFIXES: +-.SUFFIXES: .c .y .o .lo .sin .sed +- +-.c.o: +- $(COMPILE) $< +- +-.y.c: +- $(YACC) $(YFLAGS) --output $@ $< +- rm -f $*.h +- +-bindtextdom.lo: $(srcdir)/bindtextdom.c +- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/bindtextdom.c +-dcgettext.lo: $(srcdir)/dcgettext.c +- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dcgettext.c +-dgettext.lo: $(srcdir)/dgettext.c +- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dgettext.c +-gettext.lo: $(srcdir)/gettext.c +- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/gettext.c +-finddomain.lo: $(srcdir)/finddomain.c +- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/finddomain.c +-loadmsgcat.lo: $(srcdir)/loadmsgcat.c +- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/loadmsgcat.c +-localealias.lo: $(srcdir)/localealias.c +- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localealias.c +-textdomain.lo: $(srcdir)/textdomain.c +- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/textdomain.c +-l10nflist.lo: $(srcdir)/l10nflist.c +- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/l10nflist.c +-explodename.lo: $(srcdir)/explodename.c +- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/explodename.c +-dcigettext.lo: $(srcdir)/dcigettext.c +- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dcigettext.c +-dcngettext.lo: $(srcdir)/dcngettext.c +- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dcngettext.c +-dngettext.lo: $(srcdir)/dngettext.c +- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dngettext.c +-ngettext.lo: $(srcdir)/ngettext.c +- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/ngettext.c +-plural.lo: $(srcdir)/plural.c +- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/plural.c +-plural-exp.lo: $(srcdir)/plural-exp.c +- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/plural-exp.c +-localcharset.lo: $(srcdir)/localcharset.c +- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localcharset.c +-relocatable.lo: $(srcdir)/relocatable.c +- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/relocatable.c +-langprefs.lo: $(srcdir)/langprefs.c +- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/langprefs.c +-localename.lo: $(srcdir)/localename.c +- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localename.c +-log.lo: $(srcdir)/log.c +- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/log.c +-printf.lo: $(srcdir)/printf.c +- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/printf.c +-osdep.lo: $(srcdir)/osdep.c +- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/osdep.c +-intl-compat.lo: $(srcdir)/intl-compat.c +- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/intl-compat.c +- +-ref-add.sed: $(srcdir)/ref-add.sin +- sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $(srcdir)/ref-add.sin > t-ref-add.sed +- mv t-ref-add.sed ref-add.sed +-ref-del.sed: $(srcdir)/ref-del.sin +- sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $(srcdir)/ref-del.sin > t-ref-del.sed +- mv t-ref-del.sed ref-del.sed +- +-INCLUDES = -I. -I$(srcdir) -I.. +- +-libgnuintl.h: $(srcdir)/libgnuintl.h.in +- sed -e 's,@''HAVE_POSIX_PRINTF''@,@HAVE_POSIX_PRINTF@,g' \ +- -e 's,@''HAVE_ASPRINTF''@,@HAVE_ASPRINTF@,g' \ +- -e 's,@''HAVE_SNPRINTF''@,@HAVE_SNPRINTF@,g' \ +- -e 's,@''HAVE_WPRINTF''@,@HAVE_WPRINTF@,g' \ +- < $(srcdir)/libgnuintl.h.in > libgnuintl.h +- +-libintl.h: libgnuintl.h +- cp libgnuintl.h libintl.h +- +-charset.alias: $(srcdir)/config.charset +- $(SHELL) $(srcdir)/config.charset '@host@' > t-$@ +- mv t-$@ $@ +- +-check: all +- +-# We must not install the libintl.h/libintl.a files if we are on a +-# system which has the GNU gettext() function in its C library or in a +-# separate library. +-# If you want to use the one which comes with this version of the +-# package, you have to use `configure --with-included-gettext'. +-install: install-exec install-data +-install-exec: all +- if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \ +- && test '@USE_INCLUDED_LIBINTL@' = yes; then \ +- $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \ +- $(INSTALL_DATA) libintl.h $(DESTDIR)$(includedir)/libintl.h; \ +- $(LIBTOOL) --mode=install \ +- $(INSTALL_DATA) libintl.$la $(DESTDIR)$(libdir)/libintl.$la; \ +- if test "@RELOCATABLE@" = yes; then \ +- dependencies=`sed -n -e 's,^dependency_libs=\(.*\),\1,p' < $(DESTDIR)$(libdir)/libintl.la | sed -e "s,^',," -e "s,'\$$,,"`; \ +- if test -n "$$dependencies"; then \ +- rm -f $(DESTDIR)$(libdir)/libintl.la; \ +- fi; \ +- fi; \ +- else \ +- : ; \ +- fi +- if test "$(PACKAGE)" = "gettext-tools" \ +- && test '@USE_INCLUDED_LIBINTL@' = no \ +- && test @GLIBC2@ != no; then \ +- $(mkinstalldirs) $(DESTDIR)$(libdir); \ +- $(LIBTOOL) --mode=install \ +- $(INSTALL_DATA) libgnuintl.$la $(DESTDIR)$(libdir)/libgnuintl.$la; \ +- rm -f $(DESTDIR)$(libdir)/preloadable_libintl.so; \ +- $(INSTALL_DATA) $(DESTDIR)$(libdir)/libgnuintl.so $(DESTDIR)$(libdir)/preloadable_libintl.so; \ +- $(LIBTOOL) --mode=uninstall \ +- rm -f $(DESTDIR)$(libdir)/libgnuintl.$la; \ +- else \ +- : ; \ +- fi +- if test '@USE_INCLUDED_LIBINTL@' = yes; then \ +- test @GLIBC21@ != no || $(mkinstalldirs) $(DESTDIR)$(libdir); \ +- temp=$(DESTDIR)$(libdir)/t-charset.alias; \ +- dest=$(DESTDIR)$(libdir)/charset.alias; \ +- if test -f $(DESTDIR)$(libdir)/charset.alias; then \ +- orig=$(DESTDIR)$(libdir)/charset.alias; \ +- sed -f ref-add.sed $$orig > $$temp; \ +- $(INSTALL_DATA) $$temp $$dest; \ +- rm -f $$temp; \ +- else \ +- if test @GLIBC21@ = no; then \ +- orig=charset.alias; \ +- sed -f ref-add.sed $$orig > $$temp; \ +- $(INSTALL_DATA) $$temp $$dest; \ +- rm -f $$temp; \ +- fi; \ +- fi; \ +- $(mkinstalldirs) $(DESTDIR)$(localedir); \ +- test -f $(DESTDIR)$(localedir)/locale.alias \ +- && orig=$(DESTDIR)$(localedir)/locale.alias \ +- || orig=$(srcdir)/locale.alias; \ +- temp=$(DESTDIR)$(localedir)/t-locale.alias; \ +- dest=$(DESTDIR)$(localedir)/locale.alias; \ +- sed -f ref-add.sed $$orig > $$temp; \ +- $(INSTALL_DATA) $$temp $$dest; \ +- rm -f $$temp; \ +- else \ +- : ; \ +- fi +-install-data: all +- if test "$(PACKAGE)" = "gettext-tools"; then \ +- $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ +- $(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \ +- $(INSTALL_DATA) ChangeLog.inst $(DESTDIR)$(gettextsrcdir)/ChangeLog; \ +- dists="COPYING.LIB-2.0 COPYING.LIB-2.1 $(DISTFILES.common)"; \ +- for file in $$dists; do \ +- $(INSTALL_DATA) $(srcdir)/$$file \ +- $(DESTDIR)$(gettextsrcdir)/$$file; \ +- done; \ +- chmod a+x $(DESTDIR)$(gettextsrcdir)/config.charset; \ +- dists="$(DISTFILES.generated)"; \ +- for file in $$dists; do \ +- if test -f $$file; then dir=.; else dir=$(srcdir); fi; \ +- $(INSTALL_DATA) $$dir/$$file \ +- $(DESTDIR)$(gettextsrcdir)/$$file; \ +- done; \ +- dists="$(DISTFILES.obsolete)"; \ +- for file in $$dists; do \ +- rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \ +- done; \ +- else \ +- : ; \ +- fi +- +-install-strip: install +- +-installdirs: +- if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \ +- && test '@USE_INCLUDED_LIBINTL@' = yes; then \ +- $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \ +- else \ +- : ; \ +- fi +- if test "$(PACKAGE)" = "gettext-tools" \ +- && test '@USE_INCLUDED_LIBINTL@' = no \ +- && test @GLIBC2@ != no; then \ +- $(mkinstalldirs) $(DESTDIR)$(libdir); \ +- else \ +- : ; \ +- fi +- if test '@USE_INCLUDED_LIBINTL@' = yes; then \ +- test @GLIBC21@ != no || $(mkinstalldirs) $(DESTDIR)$(libdir); \ +- $(mkinstalldirs) $(DESTDIR)$(localedir); \ +- else \ +- : ; \ +- fi +- if test "$(PACKAGE)" = "gettext-tools"; then \ +- $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ +- else \ +- : ; \ +- fi +- +-# Define this as empty until I found a useful application. +-installcheck: +- +-uninstall: +- if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \ +- && test '@USE_INCLUDED_LIBINTL@' = yes; then \ +- rm -f $(DESTDIR)$(includedir)/libintl.h; \ +- $(LIBTOOL) --mode=uninstall \ +- rm -f $(DESTDIR)$(libdir)/libintl.$la; \ +- else \ +- : ; \ +- fi +- if test "$(PACKAGE)" = "gettext-tools" \ +- && test '@USE_INCLUDED_LIBINTL@' = no \ +- && test @GLIBC2@ != no; then \ +- rm -f $(DESTDIR)$(libdir)/preloadable_libintl.so; \ +- else \ +- : ; \ +- fi +- if test '@USE_INCLUDED_LIBINTL@' = yes; then \ +- if test -f $(DESTDIR)$(libdir)/charset.alias; then \ +- temp=$(DESTDIR)$(libdir)/t-charset.alias; \ +- dest=$(DESTDIR)$(libdir)/charset.alias; \ +- sed -f ref-del.sed $$dest > $$temp; \ +- if grep '^# Packages using this file: $$' $$temp > /dev/null; then \ +- rm -f $$dest; \ +- else \ +- $(INSTALL_DATA) $$temp $$dest; \ +- fi; \ +- rm -f $$temp; \ +- fi; \ +- if test -f $(DESTDIR)$(localedir)/locale.alias; then \ +- temp=$(DESTDIR)$(localedir)/t-locale.alias; \ +- dest=$(DESTDIR)$(localedir)/locale.alias; \ +- sed -f ref-del.sed $$dest > $$temp; \ +- if grep '^# Packages using this file: $$' $$temp > /dev/null; then \ +- rm -f $$dest; \ +- else \ +- $(INSTALL_DATA) $$temp $$dest; \ +- fi; \ +- rm -f $$temp; \ +- fi; \ +- else \ +- : ; \ +- fi +- if test "$(PACKAGE)" = "gettext-tools"; then \ +- for file in VERSION ChangeLog COPYING.LIB-2.0 COPYING.LIB-2.1 $(DISTFILES.common) $(DISTFILES.generated); do \ +- rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \ +- done; \ +- else \ +- : ; \ +- fi +- +-info dvi ps pdf html: +- +-$(OBJECTS): ../config.h libgnuintl.h +-bindtextdom.$lo dcgettext.$lo dcigettext.$lo dcngettext.$lo dgettext.$lo dngettext.$lo finddomain.$lo gettext.$lo intl-compat.$lo loadmsgcat.$lo localealias.$lo ngettext.$lo textdomain.$lo: $(srcdir)/gettextP.h $(srcdir)/gmo.h $(srcdir)/loadinfo.h +-dcigettext.$lo loadmsgcat.$lo: $(srcdir)/hash-string.h +-explodename.$lo l10nflist.$lo: $(srcdir)/loadinfo.h +-dcigettext.$lo loadmsgcat.$lo plural.$lo plural-exp.$lo: $(srcdir)/plural-exp.h +-dcigettext.$lo: $(srcdir)/eval-plural.h +-localcharset.$lo: $(srcdir)/localcharset.h +-localealias.$lo localcharset.$lo relocatable.$lo: $(srcdir)/relocatable.h +-printf.$lo: $(srcdir)/printf-args.h $(srcdir)/printf-args.c $(srcdir)/printf-parse.h $(srcdir)/wprintf-parse.h $(srcdir)/xsize.h $(srcdir)/printf-parse.c $(srcdir)/vasnprintf.h $(srcdir)/vasnwprintf.h $(srcdir)/vasnprintf.c +- +-tags: TAGS +- +-TAGS: $(HEADERS) $(SOURCES) +- here=`pwd`; cd $(srcdir) && etags -o $$here/TAGS $(HEADERS) $(SOURCES) +- +-ctags: CTAGS +- +-CTAGS: $(HEADERS) $(SOURCES) +- here=`pwd`; cd $(srcdir) && ctags -o $$here/CTAGS $(HEADERS) $(SOURCES) +- +-id: ID +- +-ID: $(HEADERS) $(SOURCES) +- here=`pwd`; cd $(srcdir) && mkid -f$$here/ID $(HEADERS) $(SOURCES) +- +- +-mostlyclean: +- rm -f *.a *.la *.o *.obj *.lo core core.* +- rm -f libgnuintl.h libintl.h charset.alias ref-add.sed ref-del.sed +- rm -f -r .libs _libs +- +-clean: mostlyclean +- +-distclean: clean +- rm -f Makefile ID TAGS +- if test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; then \ +- rm -f ChangeLog.inst $(DISTFILES.normal); \ +- else \ +- : ; \ +- fi +- +-maintainer-clean: distclean +- @echo "This command is intended for maintainers to use;" +- @echo "it deletes files that may require special tools to rebuild." +- +- +-# GNU gettext needs not contain the file `VERSION' but contains some +-# other files which should not be distributed in other packages. +-distdir = ../$(PACKAGE)-$(VERSION)/$(subdir) +-dist distdir: Makefile +- if test "$(PACKAGE)" = "gettext-tools"; then \ +- : ; \ +- else \ +- if test "$(PACKAGE)" = "gettext-runtime"; then \ +- additional="$(DISTFILES.gettext)"; \ +- else \ +- additional="$(DISTFILES.normal)"; \ +- fi; \ +- $(MAKE) $(DISTFILES.common) $(DISTFILES.generated) $$additional; \ +- for file in ChangeLog $(DISTFILES.common) $(DISTFILES.generated) $$additional; do \ +- if test -f $$file; then dir=.; else dir=$(srcdir); fi; \ +- cp -p $$dir/$$file $(distdir); \ +- done; \ +- fi +- +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- cd $(top_builddir) && $(SHELL) ./config.status +-# This would be more efficient, but doesn't work any more with autoconf-2.57, +-# when AC_CONFIG_FILES([intl/Makefile:somedir/Makefile.in]) is used. +-# cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status +- +-# Tell versions [3.59,3.63) of GNU make not to export all variables. +-# Otherwise a system limit (for SysV at least) may be exceeded. +-.NOEXPORT: diff --git a/meta-oe/recipes-support/hddtemp/hddtemp/0001-po-force-Language-header-for-fr-and-de-locals.patch b/meta-oe/recipes-support/hddtemp/hddtemp/0001-po-force-Language-header-for-fr-and-de-locals.patch new file mode 100644 index 0000000000..38f5c88997 --- /dev/null +++ b/meta-oe/recipes-support/hddtemp/hddtemp/0001-po-force-Language-header-for-fr-and-de-locals.patch @@ -0,0 +1,46 @@ +From 04149f9ec9b37b5bb4c2b6c38d4560b2c122c483 Mon Sep 17 00:00:00 2001 +From: Yoann Congal <yoann.congal@smile.fr> +Date: Thu, 23 May 2024 23:28:42 +0200 +Subject: [PATCH] po: force Language: header for "fr" and "de" locals + +Language: header is "new" and used to be derived from Language-Team +header. But, for fr.po and de.po, Language can't be derived. + +Force "Language" header to avoid having a default Language header. + +Upstream-Status: Inactive-Upstream [lastrelease: 26-Apr-2006] +See: http://download.savannah.nongnu.org/releases/hddtemp/?C=M&O=D + +Signed-off-by: Yoann Congal <yoann.congal@smile.fr> +--- + po/de.po | 1 + + po/fr.po | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/po/de.po b/po/de.po +index 3b79e08..d04976b 100644 +--- a/po/de.po ++++ b/po/de.po +@@ -13,6 +13,7 @@ msgstr "" + "PO-Revision-Date: 2011-08-30 16:40+0200\n" + "Last-Translator: Vinzenz Vietzke <vinz@v1nz.org>\n" + "Language-Team: <debian-l10n-german@lists.debian.org>\n" ++"Language: de\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit" +diff --git a/po/fr.po b/po/fr.po +index 2fd97c5..0b3bf19 100644 +--- a/po/fr.po ++++ b/po/fr.po +@@ -12,6 +12,7 @@ msgstr "" + "PO-Revision-Date: 2011-08-30 16:38+0200\n" + "Last-Translator: Aurelien Jarno <aurelien@aurel32.net>\n" + "Language-Team: FRANCAIS <fr@li.org>\n" ++"Language: fr\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=ISO-8859-1\n" + "Content-Transfer-Encoding: 8bit\n" +-- +2.39.2 + diff --git a/meta-oe/recipes-support/hddtemp/hddtemp/0001-sata.c-Declare-ata_get_powermode-prototype.patch b/meta-oe/recipes-support/hddtemp/hddtemp/0001-sata.c-Declare-ata_get_powermode-prototype.patch new file mode 100644 index 0000000000..5703d3c241 --- /dev/null +++ b/meta-oe/recipes-support/hddtemp/hddtemp/0001-sata.c-Declare-ata_get_powermode-prototype.patch @@ -0,0 +1,33 @@ +From c5ca31940d1d1889ef2cc6974c18ff24ab406748 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 31 Aug 2022 16:42:23 -0700 +Subject: [PATCH] sata.c: Declare ata_get_powermode prototype + +Fixes build warnings/errors + +sata.c:127:10: error: call to undeclared function 'ata_get_powermode'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] +| switch(ata_get_powermode(dsk->fd)) + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/sata.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/sata.c b/src/sata.c +index d67621f..4172245 100644 +--- a/src/sata.c ++++ b/src/sata.c +@@ -52,7 +52,8 @@ + (((u16)(__x) & (u16)0xff00U) >> 8) )); \ + }) + +- ++extern enum e_powermode ata_get_powermode(int device); ++ + static int sata_probe(int device) { + int bus_num; + unsigned char cmd[4] = { WIN_IDENTIFY, 0, 0, 1 }; +-- +2.37.3 + diff --git a/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp-0.3-beta15-autodetect-717479.patch b/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp-0.3-beta15-autodetect-717479.patch index 1ec6a61b31..1a541e32fd 100644 --- a/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp-0.3-beta15-autodetect-717479.patch +++ b/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp-0.3-beta15-autodetect-717479.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Auto-detect disks if none specified Refer to: diff --git a/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp-no-nls-support.patch b/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp-no-nls-support.patch index 8f6b9c3c4b..78de64c99d 100644 --- a/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp-no-nls-support.patch +++ b/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp-no-nls-support.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + diff -ru hddtemp-0.3-beta15.orig/configure.in hddtemp-0.3-beta15/configure.in --- hddtemp-0.3-beta15.orig/configure.in 2005-10-17 20:14:19.000000000 +0100 +++ hddtemp-0.3-beta15/configure.in 2008-06-27 00:00:46.000000000 +0100 diff --git a/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp_0.3-beta15-52.diff b/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp_0.3-beta15-52.diff index 057b1fd1d3..60953381a1 100644 --- a/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp_0.3-beta15-52.diff +++ b/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp_0.3-beta15-52.diff @@ -6,7 +6,7 @@ Filtered with: filterdiff -p1 -x README -x 'debian/*' -Upstream-Status: unmaintained +Upstream-Status: Inappropriate [unmaintained] Index: hddtemp-0.3-beta15/doc/hddtemp.8 =================================================================== diff --git a/meta-oe/recipes-support/hddtemp/hddtemp_0.3-beta15.bb b/meta-oe/recipes-support/hddtemp/hddtemp_0.3-beta15.bb index 4a871bf4f4..75feccb87c 100644 --- a/meta-oe/recipes-support/hddtemp/hddtemp_0.3-beta15.bb +++ b/meta-oe/recipes-support/hddtemp/hddtemp_0.3-beta15.bb @@ -1,14 +1,16 @@ SUMMARY = "Hard disk temperature monitor daemon" SECTION = "console/network" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" -PR = "r1" SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/hddtemp/hddtemp-0.3-beta15.tar.bz2 \ file://hddtemp-no-nls-support.patch \ file://hddtemp_0.3-beta15-52.diff \ file://hddtemp-0.3-beta15-autodetect-717479.patch \ file://0001-backtrace-Replace-struct-ucontext-with-ucontext_t.patch \ + file://0001-configure.ac-Rename-to-configure.ac-and-use-external.patch \ + file://0001-sata.c-Declare-ata_get_powermode-prototype.patch \ + file://0001-po-force-Language-header-for-fr-and-de-locals.patch \ file://hddtemp.db \ file://init \ " @@ -20,13 +22,13 @@ LIC_FILES_CHKSUM = "file://GPL-2;md5=eb723b61539feef013de476e68b5c50a" inherit autotools gettext update-rc.d -FILES_${PN} += "/usr/share/misc/hddtemp.db" +FILES:${PN} += "/usr/share/misc/hddtemp.db" -do_install_append() { +do_install:append() { install -d ${D}/usr/share/misc/ - install -m 0644 ${WORKDIR}/hddtemp.db ${D}/usr/share/misc/hddtemp.db + install -m 0644 ${UNPACKDIR}/hddtemp.db ${D}/usr/share/misc/hddtemp.db install -d ${D}${sysconfdir}/init.d - install -m 0644 ${WORKDIR}/init ${D}${sysconfdir}/init.d/hddtemp + install -m 0644 ${UNPACKDIR}/init ${D}${sysconfdir}/init.d/hddtemp } INITSCRIPT_NAME = "hddtemp" diff --git a/meta-oe/recipes-support/hdf5/files/0001-cmake-remove-build-flags.patch b/meta-oe/recipes-support/hdf5/files/0001-cmake-remove-build-flags.patch new file mode 100644 index 0000000000..68d9c3a3cf --- /dev/null +++ b/meta-oe/recipes-support/hdf5/files/0001-cmake-remove-build-flags.patch @@ -0,0 +1,96 @@ +From 4fa437782261c0da785d4574ad3a03700f624e66 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Tue, 19 Sep 2023 02:56:09 +0000 +Subject: [PATCH] cmake: remove build flags + +Don't generate the build host related info and reemove the build flags +to improve reproducibility. + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + config/cmake/libhdf5.settings.cmake.in | 18 +++++++++--------- + src/H5make_libsettings.c | 17 ----------------- + 2 files changed, 9 insertions(+), 26 deletions(-) + +diff --git a/config/cmake/libhdf5.settings.cmake.in b/config/cmake/libhdf5.settings.cmake.in +index f60f0de..f4433c0 100644 +--- a/config/cmake/libhdf5.settings.cmake.in ++++ b/config/cmake/libhdf5.settings.cmake.in +@@ -23,23 +23,23 @@ Linking Options: + ---------------- + Libraries: @BUILD_NAME_EXT@ + Statically Linked Executables: @BUILD_STATIC_EXECS@ +- LDFLAGS: @CMAKE_SHARED_LINKER_FLAGS@ ++ LDFLAGS: + H5_LDFLAGS: @H5_LDFLAGS@ + AM_LDFLAGS: @AM_LDFLAGS@ + Extra libraries: @LINK_LIBS@ +- Archiver: @CMAKE_AR@ +- AR_FLAGS: +- Ranlib: @CMAKE_RANLIB@ ++ Archiver: ++ AR_FLAGS: ++ Ranlib: + + Languages: + ---------- + C: YES +- C Compiler: @CMAKE_C_COMPILER@ @CMAKE_C_COMPILER_VERSION@ ++ C Compiler: + CPPFLAGS: @CPPFLAGS@ + H5_CPPFLAGS: @H5_CPPFLAGS@ + AM_CPPFLAGS: @AM_CPPFLAGS@ +- CFLAGS: @CMAKE_C_FLAGS@ +- H5_CFLAGS: @HDF5_CMAKE_C_FLAGS@ ++ CFLAGS: ++ H5_CFLAGS: + AM_CFLAGS: @AM_CFLAGS@ + Shared C Library: @H5_ENABLE_SHARED_LIB@ + Static C Library: @H5_ENABLE_STATIC_LIB@ +@@ -51,11 +51,11 @@ Languages: + AM Fortran Flags: @AM_FCFLAGS@ + Shared Fortran Library: @H5_ENABLE_SHARED_LIB@ + Static Fortran Library: @H5_ENABLE_STATIC_LIB@ +- Module Directory: @CMAKE_Fortran_MODULE_DIRECTORY@ ++ Module Directory: + + C++: @HDF5_BUILD_CPP_LIB@ + C++ Compiler: @CMAKE_CXX_COMPILER@ @CMAKE_CXX_COMPILER_VERSION@ +- C++ Flags: @CMAKE_CXX_FLAGS@ ++ C++ Flags: + H5 C++ Flags: @HDF5_CMAKE_CXX_FLAGS@ + AM C++ Flags: @AM_CXXFLAGS@ + Shared C++ Library: @H5_ENABLE_SHARED_LIB@ +diff --git a/src/H5make_libsettings.c b/src/H5make_libsettings.c +index 2661288..7c0f84f 100644 +--- a/src/H5make_libsettings.c ++++ b/src/H5make_libsettings.c +@@ -205,23 +205,6 @@ information about the library build configuration\n"; + fprintf(rawoutstream, "/* Generated automatically by H5make_libsettings -- do not edit */\n\n\n"); + fputs(FileHeader, rawoutstream); /*the copyright notice--see top of this file */ + +- fprintf(rawoutstream, " *\n * Created:\t\t%s %2d, %4d\n", month_name[tm->tm_mon], tm->tm_mday, +- 1900 + tm->tm_year); +- if (pwd || real_name[0] || host_name[0]) { +- fprintf(rawoutstream, " *\t\t\t"); +- if (real_name[0]) +- fprintf(rawoutstream, "%s <", real_name); +-#ifdef H5_HAVE_GETPWUID +- if (pwd) +- fputs(pwd->pw_name, rawoutstream); +-#endif +- if (host_name[0]) +- fprintf(rawoutstream, "@%s", host_name); +- if (real_name[0]) +- fprintf(rawoutstream, ">"); +- fputc('\n', rawoutstream); +- } +- + fprintf(rawoutstream, " *\n * Purpose:\t\t"); + + for (s = purpose; *s; s++) { +-- +2.35.5 + diff --git a/meta-oe/recipes-support/hdf5/files/0001-cross-compiling-support.patch b/meta-oe/recipes-support/hdf5/files/0001-cross-compiling-support.patch deleted file mode 100644 index bdc1fa5f96..0000000000 --- a/meta-oe/recipes-support/hdf5/files/0001-cross-compiling-support.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 1b4fadf550587b46e405d7ccb777dcb00aa791a2 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Tue, 29 Jan 2019 15:39:15 +0800 -Subject: [PATCH 1/2] cross compiling support - -Do not generate config files at build time, use pre-generated -files to instead. - -Upstream-Status: Inappropriate [oe specific] - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - CMakeLists.txt | 6 ++++++ - src/CMakeLists.txt | 23 ----------------------- - 2 files changed, 6 insertions(+), 23 deletions(-) - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -770,4 +770,10 @@ endif () - #----------------------------------------------------------------------------- - configure_file (${HDF_RESOURCES_DIR}/H5pubconf.h.in ${HDF5_BINARY_DIR}/H5pubconf.h @ONLY) - -+#----------------------------------------------------------------------------- -+# Copy the pre-generated files in place -+#----------------------------------------------------------------------------- -+configure_file(H5Tinit.c H5Tinit.c COPYONLY) -+configure_file(H5lib_settings.c H5lib_settings.c COPYONLY) -+ - include (CMakeInstallation.cmake) ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -613,36 +613,9 @@ set (H5_PRIVATE_HEADERS - #----------------------------------------------------------------------------- - add_executable (H5detect ${HDF5_SRC_DIR}/H5detect.c) - TARGET_C_PROPERTIES (H5detect STATIC " " " ") --if (MSVC OR MINGW) -- target_link_libraries (H5detect "ws2_32.lib") --endif () --if (CMAKE_SYSTEM_NAME STREQUAL "Emscripten") -- set_property(TARGET H5detect PROPERTY LINK_FLAGS "-O0") --endif () -- --add_custom_command ( -- OUTPUT ${HDF5_BINARY_DIR}/H5Tinit.c -- COMMAND $<TARGET_FILE:H5detect> -- ARGS > ${HDF5_BINARY_DIR}/H5Tinit.c -- DEPENDS H5detect --) - - add_executable (H5make_libsettings ${HDF5_SRC_DIR}/H5make_libsettings.c) - TARGET_C_PROPERTIES (H5make_libsettings STATIC " " " ") --if (MSVC OR MINGW) -- target_link_libraries (H5make_libsettings "ws2_32.lib") --endif () --if (CMAKE_SYSTEM_NAME STREQUAL "Emscripten") -- set_property(TARGET H5make_libsettings PROPERTY LINK_FLAGS "-O0") --endif () -- --add_custom_command ( -- OUTPUT ${HDF5_BINARY_DIR}/H5lib_settings.c -- COMMAND $<TARGET_FILE:H5make_libsettings> -- ARGS > ${HDF5_BINARY_DIR}/H5lib_settings.c -- DEPENDS H5make_libsettings -- WORKING_DIRECTORY ${HDF5_BINARY_DIR} --) - - if (GENERATE_ERROR_HEADERS) - find_package (Perl) diff --git a/meta-oe/recipes-support/hdf5/files/0002-Remove-suffix-shared-from-shared-library-name.patch b/meta-oe/recipes-support/hdf5/files/0002-Remove-suffix-shared-from-shared-library-name.patch index 6f893787f8..f0eb05a1e7 100644 --- a/meta-oe/recipes-support/hdf5/files/0002-Remove-suffix-shared-from-shared-library-name.patch +++ b/meta-oe/recipes-support/hdf5/files/0002-Remove-suffix-shared-from-shared-library-name.patch @@ -10,20 +10,19 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> CMakeLists.txt | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9af14d5..05100e3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -153,18 +153,18 @@ set (HDF5_F90_TEST_LIB_TARGET "${HDF5_F90_TEST_LIB_CORENAME}-static") - set (HDF5_F90_C_TEST_LIB_TARGET "${HDF5_F90_C_TEST_LIB_CORENAME}-static") - set (HDF5_HL_F90_LIB_TARGET "${HDF5_HL_F90_LIB_CORENAME}-static") - set (HDF5_HL_F90_C_LIB_TARGET "${HDF5_HL_F90_C_LIB_CORENAME}-static") +@@ -191,19 +191,19 @@ set (HDF5_HL_F90_C_LIB_TARGET "${HDF + set (HDF5_JAVA_JNI_LIB_TARGET "${HDF5_JAVA_JNI_LIB_CORENAME}") + set (HDF5_JAVA_HDF5_LIB_TARGET "${HDF5_JAVA_HDF5_LIB_CORENAME}") + set (HDF5_JAVA_TEST_LIB_TARGET "${HDF5_JAVA_TEST_LIB_CORENAME}") -set (HDF5_LIBSH_TARGET "${HDF5_LIB_CORENAME}-shared") -set (HDF5_TEST_LIBSH_TARGET "${HDF5_TEST_LIB_CORENAME}-shared") -set (HDF5_CPP_LIBSH_TARGET "${HDF5_CPP_LIB_CORENAME}-shared") -set (HDF5_HL_LIBSH_TARGET "${HDF5_HL_LIB_CORENAME}-shared") -set (HDF5_HL_CPP_LIBSH_TARGET "${HDF5_HL_CPP_LIB_CORENAME}-shared") -set (HDF5_TOOLS_LIBSH_TARGET "${HDF5_TOOLS_LIB_CORENAME}-shared") +-set (HDF5_UTILS_LIBSH_TARGET "${HDF5_UTILS_LIB_CORENAME}-shared") -set (HDF5_F90_LIBSH_TARGET "${HDF5_F90_LIB_CORENAME}-shared") -set (HDF5_F90_C_LIBSH_TARGET "${HDF5_F90_C_LIB_CORENAME}-shared") -set (HDF5_F90_TEST_LIBSH_TARGET "${HDF5_F90_TEST_LIB_CORENAME}-shared") @@ -36,6 +35,7 @@ index 9af14d5..05100e3 100644 +set (HDF5_HL_LIBSH_TARGET "${HDF5_HL_LIB_CORENAME}") +set (HDF5_HL_CPP_LIBSH_TARGET "${HDF5_HL_CPP_LIB_CORENAME}") +set (HDF5_TOOLS_LIBSH_TARGET "${HDF5_TOOLS_LIB_CORENAME}") ++set (HDF5_UTILS_LIBSH_TARGET "${HDF5_UTILS_LIB_CORENAME}") +set (HDF5_F90_LIBSH_TARGET "${HDF5_F90_LIB_CORENAME}") +set (HDF5_F90_C_LIBSH_TARGET "${HDF5_F90_C_LIB_CORENAME}") +set (HDF5_F90_TEST_LIBSH_TARGET "${HDF5_F90_TEST_LIB_CORENAME}") @@ -45,6 +45,3 @@ index 9af14d5..05100e3 100644 #----------------------------------------------------------------------------- # Define some CMake variables for use later in the project --- -2.7.4 - diff --git a/meta-oe/recipes-support/hdf5/files/H5Tinit-32.c b/meta-oe/recipes-support/hdf5/files/H5Tinit-32.c deleted file mode 100755 index 8057a7ad83..0000000000 --- a/meta-oe/recipes-support/hdf5/files/H5Tinit-32.c +++ /dev/null @@ -1,975 +0,0 @@ -/* Generated automatically by H5detect -- do not edit */ - - - -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright by The HDF Group. * - * Copyright by the Board of Trustees of the University of Illinois. * - * All rights reserved. * - * * - * This file is part of HDF5. The full HDF5 copyright notice, including * - * terms governing use, modification, and redistribution, is contained in * - * the COPYING file, which can be found at the root of the source code * - * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases. * - * If you do not have access to either file, you may request a copy from * - * help@hdfgroup.org. * - * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Created: Mar 5, 2019 - * root <root@qemuarm> - * - * Purpose: This machine-generated source code contains - * information about the various integer and - * floating point numeric formats found on this - * architecture. The parameters below should be - * checked carefully and errors reported to the - * HDF5 maintainer. - * - * Each of the numeric formats listed below are - * printed from most significant bit to least - * significant bit even though the actual bytes - * might be stored in a different order in - * memory. The integers above each binary byte - * indicate the relative order of the bytes in - * memory; little-endian machines have - * decreasing numbers while big-endian machines - * have increasing numbers. - * - * The fields of the numbers are printed as - * letters with `S' for the mantissa sign bit, - * `M' for the mantissa magnitude, and `E' for - * the exponent. The exponent has an associated - * bias which can be subtracted to find the - * true exponent. The radix point is assumed - * to be before the first `M' bit. Any bit - * of a floating-point value not falling into one - * of these categories is printed as a question - * mark. Bits of integer types are printed as - * `I' for 2's complement and `U' for magnitude. - * - * If the most significant bit of the normalized - * mantissa (always a `1' except for `0.0') is - * not stored then an `implicit=yes' appears - * under the field description. In thie case, - * the radix point is still assumed to be - * before the first `M' but after the implicit - * bit. - * - * Modifications: - * - * DO NOT MAKE MODIFICATIONS TO THIS FILE! - * It was generated by code in `H5detect.c'. - * - *------------------------------------------------------------------------- - */ - -/****************/ -/* Module Setup */ -/****************/ - -#define H5T_PACKAGE /*suppress error about including H5Tpkg.h*/ - - -/***********/ -/* Headers */ -/***********/ -#include "H5private.h" /* Generic Functions */ -#include "H5Eprivate.h" /* Error handling */ -#include "H5FLprivate.h" /* Free Lists */ -#include "H5Iprivate.h" /* IDs */ -#include "H5Tpkg.h" /* Datatypes */ - - -/****************/ -/* Local Macros */ -/****************/ - - -/******************/ -/* Local Typedefs */ -/******************/ - - -/********************/ -/* Package Typedefs */ -/********************/ - - -/********************/ -/* Local Prototypes */ -/********************/ - - -/********************/ -/* Public Variables */ -/********************/ - - -/*****************************/ -/* Library Private Variables */ -/*****************************/ - - -/*********************/ -/* Package Variables */ -/*********************/ - - - -/*******************/ -/* Local Variables */ -/*******************/ - - - -/*------------------------------------------------------------------------- - * Function: H5TN_init_interface - * - * Purpose: Initialize pre-defined native datatypes from code generated - * during the library configuration by H5detect. - * - * Return: Success: non-negative - * Failure: negative - * - * Programmer: Robb Matzke - * Wednesday, December 16, 1998 - * - *------------------------------------------------------------------------- - */ -herr_t -H5TN_init_interface(void) -{ - H5T_t *dt = NULL; - herr_t ret_value = SUCCEED; - - FUNC_ENTER_NOAPI(FAIL) - - /* - * 0 - * IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 1; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 8; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_SCHAR_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_SCHAR_ALIGN_g = 1; - H5T_NATIVE_SCHAR_COMP_ALIGN_g = 1; - - /* - * 0 - * UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 1; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 8; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_UCHAR_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_UCHAR_ALIGN_g = 1; - - /* - * 1 0 - * IIIIIIII IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 2; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 16; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_SHORT_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_SHORT_ALIGN_g = 1; - H5T_NATIVE_SHORT_COMP_ALIGN_g = 2; - - /* - * 1 0 - * UUUUUUUU UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 2; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 16; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_USHORT_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_USHORT_ALIGN_g = 1; - - /* - * 3 2 1 0 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 4; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 32; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_INT_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_INT_ALIGN_g = 1; - H5T_NATIVE_INT_COMP_ALIGN_g = 4; - - /* - * 3 2 1 0 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 4; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 32; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_UINT_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_UINT_ALIGN_g = 1; - - /* - * 3 2 1 0 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 4; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 32; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_LONG_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_LONG_ALIGN_g = 1; - H5T_NATIVE_LONG_COMP_ALIGN_g = 4; - - /* - * 3 2 1 0 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 4; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 32; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_ULONG_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_ULONG_ALIGN_g = 1; - - /* - * 0 - * IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 1; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 8; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_INT8_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_INT8_ALIGN_g = 1; - - /* - * 0 - * UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 1; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 8; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_UINT8_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_UINT8_ALIGN_g = 1; - - /* - * 0 - * IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 1; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 8; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_INT_LEAST8_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_INT_LEAST8_ALIGN_g = 1; - - /* - * 0 - * UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 1; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 8; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_UINT_LEAST8_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_UINT_LEAST8_ALIGN_g = 1; - - /* - * 0 - * IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 1; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 8; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_INT_FAST8_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_INT_FAST8_ALIGN_g = 1; - - /* - * 0 - * UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 1; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 8; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_UINT_FAST8_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_UINT_FAST8_ALIGN_g = 1; - - /* - * 1 0 - * IIIIIIII IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 2; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 16; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_INT16_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_INT16_ALIGN_g = 1; - - /* - * 1 0 - * UUUUUUUU UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 2; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 16; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_UINT16_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_UINT16_ALIGN_g = 1; - - /* - * 1 0 - * IIIIIIII IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 2; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 16; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_INT_LEAST16_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_INT_LEAST16_ALIGN_g = 1; - - /* - * 1 0 - * UUUUUUUU UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 2; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 16; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_UINT_LEAST16_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_UINT_LEAST16_ALIGN_g = 1; - - /* - * 3 2 1 0 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 4; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 32; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_INT_FAST16_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_INT_FAST16_ALIGN_g = 1; - - /* - * 3 2 1 0 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 4; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 32; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_UINT_FAST16_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_UINT_FAST16_ALIGN_g = 1; - - /* - * 3 2 1 0 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 4; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 32; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_INT32_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_INT32_ALIGN_g = 1; - - /* - * 3 2 1 0 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 4; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 32; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_UINT32_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_UINT32_ALIGN_g = 1; - - /* - * 3 2 1 0 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 4; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 32; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_INT_LEAST32_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_INT_LEAST32_ALIGN_g = 1; - - /* - * 3 2 1 0 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 4; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 32; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_UINT_LEAST32_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_UINT_LEAST32_ALIGN_g = 1; - - /* - * 3 2 1 0 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 4; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 32; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_INT_FAST32_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_INT_FAST32_ALIGN_g = 1; - - /* - * 3 2 1 0 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 4; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 32; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_UINT_FAST32_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_UINT_FAST32_ALIGN_g = 1; - - /* - * 7 6 5 4 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * 3 2 1 0 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 8; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 64; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_INT64_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_INT64_ALIGN_g = 1; - - /* - * 7 6 5 4 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * 3 2 1 0 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 8; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 64; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_UINT64_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_UINT64_ALIGN_g = 1; - - /* - * 7 6 5 4 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * 3 2 1 0 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 8; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 64; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_INT_LEAST64_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_INT_LEAST64_ALIGN_g = 1; - - /* - * 7 6 5 4 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * 3 2 1 0 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 8; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 64; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_UINT_LEAST64_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_UINT_LEAST64_ALIGN_g = 1; - - /* - * 7 6 5 4 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * 3 2 1 0 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 8; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 64; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_INT_FAST64_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_INT_FAST64_ALIGN_g = 1; - - /* - * 7 6 5 4 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * 3 2 1 0 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 8; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 64; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_UINT_FAST64_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_UINT_FAST64_ALIGN_g = 1; - - /* - * 7 6 5 4 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * 3 2 1 0 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 8; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 64; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_LLONG_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_LLONG_ALIGN_g = 1; - H5T_NATIVE_LLONG_COMP_ALIGN_g = 8; - - /* - * 7 6 5 4 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * 3 2 1 0 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 8; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 64; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_ULLONG_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_ULLONG_ALIGN_g = 1; - - /* - * 3 2 1 0 - * SEEEEEEE EMMMMMMM MMMMMMMM MMMMMMMM - * Implicit bit? yes - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_FLOAT; - dt->shared->size = 4; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 32; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.f.sign = 31; - dt->shared->u.atomic.u.f.epos = 23; - dt->shared->u.atomic.u.f.esize = 8; - dt->shared->u.atomic.u.f.ebias = 0x0000007f; - dt->shared->u.atomic.u.f.mpos = 0; - dt->shared->u.atomic.u.f.msize = 23; - dt->shared->u.atomic.u.f.norm = H5T_NORM_IMPLIED; - dt->shared->u.atomic.u.f.pad = H5T_PAD_ZERO; - if((H5T_NATIVE_FLOAT_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_FLOAT_ALIGN_g = 1; - H5T_NATIVE_FLOAT_COMP_ALIGN_g = 4; - - /* - * 7 6 5 4 - * SEEEEEEE EEEEMMMM MMMMMMMM MMMMMMMM - * 3 2 1 0 - * MMMMMMMM MMMMMMMM MMMMMMMM MMMMMMMM - * Implicit bit? yes - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_FLOAT; - dt->shared->size = 8; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 64; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.f.sign = 63; - dt->shared->u.atomic.u.f.epos = 52; - dt->shared->u.atomic.u.f.esize = 11; - dt->shared->u.atomic.u.f.ebias = 0x000003ff; - dt->shared->u.atomic.u.f.mpos = 0; - dt->shared->u.atomic.u.f.msize = 52; - dt->shared->u.atomic.u.f.norm = H5T_NORM_IMPLIED; - dt->shared->u.atomic.u.f.pad = H5T_PAD_ZERO; - if((H5T_NATIVE_DOUBLE_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_DOUBLE_ALIGN_g = 1; - H5T_NATIVE_DOUBLE_COMP_ALIGN_g = 8; - - /* - * 7 6 5 4 - * SEEEEEEE EEEEMMMM MMMMMMMM MMMMMMMM - * 3 2 1 0 - * MMMMMMMM MMMMMMMM MMMMMMMM MMMMMMMM - * Implicit bit? yes - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_FLOAT; - dt->shared->size = 8; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 64; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.f.sign = 63; - dt->shared->u.atomic.u.f.epos = 52; - dt->shared->u.atomic.u.f.esize = 11; - dt->shared->u.atomic.u.f.ebias = 0x000003ff; - dt->shared->u.atomic.u.f.mpos = 0; - dt->shared->u.atomic.u.f.msize = 52; - dt->shared->u.atomic.u.f.norm = H5T_NORM_IMPLIED; - dt->shared->u.atomic.u.f.pad = H5T_PAD_ZERO; - if((H5T_NATIVE_LDOUBLE_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_LDOUBLE_ALIGN_g = 1; - H5T_NATIVE_LDOUBLE_COMP_ALIGN_g = 8; - - /* Set the native order for this machine */ - H5T_native_order_g = H5T_ORDER_LE; - - /* Structure alignment for pointers, hvl_t, hobj_ref_t, hdset_reg_ref_t */ - H5T_POINTER_COMP_ALIGN_g = 4; - H5T_HVL_COMP_ALIGN_g = 4; - H5T_HOBJREF_COMP_ALIGN_g = 8; - H5T_HDSETREGREF_COMP_ALIGN_g = 1; - -done: - if(ret_value < 0) { - if(dt != NULL) { - dt->shared = H5FL_FREE(H5T_shared_t, dt->shared); - dt = H5FL_FREE(H5T_t, dt); - } /* end if */ - } /* end if */ - - FUNC_LEAVE_NOAPI(ret_value); -} /* end H5TN_init_interface() */ - -/****************************************/ -/* ALIGNMENT and signal-handling status */ -/****************************************/ -/* Signal() support: yes */ -/* setjmp() support: yes */ -/* longjmp() support: yes */ -/* sigsetjmp() support: yes */ -/* siglongjmp() support: yes */ -/* sigprocmask() support: yes */ - -/******************************/ -/* signal handlers statistics */ -/******************************/ -/* signal_handlers tested: 15 times */ -/* sigbus_handler called: 5 times */ -/* sigsegv_handler called: 5 times */ -/* sigill_handler called: 5 times */ diff --git a/meta-oe/recipes-support/hdf5/files/H5Tinit-64.c b/meta-oe/recipes-support/hdf5/files/H5Tinit-64.c deleted file mode 100644 index 85f79a6ae7..0000000000 --- a/meta-oe/recipes-support/hdf5/files/H5Tinit-64.c +++ /dev/null @@ -1,991 +0,0 @@ -/* Generated automatically by H5detect -- do not edit */ - - - -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright by The HDF Group. * - * Copyright by the Board of Trustees of the University of Illinois. * - * All rights reserved. * - * * - * This file is part of HDF5. The full HDF5 copyright notice, including * - * terms governing use, modification, and redistribution, is contained in * - * the COPYING file, which can be found at the root of the source code * - * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases. * - * If you do not have access to either file, you may request a copy from * - * help@hdfgroup.org. * - * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Created: Jan 29, 2019 - * root <root@qemux86-64> - * - * Purpose: This machine-generated source code contains - * information about the various integer and - * floating point numeric formats found on this - * architecture. The parameters below should be - * checked carefully and errors reported to the - * HDF5 maintainer. - * - * Each of the numeric formats listed below are - * printed from most significant bit to least - * significant bit even though the actual bytes - * might be stored in a different order in - * memory. The integers above each binary byte - * indicate the relative order of the bytes in - * memory; little-endian machines have - * decreasing numbers while big-endian machines - * have increasing numbers. - * - * The fields of the numbers are printed as - * letters with `S' for the mantissa sign bit, - * `M' for the mantissa magnitude, and `E' for - * the exponent. The exponent has an associated - * bias which can be subtracted to find the - * true exponent. The radix point is assumed - * to be before the first `M' bit. Any bit - * of a floating-point value not falling into one - * of these categories is printed as a question - * mark. Bits of integer types are printed as - * `I' for 2's complement and `U' for magnitude. - * - * If the most significant bit of the normalized - * mantissa (always a `1' except for `0.0') is - * not stored then an `implicit=yes' appears - * under the field description. In thie case, - * the radix point is still assumed to be - * before the first `M' but after the implicit - * bit. - * - * Modifications: - * - * DO NOT MAKE MODIFICATIONS TO THIS FILE! - * It was generated by code in `H5detect.c'. - * - *------------------------------------------------------------------------- - */ - -/****************/ -/* Module Setup */ -/****************/ - -#define H5T_PACKAGE /*suppress error about including H5Tpkg.h*/ - - -/***********/ -/* Headers */ -/***********/ -#include "H5private.h" /* Generic Functions */ -#include "H5Eprivate.h" /* Error handling */ -#include "H5FLprivate.h" /* Free Lists */ -#include "H5Iprivate.h" /* IDs */ -#include "H5Tpkg.h" /* Datatypes */ - - -/****************/ -/* Local Macros */ -/****************/ - - -/******************/ -/* Local Typedefs */ -/******************/ - - -/********************/ -/* Package Typedefs */ -/********************/ - - -/********************/ -/* Local Prototypes */ -/********************/ - - -/********************/ -/* Public Variables */ -/********************/ - - -/*****************************/ -/* Library Private Variables */ -/*****************************/ - - -/*********************/ -/* Package Variables */ -/*********************/ - - - -/*******************/ -/* Local Variables */ -/*******************/ - - - -/*------------------------------------------------------------------------- - * Function: H5TN_init_interface - * - * Purpose: Initialize pre-defined native datatypes from code generated - * during the library configuration by H5detect. - * - * Return: Success: non-negative - * Failure: negative - * - * Programmer: Robb Matzke - * Wednesday, December 16, 1998 - * - *------------------------------------------------------------------------- - */ -herr_t -H5TN_init_interface(void) -{ - H5T_t *dt = NULL; - herr_t ret_value = SUCCEED; - - FUNC_ENTER_NOAPI(FAIL) - - /* - * 0 - * IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 1; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 8; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_SCHAR_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_SCHAR_ALIGN_g = 1; - H5T_NATIVE_SCHAR_COMP_ALIGN_g = 1; - - /* - * 0 - * UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 1; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 8; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_UCHAR_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_UCHAR_ALIGN_g = 1; - - /* - * 1 0 - * IIIIIIII IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 2; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 16; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_SHORT_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_SHORT_ALIGN_g = 1; - H5T_NATIVE_SHORT_COMP_ALIGN_g = 2; - - /* - * 1 0 - * UUUUUUUU UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 2; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 16; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_USHORT_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_USHORT_ALIGN_g = 1; - - /* - * 3 2 1 0 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 4; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 32; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_INT_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_INT_ALIGN_g = 1; - H5T_NATIVE_INT_COMP_ALIGN_g = 4; - - /* - * 3 2 1 0 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 4; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 32; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_UINT_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_UINT_ALIGN_g = 1; - - /* - * 7 6 5 4 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * 3 2 1 0 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 8; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 64; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_LONG_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_LONG_ALIGN_g = 1; - H5T_NATIVE_LONG_COMP_ALIGN_g = 8; - - /* - * 7 6 5 4 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * 3 2 1 0 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 8; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 64; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_ULONG_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_ULONG_ALIGN_g = 1; - - /* - * 0 - * IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 1; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 8; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_INT8_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_INT8_ALIGN_g = 1; - - /* - * 0 - * UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 1; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 8; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_UINT8_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_UINT8_ALIGN_g = 1; - - /* - * 0 - * IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 1; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 8; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_INT_LEAST8_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_INT_LEAST8_ALIGN_g = 1; - - /* - * 0 - * UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 1; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 8; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_UINT_LEAST8_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_UINT_LEAST8_ALIGN_g = 1; - - /* - * 0 - * IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 1; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 8; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_INT_FAST8_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_INT_FAST8_ALIGN_g = 1; - - /* - * 0 - * UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 1; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 8; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_UINT_FAST8_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_UINT_FAST8_ALIGN_g = 1; - - /* - * 1 0 - * IIIIIIII IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 2; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 16; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_INT16_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_INT16_ALIGN_g = 1; - - /* - * 1 0 - * UUUUUUUU UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 2; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 16; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_UINT16_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_UINT16_ALIGN_g = 1; - - /* - * 1 0 - * IIIIIIII IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 2; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 16; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_INT_LEAST16_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_INT_LEAST16_ALIGN_g = 1; - - /* - * 1 0 - * UUUUUUUU UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 2; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 16; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_UINT_LEAST16_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_UINT_LEAST16_ALIGN_g = 1; - - /* - * 7 6 5 4 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * 3 2 1 0 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 8; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 64; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_INT_FAST16_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_INT_FAST16_ALIGN_g = 1; - - /* - * 7 6 5 4 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * 3 2 1 0 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 8; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 64; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_UINT_FAST16_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_UINT_FAST16_ALIGN_g = 1; - - /* - * 3 2 1 0 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 4; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 32; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_INT32_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_INT32_ALIGN_g = 1; - - /* - * 3 2 1 0 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 4; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 32; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_UINT32_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_UINT32_ALIGN_g = 1; - - /* - * 3 2 1 0 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 4; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 32; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_INT_LEAST32_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_INT_LEAST32_ALIGN_g = 1; - - /* - * 3 2 1 0 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 4; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 32; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_UINT_LEAST32_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_UINT_LEAST32_ALIGN_g = 1; - - /* - * 7 6 5 4 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * 3 2 1 0 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 8; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 64; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_INT_FAST32_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_INT_FAST32_ALIGN_g = 1; - - /* - * 7 6 5 4 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * 3 2 1 0 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 8; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 64; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_UINT_FAST32_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_UINT_FAST32_ALIGN_g = 1; - - /* - * 7 6 5 4 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * 3 2 1 0 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 8; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 64; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_INT64_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_INT64_ALIGN_g = 1; - - /* - * 7 6 5 4 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * 3 2 1 0 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 8; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 64; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_UINT64_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_UINT64_ALIGN_g = 1; - - /* - * 7 6 5 4 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * 3 2 1 0 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 8; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 64; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_INT_LEAST64_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_INT_LEAST64_ALIGN_g = 1; - - /* - * 7 6 5 4 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * 3 2 1 0 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 8; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 64; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_UINT_LEAST64_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_UINT_LEAST64_ALIGN_g = 1; - - /* - * 7 6 5 4 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * 3 2 1 0 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 8; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 64; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_INT_FAST64_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_INT_FAST64_ALIGN_g = 1; - - /* - * 7 6 5 4 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * 3 2 1 0 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 8; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 64; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_UINT_FAST64_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_UINT_FAST64_ALIGN_g = 1; - - /* - * 7 6 5 4 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * 3 2 1 0 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 8; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 64; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_LLONG_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_LLONG_ALIGN_g = 1; - H5T_NATIVE_LLONG_COMP_ALIGN_g = 8; - - /* - * 7 6 5 4 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * 3 2 1 0 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 8; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 64; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_ULLONG_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_ULLONG_ALIGN_g = 1; - - /* - * 3 2 1 0 - * SEEEEEEE EMMMMMMM MMMMMMMM MMMMMMMM - * Implicit bit? yes - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_FLOAT; - dt->shared->size = 4; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 32; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.f.sign = 31; - dt->shared->u.atomic.u.f.epos = 23; - dt->shared->u.atomic.u.f.esize = 8; - dt->shared->u.atomic.u.f.ebias = 0x0000007f; - dt->shared->u.atomic.u.f.mpos = 0; - dt->shared->u.atomic.u.f.msize = 23; - dt->shared->u.atomic.u.f.norm = H5T_NORM_IMPLIED; - dt->shared->u.atomic.u.f.pad = H5T_PAD_ZERO; - if((H5T_NATIVE_FLOAT_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_FLOAT_ALIGN_g = 1; - H5T_NATIVE_FLOAT_COMP_ALIGN_g = 4; - - /* - * 7 6 5 4 - * SEEEEEEE EEEEMMMM MMMMMMMM MMMMMMMM - * 3 2 1 0 - * MMMMMMMM MMMMMMMM MMMMMMMM MMMMMMMM - * Implicit bit? yes - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_FLOAT; - dt->shared->size = 8; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 64; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.f.sign = 63; - dt->shared->u.atomic.u.f.epos = 52; - dt->shared->u.atomic.u.f.esize = 11; - dt->shared->u.atomic.u.f.ebias = 0x000003ff; - dt->shared->u.atomic.u.f.mpos = 0; - dt->shared->u.atomic.u.f.msize = 52; - dt->shared->u.atomic.u.f.norm = H5T_NORM_IMPLIED; - dt->shared->u.atomic.u.f.pad = H5T_PAD_ZERO; - if((H5T_NATIVE_DOUBLE_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_DOUBLE_ALIGN_g = 1; - H5T_NATIVE_DOUBLE_COMP_ALIGN_g = 8; - - /* - * 15 14 13 12 - * ???????? ???????? ???????? ???????? - * 11 10 9 8 - * ???????? ???????? SEEEEEEE EEEEEEEE - * 7 6 5 4 - * MMMMMMMM MMMMMMMM MMMMMMMM MMMMMMMM - * 3 2 1 0 - * MMMMMMMM MMMMMMMM MMMMMMMM MMMMMMMM - * Implicit bit? no - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_FLOAT; - dt->shared->size = 16; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 80; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.f.sign = 79; - dt->shared->u.atomic.u.f.epos = 64; - dt->shared->u.atomic.u.f.esize = 15; - dt->shared->u.atomic.u.f.ebias = 0x00003fff; - dt->shared->u.atomic.u.f.mpos = 0; - dt->shared->u.atomic.u.f.msize = 64; - dt->shared->u.atomic.u.f.norm = H5T_NORM_NONE; - dt->shared->u.atomic.u.f.pad = H5T_PAD_ZERO; - if((H5T_NATIVE_LDOUBLE_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_LDOUBLE_ALIGN_g = 1; - H5T_NATIVE_LDOUBLE_COMP_ALIGN_g = 16; - - /* Set the native order for this machine */ - H5T_native_order_g = H5T_ORDER_LE; - - /* Structure alignment for pointers, hvl_t, hobj_ref_t, hdset_reg_ref_t */ - H5T_POINTER_COMP_ALIGN_g = 8; - H5T_HVL_COMP_ALIGN_g = 8; - H5T_HOBJREF_COMP_ALIGN_g = 8; - H5T_HDSETREGREF_COMP_ALIGN_g = 1; - -done: - if(ret_value < 0) { - if(dt != NULL) { - dt->shared = H5FL_FREE(H5T_shared_t, dt->shared); - dt = H5FL_FREE(H5T_t, dt); - } /* end if */ - } /* end if */ - - FUNC_LEAVE_NOAPI(ret_value); -} /* end H5TN_init_interface() */ - -/****************************************/ -/* ALIGNMENT and signal-handling status */ -/****************************************/ -/* Signal() support: yes */ -/* setjmp() support: yes */ -/* longjmp() support: yes */ -/* sigsetjmp() support: yes */ -/* siglongjmp() support: yes */ -/* sigprocmask() support: yes */ - -/******************************/ -/* signal handlers statistics */ -/******************************/ -/* signal_handlers tested: 15 times */ -/* sigbus_handler called: 5 times */ -/* sigsegv_handler called: 5 times */ -/* sigill_handler called: 5 times */ diff --git a/meta-oe/recipes-support/hdf5/files/H5lib_settings.c b/meta-oe/recipes-support/hdf5/files/H5lib_settings.c deleted file mode 100644 index c243aee121..0000000000 --- a/meta-oe/recipes-support/hdf5/files/H5lib_settings.c +++ /dev/null @@ -1,98 +0,0 @@ -/* Generated automatically by H5make_libsettings -- do not edit */ - - - -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright by The HDF Group. * - * Copyright by the Board of Trustees of the University of Illinois. * - * All rights reserved. * - * * - * This file is part of HDF5. The full HDF5 copyright notice, including * - * terms governing use, modification, and redistribution, is contained in * - * the COPYING file, which can be found at the root of the source code * - * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases. * - * If you do not have access to either file, you may request a copy from * - * help@hdfgroup.org. * - * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Created: Jan 29, 2019 - * root <root@qemux86-64> - * - * Purpose: This machine-generated source code contains - * information about the library build configuration - * - * Modifications: - * - * DO NOT MAKE MODIFICATIONS TO THIS FILE! - * It was generated by code in `H5make_libsettings.c'. - * - *------------------------------------------------------------------------- - */ - -char H5libhdf5_settings[]= - " SUMMARY OF THE HDF5 CONFIGURATION\n" - " =================================\n" - "\n" - "General Information:\n" - "-------------------\n" - " HDF5 Version: 1.8.19\n" - " Configured on: 2019-01-29\n" - " Configured by: Ninja\n" - " Configure mode: CMAKE 3.12.2\n" - " Host system: Linux-4.4.0-31-generic\n" - " Uname information: Linux\n" - " Byte sex: little-endian\n" - " Libraries: \n" - " Installation point: /usr\n" - "\n" - "Compiling Options:\n" - "------------------\n" - " Compilation Mode: \n" - " H5_CFLAGS: \n" - " AM_CFLAGS: \n" - " CPPFLAGS: \n" - " H5_CPPFLAGS: \n" - " AM_CPPFLAGS: \n" - " Shared C Library: YES\n" - " Static C Library: YES\n" - " Statically Linked Executables: OFF\n" - " LDFLAGS: -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed\n" - " AM_LDFLAGS: \n" - " Extra libraries: m;dl\n" - " Debugged Packages: \n" - " API Tracing: OFF\n" - "\n" - "Languages:\n" - "----------\n" - " Fortran: OFF\n" - " Fortran Compiler: \n" - " Fortran 2003 Compiler: \n" - " Fortran Flags: \n" - " H5 Fortran Flags: \n" - " AM Fortran Flags: \n" - " Shared Fortran Library: YES\n" - " Static Fortran Library: YES\n" - "\n" - " H5 C++ Flags: \n" - " AM C++ Flags: \n" - " Shared C++ Library: YES\n" - " Static C++ Library: YES\n" - "\n" - "Features:\n" - "---------\n" - " Parallel HDF5: OFF\n" - " High Level library: ON\n" - " Threadsafety: OFF\n" - " Default API Mapping: v18\n" - " With Deprecated Public Symbols: ON\n" - " I/O filters (external): \n" - " MPE: \n" - " Direct VFD: \n" - " dmalloc: \n" - "Clear file buffers before write: ON\n" - " Using memory checker: OFF\n" - " Function Stack Tracing: OFF\n" - " Strict File Format Checks: OFF\n" - " Optimization Instrumentation: \n" -; - diff --git a/meta-oe/recipes-support/hdf5/hdf5_1.14.2.bb b/meta-oe/recipes-support/hdf5/hdf5_1.14.2.bb new file mode 100644 index 0000000000..b8a81bb0b7 --- /dev/null +++ b/meta-oe/recipes-support/hdf5/hdf5_1.14.2.bb @@ -0,0 +1,62 @@ +SUMMARY = "Management suite for extremely large and complex data collections" +DESCRIPTION = "Unique technology suite that makes possible the management of \ +extremely large and complex data collections" +HOMEPAGE = "https://www.hdfgroup.org/" +SECTION = "libs" + +LICENSE = "HDF5" +LIC_FILES_CHKSUM = "file://COPYING;md5=9ba0f3d878ab6c2403c86e9b0362d998" + +inherit cmake siteinfo qemu multilib_header multilib_script + +DEPENDS += "qemu-native zlib" + +SRC_URI = " \ + https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.14/hdf5-${PV}/src/${BPN}-${PV}.tar.bz2 \ + file://0002-Remove-suffix-shared-from-shared-library-name.patch \ + file://0001-cmake-remove-build-flags.patch \ +" +SRC_URI[sha256sum] = "ea3c5e257ef322af5e77fc1e52ead3ad6bf3bb4ac06480dd17ee3900d7a24cfb" + +FILES:${PN} += "${libdir}/libhdf5.settings ${datadir}/*" + +EXTRA_OECMAKE = " \ + -DHDF5_INSTALL_CMAKE_DIR=${libdir}/cmake \ + -DCMAKE_INSTALL_PREFIX='${prefix}' \ + -DHDF5_INSTALL_LIB_DIR='${baselib}' \ +" +EXTRA_OECMAKE:prepend:class-target = "-DCMAKE_CROSSCOMPILING_EMULATOR=${WORKDIR}/qemuwrapper " + +gen_emu() { + # Write out a qemu wrapper that will be used by cmake + # so that it can run target helper binaries through that. + qemu_binary="${@qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST'), [d.expand('${STAGING_DIR_HOST}${libdir}'),d.expand('${STAGING_DIR_HOST}${base_libdir}')])}" + cat > ${WORKDIR}/qemuwrapper << EOF +#!/bin/sh +$qemu_binary "\$@" +EOF + chmod +x ${WORKDIR}/qemuwrapper +} + +do_unpack[postfuncs] += "gen_emu" + +MULTILIB_SCRIPTS += "${PN}:${bindir}/h5cc \ + ${PN}:${bindir}/h5hlcc \ +" + +do_install:append() { + # Used for generating config files on target + install -m 755 ${B}/bin/H5detect ${D}${bindir} + install -m 755 ${B}/bin/H5make_libsettings ${D}${bindir} + oe_multilib_header H5pubconf.h + # remove the buildpath + sed -i -e 's|${RECIPE_SYSROOT}||g' ${D}${libdir}/pkgconfig/hdf5.pc + sed -i -e 's|${RECIPE_SYSROOT}||g' ${D}${libdir}/cmake/hdf5-targets.cmake + sed -i -e 's|${RECIPE_SYSROOT_NATIVE}||g' ${D}${bindir}/h5hlcc + sed -i -e 's|${RECIPE_SYSROOT_NATIVE}||g' ${D}${bindir}/h5cc +} + +BBCLASSEXTEND = "native" + +# h5fuse.sh script needs bash +RDEPENDS:${PN} += "bash" diff --git a/meta-oe/recipes-support/hdf5/hdf5_1.8.21.bb b/meta-oe/recipes-support/hdf5/hdf5_1.8.21.bb deleted file mode 100644 index 9af2b67149..0000000000 --- a/meta-oe/recipes-support/hdf5/hdf5_1.8.21.bb +++ /dev/null @@ -1,57 +0,0 @@ -SUMMARY = "Unique technology suite that makes possible the management of \ -extremely large and complex data collections" -HOMEPAGE = "https://www.hdfgroup.org/" -SECTION = "libs" - -LICENSE = "HDF5" -LIC_FILES_CHKSUM = "file://COPYING;md5=57e5351b17591e659eedae107265c606" - -inherit cmake siteinfo - -SRC_URI = " \ - https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.8/hdf5-${PV}/src/${BPN}-${PV}.tar.bz2 \ - file://H5lib_settings.c \ - file://H5Tinit-64.c \ - file://H5Tinit-32.c \ - file://0001-cross-compiling-support.patch \ - file://0002-Remove-suffix-shared-from-shared-library-name.patch \ -" -SRC_URI[md5sum] = "2d2408f2a9dfb5c7b79998002e9a90e9" -SRC_URI[sha256sum] = "e5b1b1dee44a64b795a91c3321ab7196d9e0871fe50d42969761794e3899f40d" - -FILES_${PN} += "${libdir}/libhdf5.settings ${datadir}/*" - -EXTRA_OECMAKE = " \ - -DTEST_LFS_WORKS_RUN=0 \ - -DTEST_LFS_WORKS_RUN__TRYRUN_OUTPUT=0 \ - -DH5_PRINTF_LL_TEST_RUN=1 \ - -DH5_PRINTF_LL_TEST_RUN__TRYRUN_OUTPUT='8' \ - -DH5_LDOUBLE_TO_LONG_SPECIAL_RUN=0 \ - -DH5_LDOUBLE_TO_LONG_SPECIAL_RUN__TRYRUN_OUTPUT= \ - -DH5_LONG_TO_LDOUBLE_SPECIAL_RUN=0 \ - -DH5_LONG_TO_LDOUBLE_SPECIAL_RUN__TRYRUN_OUTPUT= \ - -DH5_LDOUBLE_TO_LLONG_ACCURATE_RUN=0 \ - -DH5_LDOUBLE_TO_LLONG_ACCURATE_RUN__TRYRUN_OUTPUT= \ - -DH5_LLONG_TO_LDOUBLE_CORRECT_RUN=0 \ - -DH5_LLONG_TO_LDOUBLE_CORRECT_RUN__TRYRUN_OUTPUT= \ - -DH5_NO_ALIGNMENT_RESTRICTIONS_RUN=0 \ - -DH5_NO_ALIGNMENT_RESTRICTIONS_RUN__TRYRUN_OUTPUT= \ - -DCMAKE_INSTALL_PREFIX='${prefix}' \ - -DHDF5_INSTALL_LIB_DIR='${baselib}' \ -" - -do_unpack[postfuncs] += "gen_hd5file" -gen_hd5file() { - install -m 544 ${WORKDIR}/H5lib_settings.c ${S} - install -m 544 ${WORKDIR}/H5Tinit-${SITEINFO_BITS}.c ${S}/H5Tinit.c -} - -do_install_append() { - # Used for generating config files on target - install -m 755 ${B}/bin/H5detect ${D}${bindir} - install -m 755 ${B}/bin/H5make_libsettings ${D}${bindir} -} - -BBCLASSEXTEND = "native" - -SRC_DISTRIBUTE_LICENSES += "HDF5" diff --git a/meta-oe/recipes-support/hidapi/hidapi_0.14.0.bb b/meta-oe/recipes-support/hidapi/hidapi_0.14.0.bb new file mode 100644 index 0000000000..c7a487ba5c --- /dev/null +++ b/meta-oe/recipes-support/hidapi/hidapi_0.14.0.bb @@ -0,0 +1,15 @@ +SUMMARY = "A Simple library for communicating with USB and Bluetooth HID devices" +HOMEPAGE = "http://www.signal11.us/oss/hidapi/" +SECTION = "libs" + +LICENSE = "BSD-3-Clause | GPL-3.0-only" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7c3949a631240cb6c31c50f3eb696077" + +DEPENDS = "libusb udev" +RDEPENDS:${PN}:append:libc-glibc = " glibc-gconv-utf-16" + +inherit autotools pkgconfig + +SRC_URI = "git://github.com/libusb/hidapi.git;protocol=https;branch=master" +SRCREV = "d3013f0af3f4029d82872c1a9487ea461a56dee4" +S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/hidapi/hidapi_git.bb b/meta-oe/recipes-support/hidapi/hidapi_git.bb deleted file mode 100644 index a34797ff51..0000000000 --- a/meta-oe/recipes-support/hidapi/hidapi_git.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "Multi-platform library to interface with USB and Bluetooth HID-Class devices" -AUTHOR = "Alan Ott" -HOMEPAGE = "http://www.signal11.us/oss/hidapi/" -SECTION = "libs" -LICENSE = "BSD-3-Clause | GPLv3" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7c3949a631240cb6c31c50f3eb696077" -DEPENDS = "libusb udev" -PV = "0.7.99+0.8.0-rc1+git${SRCPV}" - -SRCREV = "d17db57b9d4354752e0af42f5f33007a42ef2906" -SRC_URI = "git://github.com/signal11/hidapi.git" - -S = "${WORKDIR}/git" - -inherit autotools pkgconfig diff --git a/meta-oe/recipes-support/hstr/files/0001-Use-OE-specific-checks-for-ncurses.patch b/meta-oe/recipes-support/hstr/files/0001-Use-OE-specific-checks-for-ncurses.patch new file mode 100644 index 0000000000..421d824ee0 --- /dev/null +++ b/meta-oe/recipes-support/hstr/files/0001-Use-OE-specific-checks-for-ncurses.patch @@ -0,0 +1,42 @@ +From f3fb4f12fac75efe0d8f1a923ad5992a7433d0db Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Wed, 2 Mar 2022 06:22:15 +0000 +Subject: [PATCH] Use OE-specific checks for ncurses + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + src/include/hstr.h | 2 +- + src/include/hstr_curses.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/include/hstr.h b/src/include/hstr.h +index 5eac881..c47cadb 100644 +--- a/src/include/hstr.h ++++ b/src/include/hstr.h +@@ -26,7 +26,7 @@ + #elif defined(__FreeBSD__) + #include <ncurses.h> + #else +- #include <ncursesw/curses.h> ++ #include <curses.h> + #endif + #include <readline/chardefs.h> + #include <signal.h> +diff --git a/src/include/hstr_curses.h b/src/include/hstr_curses.h +index 8a50ab9..1f081a8 100644 +--- a/src/include/hstr_curses.h ++++ b/src/include/hstr_curses.h +@@ -24,7 +24,7 @@ + #elif defined(__FreeBSD__) + #include <ncurses.h> + #else +-#include <ncursesw/curses.h> ++#include <curses.h> + #endif + + #define color_attr_on(C) if(terminal_has_colors()) { attron(C); } +-- +2.31.1 + diff --git a/meta-oe/recipes-support/hstr/files/0001-configure.ac-Don-t-use-AC_CHECK_FILE.patch b/meta-oe/recipes-support/hstr/files/0001-configure.ac-Don-t-use-AC_CHECK_FILE.patch new file mode 100644 index 0000000000..832d768ff3 --- /dev/null +++ b/meta-oe/recipes-support/hstr/files/0001-configure.ac-Don-t-use-AC_CHECK_FILE.patch @@ -0,0 +1,33 @@ +From d5ad538adb9fcbad8a3b4e46f266b668301cb1c4 Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Wed, 2 Mar 2022 05:36:48 +0000 +Subject: [PATCH] configure.ac: Don't use AC_CHECK_FILE + +AC_CHECK_FILE is not suitable for cross-compile, so +remove it to fix configure error: +cannot check for file existence when cross compiling + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + configure.ac | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 775c795..bd99188 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -116,9 +116,6 @@ AC_TYPE_SIZE_T + AC_FUNC_MALLOC + AC_CHECK_FUNCS([memset strdup strstr]) + +-# Bash@Ubuntu@Windows +-AC_CHECK_FILE(/tmp/hstr-ms-wsl,AC_DEFINE(__MS_WSL__), []) +- + # Bash CLI autocomplete + AC_ARG_WITH([bash-completion-dir], + AS_HELP_STRING([--with-bash-completion-dir[=PATH]], +-- +2.31.1 + diff --git a/meta-oe/recipes-support/hstr/hstr_3.1.0.bb b/meta-oe/recipes-support/hstr/hstr_3.1.0.bb new file mode 100644 index 0000000000..a641feef6f --- /dev/null +++ b/meta-oe/recipes-support/hstr/hstr_3.1.0.bb @@ -0,0 +1,17 @@ +SUMMARY = "bash and zsh shell history suggest box - easily view, navigate, search and manage your command history." +HOMEPAGE = "http://dvorka.github.io/hstr/" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d2794c0df5b907fdace235a619d80314" + +DEPENDS = "ncurses readline" + +SRC_URI = "https://github.com/dvorka/hstr/releases/download/3.1/hstr-${PV}-tarball.tgz \ + file://0001-configure.ac-Don-t-use-AC_CHECK_FILE.patch \ + file://0001-Use-OE-specific-checks-for-ncurses.patch" + +S = "${WORKDIR}/${BPN}" + +SRC_URI[sha256sum] = "4dabf61f045f022bac8bc909e5fd96041af6c53df56d97dfa3cfbf49af4453a5" + +inherit autotools pkgconfig bash-completion diff --git a/meta-oe/recipes-support/htop/files/0001-Ask-for-python3-specifically.patch b/meta-oe/recipes-support/htop/files/0001-Ask-for-python3-specifically.patch deleted file mode 100644 index 6153bdedbe..0000000000 --- a/meta-oe/recipes-support/htop/files/0001-Ask-for-python3-specifically.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 08aca4816cc798fce58b6235c26585a0063fa8af Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 26 Nov 2019 10:43:49 -0800 -Subject: [PATCH] Ask for python3 specifically - -python2 is on its way out - -Upstream-Status: Submitted [https://github.com/hishamhm/htop/pull/968] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - scripts/MakeHeader.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/scripts/MakeHeader.py b/scripts/MakeHeader.py -index 7c48fdd..7a7586d 100755 ---- a/scripts/MakeHeader.py -+++ b/scripts/MakeHeader.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - import os, sys, string, io - try: - from StringIO import StringIO --- -2.24.0 - diff --git a/meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch b/meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch index fc0d86e335..3d113efa15 100644 --- a/meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch +++ b/meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch @@ -1,39 +1,47 @@ +From 0d49ee6416e389b9a7ba693588c2eaf129306a01 Mon Sep 17 00:00:00 2001 +From: Paul Barker <pbarker@toganlabs.com> +Date: Sun, 5 Nov 2017 22:07:30 +0000 +Subject: [PATCH] htop: Update to v2.0.2 + We need to use pkg-config to find the ncurses library instead of the ncurses*-config applications. Signed-off-by: Paul Barker <pbarker@toganlabs.com> Signed-off-by: Robert Joslyn <robert.joslyn@redrectangle.org> -Upstream-status: Inappropriate - (`ncurses*-config` can be used outside of OpenEmbedded) +Upstream-Status: Inappropriate [`ncurses*-config` can be used outside of OpenEmbedded] + +--- + configure.ac | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac -index 559dc4d..77aea22 100644 +index e4df238a..2a31b201 100644 --- a/configure.ac +++ b/configure.ac -@@ -185,10 +185,10 @@ m4_define([HTOP_CHECK_LIB], - - AC_ARG_ENABLE(unicode, [AS_HELP_STRING([--enable-unicode], [enable Unicode support])], ,enable_unicode="yes") +@@ -391,10 +391,10 @@ AC_ARG_ENABLE([unicode], + [], + [enable_unicode=yes]) if test "x$enable_unicode" = xyes; then -- HTOP_CHECK_SCRIPT([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw6-config", -- HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw6-config", -- HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw5-config", -- HTOP_CHECK_SCRIPT([ncurses], [addnwstr], [HAVE_LIBNCURSESW], "ncurses5-config", -+ HTOP_CHECK_SCRIPT([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], "pkg-config ncursesw6", -+ HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "pkg-config ncursesw6", -+ HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "pkg-config ncursesw5", -+ HTOP_CHECK_SCRIPT([ncurses], [addnwstr], [HAVE_LIBNCURSESW], "pkg-config ncurses5", +- HTOP_CHECK_SCRIPT([ncursesw6], [waddwstr], [HAVE_LIBNCURSESW], "ncursesw6-config", +- HTOP_CHECK_SCRIPT([ncursesw], [waddwstr], [HAVE_LIBNCURSESW], "ncursesw6-config", +- HTOP_CHECK_SCRIPT([ncursesw], [wadd_wch], [HAVE_LIBNCURSESW], "ncursesw5-config", +- HTOP_CHECK_SCRIPT([ncurses], [wadd_wch], [HAVE_LIBNCURSESW], "ncurses5-config", ++ HTOP_CHECK_SCRIPT([ncursesw6], [waddwstr], [HAVE_LIBNCURSESW], "pkg-config ncursesw6", ++ HTOP_CHECK_SCRIPT([ncursesw], [waddwstr], [HAVE_LIBNCURSESW], "pkg-config ncursesw6", ++ HTOP_CHECK_SCRIPT([ncursesw], [wadd_wch], [HAVE_LIBNCURSESW], "pkg-config ncursesw5", ++ HTOP_CHECK_SCRIPT([ncurses], [wadd_wch], [HAVE_LIBNCURSESW], "pkg-config ncurses5", HTOP_CHECK_LIB([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], HTOP_CHECK_LIB([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], HTOP_CHECK_LIB([ncurses], [addnwstr], [HAVE_LIBNCURSESW], -@@ -201,8 +201,8 @@ if test "x$enable_unicode" = xyes; then - [AC_CHECK_HEADERS([ncurses/curses.h],[:], - [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])]) +@@ -416,8 +416,8 @@ if test "x$enable_unicode" = xyes; then + # (at this point we already link against a working ncurses library with wide character support) + AC_SEARCH_LIBS([keypad], [tinfow tinfo]) else -- HTOP_CHECK_SCRIPT([ncurses6], [refresh], [HAVE_LIBNCURSES], "ncurses6-config", -- HTOP_CHECK_SCRIPT([ncurses], [refresh], [HAVE_LIBNCURSES], "ncurses5-config", -+ HTOP_CHECK_SCRIPT([ncurses6], [refresh], [HAVE_LIBNCURSES], "pkg-config ncurses6", -+ HTOP_CHECK_SCRIPT([ncurses], [refresh], [HAVE_LIBNCURSES], "pkg-config ncurses5", - HTOP_CHECK_LIB([ncurses6], [refresh], [HAVE_LIBNCURSES], - HTOP_CHECK_LIB([ncurses], [refresh], [HAVE_LIBNCURSES], - missing_libraries="$missing_libraries libncurses" +- HTOP_CHECK_SCRIPT([ncurses6], [wnoutrefresh], [HAVE_LIBNCURSES], [ncurses6-config], +- HTOP_CHECK_SCRIPT([ncurses], [wnoutrefresh], [HAVE_LIBNCURSES], [ncurses5-config], ++ HTOP_CHECK_SCRIPT([ncurses6], [wnoutrefresh], [HAVE_LIBNCURSES], [pkg-config ncurses6], ++ HTOP_CHECK_SCRIPT([ncurses], [wnoutrefresh], [HAVE_LIBNCURSES], [pkg-config ncurses5], + HTOP_CHECK_LIB([ncurses6], [doupdate], [HAVE_LIBNCURSES], + HTOP_CHECK_LIB([ncurses], [doupdate], [HAVE_LIBNCURSES], + HTOP_CHECK_LIB([curses], [doupdate], [HAVE_LIBNCURSES], diff --git a/meta-oe/recipes-support/htop/htop_2.2.0.bb b/meta-oe/recipes-support/htop/htop_2.2.0.bb deleted file mode 100644 index 64eb0c571f..0000000000 --- a/meta-oe/recipes-support/htop/htop_2.2.0.bb +++ /dev/null @@ -1,37 +0,0 @@ -SUMMARY = "Interactive process viewer" -HOMEPAGE = "http://hisham.hm/htop" -SECTION = "console/utils" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=c312653532e8e669f30e5ec8bdc23be3" - -DEPENDS = "ncurses" - -SRC_URI = "http://hisham.hm/htop/releases/${PV}/${BP}.tar.gz \ - file://0001-Use-pkg-config.patch \ - file://0001-Ask-for-python3-specifically.patch \ - " -SRC_URI[md5sum] = "0d816b6beed31edc75babcfbf863ffa8" -SRC_URI[sha256sum] = "d9d6826f10ce3887950d709b53ee1d8c1849a70fa38e91d5896ad8cbc6ba3c57" - -inherit autotools pkgconfig - -PACKAGECONFIG ??= "proc \ - cgroup \ - taskstats \ - unicode \ - linux-affinity \ - delayacct" -PACKAGECONFIG[proc] = "--enable-proc,--disable-proc" -PACKAGECONFIG[openvz] = "--enable-openvz,--disable-openvz" -PACKAGECONFIG[cgroup] = "--enable-cgroup,--disable-cgroup" -PACKAGECONFIG[vserver] = "--enable-vserver,--disable-vserver" -PACKAGECONFIG[taskstats] = "--enable-taskstats,--disable-taskstats" -PACKAGECONFIG[unicode] = "--enable-unicode,--disable-unicode" -PACKAGECONFIG[linux-affinity] = "--enable-linux-affinity,--disable-linux-affinity" -PACKAGECONFIG[hwloc] = "--enable-hwloc,--disable-hwloc,hwloc" -PACKAGECONFIG[setuid] = "--enable-setuid,--disable-setuid" -PACKAGECONFIG[delayacct] = "--enable-delayacct,--disable-delayacct,libnl" - -do_configure_prepend () { - rm -rf ${S}/config.h -} diff --git a/meta-oe/recipes-support/htop/htop_3.3.0.bb b/meta-oe/recipes-support/htop/htop_3.3.0.bb new file mode 100644 index 0000000000..cd5b766f0f --- /dev/null +++ b/meta-oe/recipes-support/htop/htop_3.3.0.bb @@ -0,0 +1,36 @@ +SUMMARY = "Interactive process viewer" +HOMEPAGE = "https://htop.dev" +SECTION = "console/utils" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = "ncurses" + +SRC_URI = "git://github.com/htop-dev/htop.git;branch=main;protocol=https \ + file://0001-Use-pkg-config.patch \ +" +SRCREV = "68c970c7ef4a0682760ed570b3d82388ae7ccf54" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig + +PACKAGECONFIG ??= " \ + unicode \ + affinity \ + delayacct \ +" +PACKAGECONFIG[unicode] = "--enable-unicode,--disable-unicode" +PACKAGECONFIG[affinity] = "--enable-affinity,--disable-affinity,,,,hwloc" +PACKAGECONFIG[unwind] = "--enable-unwind,--disable-unwind,libunwind" +PACKAGECONFIG[hwloc] = "--enable-hwloc,--disable-hwloc,hwloc,,,affinity" +PACKAGECONFIG[openvz] = "--enable-openvz,--disable-openvz" +PACKAGECONFIG[vserver] = "--enable-vserver,--disable-vserver" +PACKAGECONFIG[ancient-vserver] = "--enable-ancient-vserver,--disable-ancient-vserver" +PACKAGECONFIG[capabilities] = "--enable-capabilities,--disable-capabilities,libcap" +PACKAGECONFIG[delayacct] = "--enable-delayacct,--disable-delayacct,libnl" +PACKAGECONFIG[sensors] = "--enable-sensors,--disable-sensors,lmsensors,lmsensors-libsensors" + +FILES:${PN} += "${datadir}/icons/hicolor/scalable/apps/htop.svg" + +RDEPENDS:${PN} += "ncurses-terminfo-base" diff --git a/meta-oe/recipes-support/hunspell/hunspell-dictionaries.bb b/meta-oe/recipes-support/hunspell/hunspell-dictionaries.bb index 3da67d1e3a..0ec426afb9 100644 --- a/meta-oe/recipes-support/hunspell/hunspell-dictionaries.bb +++ b/meta-oe/recipes-support/hunspell/hunspell-dictionaries.bb @@ -3,69 +3,69 @@ SUMMARY = "Hunspell dictionaries used by Maliit" #Provided by Titus Wormer (wooorm) https://github.com/wooorm/dictionaries LICENSE = "MIT" -LICENSE_dictionaries/bg = "LGPL 2.1" -LICENSE_dictionaries/br = "GPL 3.0" -LICENSE_dictionaries/ca-valencia = "GPL 2.0 & LGPL-2.1" -LICENSE_dictionaries/ca = "GPL 2.0 & LGPL-2.1" -LICENSE_dictionaries/cs = "GPL-2.0" -LICENSE_dictionaries/da = "GPL-2.0" -LICENSE_dictionaries/de-AT = "GPL-3.0" -LICENSE_dictionaries/de-CH = "GPL-3.0" -LICENSE_dictionaries/de = "GPL-3.0" -LICENSE_dictionaries/el-polyton = "GPL-2.0" -LICENSE_dictionaries/el = "GPL-2.0" -LICENSE_dictionaries/en-AU = "LGPL-2.0" -LICENSE_dictionaries/en-CA = "MIT & BSD" -LICENSE_dictionaries/en-GB = "LGPL-2.0" -LICENSE_dictionaries/en-US = "MIT & BSD" -LICENSE_dictionaries/en-ZA = "LGPL 2.1" -LICENSE_dictionaries/eo = "GPL-2.0" -LICENSE_dictionaries/es = "GPL-3.0" -LICENSE_dictionaries/et = "LGPL-2.1" -LICENSE_dictionaries/eu = "GPL-2.0" -LICENSE_dictionaries/fo = "GPL-2.0" -LICENSE_dictionaries/fr = "MPL-2.0" -LICENSE_dictionaries/fur = "GPL-2.0" -LICENSE_dictionaries/fy = "GPL-3.0" -LICENSE_dictionaries/ga = "GPL-2.0" -LICENSE_dictionaries/gd = "GPL-3.0" -LICENSE_dictionaries/gl = "GPL-3.0" -LICENSE_dictionaries/he = "AGPL-3.0" -LICENSE_dictionaries/hr = "GPL-3.0" -LICENSE_dictionaries/hu = "GPL-2.0" -LICENSE_dictionaries/hy-arevela = "GPL-2.0" -LICENSE_dictionaries/hy-arevmda = "GPL-2.0" -LICENSE_dictionaries/ia = "GPL-3.0" -LICENSE_dictionaries/ie = "Apache-2.0" -LICENSE_dictionaries/is = "CC BY-SA 3.0 & CC BY 4.0" -LICENSE_dictionaries/it = "GPL-3.0" -LICENSE_dictionaries/ko = "MPL-1.1 & GPL-2.0 & LGPL-2.1" -LICENSE_dictionaries/la = "GPL-3.0" -LICENSE_dictionaries/lb = "EUPL-1.1" -LICENSE_dictionaries/lt = "Other" -LICENSE_dictionaries/ltg = "LGPL-2.1" -LICENSE_dictionaries/lv = "LGPL-2.1" -LICENSE_dictionaries/mk = "GPL-3.0" -LICENSE_dictionaries/mn = "GPL-2.0" -LICENSE_dictionaries/nb = "GPL-2.0" -LICENSE_dictionaries/nds = "GPL-2.0" -LICENSE_dictionaries/ne = "LGPL-2.1" -LICENSE_dictionaries/nl = "BSD" -LICENSE_dictionaries/nn = "GPL-2.0" -LICENSE_dictionaries/pl = "GPL-3.0" -LICENSE_dictionaries/pt-BR = "LGPL 2.1" -LICENSE_dictionaries/pt = "GPL-2.0" -LICENSE_dictionaries/ro = "GPL-2.0" -LICENSE_dictionaries/ru = "BSD" -LICENSE_dictionaries/rw = "GPL-3.0" -LICENSE_dictionaries/sk = "GPL-2.0" -LICENSE_dictionaries/sl = "GPL-2.0" -LICENSE_dictionaries/sr-Latn = "LGPL 3.0" -LICENSE_dictionaries/sr = "LGPL 3.0" -LICENSE_dictionaries/sv = "LGPL 3.0" -LICENSE_dictionaries/tr = "MIT" -LICENSE_dictionaries/uk = "GPL 2.0" -LICENSE_dictionaries/vi = "GPL 3.0" +LICENSE:dictionaries/bg = "LGPL 2.1" +LICENSE:dictionaries/br = "GPL 3.0" +LICENSE:dictionaries/ca-valencia = "GPL 2.0 & LGPL-2.1-only" +LICENSE:dictionaries/ca = "GPL 2.0 & LGPL-2.1-only" +LICENSE:dictionaries/cs = "GPL-2.0-only" +LICENSE:dictionaries/da = "GPL-2.0-only" +LICENSE:dictionaries/de-AT = "GPL-3.0-only" +LICENSE:dictionaries/de-CH = "GPL-3.0-only" +LICENSE:dictionaries/de = "GPL-3.0-only" +LICENSE:dictionaries/el-polyton = "GPL-2.0-only" +LICENSE:dictionaries/el = "GPL-2.0-only" +LICENSE:dictionaries/en-AU = "LGPL-2.0-only" +LICENSE:dictionaries/en-CA = "MIT & BSD" +LICENSE:dictionaries/en-GB = "LGPL-2.0-only" +LICENSE:dictionaries/en-US = "MIT & BSD" +LICENSE:dictionaries/en-ZA = "LGPL 2.1" +LICENSE:dictionaries/eo = "GPL-2.0-only" +LICENSE:dictionaries/es = "GPL-3.0-only" +LICENSE:dictionaries/et = "LGPL-2.1-only" +LICENSE:dictionaries/eu = "GPL-2.0-only" +LICENSE:dictionaries/fo = "GPL-2.0-only" +LICENSE:dictionaries/fr = "MPL-2.0" +LICENSE:dictionaries/fur = "GPL-2.0-only" +LICENSE:dictionaries/fy = "GPL-3.0-only" +LICENSE:dictionaries/ga = "GPL-2.0-only" +LICENSE:dictionaries/gd = "GPL-3.0-only" +LICENSE:dictionaries/gl = "GPL-3.0-only" +LICENSE:dictionaries/he = "AGPL-3.0-only" +LICENSE:dictionaries/hr = "GPL-3.0-only" +LICENSE:dictionaries/hu = "GPL-2.0-only" +LICENSE:dictionaries/hy-arevela = "GPL-2.0-only" +LICENSE:dictionaries/hy-arevmda = "GPL-2.0-only" +LICENSE:dictionaries/ia = "GPL-3.0-only" +LICENSE:dictionaries/ie = "Apache-2.0" +LICENSE:dictionaries/is = "CC BY-SA 3.0 & CC BY 4.0" +LICENSE:dictionaries/it = "GPL-3.0-only" +LICENSE:dictionaries/ko = "MPL-1.1 & GPL-2.0-only & LGPL-2.1-only" +LICENSE:dictionaries/la = "GPL-3.0-only" +LICENSE:dictionaries/lb = "EUPL-1.1" +LICENSE:dictionaries/lt = "Other" +LICENSE:dictionaries/ltg = "LGPL-2.1-only" +LICENSE:dictionaries/lv = "LGPL-2.1-only" +LICENSE:dictionaries/mk = "GPL-3.0-only" +LICENSE:dictionaries/mn = "GPL-2.0-only" +LICENSE:dictionaries/nb = "GPL-2.0-only" +LICENSE:dictionaries/nds = "GPL-2.0-only" +LICENSE:dictionaries/ne = "LGPL-2.1-only" +LICENSE:dictionaries/nl = "BSD" +LICENSE:dictionaries/nn = "GPL-2.0-only" +LICENSE:dictionaries/pl = "GPL-3.0-only" +LICENSE:dictionaries/pt-BR = "LGPL 2.1" +LICENSE:dictionaries/pt = "GPL-2.0-only" +LICENSE:dictionaries/ro = "GPL-2.0-only" +LICENSE:dictionaries/ru = "BSD" +LICENSE:dictionaries/rw = "GPL-3.0-only" +LICENSE:dictionaries/sk = "GPL-2.0-only" +LICENSE:dictionaries/sl = "GPL-2.0-only" +LICENSE:dictionaries/sr-Latn = "LGPL 3.0" +LICENSE:dictionaries/sr = "LGPL 3.0" +LICENSE:dictionaries/sv = "LGPL 3.0" +LICENSE:dictionaries/tr = "MIT" +LICENSE:dictionaries/uk = "GPL 2.0" +LICENSE:dictionaries/vi = "GPL 3.0" LIC_FILES_CHKSUM = " \ file://dictionaries/bg/license;md5=ab14e2ded1a43b84be9aba2be64b9814 \ file://dictionaries/br/license;md5=2e046c64edc0a4e47fb3ea614e6c82c4 \ @@ -131,21 +131,21 @@ LIC_FILES_CHKSUM = " \ file://dictionaries/vi/license;md5=8d9ecb4e7577ce760029786aba7ecec5 \ " -RDEPENDS_${PN} = "hunspell" +RDEPENDS:${PN} = "hunspell" -PV = "0.0.0+git${SRCPV}" +PV = "0.0.0+git" SRCREV = "820a65e539e34a3a8c2a855d2450b84745c624ee" -SRC_URI = "git://github.com/wooorm/dictionaries.git" +SRC_URI = "git://github.com/wooorm/dictionaries.git;branch=master;protocol=https" S = "${WORKDIR}/git" do_install() { for LANGUAGE in `ls -d1 ${S}/dictionaries/*` ; do - LANGUAGE_DIR=`basename $LANGUAGE` + LANGUAGE_DIR=`basename $LANGUAGE | sed 's:-:_:'` install -D -m0644 $LANGUAGE/index.dic ${D}${datadir}/hunspell/$LANGUAGE_DIR.dic install -D -m0644 $LANGUAGE/index.aff ${D}${datadir}/hunspell/$LANGUAGE_DIR.aff install -D -m0644 $LANGUAGE/LICENSE ${D}${datadir}/hunspell/LICENSE-$LANGUAGE_DIR 2>/dev/null || echo "No LICENSE for language $LANGUAGE" done } -FILES_${PN} = "${datadir}/hunspell" +FILES:${PN} = "${datadir}/hunspell" diff --git a/meta-oe/recipes-support/hunspell/hunspell_1.7.0.bb b/meta-oe/recipes-support/hunspell/hunspell_1.7.0.bb deleted file mode 100644 index c2fb4fa05b..0000000000 --- a/meta-oe/recipes-support/hunspell/hunspell_1.7.0.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "A spell checker and morphological analyzer library" -HOMEPAGE = "http://hunspell.github.io/" -LICENSE = "GPLv2 | LGPLv2.1" -LIC_FILES_CHKSUM = " \ - file://COPYING;md5=75859989545e37968a99b631ef42722e \ - file://COPYING.LESSER;md5=c96ca6c1de8adc025adfada81d06fba5 \ -" - -SRCREV = "4ddd8ed5ca6484b930b111aec50c2750a6119a0f" -SRC_URI = "git://github.com/${BPN}/${BPN}.git" - -S = "${WORKDIR}/git" - -inherit autotools pkgconfig gettext - -RDEPENDS_${PN} = "perl" - -BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/hunspell/hunspell_1.7.2.bb b/meta-oe/recipes-support/hunspell/hunspell_1.7.2.bb new file mode 100644 index 0000000000..afe75472a5 --- /dev/null +++ b/meta-oe/recipes-support/hunspell/hunspell_1.7.2.bb @@ -0,0 +1,21 @@ +SUMMARY = "A spell checker and morphological analyzer library" +HOMEPAGE = "http://hunspell.github.io/" +LICENSE = "GPL-2.0-only | LGPL-2.1-only" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=75859989545e37968a99b631ef42722e \ + file://COPYING.LESSER;md5=c96ca6c1de8adc025adfada81d06fba5 \ +" + +SRCREV = "2969be996acad84b91ab3875b1816636fe61a40e" +SRC_URI = "git://github.com/${BPN}/${BPN}.git;branch=master;protocol=https" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig gettext + +# ispellaff2myspell: A program to convert ispell affix tables to myspell format +PACKAGES =+ "${PN}-ispell" +FILES:${PN}-ispell = "${bindir}/ispellaff2myspell" +RDEPENDS:${PN}-ispell = "perl" + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/hwdata/hwdata_git.bb b/meta-oe/recipes-support/hwdata/hwdata_0.382.bb index a8479466a8..a2bb7a3340 100644 --- a/meta-oe/recipes-support/hwdata/hwdata_git.bb +++ b/meta-oe/recipes-support/hwdata/hwdata_0.382.bb @@ -2,22 +2,25 @@ DESCRIPTION = "Hardware identification and configuration data" HOMEPAGE = "https://github.com/vcrhonek/hwdata" SECTION = "System/Base" -LICENSE = "GPL-2.0+" +LICENSE = "GPL-2.0-or-later | XFree86-1.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=1556547711e8246992b999edd9445a57" -PV = "0.329" -SRCREV = "3b93b226177b6a8d219fa5edee2a417758cf74db" -SRC_URI = "git://github.com/vcrhonek/${BPN}.git" +SRCREV = "94b82b56d6ee7c7ada381b3b02fecfca4ff7af1c" +SRC_URI = "git://github.com/vcrhonek/${BPN}.git;branch=master;protocol=https" S = "${WORKDIR}/git" +inherit allarch + do_configure() { ${S}/configure --datadir=${datadir} --libdir=${libdir} } +do_compile[noexec] = "1" + do_install() { oe_runmake install DESTDIR=${D} } -FILES_${PN} = "${libdir}/* \ +FILES:${PN} = "${libdir}/* \ ${datadir}/* " diff --git a/meta-oe/recipes-support/idevicerestore/idevicerestore_git.bb b/meta-oe/recipes-support/idevicerestore/idevicerestore_git.bb new file mode 100644 index 0000000000..8218b08084 --- /dev/null +++ b/meta-oe/recipes-support/idevicerestore/idevicerestore_git.bb @@ -0,0 +1,17 @@ +SUMMARY = "A command-line application to restore firmware files to iOS devices" +LICENSE = "LGPL-3.0-or-later" +LIC_FILES_CHKSUM = "\ + file://COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02 \ +" + +HOMEPAGE = "http://www.libimobiledevice.org/" + +DEPENDS = "libirecovery libimobiledevice libzip curl libimobiledevice-glue openssl" + +PV = "1.0.1+git" + +SRCREV = "ecae6c6e8ca6b6bad080a1c73f10ffd0e67d75a7" +SRC_URI = "git://github.com/libimobiledevice/idevicerestore;protocol=https;branch=master" + +S = "${WORKDIR}/git" +inherit autotools pkgconfig diff --git a/meta-oe/recipes-support/iksemel/iksemel_1.5.bb b/meta-oe/recipes-support/iksemel/iksemel_1.5.bb index 0903e90d7d..017e7d26a6 100644 --- a/meta-oe/recipes-support/iksemel/iksemel_1.5.bb +++ b/meta-oe/recipes-support/iksemel/iksemel_1.5.bb @@ -1,19 +1,19 @@ SUMMARY = "Fast and portable XML parser and Jabber protocol library" HOMEPAGE = "https://github.com/meduketto/iksemel" SECTION = "libs" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499" SRCREV = "978b733462e41efd5db72bc9974cb3b0d1d5f6fa" -PV = "1.5+git${SRCPV}" +PV = "1.5+git" -SRC_URI = "git://github.com/meduketto/iksemel.git;protocol=https \ +SRC_URI = "git://github.com/meduketto/iksemel.git;protocol=https;branch=master \ file://fix-configure-option-parsing.patch \ file://avoid-obsolete-gnutls-apis.patch" S = "${WORKDIR}/git" -inherit autotools pkgconfig lib_package +inherit autotools pkgconfig lib_package texinfo # TLS support requires either openssl or gnutls (if both are enabled openssl will be used). PACKAGECONFIG ?= "gnutls" diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_7.0.8.bb b/meta-oe/recipes-support/imagemagick/imagemagick_7.1.1.bb index 4ee06d77f1..6ab8a61b9b 100644 --- a/meta-oe/recipes-support/imagemagick/imagemagick_7.0.8.bb +++ b/meta-oe/recipes-support/imagemagick/imagemagick_7.1.1.bb @@ -4,48 +4,60 @@ HOMEPAGE = "https://www.imagemagick.org/" DESCRIPTION = "ImageMagick is a collection of tools for displaying, converting, and \ editing raster and vector image files. It can read and write over 200 image file formats." LICENSE = "ImageMagick" -LIC_FILES_CHKSUM = "file://LICENSE;md5=05ff94b3ff59fe6fa7489fa26e3d9142" +LIC_FILES_CHKSUM = "file://LICENSE;md5=2f9de66264141265b203cde9902819ea \ + file://NOTICE;md5=bcbf1f1897b40ec8df39700cb560e9ed" # FIXME: There are many more checked libraries. All should be added or explicitly disabled to get consistent results. DEPENDS = "lcms bzip2 jpeg libpng tiff zlib fftw freetype libtool" BASE_PV := "${PV}" -PV .= "_47" -SRC_URI = "git://github.com/ImageMagick/ImageMagick.git " -SRCREV = "b672df7a44b0ab0219b1fa78b3673c2810ddd374" +PV .= "-26" +SRC_URI = "git://github.com/ImageMagick/ImageMagick.git;branch=main;protocol=https" +SRCREV = "570a9a048bb0e3a5c221ca87be9408ae35f711e2" S = "${WORKDIR}/git" inherit autotools pkgconfig update-alternatives +export ac_cv_sys_file_offset_bits="64" -# xml disabled because it's using xml2-config --prefix to determine prefix which returns just /usr with our libxml2 -# if someone needs xml support then fix it first -EXTRA_OECONF = "--program-prefix= --program-suffix=.im7 --without-perl --disable-openmp --without-xml --disable-opencl" +EXTRA_OECONF = "--program-prefix= --program-suffix=.im7 --without-perl --enable-largefile" -CACHED_CONFIGUREVARS = "ac_cv_sys_file_offset_bits=yes" -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} cxx webp xml" +PACKAGECONFIG[cxx] = "--with-magick-plus-plus,--without-magick-plus-plus" PACKAGECONFIG[graphviz] = "--with-gvc,--without-gvc,graphviz" PACKAGECONFIG[jp2] = "--with-jp2,,jasper" PACKAGECONFIG[lzma] = "--with-lzma,--without-lzma,xz" PACKAGECONFIG[openjpeg] = "--with-openjp2,--without-openjp2,openjpeg" PACKAGECONFIG[pango] = "--with-pango,--without-pango,pango cairo" PACKAGECONFIG[rsvg] = "--with-rsvg,--without-rsvg,librsvg" +PACKAGECONFIG[tcmalloc] = "--with-tcmalloc=yes,--with-tcmalloc=no,gperftools" PACKAGECONFIG[webp] = "--with-webp,--without-webp,libwebp" PACKAGECONFIG[wmf] = "--with-wmf,--without-wmf,libwmf" PACKAGECONFIG[x11] = "--with-x,--without-x,virtual/libx11 libxext libxt" +PACKAGECONFIG[xml] = "--with-xml,--without-xml,libxml2" -FILES_${PN} += "${libdir}/ImageMagick-${BASE_PV}/config-Q16* \ +do_install:append:class-target() { + for file in MagickCore-config.im7 MagickWand-config.im7 Magick++-config.im7; do + sed -i 's,${STAGING_DIR_TARGET},,g' ${D}${bindir}/"$file" + done + sed -i 's,${S},,g' ${D}${libdir}/ImageMagick-${BASE_PV}/config-Q16HDRI/configure.xml + sed -i 's,${B},,g' ${D}${libdir}/ImageMagick-${BASE_PV}/config-Q16HDRI/configure.xml + sed -i 's,${RECIPE_SYSROOT},,g' ${D}${libdir}/ImageMagick-${BASE_PV}/config-Q16HDRI/configure.xml + sed -i 's,${HOSTTOOLS_DIR},${bindir},g' ${D}${sysconfdir}/ImageMagick-7/delegates.xml +} + +FILES:${PN} += "${libdir}/ImageMagick-${BASE_PV}/config-Q16* \ ${datadir}/ImageMagick-7" -FILES_${PN}-dev += "${libdir}/ImageMagick-${BASE_PV}/modules-Q16/*/*.a" +FILES:${PN}-dev += "${libdir}/ImageMagick-${BASE_PV}/modules-Q16/*/*.a" -FILES_${PN}-dbg += "${libdir}/ImageMagick-${BASE_PV}/modules-Q16/*/.debug/*" +FILES:${PN}-dbg += "${libdir}/ImageMagick-${BASE_PV}/modules-Q16/*/.debug/*" -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE_${PN} = "animate compare composite conjure convert display \ - identify import mogrify montage stream" +ALTERNATIVE:${PN} = "animate compare composite conjure convert display \ + identify import magick-script mogrify montage stream" ALTERNATIVE_TARGET[animate] = "${bindir}/animate.im7" ALTERNATIVE_TARGET[compare] = "${bindir}/compare.im7" @@ -55,12 +67,13 @@ ALTERNATIVE_TARGET[convert] = "${bindir}/convert.im7" ALTERNATIVE_TARGET[display] = "${bindir}/display.im7" ALTERNATIVE_TARGET[identify] = "${bindir}/identify.im7" ALTERNATIVE_TARGET[import] = "${bindir}/import.im7" +ALTERNATIVE_TARGET[magick-script] = "${bindir}/magick-script.im7" ALTERNATIVE_TARGET[mogrify] = "${bindir}/mogrify.im7" ALTERNATIVE_TARGET[montage] = "${bindir}/montage.im7" ALTERNATIVE_TARGET[stream] = "${bindir}/stream.im7" -ALTERNATIVE_${PN}-doc = "animate.1 compare.1 composite.1 conjure.1 \ - convert.1 display.1 identify.1 import.1 mogrify.1 montage.1 stream.1" +ALTERNATIVE:${PN}-doc = "animate.1 compare.1 composite.1 conjure.1 \ + convert.1 display.1 identify.1 import.1 magick-script.1 mogrify.1 montage.1 stream.1" ALTERNATIVE_LINK_NAME[animate.1] = "${mandir}/man1/animate.1" ALTERNATIVE_TARGET[animate.1] = "${mandir}/man1/animate.im7.1" @@ -78,6 +91,8 @@ ALTERNATIVE_LINK_NAME[identify.1] = "${mandir}/man1/identify.1" ALTERNATIVE_TARGET[identify.1] = "${mandir}/man1/identify.im7.1" ALTERNATIVE_LINK_NAME[import.1] = "${mandir}/man1/import.1" ALTERNATIVE_TARGET[import.1] = "${mandir}/man1/import.im7.1" +ALTERNATIVE_LINK_NAME[magick-script.1] = "${mandir}/man1/magick-script.1" +ALTERNATIVE_TARGET[magick-script.1] = "${mandir}/man1/magick-script.im7.1" ALTERNATIVE_LINK_NAME[mogrify.1] = "${mandir}/man1/mogrify.1" ALTERNATIVE_TARGET[mogrify.1] = "${mandir}/man1/mogrify.im7.1" ALTERNATIVE_LINK_NAME[montage.1] = "${mandir}/man1/montage.1" diff --git a/meta-oe/recipes-support/imapfilter/imapfilter/ldflags.patch b/meta-oe/recipes-support/imapfilter/imapfilter/ldflags.patch new file mode 100644 index 0000000000..ceda8394a7 --- /dev/null +++ b/meta-oe/recipes-support/imapfilter/imapfilter/ldflags.patch @@ -0,0 +1,16 @@ +Append to LDFLAGS so it can respect the LDFLAGS passed from environment. This helps +with using propert GNU_HASH settings during link on mips/arm + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- a/src/Makefile ++++ b/src/Makefile +@@ -24,7 +24,7 @@ CFLAGS = -Wall -Wextra -O \ + -DCONFIG_SSL_CAPATH='"$(SSLCAPATH)"' \ + -DCONFIG_SSL_CAFILE='"$(SSLCAFILE)"' \ + $(INCDIRS) $(MYCFLAGS) +-LDFLAGS = $(LIBDIRS) $(MYLDFLAGS) ++LDFLAGS += $(LIBDIRS) $(MYLDFLAGS) + LIBS = -lm -ldl $(LIBLUA) $(LIBPCRE) $(LIBSSL) $(LIBCRYPTO) $(MYLIBS) + + MAN1 = imapfilter.1 diff --git a/meta-oe/recipes-support/imapfilter/imapfilter_2.8.2.bb b/meta-oe/recipes-support/imapfilter/imapfilter_2.8.2.bb new file mode 100644 index 0000000000..422d96359c --- /dev/null +++ b/meta-oe/recipes-support/imapfilter/imapfilter_2.8.2.bb @@ -0,0 +1,23 @@ +SUMMARY = "IMAPFilter is a mail filtering utility that processes mailboxes based on IMAP queries" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=f8d2fc4954306888fd0e4b27bef83525" + +# v2.7.6 +SRCREV = "9e6661278572009a92a8e125c9b339232a9735a1" +SRC_URI = "git://github.com/lefcha/imapfilter;protocol=https;branch=master \ + file://ldflags.patch \ +" +S = "${WORKDIR}/git" + +DEPENDS= "openssl lua libpcre2" + +EXTRA_OEMAKE:append = " PREFIX=${prefix}" + +do_install(){ + oe_runmake DESTDIR=${D} install + + # No need for manuals at this point, MANDIR is hardcoded to depend on prefix + rm -rf ${D}${prefix}/man +} + +ASNEEDED = "" diff --git a/meta-oe/recipes-support/inih/libinih_58.bb b/meta-oe/recipes-support/inih/libinih_58.bb new file mode 100644 index 0000000000..2bcf2b4bd4 --- /dev/null +++ b/meta-oe/recipes-support/inih/libinih_58.bb @@ -0,0 +1,14 @@ +SUMMARY = "inih (INI Not Invented Here)" +DESCRIPTION = "A .INI file parser written in C that was designed to be small and simple." +HOMEPAGE = "https://github.com/benhoyt/inih" +SECTION = "libs" +LICENSE = "BSD-3-Clause" + +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a7a95d2af90376e85a05318794e6f202" + +SRC_URI = "git://github.com/benhoyt/inih.git;protocol=https;branch=master" + +S = "${WORKDIR}/git" +SRCREV = "5cc5e2c24642513aaa5b19126aad42d0e4e0923e" + +inherit meson pkgconfig diff --git a/meta-oe/recipes-support/inih/libinih_git.bb b/meta-oe/recipes-support/inih/libinih_git.bb deleted file mode 100644 index 48271f721c..0000000000 --- a/meta-oe/recipes-support/inih/libinih_git.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "C and C++ INI Library" -HOMEPAGE = "http://code.google.com/p/inih/" -PV = "0.0+gitr${SRCPV}" -PKGV = "${GITPKGVTAG}" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=dae28cbf28207425e0d0b3eb835f4bde" - -PR = "r3" - -# The github repository provides a cmake and pkg-config integration -SRCREV = "25078f7156eb8647b3b35dd25f9ae6f8c4ee0589" -SRC_URI = "git://github.com/OSSystems/inih.git" - -S = "${WORKDIR}/git" - -inherit gitpkgv cmake - -# We don't have libinih since we only have static libraries -ALLOW_EMPTY_${PN} = "1" diff --git a/meta-oe/recipes-support/iniparser/iniparser/Add-CMake-support.patch b/meta-oe/recipes-support/iniparser/iniparser/Add-CMake-support.patch deleted file mode 100644 index b666f00f70..0000000000 --- a/meta-oe/recipes-support/iniparser/iniparser/Add-CMake-support.patch +++ /dev/null @@ -1,63 +0,0 @@ -Origin: Debian packaging -From: Klee Dienes <klee@mit.edu> -Date: Thu, 13 Feb 2014 07:03:26 -0500 -Subject: Add CMake support. - ---- - CMakeLists.txt | 44 ++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 44 insertions(+) - create mode 100644 CMakeLists.txt - ---- /dev/null -+++ b/CMakeLists.txt -@@ -0,0 +1,50 @@ -+cmake_minimum_required (VERSION 2.8.8) -+ -+project (iniparser) -+include (GNUInstallDirs) -+ -+include_directories (src) -+ -+set(INIPARSER_SRCS src/dictionary.c src/iniparser.c) -+set(INIPARSER_HDRS src/dictionary.h src/iniparser.h) -+ -+add_library(iniparser-shared SHARED ${INIPARSER_SRCS} ${INIPARSER_HDRS}) -+add_library(iniparser-static STATIC ${INIPARSER_SRCS} ${INIPARSER_HDRS}) -+ -+set_target_properties(iniparser-shared PROPERTIES SOVERSION 1) -+set_target_properties(iniparser-shared PROPERTIES OUTPUT_NAME iniparser) -+set_target_properties(iniparser-static PROPERTIES OUTPUT_NAME iniparser) -+ -+install (TARGETS iniparser-shared -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+ -+install (TARGETS iniparser-static -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+ -+find_package(Doxygen) -+if (NOT DOXYGEN_FOUND) -+message(FATAL_ERROR "Doxygen is needed to build the documentation. Please install it correctly") -+endif() -+ -+file (WRITE ${CMAKE_CURRENT_BINARY_DIR}/iniparser.dox -+ "@INCLUDE = ${CMAKE_CURRENT_SOURCE_DIR}/doc/iniparser.dox\n" -+ "OUTPUT_DIRECTORY = ${CMAKE_CURRENT_BINARY_DIR}\n" -+ ) -+ -+add_custom_target (doc ALL -+ COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/iniparser.dox -+ SOURCES doc/iniparser.dox) -+ -+enable_testing() -+ -+add_test(NAME testsuite -+ COMMAND make -+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/test) -+ -+install (FILES ${INIPARSER_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/iniparser) -+ -+install (DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION ${CMAKE_INSTALL_DOCDIR}) diff --git a/meta-oe/recipes-support/iniparser/iniparser_4.1.bb b/meta-oe/recipes-support/iniparser/iniparser_4.1.bb deleted file mode 100644 index f4b553a578..0000000000 --- a/meta-oe/recipes-support/iniparser/iniparser_4.1.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "The iniParser library is a simple C library offering INI file parsing services (both reading and writing)." -SECTION = "libs" -HOMEPAGE = "https://github.com/ndevilla/iniparser" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e02baf71c76e0650e667d7da133379ac" - -DEPENDS = "doxygen-native" - -SRC_URI = "git://github.com/ndevilla/iniparser.git;protocol=https \ - file://Add-CMake-support.patch" - -# tag 4.1 -SRCREV= "0a38e85c9cde1e099ca3bf70083bd00f89c3e5b6" - -S = "${WORKDIR}/git" - -inherit cmake diff --git a/meta-oe/recipes-support/iniparser/iniparser_4.2.2.bb b/meta-oe/recipes-support/iniparser/iniparser_4.2.2.bb new file mode 100644 index 0000000000..8c6c60a79a --- /dev/null +++ b/meta-oe/recipes-support/iniparser/iniparser_4.2.2.bb @@ -0,0 +1,18 @@ +SUMMARY = "The iniParser library is a simple C library offering INI file parsing services (both reading and writing)." +SECTION = "libs" +HOMEPAGE = "https://gitlab.com/iniparser/iniparser" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=8474d3b745f77e203f1fc82fb0bb7678" +SRCBRANCH = "main" +SRCREV = "762715ca6cdba9dcf31a5af9297b444f3b5b8c00" + +SRC_URI = "git://gitlab.com/iniparser/iniparser.git;protocol=https;branch=${SRCBRANCH}" +S = "${WORKDIR}/git" + +inherit cmake + +EXTRA_OECMAKE = " \ + -DBUILD_DOCS=OFF \ + " + +FILES_${PN}-staticdev += "${libdir}/cmake/iniparser/iniparser-staticTargets*.cmake" diff --git a/meta-oe/recipes-support/inotify-tools/inotify-tools/0002-configure-Add-AC_SYS_LARGEFILE-autoconf-macro.patch b/meta-oe/recipes-support/inotify-tools/inotify-tools/0002-configure-Add-AC_SYS_LARGEFILE-autoconf-macro.patch new file mode 100644 index 0000000000..3b195aae4f --- /dev/null +++ b/meta-oe/recipes-support/inotify-tools/inotify-tools/0002-configure-Add-AC_SYS_LARGEFILE-autoconf-macro.patch @@ -0,0 +1,28 @@ +From 6a57ff26d695aaad096b798879a5dbc5af2cedf5 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 20 Dec 2022 10:46:50 -0800 +Subject: [PATCH] configure: Add AC_SYS_LARGEFILE autoconf macro + +This will define _FILE_OFFSET_BITS to be 64 if off_t is 64bit +and we do not need to define lfs64 functions + +Upstream-Status: Submitted [https://github.com/inotify-tools/inotify-tools/pull/174] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/configure.ac b/configure.ac +index bddf14d..b89a266 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -17,6 +17,9 @@ AC_PROG_CC + AM_INIT_AUTOMAKE + LT_INIT + ++# Add option for largefile support ++AC_SYS_LARGEFILE ++ + AC_PATH_PROG(DOXYGEN, doxygen, NO_DOXYGEN) + + AC_ARG_ENABLE(doxygen, diff --git a/meta-oe/recipes-support/inotify-tools/inotify-tools/0002-libinotifytools-Bridge-differences-between-musl-glib.patch b/meta-oe/recipes-support/inotify-tools/inotify-tools/0002-libinotifytools-Bridge-differences-between-musl-glib.patch new file mode 100644 index 0000000000..931244830c --- /dev/null +++ b/meta-oe/recipes-support/inotify-tools/inotify-tools/0002-libinotifytools-Bridge-differences-between-musl-glib.patch @@ -0,0 +1,40 @@ +From 6c3ce01a281a9aa661494d24a862219fc9e2b460 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 16 Dec 2021 14:57:55 -0800 +Subject: [PATCH 2/2] libinotifytools: Bridge differences between + musl/glibc/kernel fnotify.h + +System detects to use sys/fnotify.h and then assumes glibc's definitions +but musl has definitions of its own. perhaps portable thing would be to +use linux/fnotify.h interface directly on linux irrespective of libc + +See the differences discussion here [1] + +[1] https://inbox.vuxu.org/musl/20191112220151.GC27331@x230/T/#ma8700992467200c8792e0fa8508eae656b81aeba + +Upstream-Status: Submitted [https://github.com/inotify-tools/inotify-tools/pull/154] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + libinotifytools/src/inotifytools.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/libinotifytools/src/inotifytools.c b/libinotifytools/src/inotifytools.c +index 902eac2..2b96395 100644 +--- a/libinotifytools/src/inotifytools.c ++++ b/libinotifytools/src/inotifytools.c +@@ -55,6 +55,12 @@ struct fanotify_event_fid { + struct fanotify_event_info_fid info; + struct file_handle handle; + }; ++ ++#ifndef __GLIBC__ ++#define val __val ++#define __kernel_fsid_t fsid_t ++#endif ++ + #endif + + /** +-- +2.34.1 + diff --git a/meta-oe/recipes-support/inotify-tools/inotify-tools/0003-replace-stat64-lstat64-with-stat-lstat.patch b/meta-oe/recipes-support/inotify-tools/inotify-tools/0003-replace-stat64-lstat64-with-stat-lstat.patch new file mode 100644 index 0000000000..c0784ecc73 --- /dev/null +++ b/meta-oe/recipes-support/inotify-tools/inotify-tools/0003-replace-stat64-lstat64-with-stat-lstat.patch @@ -0,0 +1,119 @@ +From c6093ad63b92f5d25e6826d1c49dc7cee86d3747 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 20 Dec 2022 10:48:10 -0800 +Subject: [PATCH] replace stat64/lstat64 with stat/lstat + +lfs64 functions are not needed when off_t is 64-bit +Additionally this fixes build with musl which does not +export these functions without defining _LARGEFILE64_SOURCE + +Upstream-Status: Submitted [https://github.com/inotify-tools/inotify-tools/pull/174] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + libinotifytools/src/inotifytools.c | 8 ++++---- + libinotifytools/src/inotifytools/inotify-nosys.h | 5 ----- + libinotifytools/src/inotifytools/inotifytools.h | 5 ----- + src/common.c | 4 ++-- + src/common.h | 6 +----- + 5 files changed, 7 insertions(+), 21 deletions(-) + +diff --git a/libinotifytools/src/inotifytools.c b/libinotifytools/src/inotifytools.c +index 50f6135..3e17ac6 100644 +--- a/libinotifytools/src/inotifytools.c ++++ b/libinotifytools/src/inotifytools.c +@@ -1750,14 +1750,14 @@ int inotifytools_watch_recursively_with_exclude(char const* path, + + static struct dirent * ent; + char * next_file; +- static struct stat64 my_stat; ++ static struct stat my_stat; + ent = readdir( dir ); + // Watch each directory within this directory + while ( ent ) { + if ( (0 != strcmp( ent->d_name, "." )) && + (0 != strcmp( ent->d_name, ".." )) ) { + nasprintf(&next_file,"%s%s", my_path, ent->d_name); +- if ( -1 == lstat64( next_file, &my_stat ) ) { ++ if ( -1 == lstat( next_file, &my_stat ) ) { + error = errno; + free( next_file ); + if ( errno != EACCES ) { +@@ -1840,9 +1840,9 @@ int inotifytools_error() { + * @internal + */ + static int isdir( char const * path ) { +- static struct stat64 my_stat; ++ static struct stat my_stat; + +- if ( -1 == lstat64( path, &my_stat ) ) { ++ if ( -1 == lstat( path, &my_stat ) ) { + if (errno == ENOENT) return 0; + fprintf(stderr, "Stat failed on %s: %s\n", path, strerror(errno)); + return 0; +diff --git a/libinotifytools/src/inotifytools/inotify-nosys.h b/libinotifytools/src/inotifytools/inotify-nosys.h +index 01aa45e..97166d4 100644 +--- a/libinotifytools/src/inotifytools/inotify-nosys.h ++++ b/libinotifytools/src/inotifytools/inotify-nosys.h +@@ -13,11 +13,6 @@ + #include <sys/syscall.h> + #include <unistd.h> + +-#ifdef __FreeBSD__ +-#define stat64 stat +-#define lstat64 lstat +-#endif +- + /* + * struct inotify_event - structure read from the inotify device for each event + * +diff --git a/libinotifytools/src/inotifytools/inotifytools.h b/libinotifytools/src/inotifytools/inotifytools.h +index 49936ae..2ec4358 100644 +--- a/libinotifytools/src/inotifytools/inotifytools.h ++++ b/libinotifytools/src/inotifytools/inotifytools.h +@@ -1,11 +1,6 @@ + #ifndef _inotifytools_H + #define _inotifytools_H + +-#ifdef __FreeBSD__ +-#define stat64 stat +-#define lstat64 lstat +-#endif +- + #ifdef __cplusplus + extern "C" + { +diff --git a/src/common.c b/src/common.c +index 5a6fda1..885286e 100644 +--- a/src/common.c ++++ b/src/common.c +@@ -45,9 +45,9 @@ void print_event_descriptions() { + } + + int isdir(char const *path) { +- static struct stat64 my_stat; ++ static struct stat my_stat; + +- if (-1 == lstat64(path, &my_stat)) { ++ if (-1 == lstat(path, &my_stat)) { + if (errno == ENOENT) + return 0; + fprintf(stderr, "Stat failed on %s: %s\n", path, strerror(errno)); +diff --git a/src/common.h b/src/common.h +index 12d3dde..7f1e34a 100644 +--- a/src/common.h ++++ b/src/common.h +@@ -1,13 +1,9 @@ + #ifndef COMMON_H + #define COMMON_H + +-#ifdef __FreeBSD__ +-#define stat64 stat +-#define lstat64 lstat +-#ifdef ENABLE_FANOTIFY ++#if defined(__FreeBSD__) && defined(ENABLE_FANOTIFY) + #error "FreeBSD does not support fanotify" + #endif +-#endif + + #include <stdbool.h> + diff --git a/meta-oe/recipes-support/inotify-tools/inotify-tools/inotify-nosys-fix-system-call-number.patch b/meta-oe/recipes-support/inotify-tools/inotify-tools/inotify-nosys-fix-system-call-number.patch deleted file mode 100644 index 89b890dda9..0000000000 --- a/meta-oe/recipes-support/inotify-tools/inotify-tools/inotify-nosys-fix-system-call-number.patch +++ /dev/null @@ -1,31 +0,0 @@ -inotify-tools: fix __NR_inotify_add_watch system call number on _MIPS_SIM_ABI64 - -The correct value should be the same as defined in -linux/arch/mips/include/uapi/asm/unistd.h - -Upstream-Status: Summitted [https://github.com/rvoicilas/inotify-tools/pull/71] - -Signed-off-by: Roy Li <rongqing.li@windriver.com> -Signed-off-by: Jackie Huang <jackie.huang@windriver.com> ---- - libinotifytools/src/inotifytools/inotify-nosys.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libinotifytools/src/inotifytools/inotify-nosys.h b/libinotifytools/src/inotifytools/inotify-nosys.h -index db76b2c..5f7b11b 100644 ---- a/libinotifytools/src/inotifytools/inotify-nosys.h -+++ b/libinotifytools/src/inotifytools/inotify-nosys.h -@@ -100,8 +100,8 @@ struct inotify_event { - # endif - # if _MIPS_SIM == _MIPS_SIM_ABI64 - # define __NR_inotify_init (__NR_Linux + 243) --# define __NR_inotify_add_watch (__NR_Linux + 243) --# define __NR_inotify_rm_watch (__NR_Linux + 243) -+# define __NR_inotify_add_watch (__NR_Linux + 244) -+# define __NR_inotify_rm_watch (__NR_Linux + 245) - # endif - # if _MIPS_SIM == _MIPS_SIM_NABI32 - # define __NR_inotify_init (__NR_Linux + 247) --- -1.7.10.4 - diff --git a/meta-oe/recipes-support/inotify-tools/inotify-tools_3.22.6.0.bb b/meta-oe/recipes-support/inotify-tools/inotify-tools_3.22.6.0.bb new file mode 100644 index 0000000000..8a0ae17ad7 --- /dev/null +++ b/meta-oe/recipes-support/inotify-tools/inotify-tools_3.22.6.0.bb @@ -0,0 +1,27 @@ +SUMMARY = "Command line tools and C library providing a simple interface to inotify" +HOMEPAGE = "http://wiki.github.com/rvoicilas/inotify-tools" +SECTION = "console/devel" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=ac6c26e52aea428ee7f56dc2c56424c6" + +SRCREV = "c8bdbc0a2ed822fc7c67c5c3e102d89fe27fb2d0" + +SRC_URI = "git://github.com/${BPN}/${BPN};branch=master;protocol=https \ + file://0002-libinotifytools-Bridge-differences-between-musl-glib.patch \ + file://0002-configure-Add-AC_SYS_LARGEFILE-autoconf-macro.patch \ + file://0003-replace-stat64-lstat64-with-stat-lstat.patch \ + " + +S = "${WORKDIR}/git" + +inherit autotools + +EXTRA_OECONF = "--disable-doxygen" + +# workaround until glibc 2.35 is fixed for this [1] +# [1] https://sourceware.org/pipermail/libc-alpha/2021-December/134215.html +CFLAGS += "-Wno-error" + +PACKAGES =+ "libinotifytools" + +FILES:libinotifytools = "${libdir}/lib*.so.*" diff --git a/meta-oe/recipes-support/inotify-tools/inotify-tools_git.bb b/meta-oe/recipes-support/inotify-tools/inotify-tools_git.bb deleted file mode 100644 index 05ca4b4ad5..0000000000 --- a/meta-oe/recipes-support/inotify-tools/inotify-tools_git.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "Command line tools and C library providing a simple interface to inotify" -AUTHOR = "Rohan McGovern <rohan@mcgovern.id.au>" -HOMEPAGE = "http://wiki.github.com/rvoicilas/inotify-tools" -SECTION = "console/devel" -LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=ac6c26e52aea428ee7f56dc2c56424c6" - -SRCREV = "e203934e46784bb34c213078423ba1678e0c4936" -PV = "3.20.1" - -SRC_URI = "git://github.com/rvoicilas/${BPN} \ - file://inotify-nosys-fix-system-call-number.patch \ - " - -S = "${WORKDIR}/git" - -inherit autotools - -EXTRA_OECONF = "--disable-doxygen" - -PACKAGES =+ "libinotifytools" - -FILES_libinotifytools = "${libdir}/lib*.so.*" diff --git a/meta-oe/recipes-support/itstool/itstool/0001-Native-Don-t-use-build-time-hardcoded-python-binary-.patch b/meta-oe/recipes-support/itstool/itstool/0001-Native-Don-t-use-build-time-hardcoded-python-binary-.patch deleted file mode 100644 index 19a858bd75..0000000000 --- a/meta-oe/recipes-support/itstool/itstool/0001-Native-Don-t-use-build-time-hardcoded-python-binary-.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 335ef14fc801c9dfbe7e5692dc71cfbe72049d2b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> -Date: Sun, 27 Oct 2019 16:38:52 +0100 -Subject: [PATCH] Native: Don't use build time hardcoded python binary path. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This is same patch as used for target build except that we do not use the -'-S' and '-s' option because '-S' is relatively young [1] and elder build-host -don't support it [2] - -[1] https://github.com/coreutils/coreutils/commit/668306ed86c8c79b0af0db8b9c882654ebb66db2#diff-83d9d52b1f12ac589739ab1334ae4f30 -[2] https://errors.yoctoproject.org/Errors/Details/274743/ - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> ---- - itstool.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/itstool.in b/itstool.in -index e64cd34..05d264f 100755 ---- a/itstool.in -+++ b/itstool.in -@@ -1,4 +1,4 @@ --#!@PYTHON@ -s -+#!/usr/bin/env python3 - # - # Copyright (c) 2010-2018 Shaun McCance <shaunm@gnome.org> - # --- -2.21.0 - diff --git a/meta-oe/recipes-support/itstool/itstool/0002-Don-t-use-build-time-hardcoded-python-binary-path.patch b/meta-oe/recipes-support/itstool/itstool/0002-Don-t-use-build-time-hardcoded-python-binary-path.patch deleted file mode 100644 index b91105330c..0000000000 --- a/meta-oe/recipes-support/itstool/itstool/0002-Don-t-use-build-time-hardcoded-python-binary-path.patch +++ /dev/null @@ -1,29 +0,0 @@ -From cd9b56224895576125e91cca317ace8a80f3eb77 Mon Sep 17 00:00:00 2001 -From: Piotr Tworek <tworaz@tworaz.net> -Date: Sat, 27 Jul 2019 10:19:11 +0200 -Subject: [PATCH] Don't use build time hardcoded python binary path. - -This path obviously won't work on target since they refer to build -machine directory structure. Native builds will also fail if local.conf -has INHERIT+=rm_work. Instread of hardcoding path to python binary use -whatever is found in PATH first. This should also allow the tool to use -python3 binary provided in recipe-sysroot-native. - -Upstream-Status: Inappropriate [OE specific] ---- - itstool.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/itstool.in b/itstool.in -index b3c0033..7df2476 100755 ---- a/itstool.in -+++ b/itstool.in -@@ -1,4 +1,4 @@ --#!@PYTHON@ -s -+#!/usr/bin/env -S python3 -s - # - # Copyright (c) 2010-2018 Shaun McCance <shaunm@gnome.org> - # --- -2.21.0 - diff --git a/meta-oe/recipes-support/itstool/itstool_2.0.6.bb b/meta-oe/recipes-support/itstool/itstool_2.0.6.bb deleted file mode 100644 index 8290c5e581..0000000000 --- a/meta-oe/recipes-support/itstool/itstool_2.0.6.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "ITS Tool allows you to translate your XML documents with PO files" -HOMEPAGE = "http://itstool.org/" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=59c57b95fd7d0e9e238ebbc7ad47c5a5" - -inherit autotools python3native - -DEPENDS = "libxml2-native" - -SRC_URI = "http://files.itstool.org/${BPN}/${BPN}-${PV}.tar.bz2" -SRC_URI_append_class-native = " file://0001-Native-Don-t-use-build-time-hardcoded-python-binary-.patch" -SRC_URI_append_class-target = " file://0002-Don-t-use-build-time-hardcoded-python-binary-path.patch" - -SRC_URI[md5sum] = "4306eeba4f4aee6b393d14f9c3c57ca1" -SRC_URI[sha256sum] = "6233cc22726a9a5a83664bf67d1af79549a298c23185d926c3677afa917b92a9" - -BBCLASSEXTEND = "native" - -RDEPENDS_${PN} += "libxml2-python" -RDEPENDS_${PN}_class-native = "" diff --git a/meta-oe/recipes-support/joe/joe_4.6.bb b/meta-oe/recipes-support/joe/joe_4.6.bb index b79e028f30..ed0bf337b5 100644 --- a/meta-oe/recipes-support/joe/joe_4.6.bb +++ b/meta-oe/recipes-support/joe/joe_4.6.bb @@ -1,7 +1,7 @@ SECTION = "console/utils" SUMMARY = "Console text editor with good functionality, good choice for vi-haters" HOMEPAGE = "http://joe-editor.sourceforge.net/" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "${SOURCEFORGE_MIRROR}/joe-editor/joe-${PV}.tar.gz" @@ -9,7 +9,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/joe-editor/joe-${PV}.tar.gz" PACKAGECONFIG ??= "curses" PACKAGECONFIG[curses] = "--enable-curses,--disable-curses,ncurses,ncurses-terminfo" -inherit autotools-brokensep +inherit autotools-brokensep mime-xdg SRC_URI[md5sum] = "9017484e6116830d846678b625ea5c43" SRC_URI[sha256sum] = "495a0a61f26404070fe8a719d80406dc7f337623788e445b92a9f6de512ab9de" diff --git a/meta-oe/recipes-support/lcms/lcms_2.16.bb b/meta-oe/recipes-support/lcms/lcms_2.16.bb new file mode 100644 index 0000000000..8135f83a05 --- /dev/null +++ b/meta-oe/recipes-support/lcms/lcms_2.16.bb @@ -0,0 +1,17 @@ +SUMMARY = "Little cms is a small-footprint, speed optimized color management engine" +SECTION = "libs" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e9ce323c4b71c943a785db90142b228a" + +SRC_URI = "${SOURCEFORGE_MIRROR}/lcms/lcms2-${PV}.tar.gz" +SRC_URI[sha256sum] = "d873d34ad8b9b4cea010631f1a6228d2087475e4dc5e763eb81acc23d9d45a51" + +DEPENDS = "tiff" + +BBCLASSEXTEND = "native nativesdk" + +S = "${WORKDIR}/lcms2-${PV}" + +inherit autotools + +CVE_PRODUCT += "littlecms:little_cms_color_engine" diff --git a/meta-oe/recipes-support/lcms/lcms_2.9.bb b/meta-oe/recipes-support/lcms/lcms_2.9.bb deleted file mode 100644 index be72d765ef..0000000000 --- a/meta-oe/recipes-support/lcms/lcms_2.9.bb +++ /dev/null @@ -1,16 +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] = "8de1b7724f578d2995c8fdfa35c3ad0e" -SRC_URI[sha256sum] = "48c6fdf98396fa245ed86e622028caf49b96fa22f3e5734f853f806fbc8e7d20" - -DEPENDS = "tiff" - -BBCLASSEXTEND = "native" - -S = "${WORKDIR}/lcms2-${PV}" - -inherit autotools diff --git a/meta-oe/recipes-support/lcov/lcov_1.14.bb b/meta-oe/recipes-support/lcov/lcov_1.16.bb index fd02f4a76b..22d68814ee 100755 --- a/meta-oe/recipes-support/lcov/lcov_1.14.bb +++ b/meta-oe/recipes-support/lcov/lcov_1.16.bb @@ -1,23 +1,24 @@ SUMMARY = "A graphical front-end for gcov" -HOMEPAGE = "http://ltp.sourceforge.net/coverage/lcov.php" +HOMEPAGE = "https://github.com/linux-test-project/lcov" DESCRIPTION = "LCOV is a graphical front-end for GCC's coverage testing \ tool gcov. It collects gcov data for multiple source files and creates \ HTML pages containing the source code annotated with coverage information. \ It also adds overview pages for easy navigation within the file structure. \ LCOV supports statement, function and branch coverage measurement." -LICENSE = "GPL-2.0" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -RDEPENDS_${PN} += " \ - gcov \ +RDEPENDS:${PN} += " \ perl \ perl-module-filehandle \ perl-module-getopt-std \ + perl-module-digest-md5 \ perl-module-digest-sha \ perl-module-constant \ perl-module-cwd \ perl-module-errno \ perl-module-file-basename \ + perl-module-file-copy \ perl-module-file-find \ perl-module-file-path \ perl-module-file-spec \ @@ -41,12 +42,16 @@ RDEPENDS_${PN} += " \ perl-module-tie-hash \ " -SRC_URI = "http://downloads.sourceforge.net/ltp/${BP}.tar.gz" - -SRC_URI[md5sum] = "0220d01753469f83921f8f41ae5054c1" -SRC_URI[sha256sum] = "14995699187440e0ae4da57fe3a64adc0a3c5cf14feab971f8db38fb7d8f071a" +RDEPENDS:${PN}:append:class-target = " \ + gcov \ + gcov-symlinks \ +" +SRC_URI = "https://github.com/linux-test-project/lcov/releases/download/v${PV}/lcov-${PV}.tar.gz" +SRC_URI[md5sum] = "bfee0cef50d7b7bd1df03bfadf68dcef" +SRC_URI[sha256sum] = "987031ad5528c8a746d4b52b380bc1bffe412de1f2b9c2ba5224995668e3240b" do_install() { - oe_runmake install PREFIX=${D}${prefix} CFG_DIR=${D}${sysconfdir} + oe_runmake install PREFIX=${D}${prefix} CFG_DIR=${D}${sysconfdir} LCOV_PERL_PATH="/usr/bin/env perl" } +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/libatasmart/libatasmart_0.19.bb b/meta-oe/recipes-support/libatasmart/libatasmart_0.19.bb index 4cfb732932..f747ecbf72 100644 --- a/meta-oe/recipes-support/libatasmart/libatasmart_0.19.bb +++ b/meta-oe/recipes-support/libatasmart/libatasmart_0.19.bb @@ -1,11 +1,11 @@ SUMMARY = "ATA S.M.A.R.T. Reading and Parsing Library" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1" DEPENDS = "udev" SRCREV = "de6258940960443038b4c1651dfda3620075e870" -SRC_URI = "git://git.0pointer.de/libatasmart.git \ +SRC_URI = "git://git.0pointer.de/libatasmart.git;branch=master \ file://0001-Makefile.am-add-CFLAGS-and-LDFLAGS-definiton.patch \ " @@ -13,9 +13,9 @@ S = "${WORKDIR}/git" inherit autotools lib_package pkgconfig -do_install_append() { +do_install:append() { sed -i -e s://:/:g -e 's:=${libdir}/libudev.la:-ludev:g' ${D}${libdir}/libatasmart.la } PACKAGES =+ "${PN}-dev-vala" -FILES_${PN}-dev-vala = "${datadir}/vala" +FILES:${PN}-dev-vala = "${datadir}/vala" diff --git a/meta-oe/recipes-support/libb64/libb64/0001-Makefile-fix-parallel-build-of-examples.patch b/meta-oe/recipes-support/libb64/libb64/0001-Makefile-fix-parallel-build-of-examples.patch new file mode 100644 index 0000000000..84dee415ad --- /dev/null +++ b/meta-oe/recipes-support/libb64/libb64/0001-Makefile-fix-parallel-build-of-examples.patch @@ -0,0 +1,46 @@ +From cbe8bd2948f522062c6170f581e1e265692a9a55 Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich <slyich@gmail.com> +Date: Sun, 24 Oct 2021 18:53:04 +0100 +Subject: [PATCH] Makefile: fix parallel build of examples + +Without the change examples fails to build as: + + $ LANG=C make -j + make -C src + make -C examples + make[1]: Entering directory 'libb64/src' + cc -O3 -Werror -pedantic -I../include -c -o cencode.o cencode.c + make[1]: Entering directory 'libb64/examples' + make[1]: *** No rule to make target 'libb64.a', needed by 'c-example1'. Stop. + make[1]: Leaving directory 'libb64/examples' + make: *** [Makefile:8: all_examples] Error 2 + make: *** Waiting for unfinished jobs.... + cc -O3 -Werror -pedantic -I../include -c -o cdecode.o cdecode.c + ar rv libb64.a cencode.o cdecode.o + ar: creating libb64.a + a - cencode.o + a - cdecode.o + make[1]: Leaving directory 'libb64/src' + +Upstream-Status: Submitted [https://github.com/libb64/libb64/pull/9] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index db40356..aa48c76 100644 +--- a/Makefile ++++ b/Makefile +@@ -4,7 +4,7 @@ all_src: + $(MAKE) -C src + all_base64: all_src + $(MAKE) -C base64 +-all_examples: ++all_examples: all_src + $(MAKE) -C examples + + clean: clean_src clean_base64 clean_include clean_examples +-- +2.37.2 + diff --git a/meta-oe/recipes-support/libb64/libb64/0001-example-Do-not-run-the-tests.patch b/meta-oe/recipes-support/libb64/libb64/0001-example-Do-not-run-the-tests.patch new file mode 100644 index 0000000000..b3ee24d9d5 --- /dev/null +++ b/meta-oe/recipes-support/libb64/libb64/0001-example-Do-not-run-the-tests.patch @@ -0,0 +1,27 @@ +From 68f66d1583be670eb8d5f3f38dbd5dd1d63b733c Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 27 Mar 2021 21:41:04 -0700 +Subject: [PATCH] example: Do not run the tests + +Upstream-Status: Inappropriate [Cross-compile specific] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + examples/Makefile | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/examples/Makefile b/examples/Makefile +index d9667a5..554b346 100644 +--- a/examples/Makefile ++++ b/examples/Makefile +@@ -33,11 +33,8 @@ depend: $(SOURCES) + makedepend -f- $(CFLAGS) $(SOURCES) 2> /dev/null 1> depend + + test-c-example1: c-example1 +- ./c-example1 + + test-c-example2: c-example2 +- ./c-example2 loremgibson.txt encoded.txt decoded.txt +- diff -q loremgibson.txt decoded.txt + + test: test-c-example1 test-c-example2 + diff --git a/meta-oe/recipes-support/libb64/libb64/0001-examples-Use-proper-function-prototype-for-main.patch b/meta-oe/recipes-support/libb64/libb64/0001-examples-Use-proper-function-prototype-for-main.patch new file mode 100644 index 0000000000..42e889efc2 --- /dev/null +++ b/meta-oe/recipes-support/libb64/libb64/0001-examples-Use-proper-function-prototype-for-main.patch @@ -0,0 +1,27 @@ +From 98eaf510f40e384b32c01ad4bd5c3a697fdd8560 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 24 Aug 2022 14:34:38 -0700 +Subject: [PATCH] examples: Use proper function prototype for main + +Upstream-Status: Submitted [https://github.com/libb64/libb64/pull/10] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + examples/c-example1.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/examples/c-example1.c b/examples/c-example1.c +index a0001df..34585dd 100644 +--- a/examples/c-example1.c ++++ b/examples/c-example1.c +@@ -83,7 +83,7 @@ char* decode(const char* input) + } + + +-int main() ++int main(int argc, char** argv) + { + const char* input = "hello world"; + char* encoded; +-- +2.37.2 + diff --git a/meta-oe/recipes-support/libb64/libb64/0002-use-BUFSIZ-as-buffer-size.patch b/meta-oe/recipes-support/libb64/libb64/0002-use-BUFSIZ-as-buffer-size.patch new file mode 100644 index 0000000000..f2b8f599c6 --- /dev/null +++ b/meta-oe/recipes-support/libb64/libb64/0002-use-BUFSIZ-as-buffer-size.patch @@ -0,0 +1,57 @@ +From 9ec49389f56816d7ac2331296c03d147531a421a Mon Sep 17 00:00:00 2001 +From: Jakub Wilk <jwilk@debian.org> +Date: Sat, 27 Mar 2021 22:01:13 -0700 +Subject: [PATCH] use BUFSIZ as buffer size + +Bug: http://sourceforge.net/tracker/?func=detail&atid=785907&aid=3591336&group_id=152942 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- + include/b64/decode.h | 3 ++- + include/b64/encode.h | 3 ++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/include/b64/decode.h b/include/b64/decode.h +index b2362e5..8db1d09 100644 +--- a/include/b64/decode.h ++++ b/include/b64/decode.h +@@ -8,6 +8,7 @@ For details, see http://sourceforge.net/projects/libb64 + #ifndef BASE64_DECODE_H + #define BASE64_DECODE_H + ++#include <cstdio> + #include <iostream> + + namespace base64 +@@ -22,7 +23,7 @@ namespace base64 + base64_decodestate _state; + int _buffersize; + +- decoder(int buffersize_in = BUFFERSIZE) ++ decoder(int buffersize_in = BUFSIZ) + : _buffersize(buffersize_in) + { + base64_init_decodestate(&_state); +diff --git a/include/b64/encode.h b/include/b64/encode.h +index c1a5f88..644e4dd 100644 +--- a/include/b64/encode.h ++++ b/include/b64/encode.h +@@ -8,6 +8,7 @@ For details, see http://sourceforge.net/projects/libb64 + #ifndef BASE64_ENCODE_H + #define BASE64_ENCODE_H + ++#include <cstdio> + #include <iostream> + + namespace base64 +@@ -22,7 +23,7 @@ namespace base64 + base64_encodestate _state; + int _buffersize; + +- encoder(int buffersize_in = BUFFERSIZE) ++ encoder(int buffersize_in = BUFSIZ) + : _buffersize(buffersize_in) + { + base64_init_encodestate(&_state); diff --git a/meta-oe/recipes-support/libb64/libb64_2.0.0.1.bb b/meta-oe/recipes-support/libb64/libb64_2.0.0.1.bb new file mode 100644 index 0000000000..e0683b177b --- /dev/null +++ b/meta-oe/recipes-support/libb64/libb64_2.0.0.1.bb @@ -0,0 +1,38 @@ +SUMMARY = "Base64 Encoding/Decoding Routines" +DESCRIPTION = "base64 encoding/decoding library - runtime library \ +libb64 is a library of ANSI C routines for fast encoding/decoding data into \ +and from a base64-encoded format" +HOMEPAGE = "https://github.com/libb64" +LICENSE = "PD" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=81296a564fa0621472714aae7c763d96" + +PV .= "+2.0.0.2+git" +SRCREV = "ce864b17ea0e24a91e77c7dd3eb2d1ac4175b3f0" + +SRC_URI = "git://github.com/libb64/libb64;protocol=https;branch=master \ + file://0001-example-Do-not-run-the-tests.patch \ + file://0002-use-BUFSIZ-as-buffer-size.patch \ + file://0001-Makefile-fix-parallel-build-of-examples.patch \ + file://0001-examples-Use-proper-function-prototype-for-main.patch \ + " + +S = "${WORKDIR}/git" + +CFLAGS += "-fPIC" + +do_configure () { + : +} + +do_compile () { + oe_runmake + ${CC} ${LDFLAGS} ${CFLAGS} -shared -Wl,-soname,${BPN}.so.0 src/*.o -o src/${BPN}.so.0 +} + +do_install () { + install -d ${D}${includedir}/b64 + install -Dm 0644 ${B}/src/libb64.a ${D}${libdir}/libb64.a + install -Dm 0644 ${B}/src/libb64.so.0 ${D}${libdir}/libb64.so.0 + ln -s libb64.so.0 ${D}${libdir}/libb64.so + install -Dm 0644 ${S}/include/b64/*.h ${D}${includedir}/b64/ +} diff --git a/meta-oe/recipes-support/libbytesize/libbytesize_2.1.bb b/meta-oe/recipes-support/libbytesize/libbytesize_2.10.bb index 07bf1faaeb..daa01bfc3d 100644 --- a/meta-oe/recipes-support/libbytesize/libbytesize_2.1.bb +++ b/meta-oe/recipes-support/libbytesize/libbytesize_2.10.bb @@ -1,18 +1,17 @@ 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+" +LICENSE = "LGPL-2.0-or-later" 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" +SRCREV = "6e83cc6f6dff4f126fc79284e0c3c1c50123380d" +SRC_URI = "git://github.com/storaged-project/libbytesize;branch=main;protocol=https" -inherit gettext autotools python3native +inherit gettext autotools pkgconfig python3native DEPENDS += " \ libpcre2 \ @@ -21,12 +20,10 @@ DEPENDS += " \ gettext-native \ " -FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}/bytesize" +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_OECONF = "--without-gtk-doc" EXTRA_OEMAKE = "py3libdir=${PYTHON_SITEPACKAGES_DIR}" - - diff --git a/meta-oe/recipes-support/libcanberra/files/0001-build-gtk-and-gtk3-version-for-canberra_gtk_play.patch b/meta-oe/recipes-support/libcanberra/files/0001-build-gtk-and-gtk3-version-for-canberra_gtk_play.patch index 4e0984f364..89f31f7946 100644 --- a/meta-oe/recipes-support/libcanberra/files/0001-build-gtk-and-gtk3-version-for-canberra_gtk_play.patch +++ b/meta-oe/recipes-support/libcanberra/files/0001-build-gtk-and-gtk3-version-for-canberra_gtk_play.patch @@ -8,6 +8,8 @@ Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> --- +Upstream-Status: Pending + src/Makefile.am | 25 +++++++++++++++---------- 1 files changed, 15 insertions(+), 10 deletions(-) diff --git a/meta-oe/recipes-support/libcanberra/files/0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch b/meta-oe/recipes-support/libcanberra/files/0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch new file mode 100644 index 0000000000..1e45441ff9 --- /dev/null +++ b/meta-oe/recipes-support/libcanberra/files/0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch @@ -0,0 +1,65 @@ +From c0620e432650e81062c1967cc669829dbd29b310 Mon Sep 17 00:00:00 2001 +From: Michael Meeks <michael.meeks@suse.com> +Date: Fri, 9 Nov 2012 16:16:40 +0000 +Subject: [PATCH] gtk: Don't assume all GdkDisplays are GdkX11Displays: + broadway/wayland + +--- +Upstream-Status: Pending + + src/canberra-gtk-module.c | 15 +++++++++++++++ + src/canberra-gtk.c | 5 +++++ + 2 files changed, 20 insertions(+) + +--- a/src/canberra-gtk-module.c ++++ b/src/canberra-gtk-module.c +@@ -307,6 +307,11 @@ static gint window_get_desktop(GdkDispla + guchar *data = NULL; + gint ret = -1; + ++#ifdef GDK_IS_X11_DISPLAY ++ if (!GDK_IS_X11_DISPLAY(d)) ++ return 0; ++#endif ++ + if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), GDK_WINDOW_XID(w), + gdk_x11_get_xatom_by_name_for_display(d, "_NET_WM_DESKTOP"), + 0, G_MAXLONG, False, XA_CARDINAL, &type_return, +@@ -335,6 +340,11 @@ static gint display_get_desktop(GdkDispl + guchar *data = NULL; + gint ret = -1; + ++#ifdef GDK_IS_X11_DISPLAY ++ if (!GDK_IS_X11_DISPLAY(d)) ++ return 0; ++#endif ++ + if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), DefaultRootWindow(GDK_DISPLAY_XDISPLAY(d)), + gdk_x11_get_xatom_by_name_for_display(d, "_NET_CURRENT_DESKTOP"), + 0, G_MAXLONG, False, XA_CARDINAL, &type_return, +@@ -365,6 +375,11 @@ static gboolean window_is_xembed(GdkDisp + gboolean ret = FALSE; + Atom xembed; + ++#ifdef GDK_IS_X11_DISPLAY ++ if (!GDK_IS_X11_DISPLAY(d)) ++ return FALSE; ++#endif ++ + /* Gnome Panel applets are XEMBED windows. We need to make sure we + * ignore them */ + +--- a/src/canberra-gtk.c ++++ b/src/canberra-gtk.c +@@ -185,6 +185,11 @@ static gint window_get_desktop(GdkDispla + guchar *data = NULL; + gint ret = -1; + ++#ifdef GDK_IS_X11_DISPLAY ++ if (!GDK_IS_X11_DISPLAY(d)) ++ return 0; ++#endif ++ + if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), GDK_WINDOW_XID(w), + gdk_x11_get_xatom_by_name_for_display(d, "_NET_WM_DESKTOP"), + 0, G_MAXLONG, False, XA_CARDINAL, &type_return, diff --git a/meta-oe/recipes-support/libcanberra/files/0001-remove-dropped-templates.patch b/meta-oe/recipes-support/libcanberra/files/0001-remove-dropped-templates.patch new file mode 100644 index 0000000000..57f5486084 --- /dev/null +++ b/meta-oe/recipes-support/libcanberra/files/0001-remove-dropped-templates.patch @@ -0,0 +1,65 @@ +From dfd3ef4caac300f517f8eeb378f0b0f9ba6a9b06 Mon Sep 17 00:00:00 2001 +From: Markus Volk <f_l_k@t-online.de> +Date: Tue, 15 Aug 2023 15:41:03 +0200 +Subject: [PATCH] remove dropped gtkdoc templates + +Signed-off-by: Markus Volk <f_l_k@t-online.de> + +Upstream-Status: Pending +--- +--- a/gtkdoc/gtk-doc.make 2011-08-25 23:20:22.000000000 +0200 ++++ b/gtkdoc/gtk-doc.make 2023-08-15 18:08:02.430729073 +0200 +@@ -33,9 +33,9 @@ + $(HTML_IMAGES) \ + $(SETUP_FILES) + +-DOC_STAMPS=setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \ ++DOC_STAMPS=setup-build.stamp scan-build.stamp sgml-build.stamp \ + html-build.stamp pdf-build.stamp \ +- tmpl.stamp sgml.stamp html.stamp pdf.stamp ++ sgml.stamp html.stamp pdf.stamp + + SCANOBJ_FILES = \ + $(DOC_MODULE).args \ +@@ -120,27 +120,12 @@ + $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp + @true + +-#### templates #### +- +-tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt +- @echo ' DOC Rebuilding template files' +- @gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) +- @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ +- if test -w $(abs_srcdir) ; then \ +- cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \ +- fi \ +- fi +- @touch tmpl-build.stamp +- +-tmpl.stamp: tmpl-build.stamp +- @true +- + $(srcdir)/tmpl/*.sgml: + @true + + #### xml #### + +-sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) ++sgml-build.stamp: $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) + @echo ' DOC Building XML' + @-chmod -R u+w $(srcdir) + @_source_dir='' ; \ + --- a/gtkdoc/Makefile.am 2009-01-21 21:52:46.000000000 +0100 ++++ b/gtkdoc/Makefile.am 2023-08-15 17:41:59.002498772 +0200 +@@ -31,10 +31,6 @@ + # e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml + MKDB_OPTIONS=--sgml-mode --output-format=xml + +-# Extra options to supply to gtkdoc-mktmpl +-# e.g. MKTMPL_OPTIONS=--only-section-tmpl +-MKTMPL_OPTIONS= +- + # Extra options to supply to gtkdoc-fixref. Not normally needed. + # e.g. FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html + FIXXREF_OPTIONS= diff --git a/meta-oe/recipes-support/libcanberra/libcanberra_0.30.bb b/meta-oe/recipes-support/libcanberra/libcanberra_0.30.bb index 72c93abe17..95c9479588 100644 --- a/meta-oe/recipes-support/libcanberra/libcanberra_0.30.bb +++ b/meta-oe/recipes-support/libcanberra/libcanberra_0.30.bb @@ -1,6 +1,6 @@ SUMMARY = "Implementation of XDG Sound Theme and Name Specifications" DESCRIPTION = "Libcanberra is an implementation of the XDG Sound Theme and Name Specifications, for generating event sounds on free desktops." -LICENSE = "LGPLv2.1+" +LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ file://src/canberra.h;beginline=7;endline=24;md5=c616c687cf8da540a14f917e0d23ab03" @@ -11,6 +11,8 @@ inherit autotools gtk-doc SRC_URI = " \ http://0pointer.de/lennart/projects/${BPN}/${BPN}-${PV}.tar.xz \ file://0001-build-gtk-and-gtk3-version-for-canberra_gtk_play.patch \ + file://0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch \ + file://0001-remove-dropped-templates.patch \ " SRC_URI[md5sum] = "34cb7e4430afaf6f447c4ebdb9b42072" SRC_URI[sha256sum] = "c2b671e67e0c288a69fc33dc1b6f1b534d07882c2aceed37004bf48c601afa72" @@ -31,32 +33,32 @@ PACKAGECONFIG[gstreamer] = "--enable-gstreamer, --disable-gstreamer, gstreamer1. PACKAGECONFIG[gtk] = "--enable-gtk, --disable-gtk, gtk+" PACKAGECONFIG[gtk3] = "--enable-gtk3, --disable-gtk3, gtk+3" -python populate_packages_prepend() { +python populate_packages:prepend() { plugindir = d.expand('${libdir}/${BPN}-${PV}/') - do_split_packages(d, plugindir, '^libcanberra-(.*)\.so$', 'libcanberra-%s', '%s support library', extra_depends='' ) - do_split_packages(d, plugindir, '^libcanberra-(.*)\.la$', 'libcanberra-%s', '%s support library', extra_depends='' ) + do_split_packages(d, plugindir, r'^libcanberra-(.*)\.so$', 'libcanberra-%s', '%s support library', extra_depends='' ) + do_split_packages(d, plugindir, r'^libcanberra-(.*)\.la$', 'libcanberra-%s', '%s support library', extra_depends='' ) } PACKAGES =+ "${PN}-gnome ${PN}-gtk2 ${PN}-gtk3 ${PN}-systemd" PACKAGES_DYNAMIC += "^libcanberra-.*" -FILES_${PN} = "${bindir}/ ${libdir}/${BPN}.so.*" +FILES:${PN} = "${bindir}/ ${libdir}/${BPN}.so.*" -FILES_${PN}-dev += "${datadir}/vala/vapi ${libdir}/*/modules/*.la ${libdir}/*/*.la" +FILES:${PN}-dev += "${datadir}/vala/vapi ${libdir}/*/modules/*.la ${libdir}/*/*.la" -FILES_${PN}-dbg += "${libdir}/${BPN}-${PV}/.debug ${libdir}/gtk-*/modules/.debug" +FILES:${PN}-dbg += "${libdir}/${BPN}-${PV}/.debug ${libdir}/gtk-*/modules/.debug" -FILES_${PN}-gtk2 = "${libdir}/${BPN}-gtk.so.* \ +FILES:${PN}-gtk2 = "${libdir}/${BPN}-gtk.so.* \ ${libdir}/gtk-2.0/modules/*.so \ ${bindir}/canberra-gtk-play" # -gtk3 ships a symlink to a .so -INSANE_SKIP_${PN}-gtk3 = "dev-so" -FILES_${PN}-gtk3 = "${libdir}/${BPN}-gtk3.so.* \ +INSANE_SKIP:${PN}-gtk3 = "dev-so" +FILES:${PN}-gtk3 = "${libdir}/${BPN}-gtk3.so.* \ ${libdir}/gtk-3.0/modules/*.so \ ${bindir}/canberra-gtk3-play" -FILES_${PN}-gnome = "${libdir}/gnome-settings-daemon-3.0/ \ +FILES:${PN}-gnome = "${libdir}/gnome-settings-daemon-3.0/ \ ${datadir}/gdm/ ${datadir}/gnome/" -FILES_${PN}-systemd = "${systemd_unitdir}/system/*.service" +FILES:${PN}-systemd = "${systemd_unitdir}/system/*.service" diff --git a/meta-oe/recipes-support/libcereal/files/0001-cmake-Use-idirafter-instead-of-isystem.patch b/meta-oe/recipes-support/libcereal/files/0001-cmake-Use-idirafter-instead-of-isystem.patch new file mode 100644 index 0000000000..fc30f0ad7c --- /dev/null +++ b/meta-oe/recipes-support/libcereal/files/0001-cmake-Use-idirafter-instead-of-isystem.patch @@ -0,0 +1,52 @@ +From ac70933783a70d5387a2bb2849c568e33ba52558 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 21 Jan 2023 01:41:32 -0800 +Subject: [PATCH] cmake: Use -idirafter instead of -isystem + +isystem dirs are searched before the regular system dirs +this exposes an interesting include ordering problem when using +clang + libc++, when including C++ headers like <cstdlib> + +cstdlib includes stdlib.h and in case of libc++, this should be coming +from libc++ as well, which is then eventually including system stdlib.h + +libc++ has added a check for checking this order recently, which means +if cstlib ends up including system stdlib.h before libc++ provided +stdlib.h it errors out + +| /mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/libcereal/1.3.2+gitAUTOINC+ebef1e9298-r0/recipe-sysroot/usr/include/c++/v1/cwchar:113:5: error: <cwchar> tried including <wchar.h> but didn't find libc++'s <wcha +r.h> header. This usually means that your header search paths are not configured properly. The header search paths should contain the C++ Standard Library headers before any C Standard + Library, and you are probably using compiler flags that make that not be the case. | # error <cwchar> tried including <wchar.h> but didn't find libc++'s <wchar.h> header. \ +| ^ + +The reason is that include_directories with SYSTEM property adds the +directory via -system and some of these directories point to sysroot +e.g. OPENSSL_INCLUDE_DIR which ends up adding -isystem +<sysroot>/usr/include and causes the system stdlib.h to included before +libc++ stdlib.h + +A fix is to use -idirafter which preserved the effects of system headers +but instead of prepending, it will append to system headers and the +issue is addressed + +Upstream-Status: Submitted [https://github.com/USCiLab/cereal/pull/777] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + unittests/boost/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/unittests/boost/CMakeLists.txt b/unittests/boost/CMakeLists.txt +index 1d733bc7..08e6a169 100644 +--- a/unittests/boost/CMakeLists.txt ++++ b/unittests/boost/CMakeLists.txt +@@ -1,6 +1,6 @@ + file(GLOB TESTS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp) + +-include_directories(SYSTEM ${Boost_INCLUDE_DIRS}) ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${Boost_INCLUDE_DIRS}") + + # Build all of the non-special tests + foreach(TEST_SOURCE ${TESTS}) +-- +2.39.1 + diff --git a/meta-oe/recipes-support/libcereal/files/0001-doctest-Do-not-use-unnamed-class.patch b/meta-oe/recipes-support/libcereal/files/0001-doctest-Do-not-use-unnamed-class.patch new file mode 100644 index 0000000000..9396cc5d01 --- /dev/null +++ b/meta-oe/recipes-support/libcereal/files/0001-doctest-Do-not-use-unnamed-class.patch @@ -0,0 +1,38 @@ +From 03bbb1b055c41ec652470f775b55a7cf80d664ef Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 17 Apr 2023 16:46:12 -0700 +Subject: [PATCH] doctest: Do not use unnamed class + +When compiling with clang this results in emitting absolute path into +debug info, especially .debug_str section has + +~(unnamed class at /mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux-musl/libcereal/1.3.2+gitAUTOINC+ebef1e9298-r0/git/unittests/doctest.h:6428:5) +(unnamed class at /mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux-musl/libcereal/1.3.2+gitAUTOINC+ebef1e9298-r0/git/unittests/doctest.h:6428:5) + +Therefore use a name for the class instead and help get rid of this +absolute path in debug info. This fixes + +File /usr/lib/libcereal/ptest/tests/.debug/test_unordered_map in package libcereal-dbg contains reference to TMPDIR + +Upstream-Status: Submitted [https://github.com/USCiLab/cereal/pull/788] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + unittests/doctest.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/unittests/doctest.h b/unittests/doctest.h +index cd5b44d6..e6d8f7f9 100644 +--- a/unittests/doctest.h ++++ b/unittests/doctest.h +@@ -6424,7 +6424,7 @@ void Context::setCout(std::ostream* out) { p->cout = out; } + static class DiscardOStream : public std::ostream + { + private: +- class : public std::streambuf ++ class discardBufStream: public std::streambuf + { + private: + // allowing some buffering decreases the amount of calls to overflow +-- +2.40.0 + diff --git a/meta-oe/recipes-support/libcereal/files/0001-sandbox-Do-not-use-int8_t-in-std-uniform_int_distrib.patch b/meta-oe/recipes-support/libcereal/files/0001-sandbox-Do-not-use-int8_t-in-std-uniform_int_distrib.patch new file mode 100644 index 0000000000..26a8223d19 --- /dev/null +++ b/meta-oe/recipes-support/libcereal/files/0001-sandbox-Do-not-use-int8_t-in-std-uniform_int_distrib.patch @@ -0,0 +1,54 @@ +From 36054278304945c6aef7d44e58788ca882c67d05 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 1 Sep 2022 15:54:13 -0700 +Subject: [PATCH] sandbox: Do not use int8_t in std::uniform_int_distribution + +Newer versions of libc++ has dropped supporting this usecase since its +an UB see. + +https://reviews.llvm.org/D114920?id=400571 + +Fixes + +uniform_int_distribution.h:162:5: error: static assertion failed due to requirement '__libcpp_random_is_valid_inttype<char>::value': IntType must be a supported integer type + static_assert(__libcpp_random_is_valid_inttype<_IntType>::value, "IntType must be a supported integer type"); + ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux-musl/libcereal/1.3.2+gitAUTOINC+ebef1e9298-r0/git/sandbox/performance.cpp:261:9: note: in instantiation of template class 'std::uniform_int_distribution<char>' requested here + c = std::uniform_int_distribution<char>(' ', '~')(gen); + ^ +/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux-musl/libcereal/1.3.2+gitAUTOINC+ebef1e9298-r0/git/sandbox/performance.cpp:261:9: error: type 'std::uniform_int_distribution<char>' does not provide a call operator + c = std::uniform_int_distribution<char>(' ', '~')(gen); + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +2 errors generated. + +Upstream-Status: Submitted [https://github.com/USCiLab/cereal/pull/764] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + sandbox/performance.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/sandbox/performance.cpp b/sandbox/performance.cpp +index f9307870..aca8c78c 100644 +--- a/sandbox/performance.cpp ++++ b/sandbox/performance.cpp +@@ -258,7 +258,7 @@ random_value(std::mt19937 & gen) + { + std::string s(std::uniform_int_distribution<int>(3, 30)(gen), ' '); + for(char & c : s) +- c = std::uniform_int_distribution<char>(' ', '~')(gen); ++ c = static_cast<char>( std::uniform_int_distribution<int>(' ', '~')(gen) ); + return s; + } + +@@ -277,7 +277,7 @@ std::string random_binary_string(std::mt19937 & gen) + { + std::string s(N, ' '); + for(auto & c : s ) +- c = std::uniform_int_distribution<char>('0', '1')(gen); ++ c = static_cast<char>( std::uniform_int_distribution<int>( '0', '1' )(gen) ); + return s; + } + +-- +2.37.3 + diff --git a/meta-oe/recipes-support/libcereal/files/run-ptest b/meta-oe/recipes-support/libcereal/files/run-ptest new file mode 100755 index 0000000000..9bc480aa7f --- /dev/null +++ b/meta-oe/recipes-support/libcereal/files/run-ptest @@ -0,0 +1,12 @@ +#!/bin/sh + +cd tests +for atest in test_* ; do + rm -rf tests.log + ./${atest} > tests.log 2>&1 + if [ $? = 0 ] ; then + echo "PASS: ${atest}" + else + echo "FAIL: ${atest}" + fi +done diff --git a/meta-oe/recipes-support/libcereal/libcereal_1.2.2.bb b/meta-oe/recipes-support/libcereal/libcereal_1.2.2.bb deleted file mode 100644 index 365b40b17d..0000000000 --- a/meta-oe/recipes-support/libcereal/libcereal_1.2.2.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "A C++11 library for serialization" -HOMEPAGE = "https://uscilab.github.io/cereal/" - -SECTION = "libs" - -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e612690af2f575dfd02e2e91443cea23" - -SRCREV = "51cbda5f30e56c801c07fe3d3aba5d7fb9e6cca4" -SRC_URI = "git://github.com/USCiLab/cereal.git" - -S = "${WORKDIR}/git" - -inherit cmake - -EXTRA_OECMAKE = "-DJUST_INSTALL_CEREAL=ON" - -ALLOW_EMPTY_${PN} = "1" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb b/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb new file mode 100644 index 0000000000..6ad20d6370 --- /dev/null +++ b/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb @@ -0,0 +1,56 @@ +SUMMARY = "A C++11 library for serialization" +HOMEPAGE = "https://uscilab.github.io/cereal/" + +SECTION = "libs" + +LICENSE = "BSD-3-Clause & MIT & BSL-1.0" +LIC_FILES_CHKSUM = "\ + file://LICENSE;md5=4921372a1fb38469e667c38b17a1c4b3 \ + file://include/cereal/external/rapidxml/license.txt;md5=d63ab70ba21ca0544b03284958324301 \ + file://include/cereal/external/LICENSE;md5=b07578c9df99c0b8b45eb041efd4a645 \ + file://include/cereal/external/rapidjson/LICENSE;md5=e7abb663111d4ac17cf00323698aff08 \ + file://include/cereal/external/rapidjson/msinttypes/LICENSE;md5=dffce65b98c773976de2e338bd130f46 \ +" + +DEPENDS = " ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'boost', '', d)} " + +PROVIDES += "${PN}-dev" + +PV .= "+git" +SRCREV = "ebef1e929807629befafbb2918ea1a08c7194554" +SRC_URI = "git://github.com/USCiLab/cereal.git;branch=master;protocol=https \ + file://0001-sandbox-Do-not-use-int8_t-in-std-uniform_int_distrib.patch \ + file://0001-cmake-Use-idirafter-instead-of-isystem.patch \ + file://0001-doctest-Do-not-use-unnamed-class.patch \ + file://run-ptest \ +" + +S = "${WORKDIR}/git" + +inherit cmake pkgconfig ptest + +CXXFLAGS:append:toolchain-clang = " -Wno-error=c++11-narrowing-const-reference" + +LIBATOMIC:mips = "${@bb.utils.contains('PTEST_ENABLED', '1', '-DCEREAL_THREAD_LIBS="-latomic"', '', d)}" +LIBATOMIC:riscv32 = "${@bb.utils.contains('PTEST_ENABLED', '1', '-DCEREAL_THREAD_LIBS="-latomic"', '', d)}" +LIBATOMIC:powerpc = "${@bb.utils.contains('PTEST_ENABLED', '1', '-DCEREAL_THREAD_LIBS="-latomic"', '', d)}" + +PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'with-tests', '', d)}" +PACKAGECONFIG[with-tests] = "-DWITH_WERROR=OFF -DBUILD_TESTS=ON ${LIBATOMIC},," +EXTRA_OECMAKE = "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', '', '-DJUST_INSTALL_CEREAL=ON', d)} \ + ${@['','-DSKIP_PORTABILITY_TEST=ON'][d.getVar('SITEINFO_BITS') != '32']}" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp ${B}/unittests/test_* ${D}${PTEST_PATH}/tests +} + +ALLOW_EMPTY:${PN} = "1" + +RDEPENDS:${PN}-dev = "" + +BBCLASSEXTEND = "native nativesdk" + +#it needs to work with CXXFLAGS += " -mlong-double-64" but ppc only supports 128bit long double +COMPATIBLE_HOST:powerpc:libc-musl = "null" +COMPATIBLE_HOST:powerpc64le:libc-musl = "null" diff --git a/meta-oe/recipes-support/libcppkafka/libcppkafka_git.bb b/meta-oe/recipes-support/libcppkafka/libcppkafka_git.bb new file mode 100644 index 0000000000..cf2d933169 --- /dev/null +++ b/meta-oe/recipes-support/libcppkafka/libcppkafka_git.bb @@ -0,0 +1,29 @@ +SUMMARY = "high level C++ wrapper for rdkafka" +DESCRIPTION = "cppkafka allows C++ applications to consume and produce messages using the Apache Kafka protocol." +HOMEPAGE = "https://github.com/mfontanini/cppkafka" +SECTION = "lib" +LICENSE = "BSD-2-Clause" + +LIC_FILES_CHKSUM = " \ +file://LICENSE;md5=d8b4ca15d239dc1485ef495c8f1bcc72 \ +" + +SRC_URI = "git://github.com/mfontanini/cppkafka;protocol=https;branch=master \ +" +SRCREV = "91ac543cbd2228588dcf24a6ca357f8be0f4e5ab" + +BASEPV = "0.4.0" +PV = "${BASEPV}+git" + +DEPENDS = "librdkafka curl boost chrpath-replacement-native" + +inherit cmake + +EXTRA_OECMAKE = "-DCPPKAFKA_BUILD_SHARED=ON" + +S = "${WORKDIR}/git" + +do_install:append(){ + chrpath -d ${D}${libdir}/libcppkafka.so.${BASEPV} + sed -i -e 's|${STAGING_INCDIR}|\$\{includedir\}|g' ${D}${datadir}/pkgconfig/cppkafka.pc +} diff --git a/meta-oe/recipes-support/libcyusbserial/libcyusbserial/0001-CMakeLists.txt-don-t-fall-back-CMAKE_INSTALL_LIBDIR-.patch b/meta-oe/recipes-support/libcyusbserial/libcyusbserial/0001-CMakeLists.txt-don-t-fall-back-CMAKE_INSTALL_LIBDIR-.patch new file mode 100644 index 0000000000..d9e10469d3 --- /dev/null +++ b/meta-oe/recipes-support/libcyusbserial/libcyusbserial/0001-CMakeLists.txt-don-t-fall-back-CMAKE_INSTALL_LIBDIR-.patch @@ -0,0 +1,43 @@ +From 655c5c32b37a2bea12389ed69c0869215fcf5abe Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Sun, 3 Sep 2023 11:22:35 +0200 +Subject: [PATCH] CMakeLists.txt: don't fall back CMAKE_INSTALL_LIBDIR to lib + +* testing ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR} existence + doesn't really work in cross compilation and on some hosts was causing: + + ERROR: QA Issue: libcyusbserial: Files/directories were installed but not shipped in any package: + /usr/lib/libcyusbserial.so.1 + /usr/lib/libcyusbserial.so + Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install. + libcyusbserial: 2 installed and not shipped files. [installed-vs-shipped] + + with multilib using /usr/lib32 or /usr/lib64 when the same didn't + exist on host. + +Upstream-Status: Pending +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + lib/CMakeLists.txt | 9 --------- + 1 file changed, 9 deletions(-) + +diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt +index 2b031cb..53a7263 100644 +--- a/lib/CMakeLists.txt ++++ b/lib/CMakeLists.txt +@@ -6,15 +6,6 @@ if (NOT CMAKE_INSTALL_LIBDIR) + include(GNUInstallDirs) + endif (NOT CMAKE_INSTALL_LIBDIR) + +-# Fall back to just "lib" if the item provided by GNUInstallDirs doesn't exist +-# For example, on Ubuntu 13.10 with CMake 2.8.11.2, +-# /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE} doesn't exist. +-if (NOT EXISTS "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") +- message(STATUS "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR} does not exist. Defaulting libcyusbserial install location to ${CMAKE_INSTALL_PREFIX}/lib.") +- set(CMAKE_INSTALL_LIBDIR lib) +-endif() +- +- + ################################################################################ + # Include paths + ################################################################################ diff --git a/meta-oe/recipes-support/libcyusbserial/libcyusbserial_git.bb b/meta-oe/recipes-support/libcyusbserial/libcyusbserial_git.bb index 74b5e21e23..dd7f457b10 100644 --- a/meta-oe/recipes-support/libcyusbserial/libcyusbserial_git.bb +++ b/meta-oe/recipes-support/libcyusbserial/libcyusbserial_git.bb @@ -1,18 +1,20 @@ SUMMARY = "Enable userspace control of Cypress USB-Serial bridge devices" HOMEPAGE = "https://github.com/cyrozap/libcyusbserial" BUGTRACKER = "https://github.com/cyrozap/libcyusbserial/issues" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING.LESSER.txt;md5=4fbd65380cdd255951079008b364516c" DEPENDS = "libusb udev" -PV = "1.0.0+git${SRCPV}" +PV = "1.0.0+git" SRCREV = "655e2d544183d094f0e2d119c7e0c6206a0ddb3f" -SRC_URI = "git://github.com/cyrozap/${BPN}.git" +SRC_URI = "git://github.com/cyrozap/${BPN}.git;branch=master;protocol=https \ + file://0001-CMakeLists.txt-don-t-fall-back-CMAKE_INSTALL_LIBDIR-.patch \ +" S = "${WORKDIR}/git" inherit cmake PACKAGES =+ "${PN}-utils" -FILES_${PN}-utils = "${bindir}/*" +FILES:${PN}-utils = "${bindir}/*" diff --git a/meta-oe/recipes-support/libee/libee.inc b/meta-oe/recipes-support/libee/libee.inc index e5a145ab22..592109b951 100644 --- a/meta-oe/recipes-support/libee/libee.inc +++ b/meta-oe/recipes-support/libee/libee.inc @@ -5,7 +5,7 @@ but hopefully convenient API layer above the CEE standard." HOMEPAGE = "http://www.libee.org" SECTION = "base" -LICENSE = "LGPL-2.1+" +LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=1c2687de35e36ba3b999136236a66cd6" SRC_URI = "http://www.libee.org/download/files/download/${BPN}-${PV}.tar.gz\ @@ -35,5 +35,5 @@ do_install_ptest() { install -d ${D}${PTEST_PATH} install -m 0755 ${B}/${TESTDIR}/genfile ${D}${PTEST_PATH} install -m 0755 ${B}/${TESTDIR}/.libs/ezapi1 ${D}${PTEST_PATH} - install -m 0755 ${WORKDIR}/ezapi1.sh ${D}${PTEST_PATH} + install -m 0755 ${UNPACKDIR}/ezapi1.sh ${D}${PTEST_PATH} } diff --git a/meta-oe/recipes-support/libee/libee/libee-parallel-make.patch b/meta-oe/recipes-support/libee/libee/libee-parallel-make.patch index 25e5c6ae02..8bb23aafca 100644 --- a/meta-oe/recipes-support/libee/libee/libee-parallel-make.patch +++ b/meta-oe/recipes-support/libee/libee/libee-parallel-make.patch @@ -3,7 +3,7 @@ fix parallel compiling problem without specifying libee_convert_DEPENDENCIES = libee.la, libee_convert can't find libee.la when linking as libee is not generated yet. -Upstream-Status: pending +Upstream-Status: Pending Signed-off-by: Yao Zhao <yao.zhao@windriver.com> --- diff --git a/meta-oe/recipes-support/libeigen/libeigen/0001-Default-eigen_packet_wrapper-constructor.patch b/meta-oe/recipes-support/libeigen/libeigen/0001-Default-eigen_packet_wrapper-constructor.patch new file mode 100644 index 0000000000..84b5a4da9f --- /dev/null +++ b/meta-oe/recipes-support/libeigen/libeigen/0001-Default-eigen_packet_wrapper-constructor.patch @@ -0,0 +1,72 @@ +From cb507309937958c632147de87e8f1231d6698847 Mon Sep 17 00:00:00 2001 +From: Antonio Sanchez <cantonios@google.com> +Date: Tue, 14 Sep 2021 10:57:22 -0700 +Subject: [PATCH] Default eigen_packet_wrapper constructor. + +This makes it trivial, allowing use of `memcpy`. + +Fixes #2326 + +Upstream-Status: Backport [https://gitlab.com/libeigen/eigen/-/merge_requests/645/diffs?commit_id=cb507309937958c632147de87e8f1231d6698847] +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> + +* fixes build failures for arm targets with NEON enabled (e.g. -mfpu=neon-vfpv4) + for recipes with -Werror enabled and gcc-11, e.g. fuse-core, robot-localization, + prbt-ikfast-manipulator-plugin, rm-chassis-controllers in meta-ros1-noetic: + +In file included from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/Core:214, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/macros.h:63, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/loss.h:37, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/constraint.h:37, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/src/constraint.cpp:34: +/jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/src/Core/arch/NEON/PacketMath.h: In function 'Packet Eigen::internal::pload(const typename Eigen::internal::unpacket_traits<T>::type*) [with Packet = Eigen::internal::eigen_packet_wrapper<int, 2>; typename Eigen::internal::unpacket_traits<T>::type = signed char]': +/jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/src/Core/arch/NEON/PacketMath.h:1671:9: error: 'void* memcpy(void*, const void*, size_t)' copying an object of non-trivial type 'Eigen::internal::Packet4c' {aka 'struct Eigen::internal::eigen_packet_wrapper<int, 2>'} from an array of 'const int8_t' {aka 'const signed char'} [-Werror=class-memaccess] + 1671 | memcpy(&res, from, sizeof(Packet4c)); + | ~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +In file included from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/Core:172, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/macros.h:63, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/loss.h:37, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/constraint.h:37, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/src/constraint.cpp:34: +/jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/src/Core/GenericPacketMath.h:159:8: note: 'Eigen::internal::Packet4c' {aka 'struct Eigen::internal::eigen_packet_wrapper<int, 2>'} declared here + 159 | struct eigen_packet_wrapper + | ^~~~~~~~~~~~~~~~~~~~ +In file included from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/Core:214, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/macros.h:63, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/loss.h:37, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/constraint.h:37, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/src/constraint.cpp:34: +/jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/src/Core/arch/NEON/PacketMath.h: In function 'Packet Eigen::internal::ploadu(const typename Eigen::internal::unpacket_traits<T>::type*) [with Packet = Eigen::internal::eigen_packet_wrapper<int, 2>; typename Eigen::internal::unpacket_traits<T>::type = signed char]': +/jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/src/Core/arch/NEON/PacketMath.h:1716:9: error: 'void* memcpy(void*, const void*, size_t)' copying an object of non-trivial type 'Eigen::internal::Packet4c' {aka 'struct Eigen::internal::eigen_packet_wrapper<int, 2>'} from an array of 'const int8_t' {aka 'const signed char'} [-Werror=class-memaccess] + 1716 | memcpy(&res, from, sizeof(Packet4c)); + | ~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +In file included from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/Core:172, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/macros.h:63, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/loss.h:37, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/constraint.h:37, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/src/constraint.cpp:34: +/jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/src/Core/GenericPacketMath.h:159:8: note: 'Eigen::internal::Packet4c' {aka 'struct Eigen::internal::eigen_packet_wrapper<int, 2>'} declared here + 159 | struct eigen_packet_wrapper + | ^~~~~~~~~~~~~~~~~~~~ +cc1plus: all warnings being treated as errors + +--- + Eigen/src/Core/GenericPacketMath.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Eigen/src/Core/GenericPacketMath.h b/Eigen/src/Core/GenericPacketMath.h +index 8f8f64f15..72234288e 100644 +--- a/Eigen/src/Core/GenericPacketMath.h ++++ b/Eigen/src/Core/GenericPacketMath.h +@@ -162,7 +162,7 @@ struct eigen_packet_wrapper + { + EIGEN_ALWAYS_INLINE operator T&() { return m_val; } + EIGEN_ALWAYS_INLINE operator const T&() const { return m_val; } +- EIGEN_ALWAYS_INLINE eigen_packet_wrapper() {} ++ EIGEN_ALWAYS_INLINE eigen_packet_wrapper() = default; + EIGEN_ALWAYS_INLINE eigen_packet_wrapper(const T &v) : m_val(v) {} + EIGEN_ALWAYS_INLINE eigen_packet_wrapper& operator=(const T &v) { + m_val = v; +-- +2.17.1 + diff --git a/meta-oe/recipes-support/libeigen/libeigen_3.3.7.bb b/meta-oe/recipes-support/libeigen/libeigen_3.3.7.bb deleted file mode 100644 index f638848d15..0000000000 --- a/meta-oe/recipes-support/libeigen/libeigen_3.3.7.bb +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "Eigen is a C++ template library for linear algebra: matrices, vectors, numerical solvers, and related algorithms." -AUTHOR = "Benoît Jacob and Gaël Guennebaud and others" -HOMEPAGE = "http://eigen.tuxfamily.org/" -LICENSE = "MPL-2.0" -LIC_FILES_CHKSUM = "file://COPYING.MPL2;md5=815ca599c9df247a0c7f619bab123dad" - -SRC_URI = "https://bitbucket.org/eigen/eigen/get/${PV}.tar.bz2;downloadfilename=${BP}.tar.bz2" -SRC_URI[md5sum] = "05b1f7511c93980c385ebe11bd3c93fa" -SRC_URI[sha256sum] = "9f13cf90dedbe3e52a19f43000d71fdf72e986beb9a5436dddcd61ff9d77a3ce" - -S = "${WORKDIR}/eigen-eigen-323c052e1731" - -inherit cmake - -FILES_${PN} = "${libdir}" -FILES_${PN}-dev = "${includedir} ${datadir}/eigen3/cmake ${datadir}/cmake/Modules ${datadir}/pkgconfig" - -# ${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-oe/recipes-support/libeigen/libeigen_3.4.0.bb b/meta-oe/recipes-support/libeigen/libeigen_3.4.0.bb new file mode 100644 index 0000000000..72044427dd --- /dev/null +++ b/meta-oe/recipes-support/libeigen/libeigen_3.4.0.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "Eigen is a C++ template library for linear algebra: matrices, vectors, numerical solvers, and related algorithms." +HOMEPAGE = "http://eigen.tuxfamily.org/" +LICENSE = "MPL-2.0 & Apache-2.0 & BSD-3-Clause & GPL-2.0-only & LGPL-2.1-only & MINPACK" +LIC_FILES_CHKSUM = "file://COPYING.MPL2;md5=815ca599c9df247a0c7f619bab123dad \ + file://COPYING.BSD;md5=2dd0510ee95e59ca28834b875bc96596 \ + file://COPYING.GPL;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \ + file://COPYING.MINPACK;md5=71d91b0f75ce79a75d3108a72bef8116 \ +" + +SRC_URI = "git://gitlab.com/libeigen/eigen.git;protocol=http;branch=3.4 \ + file://0001-Default-eigen_packet_wrapper-constructor.patch \ +" + +SRCREV = "3147391d946bb4b6c68edd901f2add6ac1f31f8c" + +S = "${WORKDIR}/git" + +inherit cmake + +FILES:${PN}-dev += "${datadir}/eigen3/cmake" + +# ${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-oe/recipes-support/libestr/libestr_0.1.11.bb b/meta-oe/recipes-support/libestr/libestr_0.1.11.bb index ff61dd8fd7..2ebf2757d7 100644 --- a/meta-oe/recipes-support/libestr/libestr_0.1.11.bb +++ b/meta-oe/recipes-support/libestr/libestr_0.1.11.bb @@ -1,6 +1,6 @@ SUMMARY = "some essentials for string handling (and a bit more)" HOMEPAGE = "http://libestr.adiscon.com/" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=9d6c993486c18262afba4ca5bcb894d0" SRC_URI = "http://libestr.adiscon.com/files/download/${BP}.tar.gz" diff --git a/meta-oe/recipes-support/libfann/libfann_git.bb b/meta-oe/recipes-support/libfann/libfann_git.bb index c986e17757..40f91ac43d 100644 --- a/meta-oe/recipes-support/libfann/libfann_git.bb +++ b/meta-oe/recipes-support/libfann/libfann_git.bb @@ -3,15 +3,17 @@ DESCRIPTION = "Fast Artificial Neural Network (FANN) Library is a free open sour HOMEPAGE = "https://github.com/libfann/fann" SECTION = "libs/devel" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=f14599a2f089f6ff8c97e2baa4e3d575" inherit cmake SRCREV ?= "7ec1fc7e5bd734f1d3c89b095e630e83c86b9be1" -SRC_URI = "git://github.com/libfann/fann.git;branch=master \ +SRC_URI = "git://github.com/libfann/fann.git;branch=master;protocol=https \ " -PV = "2.2.0+git${SRCPV}" +PV = "2.2.0+git" S = "${WORKDIR}/git" + +EXTRA_OECMAKE = "-DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')}" diff --git a/meta-oe/recipes-support/libfido2/libfido2_1.14.0.bb b/meta-oe/recipes-support/libfido2/libfido2_1.14.0.bb new file mode 100644 index 0000000000..d453d0ab97 --- /dev/null +++ b/meta-oe/recipes-support/libfido2/libfido2_1.14.0.bb @@ -0,0 +1,23 @@ +SUMMARY = "FIDO 2.0 support library" +DESCRIPTION = "libfido2 provides library functionality and command-line tools to \ +communicate with a FIDO device over USB, and to verify attestation and \ +assertion signatures." +HOMEPAGE = "https://developers.yubico.com/libfido2" +LICENSE = "BSD-2-Clause" +SECTION = "libs/network" +DEPENDS = "libcbor openssl zlib udev" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=5f14cb32bdf2b87063e0a2d20c4178d0" + +SRC_URI = "https://developers.yubico.com/${BPN}/Releases/${BPN}-${PV}.tar.gz" +SRC_URI[sha256sum] = "3601792e320032d428002c4cce8499a4c7b803319051a25a0c9f1f138ffee45a" + +inherit cmake pkgconfig manpages + +PACKAGECONFIG[manpages] = "-DBUILD_MANPAGES:BOOL=ON,-DBUILD_MANPAGES:BOOL=OFF" + +EXTRA_OECMAKE = "-DUDEV_RULES_DIR=${nonarch_base_libdir}/udev/rules.d -DBUILD_EXAMPLES:BOOL=OFF" + +PACKAGE_BEFORE_PN = "${PN}-tools" + +FILES:${PN}-tools = "${bindir}/fido2-*" diff --git a/meta-oe/recipes-support/libftdi/libftdi_1.4.bb b/meta-oe/recipes-support/libftdi/libftdi_1.5.bb index c33c791110..eae1c02f04 100644 --- a/meta-oe/recipes-support/libftdi/libftdi_1.4.bb +++ b/meta-oe/recipes-support/libftdi/libftdi_1.5.bb @@ -3,17 +3,16 @@ FT232BM/245BM, FT2232C/D and FT232/245R using libusb,\ including the popular bitbang mode." HOMEPAGE = "http://www.intra2net.com/en/developer/libftdi/" SECTION = "libs" -LICENSE = "LGPLv2.1 & GPLv2" +LICENSE = "LGPL-2.1-only & GPL-2.0-only" LIC_FILES_CHKSUM= "\ file://COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe \ file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ " -DEPENDS = "libusb1 python3" +DEPENDS = "libusb1 python3 swig-native" SRC_URI = "http://www.intra2net.com/en/developer/${BPN}/download/${BPN}1-${PV}.tar.bz2" -SRC_URI[md5sum] = "0c09fb2bb19a57c839fa6845c6c780a2" -SRC_URI[sha256sum] = "ec36fb49080f834690c24008328a5ef42d3cf584ef4060f3a35aa4681cb31b74" +SRC_URI[sha256sum] = "7c7091e9c86196148bd41177b4590dccb1510bfe6cea5bf7407ff194482eb049" S = "${WORKDIR}/${BPN}1-${PV}" @@ -21,13 +20,21 @@ inherit cmake binconfig pkgconfig python3native PACKAGECONFIG ??= "" PACKAGECONFIG[cpp-wrapper] = "-DFTDI_BUILD_CPP=on -DFTDIPP=on,-DFTDI_BUILD_CPP=off -DFTDIPP=off,boost" +PACKAGECONFIG[ftdi-eeprom] = "-DFTDI_EEPROM=on,-DFTDI_EEPROM=off,libconfuse" -EXTRA_OECMAKE = "-DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ +EXTRA_OECMAKE = "-DSTATICLIBS=off -DEXAMPLES=off \ + -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ -DPYTHON_LIBRARY=${STAGING_LIBDIR}/lib${PYTHON_DIR}${PYTHON_ABI}.so \ -DPYTHON_INCLUDE_DIR=${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}" +do_install:append() { + # remove absolute paths + sed -i -e 's|${RECIPE_SYSROOT}||g' ${D}${libdir}/cmake/libftdi1/LibFTDI1Config.cmake +} + BBCLASSEXTEND = "native nativesdk" -PACKAGES += "${PN}-python" +PACKAGES =+ "${PN}-python ftdi-eeprom" -FILES_${PN}-python = "${libdir}/${PYTHON_DIR}/site-packages/" +FILES:ftdi-eeprom = "${bindir}/ftdi_eeprom" +FILES:${PN}-python = "${PYTHON_SITEPACKAGES_DIR}/" diff --git a/meta-oe/recipes-support/libgit2/libgit2_0.28.3.bb b/meta-oe/recipes-support/libgit2/libgit2_0.28.3.bb deleted file mode 100644 index 82acc4926f..0000000000 --- a/meta-oe/recipes-support/libgit2/libgit2_0.28.3.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "the Git linkable library" -HOMEPAGE = "http://libgit2.github.com/" -LICENSE = "GPL-2.0-with-GCC-exception & MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=3f2cd5d3cccd71d62066ba619614592b" - -DEPENDS = "curl openssl zlib libssh2 libgcrypt" - -SRC_URI = "git://github.com/libgit2/libgit2.git;branch=maint/v0.28" -SRCREV = "7ce88e66a19e3b48340abcdd86aeaae1882e63cc" - -S = "${WORKDIR}/git" - -inherit cmake - -EXTRA_OECMAKE = "\ - -DBUILD_CLAR=OFF \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -" - -BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/libgpiod/libgpiod-1.x/run-ptest b/meta-oe/recipes-support/libgpiod/libgpiod-1.x/run-ptest new file mode 100644 index 0000000000..61b9b69fc6 --- /dev/null +++ b/meta-oe/recipes-support/libgpiod/libgpiod-1.x/run-ptest @@ -0,0 +1,19 @@ +#!/bin/sh + +testbins="gpiod-test gpio-tools-test gpiod-cxx-test gpiod_py_test.py" + +ptestdir=$(dirname "$(readlink -f "$0")") +cd $ptestdir/tests + +for testbin in $testbins; do + if test -e ./$testbin; then + ./$testbin > ./$testbin.out 2>&1 + if [ $? -ne 0 ]; then + echo "FAIL: $testbin" + else + echo "PASS: $testbin" + fi + else + echo "SKIP: $testbin" + fi +done diff --git a/meta-oe/recipes-support/libgpiod/libgpiod-2.x/run-ptest b/meta-oe/recipes-support/libgpiod/libgpiod-2.x/run-ptest new file mode 100644 index 0000000000..29ec0d1027 --- /dev/null +++ b/meta-oe/recipes-support/libgpiod/libgpiod-2.x/run-ptest @@ -0,0 +1,24 @@ +#!/bin/sh + +testbins="gpiod-test gpio-tools-test.bash gpiod-cxx-test" + +ptestdir=$(dirname "$(readlink -f "$0")") +cd $ptestdir/tests + +# libgpiod v2 uses gpio-sim - a configfs-based testing module. We need to +# make sure configfs is mounted before running any tests. +modprobe configfs +mountpoint /sys/kernel/config > /dev/null || mount -t configfs configfs /sys/kernel/config + +for testbin in $testbins; do + if test -e ./$testbin; then + ./$testbin > ./$testbin.out 2>&1 + if [ $? -ne 0 ]; then + echo "FAIL: $testbin" + else + echo "PASS: $testbin" + fi + else + echo "SKIP: $testbin" + fi +done diff --git a/meta-oe/recipes-support/libgpiod/libgpiod.inc b/meta-oe/recipes-support/libgpiod/libgpiod.inc index 07ce35a7f2..dc1fb4fe92 100644 --- a/meta-oe/recipes-support/libgpiod/libgpiod.inc +++ b/meta-oe/recipes-support/libgpiod/libgpiod.inc @@ -1,16 +1,60 @@ SUMMARY = "C library and tools for interacting with the linux GPIO character device" +RECIPE_MAINTAINER = "Bartosz Golaszewski <brgl@bgdev.pl>" -LICENSE = "LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=2caced0b25dfefd4c601d92bd15116de" +inherit autotools pkgconfig ptest -SRC_URI = "https://www.kernel.org/pub/software/libs/libgpiod/${BP}.tar.xz" +SRC_URI += " \ + https://www.kernel.org/pub/software/libs/libgpiod/libgpiod-${PV}.tar.xz \ + file://run-ptest \ +" -inherit autotools pkgconfig +PACKAGECONFIG[cxx] = "--enable-bindings-cxx,--disable-bindings-cxx" -PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,kmod udev" +# Enable cxx bindings by default. +PACKAGECONFIG ?= " \ + cxx \ + ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \ +" +# Always build tools - they don't have any additional +# requirements over the library. EXTRA_OECONF = "--enable-tools" -PACKAGES =+ " ${PN}-tools" +DEPENDS += "autoconf-archive-native" + +PACKAGES =+ "${PN}-tools libgpiodcxx" +FILES:${PN}-tools += " \ + ${bindir}/gpiodetect \ + ${bindir}/gpioinfo \ + ${bindir}/gpioget \ + ${bindir}/gpioset \ + ${bindir}/gpiomon \ +" +FILES:libgpiodcxx = "${libdir}/libgpiodcxx.so.*" + +RRECOMMENDS:${PN}-ptest += "coreutils" + +do_install:append() { + rm -f ${D}${bindir}/gpiod-test + rm -f ${D}${bindir}/gpio-tools-test + rm -f ${D}${bindir}/gpio-tools-test.bats + rm -f ${D}${bindir}/gpiod-cxx-test +} + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests/ + + # These are the core C library tests + install -m 0755 ${B}/tests/.libs/gpiod-test ${D}${PTEST_PATH}/tests/ + + # Tools are always built so let's always install them for ptest even if + # we're not selecting libgpiod-tools. + for tool in ${FILES:${PN}-tools}; do + install ${B}/tools/.libs/$(basename $tool) ${D}${PTEST_PATH}/tests/ + done + + if ${@bb.utils.contains('PACKAGECONFIG', 'cxx', 'true', 'false', d)}; then + install -m 0755 ${B}/bindings/cxx/tests/.libs/gpiod-cxx-test ${D}${PTEST_PATH}/tests/ + fi +} -FILES_${PN}-tools = "${bindir}/*" diff --git a/meta-oe/recipes-support/libgpiod/libgpiod_0.3.3.bb b/meta-oe/recipes-support/libgpiod/libgpiod_0.3.3.bb deleted file mode 100644 index c4d2bddf4c..0000000000 --- a/meta-oe/recipes-support/libgpiod/libgpiod_0.3.3.bb +++ /dev/null @@ -1,8 +0,0 @@ -require libgpiod.inc - -PACKAGECONFIG ?= "" - -PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,kmod udev" - -SRC_URI[md5sum] = "2aa1e1a80c3c919ae142ab9a55fb59ca" -SRC_URI[sha256sum] = "b773e557af1a497f786825462a776b7bf90168e67ee0a5bc5d2473a5674dc38c" diff --git a/meta-oe/recipes-support/libgpiod/libgpiod_1.4.1.bb b/meta-oe/recipes-support/libgpiod/libgpiod_1.4.1.bb deleted file mode 100644 index 0391deb86c..0000000000 --- a/meta-oe/recipes-support/libgpiod/libgpiod_1.4.1.bb +++ /dev/null @@ -1,21 +0,0 @@ -require libgpiod.inc - -DEPENDS += "autoconf-archive-native" - -SRC_URI[md5sum] = "585b4bb431f99c4ba9b3ee58b9d494c1" -SRC_URI[sha256sum] = "21ae8fd1f8dafc2eb2ba50e652390cf533d21351419a7426255895cb52e21b1c" - -# enable cxx bindings -PACKAGECONFIG ?= "cxx" - -PACKAGECONFIG[cxx] = "--enable-bindings-cxx,--disable-bindings-cxx" -PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,kmod udev" - -PACKAGECONFIG[python3] = "--enable-bindings-python,--disable-bindings-python,python3" - -inherit python3native - -PACKAGES =+ "${PN}-python" -FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}" -RRECOMMENDS_PYTHON = "${@bb.utils.contains('PACKAGECONFIG', 'python3', '${PN}-python', '',d)}" -RRECOMMENDS_${PN}-python += "${RRECOMMENDS_PYTHON}" diff --git a/meta-oe/recipes-support/libgpiod/libgpiod_1.6.4.bb b/meta-oe/recipes-support/libgpiod/libgpiod_1.6.4.bb new file mode 100644 index 0000000000..111a5727ba --- /dev/null +++ b/meta-oe/recipes-support/libgpiod/libgpiod_1.6.4.bb @@ -0,0 +1,45 @@ +require libgpiod.inc + +LICENSE = "LGPL-2.1-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=2caced0b25dfefd4c601d92bd15116de" + +SRC_URI[sha256sum] = "7b146e12f28fbca3df7557f176eb778c5ccf952ca464698dba8a61b2e1e3f9b5" + +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-1.x:" + +inherit python3native + +PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,kmod udev glib-2.0 catch2" +PACKAGECONFIG[python3] = "--enable-bindings-python,--disable-bindings-python,python3" + +# Always build tools - they don't have any additional +# requirements over the library. +EXTRA_OECONF = "--enable-tools" + +PACKAGES =+ "${PN}-python" +FILES:${PN}-tools += "${bindir}/gpiofind" +FILES:${PN}-ptest += " \ + ${bindir}/gpiod_py_test.py \ + ${libdir}/libgpiomockup.so.* \ +" +FILES:${PN}-python = "${PYTHON_SITEPACKAGES_DIR}/*.so" +FILES:${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/*.a" + +RRECOMMENDS:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'python3', '${PN}-python', '', d)}" +RRECOMMENDS:${PN}-ptest += " \ + kernel-module-gpio-mockup \ + ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3-unittest', '', d)} \ +" +RDEPENDS:${PN}-ptest += " \ + python3-packaging \ + ${@bb.utils.contains('PTEST_ENABLED', '1', 'bats', '', d)} \ +" + +do_install_ptest:append() { + install -m 0755 ${S}/tools/gpio-tools-test ${D}${PTEST_PATH}/tests/ + install -m 0755 ${S}/tools/gpio-tools-test.bats ${D}${PTEST_PATH}/tests/ + + if ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'true', 'false', d)}; then + install -m 0755 ${S}/bindings/python/tests/gpiod_py_test.py ${D}${PTEST_PATH}/tests/ + fi +} diff --git a/meta-oe/recipes-support/libgpiod/libgpiod_2.1.2.bb b/meta-oe/recipes-support/libgpiod/libgpiod_2.1.2.bb new file mode 100644 index 0000000000..6e4fbd2a3b --- /dev/null +++ b/meta-oe/recipes-support/libgpiod/libgpiod_2.1.2.bb @@ -0,0 +1,31 @@ +require libgpiod.inc + +LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later & CC-BY-SA-4.0" +LIC_FILES_CHKSUM = " \ + file://LICENSES/GPL-2.0-or-later.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://LICENSES/LGPL-2.1-or-later.txt;md5=4b54a1fd55a448865a0b32d41598759d \ + file://LICENSES/CC-BY-SA-4.0.txt;md5=fba3b94d88bfb9b81369b869a1e9a20f \ +" + +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-2.x:" + +SRC_URI[sha256sum] = "7a148a5a7d1c97a1abb40474b9a392b6edd7a42fe077dfd7ff42cfba24308548" + +# Enable all project features for ptest +PACKAGECONFIG[tests] = "--enable-tests --enable-tools --enable-bindings-cxx --enable-gpioset-interactive,--disable-tests,kmod util-linux glib-2.0 catch2 libedit" +PACKAGECONFIG[gpioset-interactive] = "--enable-gpioset-interactive,--disable-gpioset-interactive,libedit" + +PACKAGES =+ "${PN}-ptest-dev" +FILES:${PN}-tools += "${bindir}/gpionotify" +FILES:${PN}-ptest += "${libdir}/libgpiosim.so.*" +FILES:${PN}-ptest-dev += "${includedir}/gpiosim.h" + +RDEPENDS:${PN}-ptest += " \ + ${@bb.utils.contains('PTEST_ENABLED', '1', 'shunit2 bash', '', d)} \ +" +RRECOMMENDS:${PN}-ptest += "kernel-module-gpio-sim kernel-module-configfs" + +do_install_ptest:append() { + install -m 0755 ${S}/tools/gpio-tools-test.bash ${D}${PTEST_PATH}/tests/ + install -m 0644 ${S}/tests/gpiosim/gpiosim.h ${D}${includedir}/gpiosim.h +} diff --git a/meta-oe/recipes-support/libgusb/libgusb_0.3.10.bb b/meta-oe/recipes-support/libgusb/libgusb_0.3.10.bb new file mode 100644 index 0000000000..491b6a7a1d --- /dev/null +++ b/meta-oe/recipes-support/libgusb/libgusb_0.3.10.bb @@ -0,0 +1,18 @@ +SUMMARY = "GUsb is a GObject wrapper for libusb1" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" + +DEPENDS = "glib-2.0 libusb" + +inherit meson gobject-introspection gtk-doc gettext vala + +PACKAGECONFIG:class-target ??= "${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'vapi', '', d)}" +PACKAGECONFIG[vapi] = "-Dvapi=true,-Dvapi=false" + +EXTRA_OEMESON:append:class-native = " -Dtests=false -Dintrospection=false" + +SRC_URI = "git://github.com/hughsie/libgusb.git;branch=main;protocol=https" +SRCREV = "332d5b987ffecb824426e88518e05547faf2b520" +S = "${WORKDIR}/git" + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/libgusb/libgusb_git.bb b/meta-oe/recipes-support/libgusb/libgusb_git.bb deleted file mode 100644 index e3c0bdd15e..0000000000 --- a/meta-oe/recipes-support/libgusb/libgusb_git.bb +++ /dev/null @@ -1,12 +0,0 @@ -SUMMARY = "GUsb is a GObject wrapper for libusb1" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" - -DEPENDS = "glib-2.0 libusb" - -inherit meson gobject-introspection gtk-doc gettext vala - -SRC_URI = "git://github.com/hughsie/libgusb.git" -SRCREV = "636efc0624aa2a88174220fcabc9764c13d7febf" -PV = "0.3.0+git${SRCPV}" -S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/libharu/libharu_2.4.4.bb b/meta-oe/recipes-support/libharu/libharu_2.4.4.bb new file mode 100644 index 0000000000..02dc499e03 --- /dev/null +++ b/meta-oe/recipes-support/libharu/libharu_2.4.4.bb @@ -0,0 +1,16 @@ +SUMMARY = "free PDF library" +HOMEPAGE = "http://libharu.org" +DESCRIPTION = "libHaru is a library for generating PDF files. \ + It is free, open source, written in ANSI C and cross platform. " + +LICENSE = "Zlib" +LIC_FILES_CHKSUM = "file://LICENSE;md5=924546dab2bef90e370d7c0c090ddcf0" + +DEPENDS += "libpng zlib" + +SRC_URI = "git://github.com/libharu/libharu.git;branch=master;protocol=https" +SRCREV = "0c598becaadaef8e3d12b883f9fc2864a118c12d" + +S = "${WORKDIR}/git" + +inherit cmake diff --git a/meta-oe/recipes-support/libiio/libiio_0.25.bb b/meta-oe/recipes-support/libiio/libiio_0.25.bb new file mode 100644 index 0000000000..2c6d2b5145 --- /dev/null +++ b/meta-oe/recipes-support/libiio/libiio_0.25.bb @@ -0,0 +1,81 @@ +SUMMARY = "Library for interfacing with IIO devices" +HOMEPAGE = "https://wiki.analog.com/resources/tools-software/linux-software/libiio" +SECTION = "libs" +LICENSE = "LGPL-2.1-or-later" +LIC_FILES_CHKSUM = "file://COPYING.txt;md5=7c13b3376cea0ce68d2d2da0a1b3a72c" + +SRCREV = "b6028fdeef888ab45f7c1dd6e4ed9480ae4b55e3" + +SRC_URI = "git://github.com/analogdevicesinc/libiio.git;protocol=https;branch=main" +UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" + +S = "${WORKDIR}/git" + +SETUPTOOLS_SETUP_PATH ?= "${B}/bindings/python/" + +DEPENDS = " \ + flex-native bison-native libaio \ +" + +inherit cmake python3native systemd setuptools3 pkgconfig + +EXTRA_OECMAKE = " \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCPP_BINDINGS=ON \ + -DFLEX_TARGET_ARG_COMPILE_FLAGS='--noline' \ + -DBISON_TARGET_ARG_COMPILE_FLAGS='--no-lines' \ + -DUDEV_RULES_INSTALL_DIR=${nonarch_base_libdir}/udev/rules.d \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '-DWITH_SYSTEMD=ON -DSYSTEMD_UNIT_INSTALL_DIR=${systemd_system_unitdir}', '', d)} \ +" + +PACKAGECONFIG ??= " \ + usb_backend network_backend serial_backend xml_backend \ + ${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'dnssd', '', d)} \ +" + +# network_backend, serial_backend and usb_backend depend on xml_backend, so don't switch it off +XML_BACKEND_DISABLE = "${@bb.utils.contains_any('PACKAGECONFIG', 'network_backend serial_backend usb_backend', '', '-DWITH_XML_BACKEND=off', d)}" + +PACKAGECONFIG[usb_backend] = "-DWITH_USB_BACKEND=ON -DWITH_XML_BACKEND=ON,-DWITH_USB_BACKEND=OFF,libusb1 libxml2" +PACKAGECONFIG[network_backend] = "-DWITH_NETWORK_BACKEND=ON -DWITH_XML_BACKEND=ON,-DWITH_NETWORK_BACKEND=OFF,libxml2" +PACKAGECONFIG[serial_backend] = "-DWITH_SERIAL_BACKEND=ON -DWITH_XML_BACKEND=ON,-DWITH_SERIAL_BACKEND=off,libserialport libxml2" +PACKAGECONFIG[xml_backend] = "-DWITH_XML_BACKEND=ON,${XML_BACKEND_DISABLE},libxml2" +PACKAGECONFIG[dnssd] = "-DHAVE_DNS_SD=ON,-DHAVE_DNS_SD=off,avahi" +PACKAGECONFIG[libiio-python3] = "-DPYTHON_BINDINGS=ON,-DPYTHON_BINDINGS=OFF" + +PACKAGES =+ "${PN}-iiod ${PN}-tests ${PN}-python3" + +# Inheriting setuptools3 incorrectly adds the dependency on python3-core +# to ${PN} instead of to ${PN}-python3 where it belongs. +RDEPENDS:${PN}:remove = "python3-core" +RDEPENDS:${PN}-python3 = "${PN} python3-core python3-ctypes python3-stringold" + +FILES:${PN}-iiod = " \ + ${sbindir}/iiod \ + ${systemd_system_unitdir}/iiod.service \ +" +FILES:${PN}-tests = "${bindir}" +FILES:${PN}-python3 = "${PYTHON_SITEPACKAGES_DIR}" + +SYSTEMD_PACKAGES = "${PN}-iiod" +SYSTEMD_SERVICE:${PN}-iiod = "iiod.service" + +# Explicitly define do_configure, do_compile and do_install because both cmake and setuptools3 have +# EXPORT_FUNCTIONS do_configure do_compile do_install +do_configure() { + cmake_do_configure +} + +do_compile() { + if ${@bb.utils.contains('PACKAGECONFIG', 'libiio-python3', 'true', 'false', d)}; then + setuptools3_do_compile + fi + cmake_do_compile +} + +do_install() { + if ${@bb.utils.contains('PACKAGECONFIG', 'libiio-python3', 'true', 'false', d)}; then + setuptools3_do_install + fi + cmake_do_install +} diff --git a/meta-oe/recipes-support/libiio/libiio_git.bb b/meta-oe/recipes-support/libiio/libiio_git.bb deleted file mode 100644 index b53ba46479..0000000000 --- a/meta-oe/recipes-support/libiio/libiio_git.bb +++ /dev/null @@ -1,48 +0,0 @@ -SUMMARY = "Library for interfacing with IIO devices" -HOMEPAGE = "https://wiki.analog.com/resources/tools-software/linux-software/libiio" -SECTION = "libs" -LICENSE = "LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING.txt;md5=7c13b3376cea0ce68d2d2da0a1b3a72c" - -# v0.18 + a single commit fixing the build -SRCREV = "5090603d01779bb1717fb0c50953330e8770550f" -PV = "0.18+git${SRCPV}" - -SRC_URI = "git://github.com/analogdevicesinc/libiio.git;protocol=https" - -S = "${WORKDIR}/git" - -inherit cmake python3native systemd - -DEPENDS = " \ - flex-native bison-native libaio \ - ${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \ -" - -EXTRA_OECMAKE = " \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DUDEV_RULES_INSTALL_DIR=${nonarch_base_libdir}/udev/rules.d \ - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '-DWITH_SYSTEMD=ON -DSYSTEMD_UNIT_INSTALL_DIR=${systemd_system_unitdir}', '', d)} \ -" - -PACKAGECONFIG ??= "usb_backend network_backend" - -PACKAGECONFIG[usb_backend] = "-DWITH_USB_BACKEND=ON,-DWITH_USB_BACKEND=OFF,libusb1,libxml2" -PACKAGECONFIG[network_backend] = "-DWITH_NETWORK_BACKEND=ON,-DWITH_NETWORK_BACKEND=OFF,libxml2" -PACKAGECONFIG[libiio-python3] = "-DPYTHON_BINDINGS=ON,-DPYTHON_BINDINGS=OFF" - -inherit ${@bb.utils.contains('PACKAGECONFIG', 'libiio-python3', 'distutils3-base', '', d)} - -PACKAGES =+ "${PN}-iiod ${PN}-tests ${PN}-${PYTHON_PN}" - -RDEPENDS_${PN}-${PYTHON_PN} = "${PN} ${PYTHON_PN}-ctypes ${PYTHON_PN}-stringold" - -FILES_${PN}-iiod = " \ - ${sbindir}/iiod \ - ${systemd_system_unitdir}/iiod.service \ -" -FILES_${PN}-tests = "${bindir}" -FILES_${PN}-${PYTHON_PN} = "${PYTHON_SITEPACKAGES_DIR}" - -SYSTEMD_PACKAGES = "${PN}-iiod" -SYSTEMD_SERVICE_${PN}-iiod = "iiod.service" diff --git a/meta-oe/recipes-support/libiodbc/libiodbc_3.52.15.bb b/meta-oe/recipes-support/libiodbc/libiodbc_3.52.15.bb new file mode 100644 index 0000000000..ff976ed975 --- /dev/null +++ b/meta-oe/recipes-support/libiodbc/libiodbc_3.52.15.bb @@ -0,0 +1,30 @@ +SUMMARY = "iODBC driver manager maintained by OpenLink Software." + +DESCRIPTION = "This kit will provide you with everything you need to \ +develop ODBC-compliant applications under Unix without having to pay \ +royalties to other parties. \ +" + +HOMEPAGE = "http://www.iodbc.org/" + +LICENSE = "LGPL-2.0-only | BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=8c0138a8701f0e1282f5c8b2c7d39114 \ + file://LICENSE.BSD;md5=ff3a66a194e500df485da930da7f2c62 \ + " + +SRC_URI = "https://github.com/openlink/iODBC/releases/download/v${PV}/${BP}.tar.gz" +SRC_URI[sha256sum] = "c74541e3327fc9a1c7ccf103645471c67bc014542d70f572476eb07c0b2dd43c" + +inherit autotools + +EXTRA_OECONF += " --prefix=/usr/local \ + --includedir=/usr/include/iodbc \ + --with-iodbc-inidir=/etc \ + --enable-odbc3 \ + --enable-pthreads \ + --disable-libodbc \ + --disable-static \ + " + +inherit multilib_script +MULTILIB_SCRIPTS = "${PN}:${bindir}/iodbc-config" diff --git a/meta-oe/recipes-support/libjs/libjs-jquery-cookie_3.0.5.bb b/meta-oe/recipes-support/libjs/libjs-jquery-cookie_3.0.5.bb new file mode 100644 index 0000000000..38ffd032ab --- /dev/null +++ b/meta-oe/recipes-support/libjs/libjs-jquery-cookie_3.0.5.bb @@ -0,0 +1,27 @@ +SUMMARY = "A simple, lightweight JavaScript API for handling cookies." +HOMEPAGE = "https://github.com/js-cookie/js-cookie" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e16cf0e247d84f8999bf55865a9c98cf" + +SRC_URI = "git://github.com/js-cookie/js-cookie.git;protocol=https;branch=main" + +SRCREV = "ab3f67fc4fad88cdf07b258c08e4164e06bf7506" + +S = "${WORKDIR}/git" + +JQUERYCOOKIEDIR = "${datadir}/javascript/jquery-cookie" +JQUERYCOOKIEDOCDIR = "${docdir}/libjs-jquery-cookie" + +do_install() { + install -d ${D}${JQUERYCOOKIEDIR} + install -m 0644 ${S}/*.js ${D}${JQUERYCOOKIEDIR} + install -m 0644 ${S}/src/*.mjs ${D}${JQUERYCOOKIEDIR} + install -m 0644 ${S}/*.json ${D}${JQUERYCOOKIEDIR} + + install -d ${D}${JQUERYCOOKIEDOCDIR} + install -m 0644 ${S}/*.md ${D}${JQUERYCOOKIEDOCDIR} + +} + +FILES:${PN} += "${datadir}/javascript/jquery-cookie" +FILES:${PN}-doc += "${docdir}/libjs-jquery-cookie" diff --git a/meta-oe/recipes-support/libjs/libjs-jquery-globalize_1.7.0.bb b/meta-oe/recipes-support/libjs/libjs-jquery-globalize_1.7.0.bb new file mode 100644 index 0000000000..b6147ffeb2 --- /dev/null +++ b/meta-oe/recipes-support/libjs/libjs-jquery-globalize_1.7.0.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "A JavaScript library for internationalization and localization that leverages the official Unicode CLDR JSON data" +SECTION = "console/network" +HOMEPAGE = "https://github.com/globalizejs/globalize" +LICENSE = "MIT" + +S = "${WORKDIR}/git" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=4db68fb4d1d9986d736b35039f2ad9ea" + +SRCREV = "771061fb35f7fd8d7c2c37f5d5bb26115be382bc" +SRC_URI = "git://github.com/globalizejs/globalize;protocol=https;nobranch=1" + +FILES:${PN} = "${datadir}/javascript/jquery-globalize" +FILES:${PN}-doc += "${docdir}/${PN}" + +do_install() { + install -d ${D}${datadir}/javascript/jquery-globalize/ + install -m 0644 ${S}/dist/*.js ${D}${datadir}/javascript/jquery-globalize/ + install -m 0644 ${S}/dist/globalize/*.js ${D}${datadir}/javascript/jquery-globalize/ + + install -d ${D}${docdir}/${PN}/ + install -m 0644 ${S}/LICENSE ${D}${docdir}/${PN}/ +} diff --git a/meta-oe/recipes-support/libjs/libjs-jquery-icheck_1.0.3.bb b/meta-oe/recipes-support/libjs/libjs-jquery-icheck_1.0.3.bb new file mode 100644 index 0000000000..63dfc6fa78 --- /dev/null +++ b/meta-oe/recipes-support/libjs/libjs-jquery-icheck_1.0.3.bb @@ -0,0 +1,42 @@ +DESCRIPTION = "Highly customizable checkboxes and radio buttons (jQuery & Zepto)" +SECTION = "console/network" +HOMEPAGE = "http://fronteed.com/iCheck" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://icheck.js;beginline=6;endline=7;md5=ea25eee37fc3b14403e215bfe13564bc" + +SRC_URI = "git://github.com/fronteed/icheck.git;protocol=https;branch=${PV}" + +SRCREV = "c8c1af84e4b90b4aea31466aad09bf877619e943" + +S = "${WORKDIR}/git" + +do_install() { + install -d ${D}${datadir}/javascript/jquery-icheck/ + install -m 0644 ${S}/icheck.js ${D}${datadir}/javascript/jquery-icheck/ + install -m 0644 ${S}/icheck.min.js ${D}${datadir}/javascript/jquery-icheck/ + + install -d ${D}${datadir}/javascript/jquery-icheck/skins/ + install -m 0644 ${S}/skins/all.css ${D}${datadir}/javascript/jquery-icheck/skins/ + + install -d ${D}${datadir}/javascript/jquery-icheck/skins/flat/ + install -m 0644 ${S}/skins/flat/* ${D}${datadir}/javascript/jquery-icheck/skins/flat/ + + install -d ${D}${datadir}/javascript/jquery-icheck/skins/futurico/ + install -m 0644 ${S}/skins/futurico/* ${D}${datadir}/javascript/jquery-icheck/skins/futurico/ + + install -d ${D}${datadir}/javascript/jquery-icheck/skins/line/ + install -m 0644 ${S}/skins/line/* ${D}${datadir}/javascript/jquery-icheck/skins/line/ + + install -d ${D}${datadir}/javascript/jquery-icheck/skins/minimal/ + install -m 0644 ${S}/skins/minimal/* ${D}${datadir}/javascript/jquery-icheck/skins/minimal/ + + install -d ${D}${datadir}/javascript/jquery-icheck/skins/polaris/ + install -m 0644 ${S}/skins/polaris/* ${D}${datadir}/javascript/jquery-icheck/skins/polaris/ + + install -d ${D}${datadir}/javascript/jquery-icheck/skins/square/ + install -m 0644 ${S}/skins/square/* ${D}${datadir}/javascript/jquery-icheck/skins/square/ +} + +FILES:${PN} += "${datadir}/javascript/jquery-icheck" + diff --git a/meta-oe/recipes-support/libjs/libjs-jquery_1.7.2.bb b/meta-oe/recipes-support/libjs/libjs-jquery_3.3.1.bb index 7f425cdeab..4f0d8e5548 100644 --- a/meta-oe/recipes-support/libjs/libjs-jquery_1.7.2.bb +++ b/meta-oe/recipes-support/libjs/libjs-jquery_3.3.1.bb @@ -1,15 +1,18 @@ SUMMARY = "JavaScript library for dynamic web applications" HOMEPAGE = "https://jquery.com/" -LICENSE = "MIT | BSD | GPL-2" -LIC_FILES_CHKSUM = "file://usr/share/doc/libjs-jquery/copyright;md5=5d1ec6f95e0a91d38e2f71de93ddb00e" +LICENSE = "GPL-2.0-only | MIT" +LIC_FILES_CHKSUM = "file://usr/share/doc/libjs-jquery/copyright;md5=04bfd6e5b918af29f2f79ce44527da62" -SRC_URI = "http://kr.archive.ubuntu.com/ubuntu/pool/main/j/jquery/${BPN}_${PV}+debian-1ubuntu1~ubuntu12.04.1_all.deb;subdir=${BP}" -SRC_URI[md5sum] = "fa511ab67f6e960c5b6d39a4d665e47f" -SRC_URI[sha256sum] = "190ca18a71e35c8ab2ba73fe5be3c7cc601fe20b45709d801110818f1b602cc1" +SRC_URI = "http://kr.archive.ubuntu.com/ubuntu/pool/main/j/jquery/${BPN}_${PV}~dfsg-3_all.deb" + +SRC_URI[sha256sum] = "e04d192c2356e9d4c2b2c7d83fde9408713212b53c4d106e5b9e46c1a56da33b" JQUERYDIR = "${datadir}/javascript/jquery" JQUERYDOCDIR = "${docdir}/libjs-jquery" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + do_install() { install -d -m 0755 ${D}${JQUERYDIR} install -m 0644 ${S}${JQUERYDIR}/jquery.js ${D}${JQUERYDIR}/ @@ -22,4 +25,4 @@ do_install() { install -m 0644 ${S}${JQUERYDOCDIR}/copyright ${D}${JQUERYDOCDIR}/ } -FILES_${PN} = "/usr/share/javascript/jquery" +FILES:${PN} = "/usr/share/javascript/jquery" diff --git a/meta-oe/recipes-support/libjs/libjs-sizzle_1.10.18.bb b/meta-oe/recipes-support/libjs/libjs-sizzle_1.10.18.bb index 4928b6c3a7..e639ce59d8 100644 --- a/meta-oe/recipes-support/libjs/libjs-sizzle_1.10.18.bb +++ b/meta-oe/recipes-support/libjs/libjs-sizzle_1.10.18.bb @@ -1,6 +1,6 @@ SUMMARY = "Pure-JavaScript CSS selector engine" HOMEPAGE = "https://github.com/jquery/sizzle/wiki" -LICENSE = "GPL-2.0 & MIT & AFL-2.1" +LICENSE = "GPL-2.0-only & MIT & AFL-2.1" LIC_FILES_CHKSUM = "file://MIT-LICENSE.txt;md5=e43aa437a6a1ba421653bd5034333bf9" SRC_URI = "http://kr.archive.ubuntu.com/ubuntu/pool/universe/s/sizzle/sizzle_1.10.18.orig.tar.gz" @@ -16,4 +16,4 @@ do_install() { install -m 0644 ${SIZZLEDIR}/*.js ${D}/${datadir}/javascript/sizzle/ } -FILES_${PN} = "${datadir}/javascript/sizzle/" +FILES:${PN} = "${datadir}/javascript/sizzle/" diff --git a/meta-oe/recipes-support/libmanette/libmanette_0.2.7.bb b/meta-oe/recipes-support/libmanette/libmanette_0.2.7.bb new file mode 100644 index 0000000000..db05422699 --- /dev/null +++ b/meta-oe/recipes-support/libmanette/libmanette_0.2.7.bb @@ -0,0 +1,16 @@ +# Copyright (C) 2021 Khem Raj <raj.khem@gmail.com> +# Released under the MIT license (see COPYING.MIT for the terms) +SUMMARY = "The simple GObject game controller library" +HOMEPAGE = "https://gnome.pages.gitlab.gnome.org/libmanette/" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +DEPENDS = "libevdev libgudev" + +SRC_URI = "https://download.gnome.org/sources/libmanette/0.2/libmanette-${PV}.tar.xz" +SRC_URI[sha256sum] = "cddd5c02a131072c19c6cde6f2cb2cd57eae7dacb50d14c337efd980baa51a51" + +inherit meson pkgconfig gobject-introspection ptest vala + +FILES:${PN}-ptest =+ "${bindir}/manette-test" +FILES:${PN}-dev =+ "${libdir}/girepository-1.0" diff --git a/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.68.bb b/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.68.bb deleted file mode 100644 index f5569de9f8..0000000000 --- a/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.68.bb +++ /dev/null @@ -1,30 +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=57d09285feac8a64efa878e692b14f36" -SECTION = "net" - -DEPENDS = "file" - -SRC_URI = "${GNU_MIRROR}/libmicrohttpd/${BPN}-${PV}.tar.gz \ -" -SRC_URI[md5sum] = "1c3ca3bf92dfc680538b4186c58a9bd0" -SRC_URI[sha256sum] = "c5716e2a2899abc9e16c8fa7a1a58da88f81aca96a0b7e68a5d4d89e21610b61" - -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-oe/recipes-support/libmimetic/libmimetic/0001-libmimetic-Removing-test-directory-from-the-Makefile.patch b/meta-oe/recipes-support/libmimetic/libmimetic/0001-libmimetic-Removing-test-directory-from-the-Makefile.patch new file mode 100644 index 0000000000..717e3f1f8b --- /dev/null +++ b/meta-oe/recipes-support/libmimetic/libmimetic/0001-libmimetic-Removing-test-directory-from-the-Makefile.patch @@ -0,0 +1,69 @@ +From 64fd25af5fea3a3c9c12122a2fd0fab3cd420f72 Mon Sep 17 00:00:00 2001 +From: asmitk01-in <asmitk01@in.ibm.com> +Date: Wed, 5 Feb 2020 00:14:42 -0600 +Subject: [PATCH] libmimetic: Removing test directory from the Makefile + +The test directory is removed as there were errors (relocation errors) +since the shared object files of libc++ and libc were not taken from the +sysroot path but from the system's library path where the required +version of the .so is not present. + +The files 'mimetic/codec/other_codecs.h' and 'mimetic/contenttype.cxx' +contains changes that resolves errors when compiling on target system +aarch64-yoe-linux-musl. + +Signed-off-by: asmitk01-in <asmitk01@in.ibm.com> +Change-Id: I1822b36ad4a1fa5e7b165d8cac3a6e96aca11c35 +--- +Upstream-Status: Pending + + Makefile.am | 2 +- + mimetic/codec/other_codecs.h | 4 ++++ + mimetic/contenttype.cxx | 4 ++++ + 3 files changed, 9 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 634bd4c..c7cbae7 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,6 +1,6 @@ + MAINTAINERCLEANFILES = Makefile Makefile.in config.cache + EXTRA_DIST=LICENSE m4 +-SUBDIRS = mimetic doc examples test win32 ++SUBDIRS = mimetic doc examples win32 + INCLUDES=-I$(top_srcdir) + ACLOCAL_AMFLAGS=-I m4 + +diff --git a/mimetic/codec/other_codecs.h b/mimetic/codec/other_codecs.h +index c4ccf3f..0fc88fd 100644 +--- a/mimetic/codec/other_codecs.h ++++ b/mimetic/codec/other_codecs.h +@@ -8,6 +8,10 @@ + #define _MIMETIC_CODEC_OTHER_CODECS_H_ + #include <mimetic/codec/codec_base.h> + ++#ifndef __GLIBC__ ++ typedef unsigned int uint; ++#endif ++ + namespace mimetic + { + +diff --git a/mimetic/contenttype.cxx b/mimetic/contenttype.cxx +index 522082d..0577d44 100644 +--- a/mimetic/contenttype.cxx ++++ b/mimetic/contenttype.cxx +@@ -13,6 +13,10 @@ + #include <mimetic/tokenizer.h> + #include <mimetic/utils.h> + ++#ifndef __GLIBC__ ++ typedef unsigned int uint; ++#endif ++ + namespace mimetic + { + using namespace std; +-- +2.9.3 + diff --git a/meta-oe/recipes-support/libmimetic/libmimetic/0001-mimetic-Check-for-MMAP_FAILED-return-from-mmap.patch b/meta-oe/recipes-support/libmimetic/libmimetic/0001-mimetic-Check-for-MMAP_FAILED-return-from-mmap.patch new file mode 100644 index 0000000000..c7c8d62aaa --- /dev/null +++ b/meta-oe/recipes-support/libmimetic/libmimetic/0001-mimetic-Check-for-MMAP_FAILED-return-from-mmap.patch @@ -0,0 +1,49 @@ +From f8ab2b1aaa37f6ba9d527a99cb37b6ac2171e122 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 14 Feb 2020 17:03:12 -0800 +Subject: [PATCH] mimetic: Check for MMAP_FAILED return from mmap() + +Avoids using greater than zero comparision on pointers + +Fixes +mimetic/os/mmfile.cxx:60:14: error: ordered comparison between pointer and zero ('char *' and 'int') + +if(m_beg > 0) +~~~~ ^ ~ + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + mimetic/os/mmfile.cxx | 16 +++++++--------- + 1 file changed, 7 insertions(+), 9 deletions(-) + +diff --git a/mimetic/os/mmfile.cxx b/mimetic/os/mmfile.cxx +index dfc95b7..ed4ff55 100644 +--- a/mimetic/os/mmfile.cxx ++++ b/mimetic/os/mmfile.cxx +@@ -57,15 +57,13 @@ bool MMFile::open(int mode) + bool MMFile::map() + { + m_beg = (char*) mmap(0, m_st.st_size, PROT_READ, MAP_SHARED,m_fd,0); +- if(m_beg > 0) +- { +- m_end = m_beg + m_st.st_size; +- #if HAVE_MADVISE +- madvise(m_beg, m_st.st_size, MADV_SEQUENTIAL); +- #endif +- return true; +- } +- return false; ++ if(m_beg == MAP_FAILED) ++ return false; ++ m_end = m_beg + m_st.st_size; ++ #if HAVE_MADVISE ++ madvise(m_beg, m_st.st_size, MADV_SEQUENTIAL); ++ #endif ++ return true; + } + + MMFile::~MMFile() +-- +2.25.0 + diff --git a/meta-oe/recipes-support/libmimetic/libmimetic_0.9.8.bb b/meta-oe/recipes-support/libmimetic/libmimetic_0.9.8.bb new file mode 100644 index 0000000000..4d4a5ff109 --- /dev/null +++ b/meta-oe/recipes-support/libmimetic/libmimetic_0.9.8.bb @@ -0,0 +1,23 @@ +# Released under the MIT license. + +SUMMARY = "Mimetic Library for multi-part parsing" +DESCRIPTION = "Email library (MIME) written in C++ designed to be easy to use and integrate but yet fast and efficient." +HOMEPAGE = "http://www.codesink.org/mimetic_mime_library.html" +BUGTRACKER = "https://github.com/LadislavSopko/mimetic/issues" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b49da7df0ca479ef01ff7f2d799eabee" + +SRCREV = "50486af99b4f9b35522d7b3de40b6ce107505279" +SRC_URI += "git://github.com/LadislavSopko/mimetic/;branch=master;protocol=https \ + file://0001-libmimetic-Removing-test-directory-from-the-Makefile.patch \ + file://0001-mimetic-Check-for-MMAP_FAILED-return-from-mmap.patch \ + " + +UPSTREAM_CHECK_COMMITS = "1" + +S = "${WORKDIR}/git" + +CXXFLAGS += "-Wno-narrowing -std=c++14" + +inherit autotools diff --git a/meta-oe/recipes-support/libmxml/libmxml_3.0.bb b/meta-oe/recipes-support/libmxml/libmxml_4.0.3.bb index 5ca2dda323..54582e7047 100644 --- a/meta-oe/recipes-support/libmxml/libmxml_3.0.bb +++ b/meta-oe/recipes-support/libmxml/libmxml_4.0.3.bb @@ -4,22 +4,20 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" HOMEPAGE = "https://www.msweet.org/mxml/" BUGTRACKER = "https://github.com/michaelrsweet/mxml/issues" -SRC_URI = "git://github.com/michaelrsweet/mxml.git" -SRCREV = "c7755b6992a2afdd34dde47fc9be97f1237cfded" +SRC_URI = "git://github.com/michaelrsweet/mxml.git;branch=master;protocol=https" +SRCREV = "804c4f4d922e4ca240ce2cad3ec7bc5d00c08691" S = "${WORKDIR}/git" -inherit autotools +# Package does not support out of tree builds. +inherit autotools-brokensep PACKAGECONFIG ??= "threads" PACKAGECONFIG[threads] = "--enable-threads,--disable-threads" -# Package does not support out of tree builds. -B = "${S}" - # MXML uses autotools but it explicitly states it does not support autoheader. EXTRA_AUTORECONF = "--exclude=autopoint,autoheader" -do_configure_prepend() { +do_configure:prepend() { # Respect optimization CFLAGS specified by OE. sed -e 's/-Os -g//' -i ${S}/configure.ac diff --git a/meta-oe/recipes-support/libnice/libnice_0.1.22.bb b/meta-oe/recipes-support/libnice/libnice_0.1.22.bb new file mode 100644 index 0000000000..175e10fdf6 --- /dev/null +++ b/meta-oe/recipes-support/libnice/libnice_0.1.22.bb @@ -0,0 +1,30 @@ +SUMMARY = "Interactive Connectivity Establishment library" +DESCRIPTION = "Libnice is an implementation of the IETF's draft Interactive Connectivity Establishment standard (ICE)." +HOMEPAGE = "http://nice.freedesktop.org/wiki/" + +LICENSE = "LGPL-2.1-only & MPL-1.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=9c42325015702feda4f4d2f19a55b767 \ + file://COPYING.LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ + file://COPYING.MPL;md5=3c617710e51cdbe0fc00716f056dfb1a \ +" + +SRC_URI = "http://nice.freedesktop.org/releases/${BP}.tar.gz" +SRC_URI[sha256sum] = "a5f724cf09eae50c41a7517141d89da4a61ec9eaca32da4a0073faed5417ad7e" + +DEPENDS = "glib-2.0 gnutls ${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', 'graphviz-native', '', d)}" + +PACKAGECONFIG[gupnp] = "-Dgupnp=enabled,-Dgupnp=disabled,gupnp" +PACKAGECONFIG[gstreamer] = "-Dgstreamer=enabled,-Dgstreamer=disabled,gstreamer1.0" +PACKAGECONFIG[introspection] = "-Dintrospection=enabled,-Dintrospection=disabled," + +GTKDOC_MESON_OPTION = "gtk_doc" +GTKDOC_MESON_ENABLE_FLAG = "enabled" +GTKDOC_MESON_DISABLE_FLAG = "disabled" + +inherit meson gtk-doc gobject-introspection + +EXTRA_OEMESON = "-Dexamples=disabled -Dtests=disabled" + +FILES:${PN} += "${libdir}/gstreamer-1.0/*.so" +FILES:${PN}-staticdev += "${libdir}/gstreamer-1.0/*.a ${libdir}/gstreamer-1.0/pkgconfig" +FILES:${PN}-dbg += "${libdir}/gstreamer-1.0/.debug" diff --git a/meta-oe/recipes-support/libnih/libnih-1.0.3/0001-Update-autotool-files-also-make-it-work-with-latest-.patch b/meta-oe/recipes-support/libnih/libnih-1.0.3/0001-Update-autotool-files-also-make-it-work-with-latest-.patch deleted file mode 100644 index 2c857c26fe..0000000000 --- a/meta-oe/recipes-support/libnih/libnih-1.0.3/0001-Update-autotool-files-also-make-it-work-with-latest-.patch +++ /dev/null @@ -1,24310 +0,0 @@ -From 0f1cc1bc615807e81fd2709d4177ca41168446c0 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 7 Dec 2019 00:45:23 -0800 -Subject: [PATCH] Update autotool files, also make it work with latest gettext - -Upstream-Status: Inappropriate [Dead upstream] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - ABOUT-NLS | 1069 +-- - ChangeLog | 7 + - Makefile.am | 2 +- - configure.ac | 6 +- - intl/ChangeLog | 4 - - intl/Makefile.in | 587 -- - intl/VERSION | 1 - - intl/bindtextdom.c | 340 - - intl/config.charset | 640 -- - intl/dcgettext.c | 56 - - intl/dcigettext.c | 1689 ----- - intl/dcngettext.c | 57 - - intl/dgettext.c | 58 - - intl/dngettext.c | 59 - - intl/eval-plural.h | 108 - - intl/explodename.c | 135 - - intl/export.h | 6 - - intl/finddomain.c | 212 - - intl/gettext.c | 63 - - intl/gettextP.h | 297 - - intl/gmo.h | 152 - - intl/hash-string.c | 51 - - intl/hash-string.h | 36 - - intl/intl-compat.c | 133 - - intl/intl-exports.c | 36 - - intl/l10nflist.c | 400 -- - intl/langprefs.c | 130 - - intl/libgnuintl.h.in | 419 -- - intl/libintl.rc | 38 - - intl/loadinfo.h | 132 - - intl/loadmsgcat.c | 1336 ---- - intl/localcharset.c | 461 -- - intl/localcharset.h | 42 - - intl/locale.alias | 77 - - intl/localealias.c | 439 -- - intl/localename.c | 1507 ---- - intl/lock.c | 922 --- - intl/lock.h | 1105 --- - intl/log.c | 116 - - intl/ngettext.c | 65 - - intl/os2compat.c | 98 - - intl/os2compat.h | 46 - - intl/osdep.c | 26 - - intl/plural-exp.c | 155 - - intl/plural-exp.h | 129 - - intl/plural.c | 1981 ------ - intl/plural.y | 385 -- - intl/printf-args.c | 188 - - intl/printf-args.h | 155 - - intl/printf-parse.c | 590 -- - intl/printf-parse.h | 75 - - intl/printf.c | 427 -- - intl/ref-add.sin | 31 - - intl/ref-del.sin | 26 - - intl/relocatable.c | 468 -- - intl/relocatable.h | 79 - - intl/textdomain.c | 127 - - intl/tsearch.c | 684 -- - intl/tsearch.h | 83 - - intl/vasnprintf.c | 4677 ------------- - intl/vasnprintf.h | 78 - - intl/vasnwprintf.h | 46 - - intl/version.c | 26 - - intl/wprintf-parse.h | 75 - - intl/xsize.h | 109 - - m4/intlmacosx.m4 | 55 +- - po/ChangeLog | 8 + - po/Rules-quot | 19 +- - po/en@boldquot.header | 2 +- - po/en@quot.header | 2 +- - po/insert-header.sin | 5 + - po/remove-potcdate.sin | 8 +- - 74 files changed, 1335 insertions(+), 38646 deletions(-) - delete mode 100644 intl/ChangeLog - delete mode 100644 intl/Makefile.in - delete mode 100644 intl/VERSION - delete mode 100644 intl/bindtextdom.c - delete mode 100755 intl/config.charset - delete mode 100644 intl/dcgettext.c - delete mode 100644 intl/dcigettext.c - delete mode 100644 intl/dcngettext.c - delete mode 100644 intl/dgettext.c - delete mode 100644 intl/dngettext.c - delete mode 100644 intl/eval-plural.h - delete mode 100644 intl/explodename.c - delete mode 100644 intl/export.h - delete mode 100644 intl/finddomain.c - delete mode 100644 intl/gettext.c - delete mode 100644 intl/gettextP.h - delete mode 100644 intl/gmo.h - delete mode 100644 intl/hash-string.c - delete mode 100644 intl/hash-string.h - delete mode 100644 intl/intl-compat.c - delete mode 100644 intl/intl-exports.c - delete mode 100644 intl/l10nflist.c - delete mode 100644 intl/langprefs.c - delete mode 100644 intl/libgnuintl.h.in - delete mode 100644 intl/libintl.rc - delete mode 100644 intl/loadinfo.h - delete mode 100644 intl/loadmsgcat.c - delete mode 100644 intl/localcharset.c - delete mode 100644 intl/localcharset.h - delete mode 100644 intl/locale.alias - delete mode 100644 intl/localealias.c - delete mode 100644 intl/localename.c - delete mode 100644 intl/lock.c - delete mode 100644 intl/lock.h - delete mode 100644 intl/log.c - delete mode 100644 intl/ngettext.c - delete mode 100644 intl/os2compat.c - delete mode 100644 intl/os2compat.h - delete mode 100644 intl/osdep.c - delete mode 100644 intl/plural-exp.c - delete mode 100644 intl/plural-exp.h - delete mode 100644 intl/plural.c - delete mode 100644 intl/plural.y - delete mode 100644 intl/printf-args.c - delete mode 100644 intl/printf-args.h - delete mode 100644 intl/printf-parse.c - delete mode 100644 intl/printf-parse.h - delete mode 100644 intl/printf.c - delete mode 100644 intl/ref-add.sin - delete mode 100644 intl/ref-del.sin - delete mode 100644 intl/relocatable.c - delete mode 100644 intl/relocatable.h - delete mode 100644 intl/textdomain.c - delete mode 100644 intl/tsearch.c - delete mode 100644 intl/tsearch.h - delete mode 100644 intl/vasnprintf.c - delete mode 100644 intl/vasnprintf.h - delete mode 100644 intl/vasnwprintf.h - delete mode 100644 intl/version.c - delete mode 100644 intl/wprintf-parse.h - delete mode 100644 intl/xsize.h - ---- a/ABOUT-NLS -+++ b/ABOUT-NLS -@@ -1,1068 +1 @@ --1 Notes on the Free Translation Project --*************************************** -- --Free software is going international! The Free Translation Project is --a way to get maintainers of free software, translators, and users all --together, so that free software will gradually become able to speak many --languages. A few packages already provide translations for their --messages. -- -- If you found this `ABOUT-NLS' file inside a distribution, you may --assume that the distributed package does use GNU `gettext' internally, --itself available at your nearest GNU archive site. But you do _not_ --need to install GNU `gettext' prior to configuring, installing or using --this package with messages translated. -- -- Installers will find here some useful hints. These notes also --explain how users should proceed for getting the programs to use the --available translations. They tell how people wanting to contribute and --work on translations can contact the appropriate team. -- -- When reporting bugs in the `intl/' directory or bugs which may be --related to internationalization, you should tell about the version of --`gettext' which is used. The information can be found in the --`intl/VERSION' file, in internationalized packages. -- --1.1 Quick configuration advice --============================== -- --If you want to exploit the full power of internationalization, you --should configure it using -- -- ./configure --with-included-gettext -- --to force usage of internationalizing routines provided within this --package, despite the existence of internationalizing capabilities in the --operating system where this package is being installed. So far, only --the `gettext' implementation in the GNU C library version 2 provides as --many features (such as locale alias, message inheritance, automatic --charset conversion or plural form handling) as the implementation here. --It is also not possible to offer this additional functionality on top --of a `catgets' implementation. Future versions of GNU `gettext' will --very likely convey even more functionality. So it might be a good idea --to change to GNU `gettext' as soon as possible. -- -- So you need _not_ provide this option if you are using GNU libc 2 or --you have installed a recent copy of the GNU gettext package with the --included `libintl'. -- --1.2 INSTALL Matters --=================== -- --Some packages are "localizable" when properly installed; the programs --they contain can be made to speak your own native language. Most such --packages use GNU `gettext'. Other packages have their own ways to --internationalization, predating GNU `gettext'. -- -- By default, this package will be installed to allow translation of --messages. It will automatically detect whether the system already --provides the GNU `gettext' functions. If not, the included GNU --`gettext' library will be used. This library is wholly contained --within this package, usually in the `intl/' subdirectory, so prior --installation of the GNU `gettext' package is _not_ required. --Installers may use special options at configuration time for changing --the default behaviour. The commands: -- -- ./configure --with-included-gettext -- ./configure --disable-nls -- --will, respectively, bypass any pre-existing `gettext' to use the --internationalizing routines provided within this package, or else, --_totally_ disable translation of messages. -- -- When you already have GNU `gettext' installed on your system and run --configure without an option for your new package, `configure' will --probably detect the previously built and installed `libintl.a' file and --will decide to use this. This might not be desirable. You should use --the more recent version of the GNU `gettext' library. I.e. if the file --`intl/VERSION' shows that the library which comes with this package is --more recent, you should use -- -- ./configure --with-included-gettext -- --to prevent auto-detection. -- -- The configuration process will not test for the `catgets' function --and therefore it will not be used. The reason is that even an --emulation of `gettext' on top of `catgets' could not provide all the --extensions of the GNU `gettext' library. -- -- Internationalized packages usually have many `po/LL.po' files, where --LL gives an ISO 639 two-letter code identifying the language. Unless --translations have been forbidden at `configure' time by using the --`--disable-nls' switch, all available translations are installed --together with the package. However, the environment variable `LINGUAS' --may be set, prior to configuration, to limit the installed set. --`LINGUAS' should then contain a space separated list of two-letter --codes, stating which languages are allowed. -- --1.3 Using This Package --====================== -- --As a user, if your language has been installed for this package, you --only have to set the `LANG' environment variable to the appropriate --`LL_CC' combination. If you happen to have the `LC_ALL' or some other --`LC_xxx' environment variables set, you should unset them before --setting `LANG', otherwise the setting of `LANG' will not have the --desired effect. Here `LL' is an ISO 639 two-letter language code, and --`CC' is an ISO 3166 two-letter country code. For example, let's --suppose that you speak German and live in Germany. At the shell --prompt, merely execute `setenv LANG de_DE' (in `csh'), --`export LANG; LANG=de_DE' (in `sh') or `export LANG=de_DE' (in `bash'). --This can be done from your `.login' or `.profile' file, once and for --all. -- -- You might think that the country code specification is redundant. --But in fact, some languages have dialects in different countries. For --example, `de_AT' is used for Austria, and `pt_BR' for Brazil. The --country code serves to distinguish the dialects. -- -- The locale naming convention of `LL_CC', with `LL' denoting the --language and `CC' denoting the country, is the one use on systems based --on GNU libc. On other systems, some variations of this scheme are --used, such as `LL' or `LL_CC.ENCODING'. You can get the list of --locales supported by your system for your language by running the --command `locale -a | grep '^LL''. -- -- Not all programs have translations for all languages. By default, an --English message is shown in place of a nonexistent translation. If you --understand other languages, you can set up a priority list of languages. --This is done through a different environment variable, called --`LANGUAGE'. GNU `gettext' gives preference to `LANGUAGE' over `LANG' --for the purpose of message handling, but you still need to have `LANG' --set to the primary language; this is required by other parts of the --system libraries. For example, some Swedish users who would rather --read translations in German than English for when Swedish is not --available, set `LANGUAGE' to `sv:de' while leaving `LANG' to `sv_SE'. -- -- Special advice for Norwegian users: The language code for Norwegian --bokma*l changed from `no' to `nb' recently (in 2003). During the --transition period, while some message catalogs for this language are --installed under `nb' and some older ones under `no', it's recommended --for Norwegian users to set `LANGUAGE' to `nb:no' so that both newer and --older translations are used. -- -- In the `LANGUAGE' environment variable, but not in the `LANG' --environment variable, `LL_CC' combinations can be abbreviated as `LL' --to denote the language's main dialect. For example, `de' is equivalent --to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT' --(Portuguese as spoken in Portugal) in this context. -- --1.4 Translating Teams --===================== -- --For the Free Translation Project to be a success, we need interested --people who like their own language and write it well, and who are also --able to synergize with other translators speaking the same language. --Each translation team has its own mailing list. The up-to-date list of --teams can be found at the Free Translation Project's homepage, --`http://translationproject.org/', in the "Teams" area. -- -- If you'd like to volunteer to _work_ at translating messages, you --should become a member of the translating team for your own language. --The subscribing address is _not_ the same as the list itself, it has --`-request' appended. For example, speakers of Swedish can send a --message to `sv-request@li.org', having this message body: -- -- subscribe -- -- Keep in mind that team members are expected to participate --_actively_ in translations, or at solving translational difficulties, --rather than merely lurking around. If your team does not exist yet and --you want to start one, or if you are unsure about what to do or how to --get started, please write to `coordinator@translationproject.org' to --reach the coordinator for all translator teams. -- -- The English team is special. It works at improving and uniformizing --the terminology in use. Proven linguistic skills are praised more than --programming skills, here. -- --1.5 Available Packages --====================== -- --Languages are not equally supported in all packages. The following --matrix shows the current state of internationalization, as of November --2007. The matrix shows, in regard of each package, for which languages --PO files have been submitted to translation coordination, with a --translation percentage of at least 50%. -- -- Ready PO files af am ar az be bg bs ca cs cy da de el en en_GB eo -- +----------------------------------------------------+ -- Compendium | [] [] [] [] | -- a2ps | [] [] [] [] [] | -- aegis | () | -- ant-phone | () | -- anubis | [] | -- ap-utils | | -- aspell | [] [] [] [] [] | -- bash | [] | -- bfd | | -- bibshelf | [] | -- binutils | | -- bison | [] [] | -- bison-runtime | [] | -- bluez-pin | [] [] [] [] [] | -- cflow | [] | -- clisp | [] [] [] | -- console-tools | [] [] | -- coreutils | [] [] [] [] | -- cpio | | -- cpplib | [] [] [] | -- cryptonit | [] | -- dialog | | -- diffutils | [] [] [] [] [] [] | -- doodle | [] | -- e2fsprogs | [] [] | -- enscript | [] [] [] [] | -- fetchmail | [] [] () [] [] | -- findutils | [] | -- findutils_stable | [] [] [] | -- flex | [] [] [] | -- fslint | | -- gas | | -- gawk | [] [] [] | -- gcal | [] | -- gcc | [] | -- gettext-examples | [] [] [] [] [] | -- gettext-runtime | [] [] [] [] [] | -- gettext-tools | [] [] | -- gip | [] | -- gliv | [] [] | -- glunarclock | [] | -- gmult | [] [] | -- gnubiff | () | -- gnucash | [] [] () () [] | -- gnuedu | | -- gnulib | [] | -- gnunet | | -- gnunet-gtk | | -- gnutls | [] | -- gpe-aerial | [] [] | -- gpe-beam | [] [] | -- gpe-calendar | | -- gpe-clock | [] [] | -- gpe-conf | [] [] | -- gpe-contacts | | -- gpe-edit | [] | -- gpe-filemanager | | -- gpe-go | [] | -- gpe-login | [] [] | -- gpe-ownerinfo | [] [] | -- gpe-package | | -- gpe-sketchbook | [] [] | -- gpe-su | [] [] | -- gpe-taskmanager | [] [] | -- gpe-timesheet | [] | -- gpe-today | [] [] | -- gpe-todo | | -- gphoto2 | [] [] [] [] | -- gprof | [] [] | -- gpsdrive | | -- gramadoir | [] [] | -- grep | [] [] | -- gretl | () | -- gsasl | | -- gss | | -- gst-plugins-bad | [] [] | -- gst-plugins-base | [] [] | -- gst-plugins-good | [] [] [] | -- gst-plugins-ugly | [] [] | -- gstreamer | [] [] [] [] [] [] [] | -- gtick | () | -- gtkam | [] [] [] [] | -- gtkorphan | [] [] | -- gtkspell | [] [] [] [] | -- gutenprint | [] | -- hello | [] [] [] [] [] | -- herrie | [] | -- hylafax | | -- idutils | [] [] | -- indent | [] [] [] [] | -- iso_15924 | | -- iso_3166 | [] [] [] [] [] [] [] [] [] [] [] | -- iso_3166_2 | | -- iso_4217 | [] [] [] | -- iso_639 | [] [] [] [] | -- jpilot | [] | -- jtag | | -- jwhois | | -- kbd | [] [] [] [] | -- keytouch | [] [] | -- keytouch-editor | [] | -- keytouch-keyboa... | [] | -- latrine | () | -- ld | [] | -- leafpad | [] [] [] [] [] | -- libc | [] [] [] [] | -- libexif | [] | -- libextractor | [] | -- libgpewidget | [] [] [] | -- libgpg-error | [] | -- libgphoto2 | [] [] | -- libgphoto2_port | [] [] | -- libgsasl | | -- libiconv | [] [] | -- libidn | [] [] [] | -- lifelines | [] () | -- lilypond | [] | -- lingoteach | | -- lprng | | -- lynx | [] [] [] [] | -- m4 | [] [] [] [] | -- mailfromd | | -- mailutils | [] | -- make | [] [] | -- man-db | [] [] [] | -- minicom | [] [] [] | -- nano | [] [] [] | -- opcodes | [] | -- parted | [] [] | -- pilot-qof | | -- popt | [] [] [] | -- psmisc | [] | -- pwdutils | | -- qof | | -- radius | [] | -- recode | [] [] [] [] [] [] | -- rpm | [] | -- screem | | -- scrollkeeper | [] [] [] [] [] [] [] [] | -- sed | [] [] [] | -- shared-mime-info | [] [] [] [] () [] [] [] | -- sharutils | [] [] [] [] [] [] | -- shishi | | -- skencil | [] () | -- solfege | | -- soundtracker | [] [] | -- sp | [] | -- system-tools-ba... | [] [] [] [] [] [] [] [] [] | -- tar | [] [] | -- texinfo | [] [] [] | -- tin | () () | -- tuxpaint | [] [] [] [] [] [] | -- unicode-han-tra... | | -- unicode-transla... | | -- util-linux | [] [] [] [] | -- util-linux-ng | [] [] [] [] | -- vorbis-tools | [] | -- wastesedge | () | -- wdiff | [] [] [] [] | -- wget | [] [] [] | -- xchat | [] [] [] [] [] [] [] | -- xkeyboard-config | [] | -- xpad | [] [] [] | -- +----------------------------------------------------+ -- af am ar az be bg bs ca cs cy da de el en en_GB eo -- 6 0 2 1 8 26 2 40 48 2 56 88 15 1 15 18 -- -- es et eu fa fi fr ga gl gu he hi hr hu id is it -- +--------------------------------------------------+ -- Compendium | [] [] [] [] [] | -- a2ps | [] [] [] () | -- aegis | | -- ant-phone | [] | -- anubis | [] | -- ap-utils | [] [] | -- aspell | [] [] [] | -- bash | [] | -- bfd | [] [] | -- bibshelf | [] [] [] | -- binutils | [] [] [] | -- bison | [] [] [] [] [] [] | -- bison-runtime | [] [] [] [] [] | -- bluez-pin | [] [] [] [] [] | -- cflow | [] | -- clisp | [] [] | -- console-tools | | -- coreutils | [] [] [] [] [] [] | -- cpio | [] [] [] | -- cpplib | [] [] | -- cryptonit | [] | -- dialog | [] [] [] | -- diffutils | [] [] [] [] [] [] [] [] [] | -- doodle | [] [] | -- e2fsprogs | [] [] [] | -- enscript | [] [] [] | -- fetchmail | [] | -- findutils | [] [] [] | -- findutils_stable | [] [] [] [] | -- flex | [] [] [] | -- fslint | | -- gas | [] [] | -- gawk | [] [] [] [] () | -- gcal | [] [] | -- gcc | [] | -- gettext-examples | [] [] [] [] [] [] [] | -- gettext-runtime | [] [] [] [] [] [] | -- gettext-tools | [] [] [] [] | -- gip | [] [] [] [] | -- gliv | () | -- glunarclock | [] [] [] | -- gmult | [] [] [] | -- gnubiff | () () | -- gnucash | () () () | -- gnuedu | [] | -- gnulib | [] [] [] | -- gnunet | | -- gnunet-gtk | | -- gnutls | | -- gpe-aerial | [] [] | -- gpe-beam | [] [] | -- gpe-calendar | | -- gpe-clock | [] [] [] [] | -- gpe-conf | [] | -- gpe-contacts | [] [] | -- gpe-edit | [] [] [] [] | -- gpe-filemanager | [] | -- gpe-go | [] [] [] | -- gpe-login | [] [] [] | -- gpe-ownerinfo | [] [] [] [] [] | -- gpe-package | [] | -- gpe-sketchbook | [] [] | -- gpe-su | [] [] [] [] | -- gpe-taskmanager | [] [] [] | -- gpe-timesheet | [] [] [] [] | -- gpe-today | [] [] [] [] | -- gpe-todo | [] | -- gphoto2 | [] [] [] [] [] | -- gprof | [] [] [] [] [] | -- gpsdrive | [] | -- gramadoir | [] [] | -- grep | [] [] [] | -- gretl | [] [] [] () | -- gsasl | [] [] | -- gss | [] [] | -- gst-plugins-bad | [] [] [] [] | -- gst-plugins-base | [] [] [] [] | -- gst-plugins-good | [] [] [] [] [] | -- gst-plugins-ugly | [] [] [] [] | -- gstreamer | [] [] [] | -- gtick | [] [] [] | -- gtkam | [] [] [] [] | -- gtkorphan | [] [] | -- gtkspell | [] [] [] [] [] [] [] | -- gutenprint | [] | -- hello | [] [] [] [] [] [] [] [] [] [] [] [] [] | -- herrie | [] | -- hylafax | | -- idutils | [] [] [] [] [] | -- indent | [] [] [] [] [] [] [] [] [] [] | -- iso_15924 | [] | -- iso_3166 | [] [] [] [] [] [] [] [] [] [] [] [] [] | -- iso_3166_2 | [] | -- iso_4217 | [] [] [] [] [] [] | -- iso_639 | [] [] [] [] [] [] | -- jpilot | [] [] | -- jtag | [] | -- jwhois | [] [] [] [] [] | -- kbd | [] [] | -- keytouch | [] [] [] | -- keytouch-editor | [] | -- keytouch-keyboa... | [] [] | -- latrine | [] [] | -- ld | [] [] [] [] | -- leafpad | [] [] [] [] [] [] | -- libc | [] [] [] [] [] | -- libexif | [] | -- libextractor | [] | -- libgpewidget | [] [] [] [] [] | -- libgpg-error | [] | -- libgphoto2 | [] [] [] | -- libgphoto2_port | [] [] | -- libgsasl | [] [] | -- libiconv | [] [] [] | -- libidn | [] [] | -- lifelines | () | -- lilypond | [] [] [] | -- lingoteach | [] [] [] | -- lprng | | -- lynx | [] [] [] | -- m4 | [] [] [] [] | -- mailfromd | | -- mailutils | [] [] | -- make | [] [] [] [] [] [] [] [] | -- man-db | [] | -- minicom | [] [] [] [] | -- nano | [] [] [] [] [] [] [] | -- opcodes | [] [] [] [] | -- parted | [] [] [] | -- pilot-qof | | -- popt | [] [] [] [] | -- psmisc | [] [] | -- pwdutils | | -- qof | [] | -- radius | [] [] | -- recode | [] [] [] [] [] [] [] [] | -- rpm | [] [] | -- screem | | -- scrollkeeper | [] [] [] | -- sed | [] [] [] [] [] | -- shared-mime-info | [] [] [] [] [] [] | -- sharutils | [] [] [] [] [] [] [] [] | -- shishi | [] | -- skencil | [] [] | -- solfege | [] | -- soundtracker | [] [] [] | -- sp | [] | -- system-tools-ba... | [] [] [] [] [] [] [] [] [] | -- tar | [] [] [] [] [] | -- texinfo | [] [] [] | -- tin | [] () | -- tuxpaint | [] [] | -- unicode-han-tra... | | -- unicode-transla... | [] [] | -- util-linux | [] [] [] [] [] [] [] | -- util-linux-ng | [] [] [] [] [] [] [] | -- vorbis-tools | | -- wastesedge | () | -- wdiff | [] [] [] [] [] [] [] [] | -- wget | [] [] [] [] [] [] [] [] | -- xchat | [] [] [] [] [] [] [] | -- xkeyboard-config | [] [] [] [] | -- xpad | [] [] [] | -- +--------------------------------------------------+ -- es et eu fa fi fr ga gl gu he hi hr hu id is it -- 85 22 14 2 48 101 61 12 2 8 2 6 53 29 1 52 -- -- ja ka ko ku ky lg lt lv mk mn ms mt nb ne nl nn -- +--------------------------------------------------+ -- Compendium | [] | -- a2ps | () [] [] | -- aegis | () | -- ant-phone | [] | -- anubis | [] [] [] | -- ap-utils | [] | -- aspell | [] [] | -- bash | [] | -- bfd | | -- bibshelf | [] | -- binutils | | -- bison | [] [] [] | -- bison-runtime | [] [] [] | -- bluez-pin | [] [] [] | -- cflow | | -- clisp | [] | -- console-tools | | -- coreutils | [] | -- cpio | [] | -- cpplib | [] | -- cryptonit | [] | -- dialog | [] [] | -- diffutils | [] [] [] | -- doodle | | -- e2fsprogs | [] | -- enscript | [] | -- fetchmail | [] [] | -- findutils | [] | -- findutils_stable | [] | -- flex | [] [] | -- fslint | | -- gas | | -- gawk | [] [] | -- gcal | | -- gcc | | -- gettext-examples | [] [] [] | -- gettext-runtime | [] [] [] | -- gettext-tools | [] [] | -- gip | [] [] | -- gliv | [] | -- glunarclock | [] [] | -- gmult | [] [] [] | -- gnubiff | | -- gnucash | () () () | -- gnuedu | | -- gnulib | [] [] | -- gnunet | | -- gnunet-gtk | | -- gnutls | [] | -- gpe-aerial | [] | -- gpe-beam | [] | -- gpe-calendar | [] | -- gpe-clock | [] [] [] | -- gpe-conf | [] [] [] | -- gpe-contacts | [] | -- gpe-edit | [] [] [] | -- gpe-filemanager | [] [] | -- gpe-go | [] [] [] | -- gpe-login | [] [] [] | -- gpe-ownerinfo | [] [] | -- gpe-package | [] [] | -- gpe-sketchbook | [] [] | -- gpe-su | [] [] [] | -- gpe-taskmanager | [] [] [] [] | -- gpe-timesheet | [] | -- gpe-today | [] [] | -- gpe-todo | [] | -- gphoto2 | [] [] | -- gprof | [] | -- gpsdrive | [] | -- gramadoir | () | -- grep | [] [] | -- gretl | | -- gsasl | [] | -- gss | | -- gst-plugins-bad | [] | -- gst-plugins-base | [] | -- gst-plugins-good | [] | -- gst-plugins-ugly | [] | -- gstreamer | [] | -- gtick | [] | -- gtkam | [] [] | -- gtkorphan | [] | -- gtkspell | [] [] | -- gutenprint | [] | -- hello | [] [] [] [] [] [] [] | -- herrie | [] | -- hylafax | | -- idutils | [] | -- indent | [] [] | -- iso_15924 | [] | -- iso_3166 | [] [] [] [] [] [] [] [] | -- iso_3166_2 | [] | -- iso_4217 | [] [] [] | -- iso_639 | [] [] [] [] | -- jpilot | () () | -- jtag | | -- jwhois | [] | -- kbd | [] | -- keytouch | [] | -- keytouch-editor | [] | -- keytouch-keyboa... | | -- latrine | [] | -- ld | | -- leafpad | [] [] | -- libc | [] [] [] | -- libexif | | -- libextractor | | -- libgpewidget | [] | -- libgpg-error | | -- libgphoto2 | [] | -- libgphoto2_port | [] | -- libgsasl | [] | -- libiconv | [] | -- libidn | [] [] | -- lifelines | [] | -- lilypond | [] | -- lingoteach | [] | -- lprng | | -- lynx | [] [] | -- m4 | [] [] | -- mailfromd | | -- mailutils | | -- make | [] [] [] | -- man-db | | -- minicom | [] | -- nano | [] [] [] | -- opcodes | [] | -- parted | [] [] | -- pilot-qof | | -- popt | [] [] [] | -- psmisc | [] [] [] | -- pwdutils | | -- qof | | -- radius | | -- recode | [] | -- rpm | [] [] | -- screem | [] | -- scrollkeeper | [] [] [] [] | -- sed | [] [] | -- shared-mime-info | [] [] [] [] [] [] [] | -- sharutils | [] [] | -- shishi | | -- skencil | | -- solfege | () () | -- soundtracker | | -- sp | () | -- system-tools-ba... | [] [] [] [] | -- tar | [] [] [] | -- texinfo | [] [] | -- tin | | -- tuxpaint | () [] [] | -- unicode-han-tra... | | -- unicode-transla... | | -- util-linux | [] [] | -- util-linux-ng | [] [] | -- vorbis-tools | | -- wastesedge | [] | -- wdiff | [] [] | -- wget | [] [] | -- xchat | [] [] [] [] | -- xkeyboard-config | [] [] [] | -- xpad | [] [] [] | -- +--------------------------------------------------+ -- ja ka ko ku ky lg lt lv mk mn ms mt nb ne nl nn -- 51 2 25 3 2 0 6 0 2 2 20 0 11 1 103 6 -- -- or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv ta -- +--------------------------------------------------+ -- Compendium | [] [] [] [] [] | -- a2ps | () [] [] [] [] [] [] | -- aegis | () () | -- ant-phone | [] [] | -- anubis | [] [] [] | -- ap-utils | () | -- aspell | [] [] [] | -- bash | [] [] | -- bfd | | -- bibshelf | [] | -- binutils | [] [] | -- bison | [] [] [] [] [] | -- bison-runtime | [] [] [] [] [] | -- bluez-pin | [] [] [] [] [] [] [] [] [] | -- cflow | [] | -- clisp | [] | -- console-tools | [] | -- coreutils | [] [] [] [] | -- cpio | [] [] [] | -- cpplib | [] | -- cryptonit | [] [] | -- dialog | [] | -- diffutils | [] [] [] [] [] [] | -- doodle | [] [] | -- e2fsprogs | [] [] | -- enscript | [] [] [] [] [] | -- fetchmail | [] [] [] | -- findutils | [] [] [] | -- findutils_stable | [] [] [] [] [] [] | -- flex | [] [] [] [] [] | -- fslint | [] | -- gas | | -- gawk | [] [] [] [] | -- gcal | [] | -- gcc | [] [] | -- gettext-examples | [] [] [] [] [] [] [] [] | -- gettext-runtime | [] [] [] [] [] [] [] [] | -- gettext-tools | [] [] [] [] [] [] [] | -- gip | [] [] [] [] | -- gliv | [] [] [] [] [] [] | -- glunarclock | [] [] [] [] [] [] | -- gmult | [] [] [] [] | -- gnubiff | () [] | -- gnucash | () [] | -- gnuedu | | -- gnulib | [] [] [] | -- gnunet | | -- gnunet-gtk | [] | -- gnutls | [] [] | -- gpe-aerial | [] [] [] [] [] [] [] | -- gpe-beam | [] [] [] [] [] [] [] | -- gpe-calendar | [] [] [] [] | -- gpe-clock | [] [] [] [] [] [] [] [] | -- gpe-conf | [] [] [] [] [] [] [] | -- gpe-contacts | [] [] [] [] [] | -- gpe-edit | [] [] [] [] [] [] [] [] [] | -- gpe-filemanager | [] [] | -- gpe-go | [] [] [] [] [] [] [] [] | -- gpe-login | [] [] [] [] [] [] [] [] | -- gpe-ownerinfo | [] [] [] [] [] [] [] [] | -- gpe-package | [] [] | -- gpe-sketchbook | [] [] [] [] [] [] [] [] | -- gpe-su | [] [] [] [] [] [] [] [] | -- gpe-taskmanager | [] [] [] [] [] [] [] [] | -- gpe-timesheet | [] [] [] [] [] [] [] [] | -- gpe-today | [] [] [] [] [] [] [] [] | -- gpe-todo | [] [] [] [] | -- gphoto2 | [] [] [] [] [] [] | -- gprof | [] [] [] | -- gpsdrive | [] [] | -- gramadoir | [] [] | -- grep | [] [] [] [] | -- gretl | [] [] [] | -- gsasl | [] [] [] | -- gss | [] [] [] [] | -- gst-plugins-bad | [] [] [] | -- gst-plugins-base | [] [] | -- gst-plugins-good | [] [] | -- gst-plugins-ugly | [] [] [] | -- gstreamer | [] [] [] [] | -- gtick | [] | -- gtkam | [] [] [] [] [] | -- gtkorphan | [] | -- gtkspell | [] [] [] [] [] [] [] [] | -- gutenprint | [] | -- hello | [] [] [] [] [] [] [] [] | -- herrie | [] [] [] | -- hylafax | | -- idutils | [] [] [] [] [] | -- indent | [] [] [] [] [] [] [] | -- iso_15924 | | -- iso_3166 | [] [] [] [] [] [] [] [] [] [] [] [] [] | -- iso_3166_2 | | -- iso_4217 | [] [] [] [] [] [] [] | -- iso_639 | [] [] [] [] [] [] [] | -- jpilot | | -- jtag | [] | -- jwhois | [] [] [] [] | -- kbd | [] [] [] | -- keytouch | [] | -- keytouch-editor | [] | -- keytouch-keyboa... | [] | -- latrine | | -- ld | [] | -- leafpad | [] [] [] [] [] [] | -- libc | [] [] [] [] | -- libexif | [] [] | -- libextractor | [] [] | -- libgpewidget | [] [] [] [] [] [] [] [] | -- libgpg-error | [] [] [] | -- libgphoto2 | [] | -- libgphoto2_port | [] [] [] | -- libgsasl | [] [] [] [] | -- libiconv | [] [] [] | -- libidn | [] [] () | -- lifelines | [] [] | -- lilypond | | -- lingoteach | [] | -- lprng | [] | -- lynx | [] [] [] | -- m4 | [] [] [] [] [] | -- mailfromd | [] | -- mailutils | [] [] [] | -- make | [] [] [] [] | -- man-db | [] [] [] [] | -- minicom | [] [] [] [] [] | -- nano | [] [] [] [] | -- opcodes | [] [] | -- parted | [] | -- pilot-qof | | -- popt | [] [] [] [] | -- psmisc | [] [] | -- pwdutils | [] [] | -- qof | [] [] | -- radius | [] [] | -- recode | [] [] [] [] [] [] [] | -- rpm | [] [] [] [] | -- screem | | -- scrollkeeper | [] [] [] [] [] [] [] | -- sed | [] [] [] [] [] [] [] [] [] | -- shared-mime-info | [] [] [] [] [] [] | -- sharutils | [] [] [] [] | -- shishi | [] | -- skencil | [] [] [] | -- solfege | [] | -- soundtracker | [] [] | -- sp | | -- system-tools-ba... | [] [] [] [] [] [] [] [] [] | -- tar | [] [] [] [] | -- texinfo | [] [] [] [] | -- tin | () | -- tuxpaint | [] [] [] [] [] [] | -- unicode-han-tra... | | -- unicode-transla... | | -- util-linux | [] [] [] [] | -- util-linux-ng | [] [] [] [] | -- vorbis-tools | [] | -- wastesedge | | -- wdiff | [] [] [] [] [] [] [] | -- wget | [] [] [] [] | -- xchat | [] [] [] [] [] [] [] | -- xkeyboard-config | [] [] [] | -- xpad | [] [] [] | -- +--------------------------------------------------+ -- or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv ta -- 0 5 77 31 53 4 58 72 3 45 46 9 45 122 3 -- -- tg th tk tr uk ven vi wa xh zh_CN zh_HK zh_TW zu -- +---------------------------------------------------+ -- Compendium | [] [] [] [] | 19 -- a2ps | [] [] [] | 19 -- aegis | [] | 1 -- ant-phone | [] [] | 6 -- anubis | [] [] [] | 11 -- ap-utils | () [] | 4 -- aspell | [] [] [] | 16 -- bash | [] | 6 -- bfd | | 2 -- bibshelf | [] | 7 -- binutils | [] [] [] [] | 9 -- bison | [] [] [] [] | 20 -- bison-runtime | [] [] [] [] | 18 -- bluez-pin | [] [] [] [] [] [] | 28 -- cflow | [] [] | 5 -- clisp | | 9 -- console-tools | [] [] | 5 -- coreutils | [] [] [] | 18 -- cpio | [] [] [] [] | 11 -- cpplib | [] [] [] [] [] | 12 -- cryptonit | [] | 6 -- dialog | [] [] [] | 9 -- diffutils | [] [] [] [] [] | 29 -- doodle | [] | 6 -- e2fsprogs | [] [] | 10 -- enscript | [] [] [] | 16 -- fetchmail | [] [] | 12 -- findutils | [] [] [] | 11 -- findutils_stable | [] [] [] [] | 18 -- flex | [] [] | 15 -- fslint | [] | 2 -- gas | [] | 3 -- gawk | [] [] [] | 16 -- gcal | [] | 5 -- gcc | [] [] [] | 7 -- gettext-examples | [] [] [] [] [] [] | 29 -- gettext-runtime | [] [] [] [] [] [] | 28 -- gettext-tools | [] [] [] [] [] | 20 -- gip | [] [] | 13 -- gliv | [] [] | 11 -- glunarclock | [] [] [] | 15 -- gmult | [] [] [] [] | 16 -- gnubiff | [] | 2 -- gnucash | () [] | 5 -- gnuedu | [] | 2 -- gnulib | [] | 10 -- gnunet | | 0 -- gnunet-gtk | [] [] | 3 -- gnutls | | 4 -- gpe-aerial | [] [] | 14 -- gpe-beam | [] [] | 14 -- gpe-calendar | [] [] | 7 -- gpe-clock | [] [] [] [] | 21 -- gpe-conf | [] [] [] | 16 -- gpe-contacts | [] [] | 10 -- gpe-edit | [] [] [] [] [] | 22 -- gpe-filemanager | [] [] | 7 -- gpe-go | [] [] [] [] | 19 -- gpe-login | [] [] [] [] [] | 21 -- gpe-ownerinfo | [] [] [] [] | 21 -- gpe-package | [] | 6 -- gpe-sketchbook | [] [] | 16 -- gpe-su | [] [] [] [] | 21 -- gpe-taskmanager | [] [] [] [] | 21 -- gpe-timesheet | [] [] [] [] | 18 -- gpe-today | [] [] [] [] [] | 21 -- gpe-todo | [] [] | 8 -- gphoto2 | [] [] [] [] | 21 -- gprof | [] [] | 13 -- gpsdrive | [] | 5 -- gramadoir | [] | 7 -- grep | [] | 12 -- gretl | | 6 -- gsasl | [] [] [] | 9 -- gss | [] | 7 -- gst-plugins-bad | [] [] [] | 13 -- gst-plugins-base | [] [] | 11 -- gst-plugins-good | [] [] [] [] [] | 16 -- gst-plugins-ugly | [] [] [] | 13 -- gstreamer | [] [] [] | 18 -- gtick | [] [] | 7 -- gtkam | [] | 16 -- gtkorphan | [] | 7 -- gtkspell | [] [] [] [] [] [] | 27 -- gutenprint | | 4 -- hello | [] [] [] [] [] | 38 -- herrie | [] [] | 8 -- hylafax | | 0 -- idutils | [] [] | 15 -- indent | [] [] [] [] [] | 28 -- iso_15924 | [] [] | 4 -- iso_3166 | [] [] [] [] [] [] [] [] [] | 54 -- iso_3166_2 | [] [] | 4 -- iso_4217 | [] [] [] [] [] | 24 -- iso_639 | [] [] [] [] [] | 26 -- jpilot | [] [] [] [] | 7 -- jtag | [] | 3 -- jwhois | [] [] [] | 13 -- kbd | [] [] [] | 13 -- keytouch | [] | 8 -- keytouch-editor | [] | 5 -- keytouch-keyboa... | [] | 5 -- latrine | [] [] | 5 -- ld | [] [] [] [] | 10 -- leafpad | [] [] [] [] [] | 24 -- libc | [] [] [] | 19 -- libexif | [] | 5 -- libextractor | [] | 5 -- libgpewidget | [] [] [] | 20 -- libgpg-error | [] | 6 -- libgphoto2 | [] [] | 9 -- libgphoto2_port | [] [] [] | 11 -- libgsasl | [] | 8 -- libiconv | [] [] | 11 -- libidn | [] [] | 11 -- lifelines | | 4 -- lilypond | [] | 6 -- lingoteach | [] | 6 -- lprng | [] | 2 -- lynx | [] [] [] | 15 -- m4 | [] [] [] | 18 -- mailfromd | [] [] | 3 -- mailutils | [] [] | 8 -- make | [] [] [] | 20 -- man-db | [] | 9 -- minicom | [] | 14 -- nano | [] [] [] | 20 -- opcodes | [] [] | 10 -- parted | [] [] [] | 11 -- pilot-qof | [] | 1 -- popt | [] [] [] [] | 18 -- psmisc | [] [] | 10 -- pwdutils | [] | 3 -- qof | [] | 4 -- radius | [] [] | 7 -- recode | [] [] [] | 25 -- rpm | [] [] [] [] | 13 -- screem | [] | 2 -- scrollkeeper | [] [] [] [] | 26 -- sed | [] [] [] [] | 23 -- shared-mime-info | [] [] [] | 29 -- sharutils | [] [] [] | 23 -- shishi | [] | 3 -- skencil | [] | 7 -- solfege | [] | 3 -- soundtracker | [] [] | 9 -- sp | [] | 3 -- system-tools-ba... | [] [] [] [] [] [] [] | 38 -- tar | [] [] [] | 17 -- texinfo | [] [] [] | 15 -- tin | | 1 -- tuxpaint | [] [] [] | 19 -- unicode-han-tra... | | 0 -- unicode-transla... | | 2 -- util-linux | [] [] [] | 20 -- util-linux-ng | [] [] [] | 20 -- vorbis-tools | [] [] | 4 -- wastesedge | | 1 -- wdiff | [] [] | 23 -- wget | [] [] [] | 20 -- xchat | [] [] [] [] | 29 -- xkeyboard-config | [] [] [] | 14 -- xpad | [] [] [] | 15 -- +---------------------------------------------------+ -- 76 teams tg th tk tr uk ven vi wa xh zh_CN zh_HK zh_TW zu -- 163 domains 0 3 1 74 51 0 143 21 1 57 7 45 0 2036 -- -- Some counters in the preceding matrix are higher than the number of --visible blocks let us expect. This is because a few extra PO files are --used for implementing regional variants of languages, or language --dialects. -- -- For a PO file in the matrix above to be effective, the package to --which it applies should also have been internationalized and --distributed as such by its maintainer. There might be an observable --lag between the mere existence a PO file and its wide availability in a --distribution. -- -- If November 2007 seems to be old, you may fetch a more recent copy --of this `ABOUT-NLS' file on most GNU archive sites. The most --up-to-date matrix with full percentage details can be found at --`http://translationproject.org/extra/matrix.html'. -- --1.6 Using `gettext' in new packages --=================================== -- --If you are writing a freely available program and want to --internationalize it you are welcome to use GNU `gettext' in your --package. Of course you have to respect the GNU Library General Public --License which covers the use of the GNU `gettext' library. This means --in particular that even non-free programs can use `libintl' as a shared --library, whereas only free software can use `libintl' as a static --library or use modified versions of `libintl'. -- -- Once the sources are changed appropriately and the setup can handle --the use of `gettext' the only thing missing are the translations. The --Free Translation Project is also available for packages which are not --developed inside the GNU project. Therefore the information given above --applies also for every other Free Software Project. Contact --`coordinator@translationproject.org' to make the `.pot' files available --to the translation teams. -- -+<https://www.gnu.org/software/gettext/manual/html_node/Users.html> ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,3 +1,10 @@ -+2019-12-07 gettextize <bug-gnu-gettext@gnu.org> -+ -+ * m4/intlmacosx.m4: Upgrade to gettext-0.20.1. -+ * Makefile.am (SUBDIRS): Remove intl. -+ * configure.ac (AC_CONFIG_FILES): Remove intl/Makefile. -+ (AM_GNU_GETTEXT_VERSION): Bump to 0.20. -+ - 2013-03-13 Steve Langasek <steve.langasek@ubuntu.com> - - * nih/watch.c (nih_watch_walk_filter): New NihFileFilter function ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,6 +1,6 @@ - ## Process this file with automake to produce Makefile.in - --SUBDIRS = m4 intl nih nih-dbus nih-dbus-tool po -+SUBDIRS = m4 nih nih-dbus nih-dbus-tool po - - EXTRA_DIST = HACKING - ---- a/configure.ac -+++ b/configure.ac -@@ -15,8 +15,8 @@ AM_MAINTAINER_MODE([enable]) - LT_PREREQ(2.2.4) - LT_INIT - --AM_GNU_GETTEXT_VERSION([0.17]) --AM_GNU_GETTEXT() -+AM_GNU_GETTEXT_VERSION([0.20]) -+AM_GNU_GETTEXT([external]) - - # Checks for programs. - AC_PROG_CC -@@ -58,7 +58,7 @@ AS_IF([test "$cross_compiling" = "yes"], - AC_SUBST([NIH_DBUS_TOOL], ["\${top_builddir}/nih-dbus-tool/nih-dbus-tool"])])], - [AC_SUBST([NIH_DBUS_TOOL], ["\${top_builddir}/nih-dbus-tool/nih-dbus-tool"])]) - --AC_CONFIG_FILES([ Makefile m4/Makefile intl/Makefile -+AC_CONFIG_FILES([ Makefile m4/Makefile - nih/Makefile nih/libnih.pc - nih-dbus/Makefile nih-dbus/libnih-dbus.pc - nih-dbus-tool/Makefile ---- a/intl/ChangeLog -+++ /dev/null -@@ -1,4 +0,0 @@ --2007-11-07 GNU <bug-gnu-gettext@gnu.org> -- -- * Version 0.17 released. -- ---- a/intl/Makefile.in -+++ /dev/null -@@ -1,587 +0,0 @@ --# Makefile for directory with message catalog handling library of GNU gettext --# Copyright (C) 1995-1998, 2000-2007 Free Software Foundation, Inc. --# --# This program is free software; you can redistribute it and/or modify it --# under the terms of the GNU Library General Public License as published --# by the Free Software Foundation; either version 2, or (at your option) --# any later version. --# --# This program is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU --# Library General Public License for more details. --# --# You should have received a copy of the GNU Library General Public --# License along with this program; if not, write to the Free Software --# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, --# USA. -- --PACKAGE = @PACKAGE@ --VERSION = @VERSION@ -- --SHELL = /bin/sh -- --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ --top_builddir = .. -- --# The VPATH variables allows builds with $builddir != $srcdir, assuming a --# 'make' program that supports VPATH (such as GNU make). This line is removed --# by autoconf automatically when "$(srcdir)" = ".". --# In this directory, the VPATH handling is particular: --# 1. If INTL_LIBTOOL_SUFFIX_PREFIX is 'l' (indicating a build with libtool), --# the .c -> .lo rules carefully use $(srcdir), so that VPATH can be omitted. --# 2. If PACKAGE = gettext-tools, VPATH _must_ be omitted, because otherwise --# 'make' does the wrong thing if GNU gettext was configured with --# "./configure --srcdir=`pwd`", namely it gets confused by the .lo and .la --# files it finds in srcdir = ../../gettext-runtime/intl. --VPATH = $(srcdir) -- --prefix = @prefix@ --exec_prefix = @exec_prefix@ --transform = @program_transform_name@ --libdir = @libdir@ --includedir = @includedir@ --datarootdir = @datarootdir@ --datadir = @datadir@ --localedir = $(datadir)/locale --gettextsrcdir = $(datadir)/gettext/intl --aliaspath = $(localedir) --subdir = intl -- --INSTALL = @INSTALL@ --INSTALL_DATA = @INSTALL_DATA@ -- --# We use $(mkdir_p). --# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as --# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions, --# @install_sh@ does not start with $(SHELL), so we add it. --# In automake >= 1.10, @mkdir_p@ is derived from ${MKDIR_P}, which is defined --# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake --# versions, $(mkinstalldirs) and $(install_sh) are unused. --mkinstalldirs = $(SHELL) @install_sh@ -d --install_sh = $(SHELL) @install_sh@ --MKDIR_P = @MKDIR_P@ --mkdir_p = @mkdir_p@ -- --l = @INTL_LIBTOOL_SUFFIX_PREFIX@ -- --AR = ar --CC = @CC@ --LIBTOOL = @LIBTOOL@ --RANLIB = @RANLIB@ --YACC = @INTLBISON@ -y -d --YFLAGS = --name-prefix=__gettext --WINDRES = @WINDRES@ -- --# -DBUILDING_LIBINTL: Change expansion of LIBINTL_DLL_EXPORTED macro. --# -DBUILDING_DLL: Change expansion of RELOCATABLE_DLL_EXPORTED macro. --DEFS = -DLOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" \ ---DLIBDIR=\"$(libdir)\" -DBUILDING_LIBINTL -DBUILDING_DLL -DIN_LIBINTL \ ---DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR=\"$(libdir)\" -DNO_XMALLOC \ ---Dset_relocation_prefix=libintl_set_relocation_prefix \ ---Drelocate=libintl_relocate \ ---DDEPENDS_ON_LIBICONV=1 @DEFS@ --CPPFLAGS = @CPPFLAGS@ --CFLAGS = @CFLAGS@ @CFLAG_VISIBILITY@ --LDFLAGS = @LDFLAGS@ $(LDFLAGS_@WOE32DLL@) --LDFLAGS_yes = -Wl,--export-all-symbols --LDFLAGS_no = --LIBS = @LIBS@ -- --COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) -- --HEADERS = \ -- gmo.h \ -- gettextP.h \ -- hash-string.h \ -- loadinfo.h \ -- plural-exp.h \ -- eval-plural.h \ -- localcharset.h \ -- lock.h \ -- relocatable.h \ -- tsearch.h tsearch.c \ -- xsize.h \ -- printf-args.h printf-args.c \ -- printf-parse.h wprintf-parse.h printf-parse.c \ -- vasnprintf.h vasnwprintf.h vasnprintf.c \ -- os2compat.h \ -- libgnuintl.h.in --SOURCES = \ -- bindtextdom.c \ -- dcgettext.c \ -- dgettext.c \ -- gettext.c \ -- finddomain.c \ -- hash-string.c \ -- loadmsgcat.c \ -- localealias.c \ -- textdomain.c \ -- l10nflist.c \ -- explodename.c \ -- dcigettext.c \ -- dcngettext.c \ -- dngettext.c \ -- ngettext.c \ -- plural.y \ -- plural-exp.c \ -- localcharset.c \ -- lock.c \ -- relocatable.c \ -- langprefs.c \ -- localename.c \ -- log.c \ -- printf.c \ -- version.c \ -- osdep.c \ -- os2compat.c \ -- intl-exports.c \ -- intl-compat.c --OBJECTS = \ -- bindtextdom.$lo \ -- dcgettext.$lo \ -- dgettext.$lo \ -- gettext.$lo \ -- finddomain.$lo \ -- hash-string.$lo \ -- loadmsgcat.$lo \ -- localealias.$lo \ -- textdomain.$lo \ -- l10nflist.$lo \ -- explodename.$lo \ -- dcigettext.$lo \ -- dcngettext.$lo \ -- dngettext.$lo \ -- ngettext.$lo \ -- plural.$lo \ -- plural-exp.$lo \ -- localcharset.$lo \ -- lock.$lo \ -- relocatable.$lo \ -- langprefs.$lo \ -- localename.$lo \ -- log.$lo \ -- printf.$lo \ -- version.$lo \ -- osdep.$lo \ -- intl-compat.$lo --OBJECTS_RES_yes = libintl.res --OBJECTS_RES_no = --DISTFILES.common = Makefile.in \ --config.charset locale.alias ref-add.sin ref-del.sin export.h libintl.rc \ --$(HEADERS) $(SOURCES) --DISTFILES.generated = plural.c --DISTFILES.normal = VERSION --DISTFILES.gettext = COPYING.LIB-2.0 COPYING.LIB-2.1 libintl.glibc README.woe32 --DISTFILES.obsolete = xopen-msg.sed linux-msg.sed po2tbl.sed.in cat-compat.c \ --COPYING.LIB-2 gettext.h libgettext.h plural-eval.c libgnuintl.h \ --libgnuintl.h_vms Makefile.vms libgnuintl.h.msvc-static \ --libgnuintl.h.msvc-shared Makefile.msvc -- --all: all-@USE_INCLUDED_LIBINTL@ --all-yes: libintl.$la libintl.h charset.alias ref-add.sed ref-del.sed --all-no: all-no-@BUILD_INCLUDED_LIBINTL@ --all-no-yes: libgnuintl.$la --all-no-no: -- --libintl.a libgnuintl.a: $(OBJECTS) -- rm -f $@ -- $(AR) cru $@ $(OBJECTS) -- $(RANLIB) $@ -- --libintl.la libgnuintl.la: $(OBJECTS) $(OBJECTS_RES_@WOE32@) -- $(LIBTOOL) --mode=link \ -- $(CC) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) $(LDFLAGS) -o $@ \ -- $(OBJECTS) @LTLIBICONV@ @INTL_MACOSX_LIBS@ $(LIBS) @LTLIBTHREAD@ @LTLIBC@ \ -- $(OBJECTS_RES_@WOE32@) \ -- -version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \ -- -rpath $(libdir) \ -- -no-undefined -- --# Libtool's library version information for libintl. --# Before making a gettext release, the gettext maintainer must change this --# according to the libtool documentation, section "Library interface versions". --# Maintainers of other packages that include the intl directory must *not* --# change these values. --LTV_CURRENT=8 --LTV_REVISION=2 --LTV_AGE=0 -- --.SUFFIXES: --.SUFFIXES: .c .y .o .lo .sin .sed -- --.c.o: -- $(COMPILE) $< -- --.y.c: -- $(YACC) $(YFLAGS) --output $@ $< -- rm -f $*.h -- --bindtextdom.lo: $(srcdir)/bindtextdom.c -- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/bindtextdom.c --dcgettext.lo: $(srcdir)/dcgettext.c -- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dcgettext.c --dgettext.lo: $(srcdir)/dgettext.c -- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dgettext.c --gettext.lo: $(srcdir)/gettext.c -- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/gettext.c --finddomain.lo: $(srcdir)/finddomain.c -- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/finddomain.c --hash-string.lo: $(srcdir)/hash-string.c -- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/hash-string.c --loadmsgcat.lo: $(srcdir)/loadmsgcat.c -- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/loadmsgcat.c --localealias.lo: $(srcdir)/localealias.c -- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localealias.c --textdomain.lo: $(srcdir)/textdomain.c -- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/textdomain.c --l10nflist.lo: $(srcdir)/l10nflist.c -- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/l10nflist.c --explodename.lo: $(srcdir)/explodename.c -- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/explodename.c --dcigettext.lo: $(srcdir)/dcigettext.c -- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dcigettext.c --dcngettext.lo: $(srcdir)/dcngettext.c -- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dcngettext.c --dngettext.lo: $(srcdir)/dngettext.c -- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dngettext.c --ngettext.lo: $(srcdir)/ngettext.c -- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/ngettext.c --plural.lo: $(srcdir)/plural.c -- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/plural.c --plural-exp.lo: $(srcdir)/plural-exp.c -- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/plural-exp.c --localcharset.lo: $(srcdir)/localcharset.c -- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localcharset.c --lock.lo: $(srcdir)/lock.c -- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/lock.c --relocatable.lo: $(srcdir)/relocatable.c -- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/relocatable.c --langprefs.lo: $(srcdir)/langprefs.c -- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/langprefs.c --localename.lo: $(srcdir)/localename.c -- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localename.c --log.lo: $(srcdir)/log.c -- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/log.c --printf.lo: $(srcdir)/printf.c -- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/printf.c --version.lo: $(srcdir)/version.c -- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/version.c --osdep.lo: $(srcdir)/osdep.c -- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/osdep.c --intl-compat.lo: $(srcdir)/intl-compat.c -- $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/intl-compat.c -- --# This rule is executed only on Woe32 systems. --# The following sed expressions come from the windres-options script. They are --# inlined here, so that they can be written in a Makefile without requiring a --# temporary file. They must contain literal newlines rather than semicolons, --# so that they work with the sed-3.02 that is shipped with MSYS. We can use --# GNU bash's $'\n' syntax to obtain such a newline. --libintl.res: $(srcdir)/libintl.rc -- nl=$$'\n'; \ -- sed_extract_major='/^[0-9]/{'$${nl}'s/^\([0-9]*\).*/\1/p'$${nl}q$${nl}'}'$${nl}'c\'$${nl}0$${nl}q; \ -- sed_extract_minor='/^[0-9][0-9]*[.][0-9]/{'$${nl}'s/^[0-9]*[.]\([0-9]*\).*/\1/p'$${nl}q$${nl}'}'$${nl}'c\'$${nl}0$${nl}q; \ -- sed_extract_subminor='/^[0-9][0-9]*[.][0-9][0-9]*[.][0-9]/{'$${nl}'s/^[0-9]*[.][0-9]*[.]\([0-9]*\).*/\1/p'$${nl}q$${nl}'}'$${nl}'c\'$${nl}0$${nl}q; \ -- $(WINDRES) \ -- "-DPACKAGE_VERSION_STRING=\\\"$(VERSION)\\\"" \ -- "-DPACKAGE_VERSION_MAJOR="`echo '$(VERSION)' | sed -n -e "$$sed_extract_major"` \ -- "-DPACKAGE_VERSION_MINOR="`echo '$(VERSION)' | sed -n -e "$$sed_extract_minor"` \ -- "-DPACKAGE_VERSION_SUBMINOR="`echo '$(VERSION)' | sed -n -e "$$sed_extract_subminor"` \ -- -i $(srcdir)/libintl.rc -o libintl.res --output-format=coff -- --ref-add.sed: $(srcdir)/ref-add.sin -- sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $(srcdir)/ref-add.sin > t-ref-add.sed -- mv t-ref-add.sed ref-add.sed --ref-del.sed: $(srcdir)/ref-del.sin -- sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $(srcdir)/ref-del.sin > t-ref-del.sed -- mv t-ref-del.sed ref-del.sed -- --INCLUDES = -I. -I$(srcdir) -I.. -- --libgnuintl.h: $(srcdir)/libgnuintl.h.in -- sed -e '/IN_LIBGLOCALE/d' \ -- -e 's,@''HAVE_POSIX_PRINTF''@,@HAVE_POSIX_PRINTF@,g' \ -- -e 's,@''HAVE_ASPRINTF''@,@HAVE_ASPRINTF@,g' \ -- -e 's,@''HAVE_SNPRINTF''@,@HAVE_SNPRINTF@,g' \ -- -e 's,@''HAVE_WPRINTF''@,@HAVE_WPRINTF@,g' \ -- < $(srcdir)/libgnuintl.h.in \ -- | if test '@WOE32DLL@' = yes; then \ -- sed -e 's/extern \([^()]*\);/extern __declspec (dllimport) \1;/'; \ -- else \ -- cat; \ -- fi \ -- | sed -e 's/extern \([^"]\)/extern LIBINTL_DLL_EXPORTED \1/' \ -- -e "/#define _LIBINTL_H/r $(srcdir)/export.h" \ -- | sed -e 's,@''HAVE_VISIBILITY''@,@HAVE_VISIBILITY@,g' \ -- > libgnuintl.h -- --libintl.h: $(srcdir)/libgnuintl.h.in -- sed -e '/IN_LIBGLOCALE/d' \ -- -e 's,@''HAVE_POSIX_PRINTF''@,@HAVE_POSIX_PRINTF@,g' \ -- -e 's,@''HAVE_ASPRINTF''@,@HAVE_ASPRINTF@,g' \ -- -e 's,@''HAVE_SNPRINTF''@,@HAVE_SNPRINTF@,g' \ -- -e 's,@''HAVE_WPRINTF''@,@HAVE_WPRINTF@,g' \ -- < $(srcdir)/libgnuintl.h.in > libintl.h -- --charset.alias: $(srcdir)/config.charset -- $(SHELL) $(srcdir)/config.charset '@host@' > t-$@ -- mv t-$@ $@ -- --check: all -- --# We must not install the libintl.h/libintl.a files if we are on a --# system which has the GNU gettext() function in its C library or in a --# separate library. --# If you want to use the one which comes with this version of the --# package, you have to use `configure --with-included-gettext'. --install: install-exec install-data --install-exec: all -- if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \ -- && test '@USE_INCLUDED_LIBINTL@' = yes; then \ -- $(mkdir_p) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \ -- $(INSTALL_DATA) libintl.h $(DESTDIR)$(includedir)/libintl.h; \ -- $(LIBTOOL) --mode=install \ -- $(INSTALL_DATA) libintl.$la $(DESTDIR)$(libdir)/libintl.$la; \ -- if test "@RELOCATABLE@" = yes; then \ -- dependencies=`sed -n -e 's,^dependency_libs=\(.*\),\1,p' < $(DESTDIR)$(libdir)/libintl.la | sed -e "s,^',," -e "s,'\$$,,"`; \ -- if test -n "$$dependencies"; then \ -- rm -f $(DESTDIR)$(libdir)/libintl.la; \ -- fi; \ -- fi; \ -- else \ -- : ; \ -- fi -- if test "$(PACKAGE)" = "gettext-tools" \ -- && test '@USE_INCLUDED_LIBINTL@' = no \ -- && test @GLIBC2@ != no; then \ -- $(mkdir_p) $(DESTDIR)$(libdir); \ -- $(LIBTOOL) --mode=install \ -- $(INSTALL_DATA) libgnuintl.$la $(DESTDIR)$(libdir)/libgnuintl.$la; \ -- rm -f $(DESTDIR)$(libdir)/preloadable_libintl.so; \ -- $(INSTALL_DATA) $(DESTDIR)$(libdir)/libgnuintl.so $(DESTDIR)$(libdir)/preloadable_libintl.so; \ -- $(LIBTOOL) --mode=uninstall \ -- rm -f $(DESTDIR)$(libdir)/libgnuintl.$la; \ -- else \ -- : ; \ -- fi -- if test '@USE_INCLUDED_LIBINTL@' = yes; then \ -- test @GLIBC21@ != no || $(mkdir_p) $(DESTDIR)$(libdir); \ -- temp=$(DESTDIR)$(libdir)/t-charset.alias; \ -- dest=$(DESTDIR)$(libdir)/charset.alias; \ -- if test -f $(DESTDIR)$(libdir)/charset.alias; then \ -- orig=$(DESTDIR)$(libdir)/charset.alias; \ -- sed -f ref-add.sed $$orig > $$temp; \ -- $(INSTALL_DATA) $$temp $$dest; \ -- rm -f $$temp; \ -- else \ -- if test @GLIBC21@ = no; then \ -- orig=charset.alias; \ -- sed -f ref-add.sed $$orig > $$temp; \ -- $(INSTALL_DATA) $$temp $$dest; \ -- rm -f $$temp; \ -- fi; \ -- fi; \ -- $(mkdir_p) $(DESTDIR)$(localedir); \ -- test -f $(DESTDIR)$(localedir)/locale.alias \ -- && orig=$(DESTDIR)$(localedir)/locale.alias \ -- || orig=$(srcdir)/locale.alias; \ -- temp=$(DESTDIR)$(localedir)/t-locale.alias; \ -- dest=$(DESTDIR)$(localedir)/locale.alias; \ -- sed -f ref-add.sed $$orig > $$temp; \ -- $(INSTALL_DATA) $$temp $$dest; \ -- rm -f $$temp; \ -- else \ -- : ; \ -- fi --install-data: all -- if test "$(PACKAGE)" = "gettext-tools"; then \ -- $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \ -- $(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \ -- $(INSTALL_DATA) ChangeLog.inst $(DESTDIR)$(gettextsrcdir)/ChangeLog; \ -- dists="COPYING.LIB-2.0 COPYING.LIB-2.1 $(DISTFILES.common)"; \ -- for file in $$dists; do \ -- $(INSTALL_DATA) $(srcdir)/$$file \ -- $(DESTDIR)$(gettextsrcdir)/$$file; \ -- done; \ -- chmod a+x $(DESTDIR)$(gettextsrcdir)/config.charset; \ -- dists="$(DISTFILES.generated)"; \ -- for file in $$dists; do \ -- if test -f $$file; then dir=.; else dir=$(srcdir); fi; \ -- $(INSTALL_DATA) $$dir/$$file \ -- $(DESTDIR)$(gettextsrcdir)/$$file; \ -- done; \ -- dists="$(DISTFILES.obsolete)"; \ -- for file in $$dists; do \ -- rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \ -- done; \ -- else \ -- : ; \ -- fi -- --install-strip: install -- --install-dvi install-html install-info install-ps install-pdf: -- --installdirs: -- if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \ -- && test '@USE_INCLUDED_LIBINTL@' = yes; then \ -- $(mkdir_p) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \ -- else \ -- : ; \ -- fi -- if test "$(PACKAGE)" = "gettext-tools" \ -- && test '@USE_INCLUDED_LIBINTL@' = no \ -- && test @GLIBC2@ != no; then \ -- $(mkdir_p) $(DESTDIR)$(libdir); \ -- else \ -- : ; \ -- fi -- if test '@USE_INCLUDED_LIBINTL@' = yes; then \ -- test @GLIBC21@ != no || $(mkdir_p) $(DESTDIR)$(libdir); \ -- $(mkdir_p) $(DESTDIR)$(localedir); \ -- else \ -- : ; \ -- fi -- if test "$(PACKAGE)" = "gettext-tools"; then \ -- $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \ -- else \ -- : ; \ -- fi -- --# Define this as empty until I found a useful application. --installcheck: -- --uninstall: -- if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \ -- && test '@USE_INCLUDED_LIBINTL@' = yes; then \ -- rm -f $(DESTDIR)$(includedir)/libintl.h; \ -- $(LIBTOOL) --mode=uninstall \ -- rm -f $(DESTDIR)$(libdir)/libintl.$la; \ -- else \ -- : ; \ -- fi -- if test "$(PACKAGE)" = "gettext-tools" \ -- && test '@USE_INCLUDED_LIBINTL@' = no \ -- && test @GLIBC2@ != no; then \ -- rm -f $(DESTDIR)$(libdir)/preloadable_libintl.so; \ -- else \ -- : ; \ -- fi -- if test '@USE_INCLUDED_LIBINTL@' = yes; then \ -- if test -f $(DESTDIR)$(libdir)/charset.alias; then \ -- temp=$(DESTDIR)$(libdir)/t-charset.alias; \ -- dest=$(DESTDIR)$(libdir)/charset.alias; \ -- sed -f ref-del.sed $$dest > $$temp; \ -- if grep '^# Packages using this file: $$' $$temp > /dev/null; then \ -- rm -f $$dest; \ -- else \ -- $(INSTALL_DATA) $$temp $$dest; \ -- fi; \ -- rm -f $$temp; \ -- fi; \ -- if test -f $(DESTDIR)$(localedir)/locale.alias; then \ -- temp=$(DESTDIR)$(localedir)/t-locale.alias; \ -- dest=$(DESTDIR)$(localedir)/locale.alias; \ -- sed -f ref-del.sed $$dest > $$temp; \ -- if grep '^# Packages using this file: $$' $$temp > /dev/null; then \ -- rm -f $$dest; \ -- else \ -- $(INSTALL_DATA) $$temp $$dest; \ -- fi; \ -- rm -f $$temp; \ -- fi; \ -- else \ -- : ; \ -- fi -- if test "$(PACKAGE)" = "gettext-tools"; then \ -- for file in VERSION ChangeLog COPYING.LIB-2.0 COPYING.LIB-2.1 $(DISTFILES.common) $(DISTFILES.generated); do \ -- rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \ -- done; \ -- else \ -- : ; \ -- fi -- --info dvi ps pdf html: -- --$(OBJECTS): ../config.h libgnuintl.h --bindtextdom.$lo dcgettext.$lo dcigettext.$lo dcngettext.$lo dgettext.$lo dngettext.$lo finddomain.$lo gettext.$lo intl-compat.$lo loadmsgcat.$lo localealias.$lo ngettext.$lo textdomain.$lo: $(srcdir)/gettextP.h $(srcdir)/gmo.h $(srcdir)/loadinfo.h --hash-string.$lo dcigettext.$lo loadmsgcat.$lo: $(srcdir)/hash-string.h --explodename.$lo l10nflist.$lo: $(srcdir)/loadinfo.h --dcigettext.$lo loadmsgcat.$lo plural.$lo plural-exp.$lo: $(srcdir)/plural-exp.h --dcigettext.$lo: $(srcdir)/eval-plural.h --localcharset.$lo: $(srcdir)/localcharset.h --bindtextdom.$lo dcigettext.$lo finddomain.$lo loadmsgcat.$lo localealias.$lo lock.$lo log.$lo: $(srcdir)/lock.h --localealias.$lo localcharset.$lo relocatable.$lo: $(srcdir)/relocatable.h --printf.$lo: $(srcdir)/printf-args.h $(srcdir)/printf-args.c $(srcdir)/printf-parse.h $(srcdir)/wprintf-parse.h $(srcdir)/xsize.h $(srcdir)/printf-parse.c $(srcdir)/vasnprintf.h $(srcdir)/vasnwprintf.h $(srcdir)/vasnprintf.c -- --# A bison-2.1 generated plural.c includes <libintl.h> if ENABLE_NLS. --PLURAL_DEPS_yes = libintl.h --PLURAL_DEPS_no = --plural.$lo: $(PLURAL_DEPS_@USE_INCLUDED_LIBINTL@) -- --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) -- here=`pwd`; cd $(srcdir) && etags -o $$here/TAGS $(HEADERS) $(SOURCES) -- --ctags: CTAGS -- --CTAGS: $(HEADERS) $(SOURCES) -- here=`pwd`; cd $(srcdir) && ctags -o $$here/CTAGS $(HEADERS) $(SOURCES) -- --id: ID -- --ID: $(HEADERS) $(SOURCES) -- here=`pwd`; cd $(srcdir) && mkid -f$$here/ID $(HEADERS) $(SOURCES) -- -- --mostlyclean: -- rm -f *.a *.la *.o *.obj *.lo libintl.res core core.* -- rm -f libgnuintl.h libintl.h charset.alias ref-add.sed ref-del.sed -- rm -f -r .libs _libs -- --clean: mostlyclean -- --distclean: clean -- rm -f Makefile ID TAGS -- if test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; then \ -- rm -f ChangeLog.inst $(DISTFILES.normal); \ -- else \ -- : ; \ -- fi -- --maintainer-clean: distclean -- @echo "This command is intended for maintainers to use;" -- @echo "it deletes files that may require special tools to rebuild." -- -- --# GNU gettext needs not contain the file `VERSION' but contains some --# other files which should not be distributed in other packages. --distdir = ../$(PACKAGE)-$(VERSION)/$(subdir) --dist distdir: Makefile -- if test "$(PACKAGE)" = "gettext-tools"; then \ -- : ; \ -- else \ -- if test "$(PACKAGE)" = "gettext-runtime"; then \ -- additional="$(DISTFILES.gettext)"; \ -- else \ -- additional="$(DISTFILES.normal)"; \ -- fi; \ -- $(MAKE) $(DISTFILES.common) $(DISTFILES.generated) $$additional; \ -- for file in ChangeLog $(DISTFILES.common) $(DISTFILES.generated) $$additional; do \ -- if test -f $$file; then dir=.; else dir=$(srcdir); fi; \ -- cp -p $$dir/$$file $(distdir) || test $$file = Makefile.in || exit 1; \ -- done; \ -- fi -- --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- cd $(top_builddir) && $(SHELL) ./config.status --# This would be more efficient, but doesn't work any more with autoconf-2.57, --# when AC_CONFIG_FILES([intl/Makefile:somedir/Makefile.in]) is used. --# cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ -- --# Tell versions [3.59,3.63) of GNU make not to export all variables. --# Otherwise a system limit (for SysV at least) may be exceeded. --.NOEXPORT: ---- a/intl/VERSION -+++ /dev/null -@@ -1 +0,0 @@ --GNU gettext library from gettext-0.17 ---- a/intl/bindtextdom.c -+++ /dev/null -@@ -1,340 +0,0 @@ --/* Implementation of the bindtextdomain(3) function -- Copyright (C) 1995-1998, 2000-2003, 2005-2006 Free Software Foundation, Inc. -- -- This program is free software; you can redistribute it and/or modify it -- under the terms of the GNU Library General Public License as published -- by the Free Software Foundation; either version 2, or (at your option) -- any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Library General Public License for more details. -- -- You should have received a copy of the GNU Library General Public -- License along with this program; if not, write to the Free Software -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, -- USA. */ -- --#ifdef HAVE_CONFIG_H --# include <config.h> --#endif -- --#include <stddef.h> --#include <stdlib.h> --#include <string.h> -- --#include "gettextP.h" --#ifdef _LIBC --# include <libintl.h> --#else --# include "libgnuintl.h" --#endif -- --/* Handle multi-threaded applications. */ --#ifdef _LIBC --# include <bits/libc-lock.h> --# define gl_rwlock_define __libc_rwlock_define --# define gl_rwlock_wrlock __libc_rwlock_wrlock --# define gl_rwlock_unlock __libc_rwlock_unlock --#else --# include "lock.h" --#endif -- --/* Some compilers, like SunOS4 cc, don't have offsetof in <stddef.h>. */ --#ifndef offsetof --# define offsetof(type,ident) ((size_t)&(((type*)0)->ident)) --#endif -- --/* @@ end of prolog @@ */ -- --/* Lock variable to protect the global data in the gettext implementation. */ --gl_rwlock_define (extern, _nl_state_lock attribute_hidden) -- -- --/* Names for the libintl functions are a problem. They must not clash -- with existing names and they should follow ANSI C. But this source -- code is also used in GNU C Library where the names have a __ -- prefix. So we have to make a difference here. */ --#ifdef _LIBC --# define BINDTEXTDOMAIN __bindtextdomain --# define BIND_TEXTDOMAIN_CODESET __bind_textdomain_codeset --# ifndef strdup --# define strdup(str) __strdup (str) --# endif --#else --# define BINDTEXTDOMAIN libintl_bindtextdomain --# define BIND_TEXTDOMAIN_CODESET libintl_bind_textdomain_codeset --#endif -- --/* Specifies the directory name *DIRNAMEP and the output codeset *CODESETP -- to be used for the DOMAINNAME message catalog. -- If *DIRNAMEP or *CODESETP is NULL, the corresponding attribute is not -- modified, only the current value is returned. -- If DIRNAMEP or CODESETP is NULL, the corresponding attribute is neither -- modified nor returned. */ --static void --set_binding_values (const char *domainname, -- const char **dirnamep, const char **codesetp) --{ -- struct binding *binding; -- int modified; -- -- /* Some sanity checks. */ -- if (domainname == NULL || domainname[0] == '\0') -- { -- if (dirnamep) -- *dirnamep = NULL; -- if (codesetp) -- *codesetp = NULL; -- return; -- } -- -- gl_rwlock_wrlock (_nl_state_lock); -- -- modified = 0; -- -- for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next) -- { -- int compare = strcmp (domainname, binding->domainname); -- if (compare == 0) -- /* We found it! */ -- break; -- if (compare < 0) -- { -- /* It is not in the list. */ -- binding = NULL; -- break; -- } -- } -- -- if (binding != NULL) -- { -- if (dirnamep) -- { -- const char *dirname = *dirnamep; -- -- if (dirname == NULL) -- /* The current binding has be to returned. */ -- *dirnamep = binding->dirname; -- else -- { -- /* The domain is already bound. If the new value and the old -- one are equal we simply do nothing. Otherwise replace the -- old binding. */ -- char *result = binding->dirname; -- if (strcmp (dirname, result) != 0) -- { -- if (strcmp (dirname, _nl_default_dirname) == 0) -- result = (char *) _nl_default_dirname; -- else -- { --#if defined _LIBC || defined HAVE_STRDUP -- result = strdup (dirname); --#else -- size_t len = strlen (dirname) + 1; -- result = (char *) malloc (len); -- if (__builtin_expect (result != NULL, 1)) -- memcpy (result, dirname, len); --#endif -- } -- -- if (__builtin_expect (result != NULL, 1)) -- { -- if (binding->dirname != _nl_default_dirname) -- free (binding->dirname); -- -- binding->dirname = result; -- modified = 1; -- } -- } -- *dirnamep = result; -- } -- } -- -- if (codesetp) -- { -- const char *codeset = *codesetp; -- -- if (codeset == NULL) -- /* The current binding has be to returned. */ -- *codesetp = binding->codeset; -- else -- { -- /* The domain is already bound. If the new value and the old -- one are equal we simply do nothing. Otherwise replace the -- old binding. */ -- char *result = binding->codeset; -- if (result == NULL || strcmp (codeset, result) != 0) -- { --#if defined _LIBC || defined HAVE_STRDUP -- result = strdup (codeset); --#else -- size_t len = strlen (codeset) + 1; -- result = (char *) malloc (len); -- if (__builtin_expect (result != NULL, 1)) -- memcpy (result, codeset, len); --#endif -- -- if (__builtin_expect (result != NULL, 1)) -- { -- if (binding->codeset != NULL) -- free (binding->codeset); -- -- binding->codeset = result; -- modified = 1; -- } -- } -- *codesetp = result; -- } -- } -- } -- else if ((dirnamep == NULL || *dirnamep == NULL) -- && (codesetp == NULL || *codesetp == NULL)) -- { -- /* Simply return the default values. */ -- if (dirnamep) -- *dirnamep = _nl_default_dirname; -- if (codesetp) -- *codesetp = NULL; -- } -- else -- { -- /* We have to create a new binding. */ -- size_t len = strlen (domainname) + 1; -- struct binding *new_binding = -- (struct binding *) malloc (offsetof (struct binding, domainname) + len); -- -- if (__builtin_expect (new_binding == NULL, 0)) -- goto failed; -- -- memcpy (new_binding->domainname, domainname, len); -- -- if (dirnamep) -- { -- const char *dirname = *dirnamep; -- -- if (dirname == NULL) -- /* The default value. */ -- dirname = _nl_default_dirname; -- else -- { -- if (strcmp (dirname, _nl_default_dirname) == 0) -- dirname = _nl_default_dirname; -- else -- { -- char *result; --#if defined _LIBC || defined HAVE_STRDUP -- result = strdup (dirname); -- if (__builtin_expect (result == NULL, 0)) -- goto failed_dirname; --#else -- size_t len = strlen (dirname) + 1; -- result = (char *) malloc (len); -- if (__builtin_expect (result == NULL, 0)) -- goto failed_dirname; -- memcpy (result, dirname, len); --#endif -- dirname = result; -- } -- } -- *dirnamep = dirname; -- new_binding->dirname = (char *) dirname; -- } -- else -- /* The default value. */ -- new_binding->dirname = (char *) _nl_default_dirname; -- -- if (codesetp) -- { -- const char *codeset = *codesetp; -- -- if (codeset != NULL) -- { -- char *result; -- --#if defined _LIBC || defined HAVE_STRDUP -- result = strdup (codeset); -- if (__builtin_expect (result == NULL, 0)) -- goto failed_codeset; --#else -- size_t len = strlen (codeset) + 1; -- result = (char *) malloc (len); -- if (__builtin_expect (result == NULL, 0)) -- goto failed_codeset; -- memcpy (result, codeset, len); --#endif -- codeset = result; -- } -- *codesetp = codeset; -- new_binding->codeset = (char *) codeset; -- } -- else -- new_binding->codeset = NULL; -- -- /* Now enqueue it. */ -- if (_nl_domain_bindings == NULL -- || strcmp (domainname, _nl_domain_bindings->domainname) < 0) -- { -- new_binding->next = _nl_domain_bindings; -- _nl_domain_bindings = new_binding; -- } -- else -- { -- binding = _nl_domain_bindings; -- while (binding->next != NULL -- && strcmp (domainname, binding->next->domainname) > 0) -- binding = binding->next; -- -- new_binding->next = binding->next; -- binding->next = new_binding; -- } -- -- modified = 1; -- -- /* Here we deal with memory allocation failures. */ -- if (0) -- { -- failed_codeset: -- if (new_binding->dirname != _nl_default_dirname) -- free (new_binding->dirname); -- failed_dirname: -- free (new_binding); -- failed: -- if (dirnamep) -- *dirnamep = NULL; -- if (codesetp) -- *codesetp = NULL; -- } -- } -- -- /* If we modified any binding, we flush the caches. */ -- if (modified) -- ++_nl_msg_cat_cntr; -- -- gl_rwlock_unlock (_nl_state_lock); --} -- --/* Specify that the DOMAINNAME message catalog will be found -- in DIRNAME rather than in the system locale data base. */ --char * --BINDTEXTDOMAIN (const char *domainname, const char *dirname) --{ -- set_binding_values (domainname, &dirname, NULL); -- return (char *) dirname; --} -- --/* Specify the character encoding in which the messages from the -- DOMAINNAME message catalog will be returned. */ --char * --BIND_TEXTDOMAIN_CODESET (const char *domainname, const char *codeset) --{ -- set_binding_values (domainname, NULL, &codeset); -- return (char *) codeset; --} -- --#ifdef _LIBC --/* Aliases for function names in GNU C Library. */ --weak_alias (__bindtextdomain, bindtextdomain); --weak_alias (__bind_textdomain_codeset, bind_textdomain_codeset); --#endif ---- a/intl/config.charset -+++ /dev/null -@@ -1,640 +0,0 @@ --#! /bin/sh --# Output a system dependent table of character encoding aliases. --# --# Copyright (C) 2000-2004, 2006 Free Software Foundation, Inc. --# --# This program is free software; you can redistribute it and/or modify it --# under the terms of the GNU Library General Public License as published --# by the Free Software Foundation; either version 2, or (at your option) --# any later version. --# --# This program is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU --# Library General Public License for more details. --# --# You should have received a copy of the GNU Library General Public --# License along with this program; if not, write to the Free Software --# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, --# USA. --# --# The table consists of lines of the form --# ALIAS CANONICAL --# --# ALIAS is the (system dependent) result of "nl_langinfo (CODESET)". --# ALIAS is compared in a case sensitive way. --# --# CANONICAL is the GNU canonical name for this character encoding. --# It must be an encoding supported by libiconv. Support by GNU libc is --# also desirable. CANONICAL is case insensitive. Usually an upper case --# MIME charset name is preferred. --# The current list of GNU canonical charset names is as follows. --# --# name MIME? used by which systems --# ASCII, ANSI_X3.4-1968 glibc solaris freebsd netbsd darwin --# ISO-8859-1 Y glibc aix hpux irix osf solaris freebsd netbsd darwin --# ISO-8859-2 Y glibc aix hpux irix osf solaris freebsd netbsd darwin --# ISO-8859-3 Y glibc solaris --# ISO-8859-4 Y osf solaris freebsd netbsd darwin --# ISO-8859-5 Y glibc aix hpux irix osf solaris freebsd netbsd darwin --# ISO-8859-6 Y glibc aix hpux solaris --# ISO-8859-7 Y glibc aix hpux irix osf solaris netbsd darwin --# ISO-8859-8 Y glibc aix hpux osf solaris --# ISO-8859-9 Y glibc aix hpux irix osf solaris darwin --# ISO-8859-13 glibc netbsd darwin --# ISO-8859-14 glibc --# ISO-8859-15 glibc aix osf solaris freebsd darwin --# KOI8-R Y glibc solaris freebsd netbsd darwin --# KOI8-U Y glibc freebsd netbsd darwin --# KOI8-T glibc --# CP437 dos --# CP775 dos --# CP850 aix osf dos --# CP852 dos --# CP855 dos --# CP856 aix --# CP857 dos --# CP861 dos --# CP862 dos --# CP864 dos --# CP865 dos --# CP866 freebsd netbsd darwin dos --# CP869 dos --# CP874 woe32 dos --# CP922 aix --# CP932 aix woe32 dos --# CP943 aix --# CP949 osf woe32 dos --# CP950 woe32 dos --# CP1046 aix --# CP1124 aix --# CP1125 dos --# CP1129 aix --# CP1250 woe32 --# CP1251 glibc solaris netbsd darwin woe32 --# CP1252 aix woe32 --# CP1253 woe32 --# CP1254 woe32 --# CP1255 glibc woe32 --# CP1256 woe32 --# CP1257 woe32 --# GB2312 Y glibc aix hpux irix solaris freebsd netbsd darwin --# EUC-JP Y glibc aix hpux irix osf solaris freebsd netbsd darwin --# EUC-KR Y glibc aix hpux irix osf solaris freebsd netbsd darwin --# EUC-TW glibc aix hpux irix osf solaris netbsd --# BIG5 Y glibc aix hpux osf solaris freebsd netbsd darwin --# BIG5-HKSCS glibc solaris --# GBK glibc aix osf solaris woe32 dos --# GB18030 glibc solaris netbsd --# SHIFT_JIS Y hpux osf solaris freebsd netbsd darwin --# JOHAB glibc solaris woe32 --# TIS-620 glibc aix hpux osf solaris --# VISCII Y glibc --# TCVN5712-1 glibc --# GEORGIAN-PS glibc --# HP-ROMAN8 hpux --# HP-ARABIC8 hpux --# HP-GREEK8 hpux --# HP-HEBREW8 hpux --# HP-TURKISH8 hpux --# HP-KANA8 hpux --# DEC-KANJI osf --# DEC-HANYU osf --# UTF-8 Y glibc aix hpux osf solaris netbsd darwin --# --# Note: Names which are not marked as being a MIME name should not be used in --# Internet protocols for information interchange (mail, news, etc.). --# --# Note: ASCII and ANSI_X3.4-1968 are synonymous canonical names. Applications --# must understand both names and treat them as equivalent. --# --# The first argument passed to this file is the canonical host specification, --# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM --# or --# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM -- --host="$1" --os=`echo "$host" | sed -e 's/^[^-]*-[^-]*-\(.*\)$/\1/'` --echo "# This file contains a table of character encoding aliases," --echo "# suitable for operating system '${os}'." --echo "# It was automatically generated from config.charset." --# List of references, updated during installation: --echo "# Packages using this file: " --case "$os" in -- linux-gnulibc1*) -- # Linux libc5 doesn't have nl_langinfo(CODESET); therefore -- # localcharset.c falls back to using the full locale name -- # from the environment variables. -- echo "C ASCII" -- echo "POSIX ASCII" -- for l in af af_ZA ca ca_ES da da_DK de de_AT de_BE de_CH de_DE de_LU \ -- en en_AU en_BW en_CA en_DK en_GB en_IE en_NZ en_US en_ZA \ -- en_ZW es es_AR es_BO es_CL es_CO es_DO es_EC es_ES es_GT \ -- es_HN es_MX es_PA es_PE es_PY es_SV es_US es_UY es_VE et \ -- et_EE eu eu_ES fi fi_FI fo fo_FO fr fr_BE fr_CA fr_CH fr_FR \ -- fr_LU ga ga_IE gl gl_ES id id_ID in in_ID is is_IS it it_CH \ -- it_IT kl kl_GL nl nl_BE nl_NL no no_NO pt pt_BR pt_PT sv \ -- sv_FI sv_SE; do -- echo "$l ISO-8859-1" -- echo "$l.iso-8859-1 ISO-8859-1" -- echo "$l.iso-8859-15 ISO-8859-15" -- echo "$l.iso-8859-15@euro ISO-8859-15" -- echo "$l@euro ISO-8859-15" -- echo "$l.cp-437 CP437" -- echo "$l.cp-850 CP850" -- echo "$l.cp-1252 CP1252" -- echo "$l.cp-1252@euro CP1252" -- #echo "$l.atari-st ATARI-ST" # not a commonly used encoding -- echo "$l.utf-8 UTF-8" -- echo "$l.utf-8@euro UTF-8" -- done -- for l in cs cs_CZ hr hr_HR hu hu_HU pl pl_PL ro ro_RO sk sk_SK sl \ -- sl_SI sr sr_CS sr_YU; do -- echo "$l ISO-8859-2" -- echo "$l.iso-8859-2 ISO-8859-2" -- echo "$l.cp-852 CP852" -- echo "$l.cp-1250 CP1250" -- echo "$l.utf-8 UTF-8" -- done -- for l in mk mk_MK ru ru_RU; do -- echo "$l ISO-8859-5" -- echo "$l.iso-8859-5 ISO-8859-5" -- echo "$l.koi8-r KOI8-R" -- echo "$l.cp-866 CP866" -- echo "$l.cp-1251 CP1251" -- echo "$l.utf-8 UTF-8" -- done -- for l in ar ar_SA; do -- echo "$l ISO-8859-6" -- echo "$l.iso-8859-6 ISO-8859-6" -- echo "$l.cp-864 CP864" -- #echo "$l.cp-868 CP868" # not a commonly used encoding -- echo "$l.cp-1256 CP1256" -- echo "$l.utf-8 UTF-8" -- done -- for l in el el_GR gr gr_GR; do -- echo "$l ISO-8859-7" -- echo "$l.iso-8859-7 ISO-8859-7" -- echo "$l.cp-869 CP869" -- echo "$l.cp-1253 CP1253" -- echo "$l.cp-1253@euro CP1253" -- echo "$l.utf-8 UTF-8" -- echo "$l.utf-8@euro UTF-8" -- done -- for l in he he_IL iw iw_IL; do -- echo "$l ISO-8859-8" -- echo "$l.iso-8859-8 ISO-8859-8" -- echo "$l.cp-862 CP862" -- echo "$l.cp-1255 CP1255" -- echo "$l.utf-8 UTF-8" -- done -- for l in tr tr_TR; do -- echo "$l ISO-8859-9" -- echo "$l.iso-8859-9 ISO-8859-9" -- echo "$l.cp-857 CP857" -- echo "$l.cp-1254 CP1254" -- echo "$l.utf-8 UTF-8" -- done -- for l in lt lt_LT lv lv_LV; do -- #echo "$l BALTIC" # not a commonly used encoding, wrong encoding name -- echo "$l ISO-8859-13" -- done -- for l in ru_UA uk uk_UA; do -- echo "$l KOI8-U" -- done -- for l in zh zh_CN; do -- #echo "$l GB_2312-80" # not a commonly used encoding, wrong encoding name -- echo "$l GB2312" -- done -- for l in ja ja_JP ja_JP.EUC; do -- echo "$l EUC-JP" -- done -- for l in ko ko_KR; do -- echo "$l EUC-KR" -- done -- for l in th th_TH; do -- echo "$l TIS-620" -- done -- for l in fa fa_IR; do -- #echo "$l ISIRI-3342" # a broken encoding -- echo "$l.utf-8 UTF-8" -- done -- ;; -- linux* | *-gnu*) -- # With glibc-2.1 or newer, we don't need any canonicalization, -- # because glibc has iconv and both glibc and libiconv support all -- # GNU canonical names directly. Therefore, the Makefile does not -- # need to install the alias file at all. -- # The following applies only to glibc-2.0.x and older libcs. -- echo "ISO_646.IRV:1983 ASCII" -- ;; -- aix*) -- echo "ISO8859-1 ISO-8859-1" -- echo "ISO8859-2 ISO-8859-2" -- echo "ISO8859-5 ISO-8859-5" -- echo "ISO8859-6 ISO-8859-6" -- echo "ISO8859-7 ISO-8859-7" -- echo "ISO8859-8 ISO-8859-8" -- echo "ISO8859-9 ISO-8859-9" -- echo "ISO8859-15 ISO-8859-15" -- echo "IBM-850 CP850" -- echo "IBM-856 CP856" -- echo "IBM-921 ISO-8859-13" -- echo "IBM-922 CP922" -- echo "IBM-932 CP932" -- echo "IBM-943 CP943" -- echo "IBM-1046 CP1046" -- echo "IBM-1124 CP1124" -- echo "IBM-1129 CP1129" -- echo "IBM-1252 CP1252" -- echo "IBM-eucCN GB2312" -- echo "IBM-eucJP EUC-JP" -- echo "IBM-eucKR EUC-KR" -- echo "IBM-eucTW EUC-TW" -- echo "big5 BIG5" -- echo "GBK GBK" -- echo "TIS-620 TIS-620" -- echo "UTF-8 UTF-8" -- ;; -- hpux*) -- echo "iso88591 ISO-8859-1" -- echo "iso88592 ISO-8859-2" -- echo "iso88595 ISO-8859-5" -- echo "iso88596 ISO-8859-6" -- echo "iso88597 ISO-8859-7" -- echo "iso88598 ISO-8859-8" -- echo "iso88599 ISO-8859-9" -- echo "iso885915 ISO-8859-15" -- echo "roman8 HP-ROMAN8" -- echo "arabic8 HP-ARABIC8" -- echo "greek8 HP-GREEK8" -- echo "hebrew8 HP-HEBREW8" -- echo "turkish8 HP-TURKISH8" -- echo "kana8 HP-KANA8" -- echo "tis620 TIS-620" -- echo "big5 BIG5" -- echo "eucJP EUC-JP" -- echo "eucKR EUC-KR" -- echo "eucTW EUC-TW" -- echo "hp15CN GB2312" -- #echo "ccdc ?" # what is this? -- echo "SJIS SHIFT_JIS" -- echo "utf8 UTF-8" -- ;; -- irix*) -- echo "ISO8859-1 ISO-8859-1" -- echo "ISO8859-2 ISO-8859-2" -- echo "ISO8859-5 ISO-8859-5" -- echo "ISO8859-7 ISO-8859-7" -- echo "ISO8859-9 ISO-8859-9" -- echo "eucCN GB2312" -- echo "eucJP EUC-JP" -- echo "eucKR EUC-KR" -- echo "eucTW EUC-TW" -- ;; -- osf*) -- echo "ISO8859-1 ISO-8859-1" -- echo "ISO8859-2 ISO-8859-2" -- echo "ISO8859-4 ISO-8859-4" -- echo "ISO8859-5 ISO-8859-5" -- echo "ISO8859-7 ISO-8859-7" -- echo "ISO8859-8 ISO-8859-8" -- echo "ISO8859-9 ISO-8859-9" -- echo "ISO8859-15 ISO-8859-15" -- echo "cp850 CP850" -- echo "big5 BIG5" -- echo "dechanyu DEC-HANYU" -- echo "dechanzi GB2312" -- echo "deckanji DEC-KANJI" -- echo "deckorean EUC-KR" -- echo "eucJP EUC-JP" -- echo "eucKR EUC-KR" -- echo "eucTW EUC-TW" -- echo "GBK GBK" -- echo "KSC5601 CP949" -- echo "sdeckanji EUC-JP" -- echo "SJIS SHIFT_JIS" -- echo "TACTIS TIS-620" -- echo "UTF-8 UTF-8" -- ;; -- solaris*) -- echo "646 ASCII" -- echo "ISO8859-1 ISO-8859-1" -- echo "ISO8859-2 ISO-8859-2" -- echo "ISO8859-3 ISO-8859-3" -- echo "ISO8859-4 ISO-8859-4" -- echo "ISO8859-5 ISO-8859-5" -- echo "ISO8859-6 ISO-8859-6" -- echo "ISO8859-7 ISO-8859-7" -- echo "ISO8859-8 ISO-8859-8" -- echo "ISO8859-9 ISO-8859-9" -- echo "ISO8859-15 ISO-8859-15" -- echo "koi8-r KOI8-R" -- echo "ansi-1251 CP1251" -- echo "BIG5 BIG5" -- echo "Big5-HKSCS BIG5-HKSCS" -- echo "gb2312 GB2312" -- echo "GBK GBK" -- echo "GB18030 GB18030" -- echo "cns11643 EUC-TW" -- echo "5601 EUC-KR" -- echo "ko_KR.johap92 JOHAB" -- echo "eucJP EUC-JP" -- echo "PCK SHIFT_JIS" -- echo "TIS620.2533 TIS-620" -- #echo "sun_eu_greek ?" # what is this? -- echo "UTF-8 UTF-8" -- ;; -- freebsd* | os2*) -- # FreeBSD 4.2 doesn't have nl_langinfo(CODESET); therefore -- # localcharset.c falls back to using the full locale name -- # from the environment variables. -- # Likewise for OS/2. OS/2 has XFree86 just like FreeBSD. Just -- # reuse FreeBSD's locale data for OS/2. -- echo "C ASCII" -- echo "US-ASCII ASCII" -- for l in la_LN lt_LN; do -- echo "$l.ASCII ASCII" -- done -- for l in da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_US es_ES \ -- fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH it_IT la_LN \ -- lt_LN nl_BE nl_NL no_NO pt_PT sv_SE; do -- echo "$l.ISO_8859-1 ISO-8859-1" -- echo "$l.DIS_8859-15 ISO-8859-15" -- done -- for l in cs_CZ hr_HR hu_HU la_LN lt_LN pl_PL sl_SI; do -- echo "$l.ISO_8859-2 ISO-8859-2" -- done -- for l in la_LN lt_LT; do -- echo "$l.ISO_8859-4 ISO-8859-4" -- done -- for l in ru_RU ru_SU; do -- echo "$l.KOI8-R KOI8-R" -- echo "$l.ISO_8859-5 ISO-8859-5" -- echo "$l.CP866 CP866" -- done -- echo "uk_UA.KOI8-U KOI8-U" -- echo "zh_TW.BIG5 BIG5" -- echo "zh_TW.Big5 BIG5" -- echo "zh_CN.EUC GB2312" -- echo "ja_JP.EUC EUC-JP" -- echo "ja_JP.SJIS SHIFT_JIS" -- echo "ja_JP.Shift_JIS SHIFT_JIS" -- echo "ko_KR.EUC EUC-KR" -- ;; -- netbsd*) -- echo "646 ASCII" -- echo "ISO8859-1 ISO-8859-1" -- echo "ISO8859-2 ISO-8859-2" -- echo "ISO8859-4 ISO-8859-4" -- echo "ISO8859-5 ISO-8859-5" -- echo "ISO8859-7 ISO-8859-7" -- echo "ISO8859-13 ISO-8859-13" -- echo "ISO8859-15 ISO-8859-15" -- echo "eucCN GB2312" -- echo "eucJP EUC-JP" -- echo "eucKR EUC-KR" -- echo "eucTW EUC-TW" -- echo "BIG5 BIG5" -- echo "SJIS SHIFT_JIS" -- ;; -- darwin[56]*) -- # Darwin 6.8 doesn't have nl_langinfo(CODESET); therefore -- # localcharset.c falls back to using the full locale name -- # from the environment variables. -- echo "C ASCII" -- for l in en_AU en_CA en_GB en_US la_LN; do -- echo "$l.US-ASCII ASCII" -- done -- for l in da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_US es_ES \ -- fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH it_IT nl_BE \ -- nl_NL no_NO pt_PT sv_SE; do -- echo "$l ISO-8859-1" -- echo "$l.ISO8859-1 ISO-8859-1" -- echo "$l.ISO8859-15 ISO-8859-15" -- done -- for l in la_LN; do -- echo "$l.ISO8859-1 ISO-8859-1" -- echo "$l.ISO8859-15 ISO-8859-15" -- done -- for l in cs_CZ hr_HR hu_HU la_LN pl_PL sl_SI; do -- echo "$l.ISO8859-2 ISO-8859-2" -- done -- for l in la_LN lt_LT; do -- echo "$l.ISO8859-4 ISO-8859-4" -- done -- for l in ru_RU; do -- echo "$l.KOI8-R KOI8-R" -- echo "$l.ISO8859-5 ISO-8859-5" -- echo "$l.CP866 CP866" -- done -- for l in bg_BG; do -- echo "$l.CP1251 CP1251" -- done -- echo "uk_UA.KOI8-U KOI8-U" -- echo "zh_TW.BIG5 BIG5" -- echo "zh_TW.Big5 BIG5" -- echo "zh_CN.EUC GB2312" -- echo "ja_JP.EUC EUC-JP" -- echo "ja_JP.SJIS SHIFT_JIS" -- echo "ko_KR.EUC EUC-KR" -- ;; -- darwin*) -- # Darwin 7.5 has nl_langinfo(CODESET), but it is useless: -- # - It returns the empty string when LANG is set to a locale of the -- # form ll_CC, although ll_CC/LC_CTYPE is a symlink to an UTF-8 -- # LC_CTYPE file. -- # - The environment variables LANG, LC_CTYPE, LC_ALL are not set by -- # the system; nl_langinfo(CODESET) returns "US-ASCII" in this case. -- # - The documentation says: -- # "... all code that calls BSD system routines should ensure -- # that the const *char parameters of these routines are in UTF-8 -- # encoding. All BSD system functions expect their string -- # parameters to be in UTF-8 encoding and nothing else." -- # It also says -- # "An additional caveat is that string parameters for files, -- # paths, and other file-system entities must be in canonical -- # UTF-8. In a canonical UTF-8 Unicode string, all decomposable -- # characters are decomposed ..." -- # but this is not true: You can pass non-decomposed UTF-8 strings -- # to file system functions, and it is the OS which will convert -- # them to decomposed UTF-8 before accessing the file system. -- # - The Apple Terminal application displays UTF-8 by default. -- # - However, other applications are free to use different encodings: -- # - xterm uses ISO-8859-1 by default. -- # - TextEdit uses MacRoman by default. -- # We prefer UTF-8 over decomposed UTF-8-MAC because one should -- # minimize the use of decomposed Unicode. Unfortunately, through the -- # Darwin file system, decomposed UTF-8 strings are leaked into user -- # space nevertheless. -- echo "* UTF-8" -- ;; -- beos*) -- # BeOS has a single locale, and it has UTF-8 encoding. -- echo "* UTF-8" -- ;; -- msdosdjgpp*) -- # DJGPP 2.03 doesn't have nl_langinfo(CODESET); therefore -- # localcharset.c falls back to using the full locale name -- # from the environment variables. -- echo "#" -- echo "# The encodings given here may not all be correct." -- echo "# If you find that the encoding given for your language and" -- echo "# country is not the one your DOS machine actually uses, just" -- echo "# correct it in this file, and send a mail to" -- echo "# Juan Manuel Guerrero <juan.guerrero@gmx.de>" -- echo "# and Bruno Haible <bruno@clisp.org>." -- echo "#" -- echo "C ASCII" -- # ISO-8859-1 languages -- echo "ca CP850" -- echo "ca_ES CP850" -- echo "da CP865" # not CP850 ?? -- echo "da_DK CP865" # not CP850 ?? -- echo "de CP850" -- echo "de_AT CP850" -- echo "de_CH CP850" -- echo "de_DE CP850" -- echo "en CP850" -- echo "en_AU CP850" # not CP437 ?? -- echo "en_CA CP850" -- echo "en_GB CP850" -- echo "en_NZ CP437" -- echo "en_US CP437" -- echo "en_ZA CP850" # not CP437 ?? -- echo "es CP850" -- echo "es_AR CP850" -- echo "es_BO CP850" -- echo "es_CL CP850" -- echo "es_CO CP850" -- echo "es_CR CP850" -- echo "es_CU CP850" -- echo "es_DO CP850" -- echo "es_EC CP850" -- echo "es_ES CP850" -- echo "es_GT CP850" -- echo "es_HN CP850" -- echo "es_MX CP850" -- echo "es_NI CP850" -- echo "es_PA CP850" -- echo "es_PY CP850" -- echo "es_PE CP850" -- echo "es_SV CP850" -- echo "es_UY CP850" -- echo "es_VE CP850" -- echo "et CP850" -- echo "et_EE CP850" -- echo "eu CP850" -- echo "eu_ES CP850" -- echo "fi CP850" -- echo "fi_FI CP850" -- echo "fr CP850" -- echo "fr_BE CP850" -- echo "fr_CA CP850" -- echo "fr_CH CP850" -- echo "fr_FR CP850" -- echo "ga CP850" -- echo "ga_IE CP850" -- echo "gd CP850" -- echo "gd_GB CP850" -- echo "gl CP850" -- echo "gl_ES CP850" -- echo "id CP850" # not CP437 ?? -- echo "id_ID CP850" # not CP437 ?? -- echo "is CP861" # not CP850 ?? -- echo "is_IS CP861" # not CP850 ?? -- echo "it CP850" -- echo "it_CH CP850" -- echo "it_IT CP850" -- echo "lt CP775" -- echo "lt_LT CP775" -- echo "lv CP775" -- echo "lv_LV CP775" -- echo "nb CP865" # not CP850 ?? -- echo "nb_NO CP865" # not CP850 ?? -- echo "nl CP850" -- echo "nl_BE CP850" -- echo "nl_NL CP850" -- echo "nn CP865" # not CP850 ?? -- echo "nn_NO CP865" # not CP850 ?? -- echo "no CP865" # not CP850 ?? -- echo "no_NO CP865" # not CP850 ?? -- echo "pt CP850" -- echo "pt_BR CP850" -- echo "pt_PT CP850" -- echo "sv CP850" -- echo "sv_SE CP850" -- # ISO-8859-2 languages -- echo "cs CP852" -- echo "cs_CZ CP852" -- echo "hr CP852" -- echo "hr_HR CP852" -- echo "hu CP852" -- echo "hu_HU CP852" -- echo "pl CP852" -- echo "pl_PL CP852" -- echo "ro CP852" -- echo "ro_RO CP852" -- echo "sk CP852" -- echo "sk_SK CP852" -- echo "sl CP852" -- echo "sl_SI CP852" -- echo "sq CP852" -- echo "sq_AL CP852" -- echo "sr CP852" # CP852 or CP866 or CP855 ?? -- echo "sr_CS CP852" # CP852 or CP866 or CP855 ?? -- echo "sr_YU CP852" # CP852 or CP866 or CP855 ?? -- # ISO-8859-3 languages -- echo "mt CP850" -- echo "mt_MT CP850" -- # ISO-8859-5 languages -- echo "be CP866" -- echo "be_BE CP866" -- echo "bg CP866" # not CP855 ?? -- echo "bg_BG CP866" # not CP855 ?? -- echo "mk CP866" # not CP855 ?? -- echo "mk_MK CP866" # not CP855 ?? -- echo "ru CP866" -- echo "ru_RU CP866" -- echo "uk CP1125" -- echo "uk_UA CP1125" -- # ISO-8859-6 languages -- echo "ar CP864" -- echo "ar_AE CP864" -- echo "ar_DZ CP864" -- echo "ar_EG CP864" -- echo "ar_IQ CP864" -- echo "ar_IR CP864" -- echo "ar_JO CP864" -- echo "ar_KW CP864" -- echo "ar_MA CP864" -- echo "ar_OM CP864" -- echo "ar_QA CP864" -- echo "ar_SA CP864" -- echo "ar_SY CP864" -- # ISO-8859-7 languages -- echo "el CP869" -- echo "el_GR CP869" -- # ISO-8859-8 languages -- echo "he CP862" -- echo "he_IL CP862" -- # ISO-8859-9 languages -- echo "tr CP857" -- echo "tr_TR CP857" -- # Japanese -- echo "ja CP932" -- echo "ja_JP CP932" -- # Chinese -- echo "zh_CN GBK" -- echo "zh_TW CP950" # not CP938 ?? -- # Korean -- echo "kr CP949" # not CP934 ?? -- echo "kr_KR CP949" # not CP934 ?? -- # Thai -- echo "th CP874" -- echo "th_TH CP874" -- # Other -- echo "eo CP850" -- echo "eo_EO CP850" -- ;; --esac ---- a/intl/dcgettext.c -+++ /dev/null -@@ -1,56 +0,0 @@ --/* Implementation of the dcgettext(3) function. -- Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc. -- -- This program is free software; you can redistribute it and/or modify it -- under the terms of the GNU Library General Public License as published -- by the Free Software Foundation; either version 2, or (at your option) -- any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Library General Public License for more details. -- -- You should have received a copy of the GNU Library General Public -- License along with this program; if not, write to the Free Software -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, -- USA. */ -- --#ifdef HAVE_CONFIG_H --# include <config.h> --#endif -- --#include "gettextP.h" --#ifdef _LIBC --# include <libintl.h> --#else --# include "libgnuintl.h" --#endif -- --/* @@ end of prolog @@ */ -- --/* Names for the libintl functions are a problem. They must not clash -- with existing names and they should follow ANSI C. But this source -- code is also used in GNU C Library where the names have a __ -- prefix. So we have to make a difference here. */ --#ifdef _LIBC --# define DCGETTEXT __dcgettext --# define DCIGETTEXT __dcigettext --#else --# define DCGETTEXT libintl_dcgettext --# define DCIGETTEXT libintl_dcigettext --#endif -- --/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY -- locale. */ --char * --DCGETTEXT (const char *domainname, const char *msgid, int category) --{ -- return DCIGETTEXT (domainname, msgid, NULL, 0, 0, category); --} -- --#ifdef _LIBC --/* Alias for function name in GNU C Library. */ --INTDEF(__dcgettext) --weak_alias (__dcgettext, dcgettext); --#endif ---- a/intl/dcigettext.c -+++ /dev/null -@@ -1,1689 +0,0 @@ --/* Implementation of the internal dcigettext function. -- Copyright (C) 1995-1999, 2000-2007 Free Software Foundation, Inc. -- -- This program is free software; you can redistribute it and/or modify it -- under the terms of the GNU Library General Public License as published -- by the Free Software Foundation; either version 2, or (at your option) -- any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Library General Public License for more details. -- -- You should have received a copy of the GNU Library General Public -- License along with this program; if not, write to the Free Software -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, -- USA. */ -- --/* Tell glibc's <string.h> to provide a prototype for mempcpy(). -- This must come before <config.h> because <config.h> may include -- <features.h>, and once <features.h> has been included, it's too late. */ --#ifndef _GNU_SOURCE --# define _GNU_SOURCE 1 --#endif -- --#ifdef HAVE_CONFIG_H --# include <config.h> --#endif -- --/* NL_LOCALE_NAME does not work in glibc-2.4. Ignore it. */ --#undef HAVE_NL_LOCALE_NAME -- --#include <sys/types.h> -- --#ifdef __GNUC__ --# define alloca __builtin_alloca --# define HAVE_ALLOCA 1 --#else --# ifdef _MSC_VER --# include <malloc.h> --# define alloca _alloca --# else --# if defined HAVE_ALLOCA_H || defined _LIBC --# include <alloca.h> --# else --# ifdef _AIX -- #pragma alloca --# else --# ifndef alloca --char *alloca (); --# endif --# endif --# endif --# endif --#endif -- --#include <errno.h> --#ifndef errno --extern int errno; --#endif --#ifndef __set_errno --# define __set_errno(val) errno = (val) --#endif -- --#include <stddef.h> --#include <stdlib.h> --#include <string.h> -- --#if defined HAVE_UNISTD_H || defined _LIBC --# include <unistd.h> --#endif -- --#include <locale.h> -- --#ifdef _LIBC -- /* Guess whether integer division by zero raises signal SIGFPE. -- Set to 1 only if you know for sure. In case of doubt, set to 0. */ --# if defined __alpha__ || defined __arm__ || defined __i386__ \ -- || defined __m68k__ || defined __s390__ --# define INTDIV0_RAISES_SIGFPE 1 --# else --# define INTDIV0_RAISES_SIGFPE 0 --# endif --#endif --#if !INTDIV0_RAISES_SIGFPE --# include <signal.h> --#endif -- --#if defined HAVE_SYS_PARAM_H || defined _LIBC --# include <sys/param.h> --#endif -- --#if !defined _LIBC --# if HAVE_NL_LOCALE_NAME --# include <langinfo.h> --# endif --# include "localcharset.h" --#endif -- --#include "gettextP.h" --#include "plural-exp.h" --#ifdef _LIBC --# include <libintl.h> --#else --# ifdef IN_LIBGLOCALE --# include <libintl.h> --# endif --# include "libgnuintl.h" --#endif --#include "hash-string.h" -- --/* Handle multi-threaded applications. */ --#ifdef _LIBC --# include <bits/libc-lock.h> --# define gl_rwlock_define_initialized __libc_rwlock_define_initialized --# define gl_rwlock_rdlock __libc_rwlock_rdlock --# define gl_rwlock_wrlock __libc_rwlock_wrlock --# define gl_rwlock_unlock __libc_rwlock_unlock --#else --# include "lock.h" --#endif -- --/* Alignment of types. */ --#if defined __GNUC__ && __GNUC__ >= 2 --# define alignof(TYPE) __alignof__ (TYPE) --#else --# define alignof(TYPE) \ -- ((int) &((struct { char dummy1; TYPE dummy2; } *) 0)->dummy2) --#endif -- --/* Some compilers, like SunOS4 cc, don't have offsetof in <stddef.h>. */ --#ifndef offsetof --# define offsetof(type,ident) ((size_t)&(((type*)0)->ident)) --#endif -- --/* @@ end of prolog @@ */ -- --#ifdef _LIBC --/* Rename the non ANSI C functions. This is required by the standard -- because some ANSI C functions will require linking with this object -- file and the name space must not be polluted. */ --# define getcwd __getcwd --# ifndef stpcpy --# define stpcpy __stpcpy --# endif --# define tfind __tfind --#else --# if !defined HAVE_GETCWD --char *getwd (); --# define getcwd(buf, max) getwd (buf) --# else --# if VMS --# define getcwd(buf, max) (getcwd) (buf, max, 0) --# else --char *getcwd (); --# endif --# endif --# ifndef HAVE_STPCPY --static char *stpcpy (char *dest, const char *src); --# endif --# ifndef HAVE_MEMPCPY --static void *mempcpy (void *dest, const void *src, size_t n); --# endif --#endif -- --/* Use a replacement if the system does not provide the `tsearch' function -- family. */ --#if HAVE_TSEARCH || defined _LIBC --# include <search.h> --#else --# define tsearch libintl_tsearch --# define tfind libintl_tfind --# define tdelete libintl_tdelete --# define twalk libintl_twalk --# include "tsearch.h" --#endif -- --#ifdef _LIBC --# define tsearch __tsearch --#endif -- --/* Amount to increase buffer size by in each try. */ --#define PATH_INCR 32 -- --/* The following is from pathmax.h. */ --/* Non-POSIX BSD systems might have gcc's limits.h, which doesn't define -- PATH_MAX but might cause redefinition warnings when sys/param.h is -- later included (as on MORE/BSD 4.3). */ --#if defined _POSIX_VERSION || (defined HAVE_LIMITS_H && !defined __GNUC__) --# include <limits.h> --#endif -- --#ifndef _POSIX_PATH_MAX --# define _POSIX_PATH_MAX 255 --#endif -- --#if !defined PATH_MAX && defined _PC_PATH_MAX --# define PATH_MAX (pathconf ("/", _PC_PATH_MAX) < 1 ? 1024 : pathconf ("/", _PC_PATH_MAX)) --#endif -- --/* Don't include sys/param.h if it already has been. */ --#if defined HAVE_SYS_PARAM_H && !defined PATH_MAX && !defined MAXPATHLEN --# include <sys/param.h> --#endif -- --#if !defined PATH_MAX && defined MAXPATHLEN --# define PATH_MAX MAXPATHLEN --#endif -- --#ifndef PATH_MAX --# define PATH_MAX _POSIX_PATH_MAX --#endif -- --/* Pathname support. -- ISSLASH(C) tests whether C is a directory separator character. -- IS_ABSOLUTE_PATH(P) tests whether P is an absolute path. If it is not, -- it may be concatenated to a directory pathname. -- IS_PATH_WITH_DIR(P) tests whether P contains a directory specification. -- */ --#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__ -- /* Win32, Cygwin, OS/2, DOS */ --# define ISSLASH(C) ((C) == '/' || (C) == '\\') --# define HAS_DEVICE(P) \ -- ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \ -- && (P)[1] == ':') --# define IS_ABSOLUTE_PATH(P) (ISSLASH ((P)[0]) || HAS_DEVICE (P)) --# define IS_PATH_WITH_DIR(P) \ -- (strchr (P, '/') != NULL || strchr (P, '\\') != NULL || HAS_DEVICE (P)) --#else -- /* Unix */ --# define ISSLASH(C) ((C) == '/') --# define IS_ABSOLUTE_PATH(P) ISSLASH ((P)[0]) --# define IS_PATH_WITH_DIR(P) (strchr (P, '/') != NULL) --#endif -- --/* Whether to support different locales in different threads. */ --#if defined _LIBC || HAVE_NL_LOCALE_NAME || (HAVE_STRUCT___LOCALE_STRUCT___NAMES && defined USE_IN_GETTEXT_TESTS) || defined IN_LIBGLOCALE --# define HAVE_PER_THREAD_LOCALE --#endif -- --/* This is the type used for the search tree where known translations -- are stored. */ --struct known_translation_t --{ -- /* Domain in which to search. */ -- const char *domainname; -- -- /* The category. */ -- int category; -- --#ifdef HAVE_PER_THREAD_LOCALE -- /* Name of the relevant locale category, or "" for the global locale. */ -- const char *localename; --#endif -- --#ifdef IN_LIBGLOCALE -- /* The character encoding. */ -- const char *encoding; --#endif -- -- /* State of the catalog counter at the point the string was found. */ -- int counter; -- -- /* Catalog where the string was found. */ -- struct loaded_l10nfile *domain; -- -- /* And finally the translation. */ -- const char *translation; -- size_t translation_length; -- -- /* Pointer to the string in question. */ -- char msgid[ZERO]; --}; -- --gl_rwlock_define_initialized (static, tree_lock) -- --/* Root of the search tree with known translations. */ --static void *root; -- --/* Function to compare two entries in the table of known translations. */ --static int --transcmp (const void *p1, const void *p2) --{ -- const struct known_translation_t *s1; -- const struct known_translation_t *s2; -- int result; -- -- s1 = (const struct known_translation_t *) p1; -- s2 = (const struct known_translation_t *) p2; -- -- result = strcmp (s1->msgid, s2->msgid); -- if (result == 0) -- { -- result = strcmp (s1->domainname, s2->domainname); -- if (result == 0) -- { --#ifdef HAVE_PER_THREAD_LOCALE -- result = strcmp (s1->localename, s2->localename); -- if (result == 0) --#endif -- { --#ifdef IN_LIBGLOCALE -- result = strcmp (s1->encoding, s2->encoding); -- if (result == 0) --#endif -- /* We compare the category last (though this is the cheapest -- operation) since it is hopefully always the same (namely -- LC_MESSAGES). */ -- result = s1->category - s2->category; -- } -- } -- } -- -- return result; --} -- --/* Name of the default domain used for gettext(3) prior any call to -- textdomain(3). The default value for this is "messages". */ --const char _nl_default_default_domain[] attribute_hidden = "messages"; -- --#ifndef IN_LIBGLOCALE --/* Value used as the default domain for gettext(3). */ --const char *_nl_current_default_domain attribute_hidden -- = _nl_default_default_domain; --#endif -- --/* Contains the default location of the message catalogs. */ --#if defined __EMX__ --extern const char _nl_default_dirname[]; --#else --# ifdef _LIBC --extern const char _nl_default_dirname[]; --libc_hidden_proto (_nl_default_dirname) --# endif --const char _nl_default_dirname[] = LOCALEDIR; --# ifdef _LIBC --libc_hidden_data_def (_nl_default_dirname) --# endif --#endif -- --#ifndef IN_LIBGLOCALE --/* List with bindings of specific domains created by bindtextdomain() -- calls. */ --struct binding *_nl_domain_bindings; --#endif -- --/* Prototypes for local functions. */ --static char *plural_lookup (struct loaded_l10nfile *domain, -- unsigned long int n, -- const char *translation, size_t translation_len) -- internal_function; -- --#ifdef IN_LIBGLOCALE --static const char *guess_category_value (int category, -- const char *categoryname, -- const char *localename) -- internal_function; --#else --static const char *guess_category_value (int category, -- const char *categoryname) -- internal_function; --#endif -- --#ifdef _LIBC --# include "../locale/localeinfo.h" --# define category_to_name(category) \ -- _nl_category_names.str + _nl_category_name_idxs[category] --#else --static const char *category_to_name (int category) internal_function; --#endif --#if (defined _LIBC || HAVE_ICONV) && !defined IN_LIBGLOCALE --static const char *get_output_charset (struct binding *domainbinding) -- internal_function; --#endif -- -- --/* For those loosing systems which don't have `alloca' we have to add -- some additional code emulating it. */ --#ifdef HAVE_ALLOCA --/* Nothing has to be done. */ --# define freea(p) /* nothing */ --# define ADD_BLOCK(list, address) /* nothing */ --# define FREE_BLOCKS(list) /* nothing */ --#else --struct block_list --{ -- void *address; -- struct block_list *next; --}; --# define ADD_BLOCK(list, addr) \ -- do { \ -- struct block_list *newp = (struct block_list *) malloc (sizeof (*newp)); \ -- /* If we cannot get a free block we cannot add the new element to \ -- the list. */ \ -- if (newp != NULL) { \ -- newp->address = (addr); \ -- newp->next = (list); \ -- (list) = newp; \ -- } \ -- } while (0) --# define FREE_BLOCKS(list) \ -- do { \ -- while (list != NULL) { \ -- struct block_list *old = list; \ -- list = list->next; \ -- free (old->address); \ -- free (old); \ -- } \ -- } while (0) --# undef alloca --# define alloca(size) (malloc (size)) --# define freea(p) free (p) --#endif /* have alloca */ -- -- --#ifdef _LIBC --/* List of blocks allocated for translations. */ --typedef struct transmem_list --{ -- struct transmem_list *next; -- char data[ZERO]; --} transmem_block_t; --static struct transmem_list *transmem_list; --#else --typedef unsigned char transmem_block_t; --#endif -- -- --/* Names for the libintl functions are a problem. They must not clash -- with existing names and they should follow ANSI C. But this source -- code is also used in GNU C Library where the names have a __ -- prefix. So we have to make a difference here. */ --#ifdef _LIBC --# define DCIGETTEXT __dcigettext --#else --# define DCIGETTEXT libintl_dcigettext --#endif -- --/* Lock variable to protect the global data in the gettext implementation. */ --gl_rwlock_define_initialized (, _nl_state_lock attribute_hidden) -- --/* Checking whether the binaries runs SUID must be done and glibc provides -- easier methods therefore we make a difference here. */ --#ifdef _LIBC --# define ENABLE_SECURE __libc_enable_secure --# define DETERMINE_SECURE --#else --# ifndef HAVE_GETUID --# define getuid() 0 --# endif --# ifndef HAVE_GETGID --# define getgid() 0 --# endif --# ifndef HAVE_GETEUID --# define geteuid() getuid() --# endif --# ifndef HAVE_GETEGID --# define getegid() getgid() --# endif --static int enable_secure; --# define ENABLE_SECURE (enable_secure == 1) --# define DETERMINE_SECURE \ -- if (enable_secure == 0) \ -- { \ -- if (getuid () != geteuid () || getgid () != getegid ()) \ -- enable_secure = 1; \ -- else \ -- enable_secure = -1; \ -- } --#endif -- --/* Get the function to evaluate the plural expression. */ --#include "eval-plural.h" -- --/* Look up MSGID in the DOMAINNAME message catalog for the current -- CATEGORY locale and, if PLURAL is nonzero, search over string -- depending on the plural form determined by N. */ --#ifdef IN_LIBGLOCALE --char * --gl_dcigettext (const char *domainname, -- const char *msgid1, const char *msgid2, -- int plural, unsigned long int n, -- int category, -- const char *localename, const char *encoding) --#else --char * --DCIGETTEXT (const char *domainname, const char *msgid1, const char *msgid2, -- int plural, unsigned long int n, int category) --#endif --{ --#ifndef HAVE_ALLOCA -- struct block_list *block_list = NULL; --#endif -- struct loaded_l10nfile *domain; -- struct binding *binding; -- const char *categoryname; -- const char *categoryvalue; -- const char *dirname; -- char *xdomainname; -- char *single_locale; -- char *retval; -- size_t retlen; -- int saved_errno; -- struct known_translation_t *search; -- struct known_translation_t **foundp = NULL; -- size_t msgid_len; --#if defined HAVE_PER_THREAD_LOCALE && !defined IN_LIBGLOCALE -- const char *localename; --#endif -- size_t domainname_len; -- -- /* If no real MSGID is given return NULL. */ -- if (msgid1 == NULL) -- return NULL; -- --#ifdef _LIBC -- if (category < 0 || category >= __LC_LAST || category == LC_ALL) -- /* Bogus. */ -- return (plural == 0 -- ? (char *) msgid1 -- /* Use the Germanic plural rule. */ -- : n == 1 ? (char *) msgid1 : (char *) msgid2); --#endif -- -- /* Preserve the `errno' value. */ -- saved_errno = errno; -- -- gl_rwlock_rdlock (_nl_state_lock); -- -- /* If DOMAINNAME is NULL, we are interested in the default domain. If -- CATEGORY is not LC_MESSAGES this might not make much sense but the -- definition left this undefined. */ -- if (domainname == NULL) -- domainname = _nl_current_default_domain; -- -- /* OS/2 specific: backward compatibility with older libintl versions */ --#ifdef LC_MESSAGES_COMPAT -- if (category == LC_MESSAGES_COMPAT) -- category = LC_MESSAGES; --#endif -- -- msgid_len = strlen (msgid1) + 1; -- -- /* Try to find the translation among those which we found at -- some time. */ -- search = (struct known_translation_t *) -- alloca (offsetof (struct known_translation_t, msgid) + msgid_len); -- memcpy (search->msgid, msgid1, msgid_len); -- search->domainname = domainname; -- search->category = category; --#ifdef HAVE_PER_THREAD_LOCALE --# ifndef IN_LIBGLOCALE --# ifdef _LIBC -- localename = __current_locale_name (category); --# else --# if HAVE_NL_LOCALE_NAME -- /* NL_LOCALE_NAME is public glibc API introduced in glibc-2.4. */ -- localename = nl_langinfo (NL_LOCALE_NAME (category)); --# else --# if HAVE_STRUCT___LOCALE_STRUCT___NAMES && defined USE_IN_GETTEXT_TESTS -- /* The __names field is not public glibc API and must therefore not be used -- in code that is installed in public locations. */ -- { -- locale_t thread_locale = uselocale (NULL); -- if (thread_locale != LC_GLOBAL_LOCALE) -- localename = thread_locale->__names[category]; -- else -- localename = ""; -- } --# endif --# endif --# endif --# endif -- search->localename = localename; --# ifdef IN_LIBGLOCALE -- search->encoding = encoding; --# endif -- -- /* Since tfind/tsearch manage a balanced tree, concurrent tfind and -- tsearch calls can be fatal. */ -- gl_rwlock_rdlock (tree_lock); -- -- foundp = (struct known_translation_t **) tfind (search, &root, transcmp); -- -- gl_rwlock_unlock (tree_lock); -- -- freea (search); -- if (foundp != NULL && (*foundp)->counter == _nl_msg_cat_cntr) -- { -- /* Now deal with plural. */ -- if (plural) -- retval = plural_lookup ((*foundp)->domain, n, (*foundp)->translation, -- (*foundp)->translation_length); -- else -- retval = (char *) (*foundp)->translation; -- -- gl_rwlock_unlock (_nl_state_lock); -- __set_errno (saved_errno); -- return retval; -- } --#endif -- -- /* See whether this is a SUID binary or not. */ -- DETERMINE_SECURE; -- -- /* First find matching binding. */ --#ifdef IN_LIBGLOCALE -- /* We can use a trivial binding, since _nl_find_msg will ignore it anyway, -- and _nl_load_domain and _nl_find_domain just pass it through. */ -- binding = NULL; -- dirname = bindtextdomain (domainname, NULL); --#else -- for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next) -- { -- int compare = strcmp (domainname, binding->domainname); -- if (compare == 0) -- /* We found it! */ -- break; -- if (compare < 0) -- { -- /* It is not in the list. */ -- binding = NULL; -- break; -- } -- } -- -- if (binding == NULL) -- dirname = _nl_default_dirname; -- else -- { -- dirname = binding->dirname; --#endif -- if (!IS_ABSOLUTE_PATH (dirname)) -- { -- /* We have a relative path. Make it absolute now. */ -- size_t dirname_len = strlen (dirname) + 1; -- size_t path_max; -- char *resolved_dirname; -- char *ret; -- -- path_max = (unsigned int) PATH_MAX; -- path_max += 2; /* The getcwd docs say to do this. */ -- -- for (;;) -- { -- resolved_dirname = (char *) alloca (path_max + dirname_len); -- ADD_BLOCK (block_list, tmp_dirname); -- -- __set_errno (0); -- ret = getcwd (resolved_dirname, path_max); -- if (ret != NULL || errno != ERANGE) -- break; -- -- path_max += path_max / 2; -- path_max += PATH_INCR; -- } -- -- if (ret == NULL) -- /* We cannot get the current working directory. Don't signal an -- error but simply return the default string. */ -- goto return_untranslated; -- -- stpcpy (stpcpy (strchr (resolved_dirname, '\0'), "/"), dirname); -- dirname = resolved_dirname; -- } --#ifndef IN_LIBGLOCALE -- } --#endif -- -- /* Now determine the symbolic name of CATEGORY and its value. */ -- categoryname = category_to_name (category); --#ifdef IN_LIBGLOCALE -- categoryvalue = guess_category_value (category, categoryname, localename); --#else -- categoryvalue = guess_category_value (category, categoryname); --#endif -- -- domainname_len = strlen (domainname); -- xdomainname = (char *) alloca (strlen (categoryname) -- + domainname_len + 5); -- ADD_BLOCK (block_list, xdomainname); -- -- stpcpy ((char *) mempcpy (stpcpy (stpcpy (xdomainname, categoryname), "/"), -- domainname, domainname_len), -- ".mo"); -- -- /* Creating working area. */ -- single_locale = (char *) alloca (strlen (categoryvalue) + 1); -- ADD_BLOCK (block_list, single_locale); -- -- -- /* Search for the given string. This is a loop because we perhaps -- got an ordered list of languages to consider for the translation. */ -- while (1) -- { -- /* Make CATEGORYVALUE point to the next element of the list. */ -- while (categoryvalue[0] != '\0' && categoryvalue[0] == ':') -- ++categoryvalue; -- if (categoryvalue[0] == '\0') -- { -- /* The whole contents of CATEGORYVALUE has been searched but -- no valid entry has been found. We solve this situation -- by implicitly appending a "C" entry, i.e. no translation -- will take place. */ -- single_locale[0] = 'C'; -- single_locale[1] = '\0'; -- } -- else -- { -- char *cp = single_locale; -- while (categoryvalue[0] != '\0' && categoryvalue[0] != ':') -- *cp++ = *categoryvalue++; -- *cp = '\0'; -- -- /* When this is a SUID binary we must not allow accessing files -- outside the dedicated directories. */ -- if (ENABLE_SECURE && IS_PATH_WITH_DIR (single_locale)) -- /* Ingore this entry. */ -- continue; -- } -- -- /* If the current locale value is C (or POSIX) we don't load a -- domain. Return the MSGID. */ -- if (strcmp (single_locale, "C") == 0 -- || strcmp (single_locale, "POSIX") == 0) -- break; -- -- /* Find structure describing the message catalog matching the -- DOMAINNAME and CATEGORY. */ -- domain = _nl_find_domain (dirname, single_locale, xdomainname, binding); -- -- if (domain != NULL) -- { --#if defined IN_LIBGLOCALE -- retval = _nl_find_msg (domain, binding, encoding, msgid1, &retlen); --#else -- retval = _nl_find_msg (domain, binding, msgid1, 1, &retlen); --#endif -- -- if (retval == NULL) -- { -- int cnt; -- -- for (cnt = 0; domain->successor[cnt] != NULL; ++cnt) -- { --#if defined IN_LIBGLOCALE -- retval = _nl_find_msg (domain->successor[cnt], binding, -- encoding, msgid1, &retlen); --#else -- retval = _nl_find_msg (domain->successor[cnt], binding, -- msgid1, 1, &retlen); --#endif -- -- if (retval != NULL) -- { -- domain = domain->successor[cnt]; -- break; -- } -- } -- } -- -- /* Returning -1 means that some resource problem exists -- (likely memory) and that the strings could not be -- converted. Return the original strings. */ -- if (__builtin_expect (retval == (char *) -1, 0)) -- break; -- -- if (retval != NULL) -- { -- /* Found the translation of MSGID1 in domain DOMAIN: -- starting at RETVAL, RETLEN bytes. */ -- FREE_BLOCKS (block_list); -- if (foundp == NULL) -- { -- /* Create a new entry and add it to the search tree. */ -- size_t size; -- struct known_translation_t *newp; -- -- size = offsetof (struct known_translation_t, msgid) -- + msgid_len + domainname_len + 1; --#ifdef HAVE_PER_THREAD_LOCALE -- size += strlen (localename) + 1; --#endif -- newp = (struct known_translation_t *) malloc (size); -- if (newp != NULL) -- { -- char *new_domainname; --#ifdef HAVE_PER_THREAD_LOCALE -- char *new_localename; --#endif -- -- new_domainname = -- (char *) mempcpy (newp->msgid, msgid1, msgid_len); -- memcpy (new_domainname, domainname, domainname_len + 1); --#ifdef HAVE_PER_THREAD_LOCALE -- new_localename = new_domainname + domainname_len + 1; -- strcpy (new_localename, localename); --#endif -- newp->domainname = new_domainname; -- newp->category = category; --#ifdef HAVE_PER_THREAD_LOCALE -- newp->localename = new_localename; --#endif --#ifdef IN_LIBGLOCALE -- newp->encoding = encoding; --#endif -- newp->counter = _nl_msg_cat_cntr; -- newp->domain = domain; -- newp->translation = retval; -- newp->translation_length = retlen; -- -- gl_rwlock_wrlock (tree_lock); -- -- /* Insert the entry in the search tree. */ -- foundp = (struct known_translation_t **) -- tsearch (newp, &root, transcmp); -- -- gl_rwlock_unlock (tree_lock); -- -- if (foundp == NULL -- || __builtin_expect (*foundp != newp, 0)) -- /* The insert failed. */ -- free (newp); -- } -- } -- else -- { -- /* We can update the existing entry. */ -- (*foundp)->counter = _nl_msg_cat_cntr; -- (*foundp)->domain = domain; -- (*foundp)->translation = retval; -- (*foundp)->translation_length = retlen; -- } -- -- __set_errno (saved_errno); -- -- /* Now deal with plural. */ -- if (plural) -- retval = plural_lookup (domain, n, retval, retlen); -- -- gl_rwlock_unlock (_nl_state_lock); -- return retval; -- } -- } -- } -- -- return_untranslated: -- /* Return the untranslated MSGID. */ -- FREE_BLOCKS (block_list); -- gl_rwlock_unlock (_nl_state_lock); --#ifndef _LIBC -- if (!ENABLE_SECURE) -- { -- extern void _nl_log_untranslated (const char *logfilename, -- const char *domainname, -- const char *msgid1, const char *msgid2, -- int plural); -- const char *logfilename = getenv ("GETTEXT_LOG_UNTRANSLATED"); -- -- if (logfilename != NULL && logfilename[0] != '\0') -- _nl_log_untranslated (logfilename, domainname, msgid1, msgid2, plural); -- } --#endif -- __set_errno (saved_errno); -- return (plural == 0 -- ? (char *) msgid1 -- /* Use the Germanic plural rule. */ -- : n == 1 ? (char *) msgid1 : (char *) msgid2); --} -- -- --/* Look up the translation of msgid within DOMAIN_FILE and DOMAINBINDING. -- Return it if found. Return NULL if not found or in case of a conversion -- failure (problem in the particular message catalog). Return (char *) -1 -- in case of a memory allocation failure during conversion (only if -- ENCODING != NULL resp. CONVERT == true). */ --char * --internal_function --#ifdef IN_LIBGLOCALE --_nl_find_msg (struct loaded_l10nfile *domain_file, -- struct binding *domainbinding, const char *encoding, -- const char *msgid, -- size_t *lengthp) --#else --_nl_find_msg (struct loaded_l10nfile *domain_file, -- struct binding *domainbinding, -- const char *msgid, int convert, -- size_t *lengthp) --#endif --{ -- struct loaded_domain *domain; -- nls_uint32 nstrings; -- size_t act; -- char *result; -- size_t resultlen; -- -- if (domain_file->decided <= 0) -- _nl_load_domain (domain_file, domainbinding); -- -- if (domain_file->data == NULL) -- return NULL; -- -- domain = (struct loaded_domain *) domain_file->data; -- -- nstrings = domain->nstrings; -- -- /* Locate the MSGID and its translation. */ -- if (domain->hash_tab != NULL) -- { -- /* Use the hashing table. */ -- nls_uint32 len = strlen (msgid); -- nls_uint32 hash_val = __hash_string (msgid); -- nls_uint32 idx = hash_val % domain->hash_size; -- nls_uint32 incr = 1 + (hash_val % (domain->hash_size - 2)); -- -- while (1) -- { -- nls_uint32 nstr = -- W (domain->must_swap_hash_tab, domain->hash_tab[idx]); -- -- if (nstr == 0) -- /* Hash table entry is empty. */ -- return NULL; -- -- nstr--; -- -- /* Compare msgid with the original string at index nstr. -- We compare the lengths with >=, not ==, because plural entries -- are represented by strings with an embedded NUL. */ -- if (nstr < nstrings -- ? W (domain->must_swap, domain->orig_tab[nstr].length) >= len -- && (strcmp (msgid, -- domain->data + W (domain->must_swap, -- domain->orig_tab[nstr].offset)) -- == 0) -- : domain->orig_sysdep_tab[nstr - nstrings].length > len -- && (strcmp (msgid, -- domain->orig_sysdep_tab[nstr - nstrings].pointer) -- == 0)) -- { -- act = nstr; -- goto found; -- } -- -- if (idx >= domain->hash_size - incr) -- idx -= domain->hash_size - incr; -- else -- idx += incr; -- } -- /* NOTREACHED */ -- } -- else -- { -- /* Try the default method: binary search in the sorted array of -- messages. */ -- size_t top, bottom; -- -- bottom = 0; -- top = nstrings; -- while (bottom < top) -- { -- int cmp_val; -- -- act = (bottom + top) / 2; -- cmp_val = strcmp (msgid, (domain->data -- + W (domain->must_swap, -- domain->orig_tab[act].offset))); -- if (cmp_val < 0) -- top = act; -- else if (cmp_val > 0) -- bottom = act + 1; -- else -- goto found; -- } -- /* No translation was found. */ -- return NULL; -- } -- -- found: -- /* The translation was found at index ACT. If we have to convert the -- string to use a different character set, this is the time. */ -- if (act < nstrings) -- { -- result = (char *) -- (domain->data + W (domain->must_swap, domain->trans_tab[act].offset)); -- resultlen = W (domain->must_swap, domain->trans_tab[act].length) + 1; -- } -- else -- { -- result = (char *) domain->trans_sysdep_tab[act - nstrings].pointer; -- resultlen = domain->trans_sysdep_tab[act - nstrings].length; -- } -- --#if defined _LIBC || HAVE_ICONV --# ifdef IN_LIBGLOCALE -- if (encoding != NULL) --# else -- if (convert) --# endif -- { -- /* We are supposed to do a conversion. */ --# ifndef IN_LIBGLOCALE -- const char *encoding = get_output_charset (domainbinding); --# endif -- size_t nconversions; -- struct converted_domain *convd; -- size_t i; -- -- /* Protect against reallocation of the table. */ -- gl_rwlock_rdlock (domain->conversions_lock); -- -- /* Search whether a table with converted translations for this -- encoding has already been allocated. */ -- nconversions = domain->nconversions; -- convd = NULL; -- -- for (i = nconversions; i > 0; ) -- { -- i--; -- if (strcmp (domain->conversions[i].encoding, encoding) == 0) -- { -- convd = &domain->conversions[i]; -- break; -- } -- } -- -- gl_rwlock_unlock (domain->conversions_lock); -- -- if (convd == NULL) -- { -- /* We have to allocate a new conversions table. */ -- gl_rwlock_wrlock (domain->conversions_lock); -- -- /* Maybe in the meantime somebody added the translation. -- Recheck. */ -- for (i = nconversions; i > 0; ) -- { -- i--; -- if (strcmp (domain->conversions[i].encoding, encoding) == 0) -- { -- convd = &domain->conversions[i]; -- goto found_convd; -- } -- } -- -- { -- /* Allocate a table for the converted translations for this -- encoding. */ -- struct converted_domain *new_conversions = -- (struct converted_domain *) -- (domain->conversions != NULL -- ? realloc (domain->conversions, -- (nconversions + 1) * sizeof (struct converted_domain)) -- : malloc ((nconversions + 1) * sizeof (struct converted_domain))); -- -- if (__builtin_expect (new_conversions == NULL, 0)) -- { -- /* Nothing we can do, no more memory. We cannot use the -- translation because it might be encoded incorrectly. */ -- unlock_fail: -- gl_rwlock_unlock (domain->conversions_lock); -- return (char *) -1; -- } -- -- domain->conversions = new_conversions; -- -- /* Copy the 'encoding' string to permanent storage. */ -- encoding = strdup (encoding); -- if (__builtin_expect (encoding == NULL, 0)) -- /* Nothing we can do, no more memory. We cannot use the -- translation because it might be encoded incorrectly. */ -- goto unlock_fail; -- -- convd = &new_conversions[nconversions]; -- convd->encoding = encoding; -- -- /* Find out about the character set the file is encoded with. -- This can be found (in textual form) in the entry "". If this -- entry does not exist or if this does not contain the 'charset=' -- information, we will assume the charset matches the one the -- current locale and we don't have to perform any conversion. */ --# ifdef _LIBC -- convd->conv = (__gconv_t) -1; --# else --# if HAVE_ICONV -- convd->conv = (iconv_t) -1; --# endif --# endif -- { -- char *nullentry; -- size_t nullentrylen; -- -- /* Get the header entry. This is a recursion, but it doesn't -- reallocate domain->conversions because we pass -- encoding = NULL or convert = 0, respectively. */ -- nullentry = --# ifdef IN_LIBGLOCALE -- _nl_find_msg (domain_file, domainbinding, NULL, "", -- &nullentrylen); --# else -- _nl_find_msg (domain_file, domainbinding, "", 0, &nullentrylen); --# endif -- -- if (nullentry != NULL) -- { -- const char *charsetstr; -- -- charsetstr = strstr (nullentry, "charset="); -- if (charsetstr != NULL) -- { -- size_t len; -- char *charset; -- const char *outcharset; -- -- charsetstr += strlen ("charset="); -- len = strcspn (charsetstr, " \t\n"); -- -- charset = (char *) alloca (len + 1); --# if defined _LIBC || HAVE_MEMPCPY -- *((char *) mempcpy (charset, charsetstr, len)) = '\0'; --# else -- memcpy (charset, charsetstr, len); -- charset[len] = '\0'; --# endif -- -- outcharset = encoding; -- --# ifdef _LIBC -- /* We always want to use transliteration. */ -- outcharset = norm_add_slashes (outcharset, "TRANSLIT"); -- charset = norm_add_slashes (charset, ""); -- int r = __gconv_open (outcharset, charset, &convd->conv, -- GCONV_AVOID_NOCONV); -- if (__builtin_expect (r != __GCONV_OK, 0)) -- { -- /* If the output encoding is the same there is -- nothing to do. Otherwise do not use the -- translation at all. */ -- if (__builtin_expect (r != __GCONV_NULCONV, 1)) -- { -- gl_rwlock_unlock (domain->conversions_lock); -- free ((char *) encoding); -- return NULL; -- } -- -- convd->conv = (__gconv_t) -1; -- } --# else --# if HAVE_ICONV -- /* When using GNU libc >= 2.2 or GNU libiconv >= 1.5, -- we want to use transliteration. */ --# if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2 \ -- || _LIBICONV_VERSION >= 0x0105 -- if (strchr (outcharset, '/') == NULL) -- { -- char *tmp; -- -- len = strlen (outcharset); -- tmp = (char *) alloca (len + 10 + 1); -- memcpy (tmp, outcharset, len); -- memcpy (tmp + len, "//TRANSLIT", 10 + 1); -- outcharset = tmp; -- -- convd->conv = iconv_open (outcharset, charset); -- -- freea (outcharset); -- } -- else --# endif -- convd->conv = iconv_open (outcharset, charset); --# endif --# endif -- -- freea (charset); -- } -- } -- } -- convd->conv_tab = NULL; -- /* Here domain->conversions is still == new_conversions. */ -- domain->nconversions++; -- } -- -- found_convd: -- gl_rwlock_unlock (domain->conversions_lock); -- } -- -- if ( --# ifdef _LIBC -- convd->conv != (__gconv_t) -1 --# else --# if HAVE_ICONV -- convd->conv != (iconv_t) -1 --# endif --# endif -- ) -- { -- /* We are supposed to do a conversion. First allocate an -- appropriate table with the same structure as the table -- of translations in the file, where we can put the pointers -- to the converted strings in. -- There is a slight complication with plural entries. They -- are represented by consecutive NUL terminated strings. We -- handle this case by converting RESULTLEN bytes, including -- NULs. */ -- -- if (convd->conv_tab == NULL -- && ((convd->conv_tab = -- (char **) calloc (nstrings + domain->n_sysdep_strings, -- sizeof (char *))) -- == NULL)) -- /* Mark that we didn't succeed allocating a table. */ -- convd->conv_tab = (char **) -1; -- -- if (__builtin_expect (convd->conv_tab == (char **) -1, 0)) -- /* Nothing we can do, no more memory. We cannot use the -- translation because it might be encoded incorrectly. */ -- return (char *) -1; -- -- if (convd->conv_tab[act] == NULL) -- { -- /* We haven't used this string so far, so it is not -- translated yet. Do this now. */ -- /* We use a bit more efficient memory handling. -- We allocate always larger blocks which get used over -- time. This is faster than many small allocations. */ -- __libc_lock_define_initialized (static, lock) --# define INITIAL_BLOCK_SIZE 4080 -- static unsigned char *freemem; -- static size_t freemem_size; -- -- const unsigned char *inbuf; -- unsigned char *outbuf; -- int malloc_count; --# ifndef _LIBC -- transmem_block_t *transmem_list = NULL; --# endif -- -- __libc_lock_lock (lock); -- -- inbuf = (const unsigned char *) result; -- outbuf = freemem + sizeof (size_t); -- -- malloc_count = 0; -- while (1) -- { -- transmem_block_t *newmem; --# ifdef _LIBC -- size_t non_reversible; -- int res; -- -- if (freemem_size < sizeof (size_t)) -- goto resize_freemem; -- -- res = __gconv (convd->conv, -- &inbuf, inbuf + resultlen, -- &outbuf, -- outbuf + freemem_size - sizeof (size_t), -- &non_reversible); -- -- if (res == __GCONV_OK || res == __GCONV_EMPTY_INPUT) -- break; -- -- if (res != __GCONV_FULL_OUTPUT) -- { -- /* We should not use the translation at all, it -- is incorrectly encoded. */ -- __libc_lock_unlock (lock); -- return NULL; -- } -- -- inbuf = (const unsigned char *) result; --# else --# if HAVE_ICONV -- const char *inptr = (const char *) inbuf; -- size_t inleft = resultlen; -- char *outptr = (char *) outbuf; -- size_t outleft; -- -- if (freemem_size < sizeof (size_t)) -- goto resize_freemem; -- -- outleft = freemem_size - sizeof (size_t); -- if (iconv (convd->conv, -- (ICONV_CONST char **) &inptr, &inleft, -- &outptr, &outleft) -- != (size_t) (-1)) -- { -- outbuf = (unsigned char *) outptr; -- break; -- } -- if (errno != E2BIG) -- { -- __libc_lock_unlock (lock); -- return NULL; -- } --# endif --# endif -- -- resize_freemem: -- /* We must allocate a new buffer or resize the old one. */ -- if (malloc_count > 0) -- { -- ++malloc_count; -- freemem_size = malloc_count * INITIAL_BLOCK_SIZE; -- newmem = (transmem_block_t *) realloc (transmem_list, -- freemem_size); --# ifdef _LIBC -- if (newmem != NULL) -- transmem_list = transmem_list->next; -- else -- { -- struct transmem_list *old = transmem_list; -- -- transmem_list = transmem_list->next; -- free (old); -- } --# endif -- } -- else -- { -- malloc_count = 1; -- freemem_size = INITIAL_BLOCK_SIZE; -- newmem = (transmem_block_t *) malloc (freemem_size); -- } -- if (__builtin_expect (newmem == NULL, 0)) -- { -- freemem = NULL; -- freemem_size = 0; -- __libc_lock_unlock (lock); -- return (char *) -1; -- } -- --# ifdef _LIBC -- /* Add the block to the list of blocks we have to free -- at some point. */ -- newmem->next = transmem_list; -- transmem_list = newmem; -- -- freemem = (unsigned char *) newmem->data; -- freemem_size -= offsetof (struct transmem_list, data); --# else -- transmem_list = newmem; -- freemem = newmem; --# endif -- -- outbuf = freemem + sizeof (size_t); -- } -- -- /* We have now in our buffer a converted string. Put this -- into the table of conversions. */ -- *(size_t *) freemem = outbuf - freemem - sizeof (size_t); -- convd->conv_tab[act] = (char *) freemem; -- /* Shrink freemem, but keep it aligned. */ -- freemem_size -= outbuf - freemem; -- freemem = outbuf; -- freemem += freemem_size & (alignof (size_t) - 1); -- freemem_size = freemem_size & ~ (alignof (size_t) - 1); -- -- __libc_lock_unlock (lock); -- } -- -- /* Now convd->conv_tab[act] contains the translation of all -- the plural variants. */ -- result = convd->conv_tab[act] + sizeof (size_t); -- resultlen = *(size_t *) convd->conv_tab[act]; -- } -- } -- -- /* The result string is converted. */ -- --#endif /* _LIBC || HAVE_ICONV */ -- -- *lengthp = resultlen; -- return result; --} -- -- --/* Look up a plural variant. */ --static char * --internal_function --plural_lookup (struct loaded_l10nfile *domain, unsigned long int n, -- const char *translation, size_t translation_len) --{ -- struct loaded_domain *domaindata = (struct loaded_domain *) domain->data; -- unsigned long int index; -- const char *p; -- -- index = plural_eval (domaindata->plural, n); -- if (index >= domaindata->nplurals) -- /* This should never happen. It means the plural expression and the -- given maximum value do not match. */ -- index = 0; -- -- /* Skip INDEX strings at TRANSLATION. */ -- p = translation; -- while (index-- > 0) -- { --#ifdef _LIBC -- p = __rawmemchr (p, '\0'); --#else -- p = strchr (p, '\0'); --#endif -- /* And skip over the NUL byte. */ -- p++; -- -- if (p >= translation + translation_len) -- /* This should never happen. It means the plural expression -- evaluated to a value larger than the number of variants -- available for MSGID1. */ -- return (char *) translation; -- } -- return (char *) p; --} -- --#ifndef _LIBC --/* Return string representation of locale CATEGORY. */ --static const char * --internal_function --category_to_name (int category) --{ -- const char *retval; -- -- switch (category) -- { --#ifdef LC_COLLATE -- case LC_COLLATE: -- retval = "LC_COLLATE"; -- break; --#endif --#ifdef LC_CTYPE -- case LC_CTYPE: -- retval = "LC_CTYPE"; -- break; --#endif --#ifdef LC_MONETARY -- case LC_MONETARY: -- retval = "LC_MONETARY"; -- break; --#endif --#ifdef LC_NUMERIC -- case LC_NUMERIC: -- retval = "LC_NUMERIC"; -- break; --#endif --#ifdef LC_TIME -- case LC_TIME: -- retval = "LC_TIME"; -- break; --#endif --#ifdef LC_MESSAGES -- case LC_MESSAGES: -- retval = "LC_MESSAGES"; -- break; --#endif --#ifdef LC_RESPONSE -- case LC_RESPONSE: -- retval = "LC_RESPONSE"; -- break; --#endif --#ifdef LC_ALL -- case LC_ALL: -- /* This might not make sense but is perhaps better than any other -- value. */ -- retval = "LC_ALL"; -- break; --#endif -- default: -- /* If you have a better idea for a default value let me know. */ -- retval = "LC_XXX"; -- } -- -- return retval; --} --#endif -- --/* Guess value of current locale from value of the environment variables -- or system-dependent defaults. */ --static const char * --internal_function --#ifdef IN_LIBGLOCALE --guess_category_value (int category, const char *categoryname, -- const char *locale) -- --#else --guess_category_value (int category, const char *categoryname) --#endif --{ -- const char *language; --#ifndef IN_LIBGLOCALE -- const char *locale; --# ifndef _LIBC -- const char *language_default; -- int locale_defaulted; --# endif --#endif -- -- /* We use the settings in the following order: -- 1. The value of the environment variable 'LANGUAGE'. This is a GNU -- extension. Its value can be a colon-separated list of locale names. -- 2. The value of the environment variable 'LC_ALL', 'LC_xxx', or 'LANG'. -- More precisely, the first among these that is set to a non-empty value. -- This is how POSIX specifies it. The value is a single locale name. -- 3. A system-dependent preference list of languages. Its value can be a -- colon-separated list of locale names. -- 4. A system-dependent default locale name. -- This way: -- - System-dependent settings can be overridden by environment variables. -- - If the system provides both a list of languages and a default locale, -- the former is used. */ -- --#ifndef IN_LIBGLOCALE -- /* Fetch the locale name, through the POSIX method of looking to `LC_ALL', -- `LC_xxx', and `LANG'. On some systems this can be done by the -- `setlocale' function itself. */ --# ifdef _LIBC -- locale = __current_locale_name (category); --# else --# if HAVE_STRUCT___LOCALE_STRUCT___NAMES && defined USE_IN_GETTEXT_TESTS -- /* The __names field is not public glibc API and must therefore not be used -- in code that is installed in public locations. */ -- locale_t thread_locale = uselocale (NULL); -- if (thread_locale != LC_GLOBAL_LOCALE) -- { -- locale = thread_locale->__names[category]; -- locale_defaulted = 0; -- } -- else --# endif -- { -- locale = _nl_locale_name_posix (category, categoryname); -- locale_defaulted = 0; -- if (locale == NULL) -- { -- locale = _nl_locale_name_default (); -- locale_defaulted = 1; -- } -- } --# endif --#endif -- -- /* Ignore LANGUAGE and its system-dependent analogon if the locale is set -- to "C" because -- 1. "C" locale usually uses the ASCII encoding, and most international -- messages use non-ASCII characters. These characters get displayed -- as question marks (if using glibc's iconv()) or as invalid 8-bit -- characters (because other iconv()s refuse to convert most non-ASCII -- characters to ASCII). In any case, the output is ugly. -- 2. The precise output of some programs in the "C" locale is specified -- by POSIX and should not depend on environment variables like -- "LANGUAGE" or system-dependent information. We allow such programs -- to use gettext(). */ -- if (strcmp (locale, "C") == 0) -- return locale; -- -- /* The highest priority value is the value of the 'LANGUAGE' environment -- variable. */ -- language = getenv ("LANGUAGE"); -- if (language != NULL && language[0] != '\0') -- return language; --#if !defined IN_LIBGLOCALE && !defined _LIBC -- /* The next priority value is the locale name, if not defaulted. */ -- if (locale_defaulted) -- { -- /* The next priority value is the default language preferences list. */ -- language_default = _nl_language_preferences_default (); -- if (language_default != NULL) -- return language_default; -- } -- /* The least priority value is the locale name, if defaulted. */ --#endif -- return locale; --} -- --#if (defined _LIBC || HAVE_ICONV) && !defined IN_LIBGLOCALE --/* Returns the output charset. */ --static const char * --internal_function --get_output_charset (struct binding *domainbinding) --{ -- /* The output charset should normally be determined by the locale. But -- sometimes the locale is not used or not correctly set up, so we provide -- a possibility for the user to override this: the OUTPUT_CHARSET -- environment variable. Moreover, the value specified through -- bind_textdomain_codeset overrides both. */ -- if (domainbinding != NULL && domainbinding->codeset != NULL) -- return domainbinding->codeset; -- else -- { -- /* For speed reasons, we look at the value of OUTPUT_CHARSET only -- once. This is a user variable that is not supposed to change -- during a program run. */ -- static char *output_charset_cache; -- static int output_charset_cached; -- -- if (!output_charset_cached) -- { -- const char *value = getenv ("OUTPUT_CHARSET"); -- -- if (value != NULL && value[0] != '\0') -- { -- size_t len = strlen (value) + 1; -- char *value_copy = (char *) malloc (len); -- -- if (value_copy != NULL) -- memcpy (value_copy, value, len); -- output_charset_cache = value_copy; -- } -- output_charset_cached = 1; -- } -- -- if (output_charset_cache != NULL) -- return output_charset_cache; -- else -- { --# ifdef _LIBC -- return _NL_CURRENT (LC_CTYPE, CODESET); --# else --# if HAVE_ICONV -- return locale_charset (); --# endif --# endif -- } -- } --} --#endif -- --/* @@ begin of epilog @@ */ -- --/* We don't want libintl.a to depend on any other library. So we -- avoid the non-standard function stpcpy. In GNU C Library this -- function is available, though. Also allow the symbol HAVE_STPCPY -- to be defined. */ --#if !_LIBC && !HAVE_STPCPY --static char * --stpcpy (char *dest, const char *src) --{ -- while ((*dest++ = *src++) != '\0') -- /* Do nothing. */ ; -- return dest - 1; --} --#endif -- --#if !_LIBC && !HAVE_MEMPCPY --static void * --mempcpy (void *dest, const void *src, size_t n) --{ -- return (void *) ((char *) memcpy (dest, src, n) + n); --} --#endif -- --#if !_LIBC && !HAVE_TSEARCH --# include "tsearch.c" --#endif -- -- --#ifdef _LIBC --/* If we want to free all resources we have to do some work at -- program's end. */ --libc_freeres_fn (free_mem) --{ -- void *old; -- -- while (_nl_domain_bindings != NULL) -- { -- struct binding *oldp = _nl_domain_bindings; -- _nl_domain_bindings = _nl_domain_bindings->next; -- if (oldp->dirname != _nl_default_dirname) -- /* Yes, this is a pointer comparison. */ -- free (oldp->dirname); -- free (oldp->codeset); -- free (oldp); -- } -- -- if (_nl_current_default_domain != _nl_default_default_domain) -- /* Yes, again a pointer comparison. */ -- free ((char *) _nl_current_default_domain); -- -- /* Remove the search tree with the known translations. */ -- __tdestroy (root, free); -- root = NULL; -- -- while (transmem_list != NULL) -- { -- old = transmem_list; -- transmem_list = transmem_list->next; -- free (old); -- } --} --#endif ---- a/intl/dcngettext.c -+++ /dev/null -@@ -1,57 +0,0 @@ --/* Implementation of the dcngettext(3) function. -- Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc. -- -- This program is free software; you can redistribute it and/or modify it -- under the terms of the GNU Library General Public License as published -- by the Free Software Foundation; either version 2, or (at your option) -- any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Library General Public License for more details. -- -- You should have received a copy of the GNU Library General Public -- License along with this program; if not, write to the Free Software -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, -- USA. */ -- --#ifdef HAVE_CONFIG_H --# include <config.h> --#endif -- --#include "gettextP.h" --#ifdef _LIBC --# include <libintl.h> --#else --# include "libgnuintl.h" --#endif -- --/* @@ end of prolog @@ */ -- --/* Names for the libintl functions are a problem. They must not clash -- with existing names and they should follow ANSI C. But this source -- code is also used in GNU C Library where the names have a __ -- prefix. So we have to make a difference here. */ --#ifdef _LIBC --# define DCNGETTEXT __dcngettext --# define DCIGETTEXT __dcigettext --#else --# define DCNGETTEXT libintl_dcngettext --# define DCIGETTEXT libintl_dcigettext --#endif -- --/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY -- locale. */ --char * --DCNGETTEXT (const char *domainname, -- const char *msgid1, const char *msgid2, unsigned long int n, -- int category) --{ -- return DCIGETTEXT (domainname, msgid1, msgid2, 1, n, category); --} -- --#ifdef _LIBC --/* Alias for function name in GNU C Library. */ --weak_alias (__dcngettext, dcngettext); --#endif ---- a/intl/dgettext.c -+++ /dev/null -@@ -1,58 +0,0 @@ --/* Implementation of the dgettext(3) function. -- Copyright (C) 1995-1997, 2000-2003 Free Software Foundation, Inc. -- -- This program is free software; you can redistribute it and/or modify it -- under the terms of the GNU Library General Public License as published -- by the Free Software Foundation; either version 2, or (at your option) -- any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Library General Public License for more details. -- -- You should have received a copy of the GNU Library General Public -- License along with this program; if not, write to the Free Software -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, -- USA. */ -- --#ifdef HAVE_CONFIG_H --# include <config.h> --#endif -- --#include "gettextP.h" -- --#include <locale.h> -- --#ifdef _LIBC --# include <libintl.h> --#else --# include "libgnuintl.h" --#endif -- --/* @@ end of prolog @@ */ -- --/* Names for the libintl functions are a problem. They must not clash -- with existing names and they should follow ANSI C. But this source -- code is also used in GNU C Library where the names have a __ -- prefix. So we have to make a difference here. */ --#ifdef _LIBC --# define DGETTEXT __dgettext --# define DCGETTEXT INTUSE(__dcgettext) --#else --# define DGETTEXT libintl_dgettext --# define DCGETTEXT libintl_dcgettext --#endif -- --/* Look up MSGID in the DOMAINNAME message catalog of the current -- LC_MESSAGES locale. */ --char * --DGETTEXT (const char *domainname, const char *msgid) --{ -- return DCGETTEXT (domainname, msgid, LC_MESSAGES); --} -- --#ifdef _LIBC --/* Alias for function name in GNU C Library. */ --weak_alias (__dgettext, dgettext); --#endif ---- a/intl/dngettext.c -+++ /dev/null -@@ -1,59 +0,0 @@ --/* Implementation of the dngettext(3) function. -- Copyright (C) 1995-1997, 2000-2003 Free Software Foundation, Inc. -- -- This program is free software; you can redistribute it and/or modify it -- under the terms of the GNU Library General Public License as published -- by the Free Software Foundation; either version 2, or (at your option) -- any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Library General Public License for more details. -- -- You should have received a copy of the GNU Library General Public -- License along with this program; if not, write to the Free Software -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, -- USA. */ -- --#ifdef HAVE_CONFIG_H --# include <config.h> --#endif -- --#include "gettextP.h" -- --#include <locale.h> -- --#ifdef _LIBC --# include <libintl.h> --#else --# include "libgnuintl.h" --#endif -- --/* @@ end of prolog @@ */ -- --/* Names for the libintl functions are a problem. They must not clash -- with existing names and they should follow ANSI C. But this source -- code is also used in GNU C Library where the names have a __ -- prefix. So we have to make a difference here. */ --#ifdef _LIBC --# define DNGETTEXT __dngettext --# define DCNGETTEXT __dcngettext --#else --# define DNGETTEXT libintl_dngettext --# define DCNGETTEXT libintl_dcngettext --#endif -- --/* Look up MSGID in the DOMAINNAME message catalog of the current -- LC_MESSAGES locale and skip message according to the plural form. */ --char * --DNGETTEXT (const char *domainname, -- const char *msgid1, const char *msgid2, unsigned long int n) --{ -- return DCNGETTEXT (domainname, msgid1, msgid2, n, LC_MESSAGES); --} -- --#ifdef _LIBC --/* Alias for function name in GNU C Library. */ --weak_alias (__dngettext, dngettext); --#endif ---- a/intl/eval-plural.h -+++ /dev/null -@@ -1,108 +0,0 @@ --/* Plural expression evaluation. -- Copyright (C) 2000-2003, 2007 Free Software Foundation, Inc. -- -- This program is free software; you can redistribute it and/or modify it -- under the terms of the GNU Library General Public License as published -- by the Free Software Foundation; either version 2, or (at your option) -- any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Library General Public License for more details. -- -- You should have received a copy of the GNU Library General Public -- License along with this program; if not, write to the Free Software -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, -- USA. */ -- --#ifndef STATIC --#define STATIC static --#endif -- --/* Evaluate the plural expression and return an index value. */ --STATIC --unsigned long int --internal_function --plural_eval (const struct expression *pexp, unsigned long int n) --{ -- switch (pexp->nargs) -- { -- case 0: -- switch (pexp->operation) -- { -- case var: -- return n; -- case num: -- return pexp->val.num; -- default: -- break; -- } -- /* NOTREACHED */ -- break; -- case 1: -- { -- /* pexp->operation must be lnot. */ -- unsigned long int arg = plural_eval (pexp->val.args[0], n); -- return ! arg; -- } -- case 2: -- { -- unsigned long int leftarg = plural_eval (pexp->val.args[0], n); -- if (pexp->operation == lor) -- return leftarg || plural_eval (pexp->val.args[1], n); -- else if (pexp->operation == land) -- return leftarg && plural_eval (pexp->val.args[1], n); -- else -- { -- unsigned long int rightarg = plural_eval (pexp->val.args[1], n); -- -- switch (pexp->operation) -- { -- case mult: -- return leftarg * rightarg; -- case divide: --#if !INTDIV0_RAISES_SIGFPE -- if (rightarg == 0) -- raise (SIGFPE); --#endif -- return leftarg / rightarg; -- case module: --#if !INTDIV0_RAISES_SIGFPE -- if (rightarg == 0) -- raise (SIGFPE); --#endif -- return leftarg % rightarg; -- case plus: -- return leftarg + rightarg; -- case minus: -- return leftarg - rightarg; -- case less_than: -- return leftarg < rightarg; -- case greater_than: -- return leftarg > rightarg; -- case less_or_equal: -- return leftarg <= rightarg; -- case greater_or_equal: -- return leftarg >= rightarg; -- case equal: -- return leftarg == rightarg; -- case not_equal: -- return leftarg != rightarg; -- default: -- break; -- } -- } -- /* NOTREACHED */ -- break; -- } -- case 3: -- { -- /* pexp->operation must be qmop. */ -- unsigned long int boolarg = plural_eval (pexp->val.args[0], n); -- return plural_eval (pexp->val.args[boolarg ? 1 : 2], n); -- } -- } -- /* NOTREACHED */ -- return 0; --} ---- a/intl/explodename.c -+++ /dev/null -@@ -1,135 +0,0 @@ --/* Copyright (C) 1995-1998, 2000-2001, 2003, 2005, 2007 Free Software Foundation, Inc. -- Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. -- -- This program is free software; you can redistribute it and/or modify it -- under the terms of the GNU Library General Public License as published -- by the Free Software Foundation; either version 2, or (at your option) -- any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Library General Public License for more details. -- -- You should have received a copy of the GNU Library General Public -- License along with this program; if not, write to the Free Software -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, -- USA. */ -- --#ifdef HAVE_CONFIG_H --# include <config.h> --#endif -- --#include <stdlib.h> --#include <string.h> --#include <sys/types.h> -- --#include "loadinfo.h" -- --/* On some strange systems still no definition of NULL is found. Sigh! */ --#ifndef NULL --# if defined __STDC__ && __STDC__ --# define NULL ((void *) 0) --# else --# define NULL 0 --# endif --#endif -- --/* @@ end of prolog @@ */ -- --/* Split a locale name NAME into a leading language part and all the -- rest. Return a pointer to the first character after the language, -- i.e. to the first byte of the rest. */ --static char *_nl_find_language (const char *name); -- --static char * --_nl_find_language (const char *name) --{ -- while (name[0] != '\0' && name[0] != '_' && name[0] != '@' && name[0] != '.') -- ++name; -- -- return (char *) name; --} -- -- --int --_nl_explode_name (char *name, -- const char **language, const char **modifier, -- const char **territory, const char **codeset, -- const char **normalized_codeset) --{ -- char *cp; -- int mask; -- -- *modifier = NULL; -- *territory = NULL; -- *codeset = NULL; -- *normalized_codeset = NULL; -- -- /* Now we determine the single parts of the locale name. First -- look for the language. Termination symbols are `_', '.', and `@'. */ -- mask = 0; -- *language = cp = name; -- cp = _nl_find_language (*language); -- -- if (*language == cp) -- /* This does not make sense: language has to be specified. Use -- this entry as it is without exploding. Perhaps it is an alias. */ -- cp = strchr (*language, '\0'); -- else -- { -- if (cp[0] == '_') -- { -- /* Next is the territory. */ -- cp[0] = '\0'; -- *territory = ++cp; -- -- while (cp[0] != '\0' && cp[0] != '.' && cp[0] != '@') -- ++cp; -- -- mask |= XPG_TERRITORY; -- } -- -- if (cp[0] == '.') -- { -- /* Next is the codeset. */ -- cp[0] = '\0'; -- *codeset = ++cp; -- -- while (cp[0] != '\0' && cp[0] != '@') -- ++cp; -- -- mask |= XPG_CODESET; -- -- if (*codeset != cp && (*codeset)[0] != '\0') -- { -- *normalized_codeset = _nl_normalize_codeset (*codeset, -- cp - *codeset); -- if (*normalized_codeset == NULL) -- return -1; -- else if (strcmp (*codeset, *normalized_codeset) == 0) -- free ((char *) *normalized_codeset); -- else -- mask |= XPG_NORM_CODESET; -- } -- } -- } -- -- if (cp[0] == '@') -- { -- /* Next is the modifier. */ -- cp[0] = '\0'; -- *modifier = ++cp; -- -- if (cp[0] != '\0') -- mask |= XPG_MODIFIER; -- } -- -- if (*territory != NULL && (*territory)[0] == '\0') -- mask &= ~XPG_TERRITORY; -- -- if (*codeset != NULL && (*codeset)[0] == '\0') -- mask &= ~XPG_CODESET; -- -- return mask; --} ---- a/intl/export.h -+++ /dev/null -@@ -1,6 +0,0 @@ -- --#if @HAVE_VISIBILITY@ && BUILDING_LIBINTL --#define LIBINTL_DLL_EXPORTED __attribute__((__visibility__("default"))) --#else --#define LIBINTL_DLL_EXPORTED --#endif ---- a/intl/finddomain.c -+++ /dev/null -@@ -1,212 +0,0 @@ --/* Handle list of needed message catalogs -- Copyright (C) 1995-1999, 2000-2001, 2003-2007 Free Software Foundation, Inc. -- Written by Ulrich Drepper <drepper@gnu.org>, 1995. -- -- This program is free software; you can redistribute it and/or modify it -- under the terms of the GNU Library General Public License as published -- by the Free Software Foundation; either version 2, or (at your option) -- any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Library General Public License for more details. -- -- You should have received a copy of the GNU Library General Public -- License along with this program; if not, write to the Free Software -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, -- USA. */ -- --#ifdef HAVE_CONFIG_H --# include <config.h> --#endif -- --#include <stdio.h> --#include <sys/types.h> --#include <stdlib.h> --#include <string.h> -- --#if defined HAVE_UNISTD_H || defined _LIBC --# include <unistd.h> --#endif -- --#include "gettextP.h" --#ifdef _LIBC --# include <libintl.h> --#else --# include "libgnuintl.h" --#endif -- --/* Handle multi-threaded applications. */ --#ifdef _LIBC --# include <bits/libc-lock.h> --# define gl_rwlock_define_initialized __libc_rwlock_define_initialized --# define gl_rwlock_rdlock __libc_rwlock_rdlock --# define gl_rwlock_wrlock __libc_rwlock_wrlock --# define gl_rwlock_unlock __libc_rwlock_unlock --#else --# include "lock.h" --#endif -- --/* @@ end of prolog @@ */ --/* List of already loaded domains. */ --static struct loaded_l10nfile *_nl_loaded_domains; -- -- --/* Return a data structure describing the message catalog described by -- the DOMAINNAME and CATEGORY parameters with respect to the currently -- established bindings. */ --struct loaded_l10nfile * --internal_function --_nl_find_domain (const char *dirname, char *locale, -- const char *domainname, struct binding *domainbinding) --{ -- struct loaded_l10nfile *retval; -- const char *language; -- const char *modifier; -- const char *territory; -- const char *codeset; -- const char *normalized_codeset; -- const char *alias_value; -- int mask; -- -- /* LOCALE can consist of up to four recognized parts for the XPG syntax: -- -- language[_territory][.codeset][@modifier] -- -- Beside the first part all of them are allowed to be missing. If -- the full specified locale is not found, the less specific one are -- looked for. The various parts will be stripped off according to -- the following order: -- (1) codeset -- (2) normalized codeset -- (3) territory -- (4) modifier -- */ -- -- /* We need to protect modifying the _NL_LOADED_DOMAINS data. */ -- gl_rwlock_define_initialized (static, lock); -- gl_rwlock_rdlock (lock); -- -- /* If we have already tested for this locale entry there has to -- be one data set in the list of loaded domains. */ -- retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname, -- strlen (dirname) + 1, 0, locale, NULL, NULL, -- NULL, NULL, domainname, 0); -- -- gl_rwlock_unlock (lock); -- -- if (retval != NULL) -- { -- /* We know something about this locale. */ -- int cnt; -- -- if (retval->decided <= 0) -- _nl_load_domain (retval, domainbinding); -- -- if (retval->data != NULL) -- return retval; -- -- for (cnt = 0; retval->successor[cnt] != NULL; ++cnt) -- { -- if (retval->successor[cnt]->decided <= 0) -- _nl_load_domain (retval->successor[cnt], domainbinding); -- -- if (retval->successor[cnt]->data != NULL) -- break; -- } -- -- return retval; -- /* NOTREACHED */ -- } -- -- /* See whether the locale value is an alias. If yes its value -- *overwrites* the alias name. No test for the original value is -- done. */ -- alias_value = _nl_expand_alias (locale); -- if (alias_value != NULL) -- { --#if defined _LIBC || defined HAVE_STRDUP -- locale = strdup (alias_value); -- if (locale == NULL) -- return NULL; --#else -- size_t len = strlen (alias_value) + 1; -- locale = (char *) malloc (len); -- if (locale == NULL) -- return NULL; -- -- memcpy (locale, alias_value, len); --#endif -- } -- -- /* Now we determine the single parts of the locale name. First -- look for the language. Termination symbols are `_', '.', and `@'. */ -- mask = _nl_explode_name (locale, &language, &modifier, &territory, -- &codeset, &normalized_codeset); -- if (mask == -1) -- /* This means we are out of core. */ -- return NULL; -- -- /* We need to protect modifying the _NL_LOADED_DOMAINS data. */ -- gl_rwlock_wrlock (lock); -- -- /* Create all possible locale entries which might be interested in -- generalization. */ -- retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname, -- strlen (dirname) + 1, mask, language, territory, -- codeset, normalized_codeset, modifier, -- domainname, 1); -- -- gl_rwlock_unlock (lock); -- -- if (retval == NULL) -- /* This means we are out of core. */ -- goto out; -- -- if (retval->decided <= 0) -- _nl_load_domain (retval, domainbinding); -- if (retval->data == NULL) -- { -- int cnt; -- for (cnt = 0; retval->successor[cnt] != NULL; ++cnt) -- { -- if (retval->successor[cnt]->decided <= 0) -- _nl_load_domain (retval->successor[cnt], domainbinding); -- if (retval->successor[cnt]->data != NULL) -- break; -- } -- } -- -- /* The room for an alias was dynamically allocated. Free it now. */ -- if (alias_value != NULL) -- free (locale); -- --out: -- /* The space for normalized_codeset is dynamically allocated. Free it. */ -- if (mask & XPG_NORM_CODESET) -- free ((void *) normalized_codeset); -- -- return retval; --} -- -- --#ifdef _LIBC --/* This is called from iconv/gconv_db.c's free_mem, as locales must -- be freed before freeing gconv steps arrays. */ --void __libc_freeres_fn_section --_nl_finddomain_subfreeres () --{ -- struct loaded_l10nfile *runp = _nl_loaded_domains; -- -- while (runp != NULL) -- { -- struct loaded_l10nfile *here = runp; -- if (runp->data != NULL) -- _nl_unload_domain ((struct loaded_domain *) runp->data); -- runp = runp->next; -- free ((char *) here->filename); -- free (here); -- } --} --#endif ---- a/intl/gettext.c -+++ /dev/null -@@ -1,63 +0,0 @@ --/* Implementation of gettext(3) function. -- Copyright (C) 1995, 1997, 2000-2003 Free Software Foundation, Inc. -- -- This program is free software; you can redistribute it and/or modify it -- under the terms of the GNU Library General Public License as published -- by the Free Software Foundation; either version 2, or (at your option) -- any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Library General Public License for more details. -- -- You should have received a copy of the GNU Library General Public -- License along with this program; if not, write to the Free Software -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, -- USA. */ -- --#ifdef HAVE_CONFIG_H --# include <config.h> --#endif -- --#ifdef _LIBC --# define __need_NULL --# include <stddef.h> --#else --# include <stdlib.h> /* Just for NULL. */ --#endif -- --#include "gettextP.h" --#ifdef _LIBC --# include <libintl.h> --#else --# include "libgnuintl.h" --#endif -- --/* @@ end of prolog @@ */ -- --/* Names for the libintl functions are a problem. They must not clash -- with existing names and they should follow ANSI C. But this source -- code is also used in GNU C Library where the names have a __ -- prefix. So we have to make a difference here. */ --#ifdef _LIBC --# define GETTEXT __gettext --# define DCGETTEXT INTUSE(__dcgettext) --#else --# define GETTEXT libintl_gettext --# define DCGETTEXT libintl_dcgettext --#endif -- --/* Look up MSGID in the current default message catalog for the current -- LC_MESSAGES locale. If not found, returns MSGID itself (the default -- text). */ --char * --GETTEXT (const char *msgid) --{ -- return DCGETTEXT (NULL, msgid, LC_MESSAGES); --} -- --#ifdef _LIBC --/* Alias for function name in GNU C Library. */ --weak_alias (__gettext, gettext); --#endif ---- a/intl/gettextP.h -+++ /dev/null -@@ -1,297 +0,0 @@ --/* Header describing internals of libintl library. -- Copyright (C) 1995-1999, 2000-2007 Free Software Foundation, Inc. -- Written by Ulrich Drepper <drepper@cygnus.com>, 1995. -- -- This program is free software; you can redistribute it and/or modify it -- under the terms of the GNU Library General Public License as published -- by the Free Software Foundation; either version 2, or (at your option) -- any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Library General Public License for more details. -- -- You should have received a copy of the GNU Library General Public -- License along with this program; if not, write to the Free Software -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, -- USA. */ -- --#ifndef _GETTEXTP_H --#define _GETTEXTP_H -- --#include <stddef.h> /* Get size_t. */ -- --#ifdef _LIBC --# include "../iconv/gconv_int.h" --#else --# if HAVE_ICONV --# include <iconv.h> --# endif --#endif -- --/* Handle multi-threaded applications. */ --#ifdef _LIBC --# include <bits/libc-lock.h> --# define gl_rwlock_define __libc_rwlock_define --#else --# include "lock.h" --#endif -- --#ifdef _LIBC --extern char *__gettext (const char *__msgid); --extern char *__dgettext (const char *__domainname, const char *__msgid); --extern char *__dcgettext (const char *__domainname, const char *__msgid, -- int __category); --extern char *__ngettext (const char *__msgid1, const char *__msgid2, -- unsigned long int __n); --extern char *__dngettext (const char *__domainname, -- const char *__msgid1, const char *__msgid2, -- unsigned long int n); --extern char *__dcngettext (const char *__domainname, -- const char *__msgid1, const char *__msgid2, -- unsigned long int __n, int __category); --extern char *__dcigettext (const char *__domainname, -- const char *__msgid1, const char *__msgid2, -- int __plural, unsigned long int __n, -- int __category); --extern char *__textdomain (const char *__domainname); --extern char *__bindtextdomain (const char *__domainname, -- const char *__dirname); --extern char *__bind_textdomain_codeset (const char *__domainname, -- const char *__codeset); --extern void _nl_finddomain_subfreeres (void) attribute_hidden; --extern void _nl_unload_domain (struct loaded_domain *__domain) -- internal_function attribute_hidden; --#else --/* Declare the exported libintl_* functions, in a way that allows us to -- call them under their real name. */ --# undef _INTL_REDIRECT_INLINE --# undef _INTL_REDIRECT_MACROS --# define _INTL_REDIRECT_MACROS --# include "libgnuintl.h" --# ifdef IN_LIBGLOCALE --extern char *gl_dcigettext (const char *__domainname, -- const char *__msgid1, const char *__msgid2, -- int __plural, unsigned long int __n, -- int __category, -- const char *__localename, const char *__encoding); --# else --extern char *libintl_dcigettext (const char *__domainname, -- const char *__msgid1, const char *__msgid2, -- int __plural, unsigned long int __n, -- int __category); --# endif --#endif -- --#include "loadinfo.h" -- --#include "gmo.h" /* Get nls_uint32. */ -- --/* @@ end of prolog @@ */ -- --#ifndef internal_function --# define internal_function --#endif -- --#ifndef attribute_hidden --# define attribute_hidden --#endif -- --/* Tell the compiler when a conditional or integer expression is -- almost always true or almost always false. */ --#ifndef HAVE_BUILTIN_EXPECT --# define __builtin_expect(expr, val) (expr) --#endif -- --#ifndef W --# define W(flag, data) ((flag) ? SWAP (data) : (data)) --#endif -- -- --#ifdef _LIBC --# include <byteswap.h> --# define SWAP(i) bswap_32 (i) --#else --static inline nls_uint32 --# ifdef __cplusplus --SWAP (nls_uint32 i) --# else --SWAP (i) -- nls_uint32 i; --# endif --{ -- return (i << 24) | ((i & 0xff00) << 8) | ((i >> 8) & 0xff00) | (i >> 24); --} --#endif -- -- --/* In-memory representation of system dependent string. */ --struct sysdep_string_desc --{ -- /* Length of addressed string, including the trailing NUL. */ -- size_t length; -- /* Pointer to addressed string. */ -- const char *pointer; --}; -- --/* Cache of translated strings after charset conversion. -- Note: The strings are converted to the target encoding only on an as-needed -- basis. */ --struct converted_domain --{ -- /* The target encoding name. */ -- const char *encoding; -- /* The descriptor for conversion from the message catalog's encoding to -- this target encoding. */ --#ifdef _LIBC -- __gconv_t conv; --#else --# if HAVE_ICONV -- iconv_t conv; --# endif --#endif -- /* The table of translated strings after charset conversion. */ -- char **conv_tab; --}; -- --/* The representation of an opened message catalog. */ --struct loaded_domain --{ -- /* Pointer to memory containing the .mo file. */ -- const char *data; -- /* 1 if the memory is mmap()ed, 0 if the memory is malloc()ed. */ -- int use_mmap; -- /* Size of mmap()ed memory. */ -- size_t mmap_size; -- /* 1 if the .mo file uses a different endianness than this machine. */ -- int must_swap; -- /* Pointer to additional malloc()ed memory. */ -- void *malloced; -- -- /* Number of static strings pairs. */ -- nls_uint32 nstrings; -- /* Pointer to descriptors of original strings in the file. */ -- const struct string_desc *orig_tab; -- /* Pointer to descriptors of translated strings in the file. */ -- const struct string_desc *trans_tab; -- -- /* Number of system dependent strings pairs. */ -- nls_uint32 n_sysdep_strings; -- /* Pointer to descriptors of original sysdep strings. */ -- const struct sysdep_string_desc *orig_sysdep_tab; -- /* Pointer to descriptors of translated sysdep strings. */ -- const struct sysdep_string_desc *trans_sysdep_tab; -- -- /* Size of hash table. */ -- nls_uint32 hash_size; -- /* Pointer to hash table. */ -- const nls_uint32 *hash_tab; -- /* 1 if the hash table uses a different endianness than this machine. */ -- int must_swap_hash_tab; -- -- /* Cache of charset conversions of the translated strings. */ -- struct converted_domain *conversions; -- size_t nconversions; -- gl_rwlock_define (, conversions_lock) -- -- const struct expression *plural; -- unsigned long int nplurals; --}; -- --/* We want to allocate a string at the end of the struct. But ISO C -- doesn't allow zero sized arrays. */ --#ifdef __GNUC__ --# define ZERO 0 --#else --# define ZERO 1 --#endif -- --/* A set of settings bound to a message domain. Used to store settings -- from bindtextdomain() and bind_textdomain_codeset(). */ --struct binding --{ -- struct binding *next; -- char *dirname; -- char *codeset; -- char domainname[ZERO]; --}; -- --/* A counter which is incremented each time some previous translations -- become invalid. -- This variable is part of the external ABI of the GNU libintl. */ --#ifdef IN_LIBGLOCALE --# include <glocale/config.h> --extern LIBGLOCALE_DLL_EXPORTED int _nl_msg_cat_cntr; --#else --extern LIBINTL_DLL_EXPORTED int _nl_msg_cat_cntr; --#endif -- --#ifndef _LIBC --extern const char *_nl_language_preferences_default (void); --# define gl_locale_name_canonicalize _nl_locale_name_canonicalize --extern void _nl_locale_name_canonicalize (char *name); --# define gl_locale_name_posix _nl_locale_name_posix --extern const char *_nl_locale_name_posix (int category, -- const char *categoryname); --# define gl_locale_name_default _nl_locale_name_default --extern const char *_nl_locale_name_default (void); --# define gl_locale_name _nl_locale_name --extern const char *_nl_locale_name (int category, const char *categoryname); --#endif -- --struct loaded_l10nfile *_nl_find_domain (const char *__dirname, char *__locale, -- const char *__domainname, -- struct binding *__domainbinding) -- internal_function; --void _nl_load_domain (struct loaded_l10nfile *__domain, -- struct binding *__domainbinding) -- internal_function; -- --#ifdef IN_LIBGLOCALE --char *_nl_find_msg (struct loaded_l10nfile *domain_file, -- struct binding *domainbinding, const char *encoding, -- const char *msgid, -- size_t *lengthp) -- internal_function; --#else --char *_nl_find_msg (struct loaded_l10nfile *domain_file, -- struct binding *domainbinding, const char *msgid, -- int convert, size_t *lengthp) -- internal_function; --#endif -- --/* The internal variables in the standalone libintl.a must have different -- names than the internal variables in GNU libc, otherwise programs -- using libintl.a cannot be linked statically. */ --#if !defined _LIBC --# define _nl_default_dirname libintl_nl_default_dirname --# define _nl_domain_bindings libintl_nl_domain_bindings --#endif -- --/* Contains the default location of the message catalogs. */ --extern const char _nl_default_dirname[]; --#ifdef _LIBC --libc_hidden_proto (_nl_default_dirname) --#endif -- --/* List with bindings of specific domains. */ --extern struct binding *_nl_domain_bindings; -- --/* The internal variables in the standalone libintl.a must have different -- names than the internal variables in GNU libc, otherwise programs -- using libintl.a cannot be linked statically. */ --#if !defined _LIBC --# define _nl_default_default_domain libintl_nl_default_default_domain --# define _nl_current_default_domain libintl_nl_current_default_domain --#endif -- --/* Name of the default text domain. */ --extern const char _nl_default_default_domain[] attribute_hidden; -- --/* Default text domain in which entries for gettext(3) are to be found. */ --extern const char *_nl_current_default_domain attribute_hidden; -- --/* @@ begin of epilog @@ */ -- --#endif /* gettextP.h */ ---- a/intl/gmo.h -+++ /dev/null -@@ -1,152 +0,0 @@ --/* Description of GNU message catalog format: general file layout. -- Copyright (C) 1995, 1997, 2000-2002, 2004, 2006 Free Software Foundation, Inc. -- -- This program is free software; you can redistribute it and/or modify it -- under the terms of the GNU Library General Public License as published -- by the Free Software Foundation; either version 2, or (at your option) -- any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Library General Public License for more details. -- -- You should have received a copy of the GNU Library General Public -- License along with this program; if not, write to the Free Software -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, -- USA. */ -- --#ifndef _GETTEXT_H --#define _GETTEXT_H 1 -- --#include <limits.h> -- --/* @@ end of prolog @@ */ -- --/* The magic number of the GNU message catalog format. */ --#define _MAGIC 0x950412de --#define _MAGIC_SWAPPED 0xde120495 -- --/* Revision number of the currently used .mo (binary) file format. */ --#define MO_REVISION_NUMBER 0 --#define MO_REVISION_NUMBER_WITH_SYSDEP_I 1 -- --/* The following contortions are an attempt to use the C preprocessor -- to determine an unsigned integral type that is 32 bits wide. An -- alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but -- as of version autoconf-2.13, the AC_CHECK_SIZEOF macro doesn't work -- when cross-compiling. */ -- --#if __STDC__ --# define UINT_MAX_32_BITS 4294967295U --#else --# define UINT_MAX_32_BITS 0xFFFFFFFF --#endif -- --/* If UINT_MAX isn't defined, assume it's a 32-bit type. -- This should be valid for all systems GNU cares about because -- that doesn't include 16-bit systems, and only modern systems -- (that certainly have <limits.h>) have 64+-bit integral types. */ -- --#ifndef UINT_MAX --# define UINT_MAX UINT_MAX_32_BITS --#endif -- --#if UINT_MAX == UINT_MAX_32_BITS --typedef unsigned nls_uint32; --#else --# if USHRT_MAX == UINT_MAX_32_BITS --typedef unsigned short nls_uint32; --# else --# if ULONG_MAX == UINT_MAX_32_BITS --typedef unsigned long nls_uint32; --# else -- /* The following line is intended to throw an error. Using #error is -- not portable enough. */ -- "Cannot determine unsigned 32-bit data type." --# endif --# endif --#endif -- -- --/* Header for binary .mo file format. */ --struct mo_file_header --{ -- /* The magic number. */ -- nls_uint32 magic; -- /* The revision number of the file format. */ -- nls_uint32 revision; -- -- /* The following are only used in .mo files with major revision 0 or 1. */ -- -- /* The number of strings pairs. */ -- nls_uint32 nstrings; -- /* Offset of table with start offsets of original strings. */ -- nls_uint32 orig_tab_offset; -- /* Offset of table with start offsets of translated strings. */ -- nls_uint32 trans_tab_offset; -- /* Size of hash table. */ -- nls_uint32 hash_tab_size; -- /* Offset of first hash table entry. */ -- nls_uint32 hash_tab_offset; -- -- /* The following are only used in .mo files with minor revision >= 1. */ -- -- /* The number of system dependent segments. */ -- nls_uint32 n_sysdep_segments; -- /* Offset of table describing system dependent segments. */ -- nls_uint32 sysdep_segments_offset; -- /* The number of system dependent strings pairs. */ -- nls_uint32 n_sysdep_strings; -- /* Offset of table with start offsets of original sysdep strings. */ -- nls_uint32 orig_sysdep_tab_offset; -- /* Offset of table with start offsets of translated sysdep strings. */ -- nls_uint32 trans_sysdep_tab_offset; --}; -- --/* Descriptor for static string contained in the binary .mo file. */ --struct string_desc --{ -- /* Length of addressed string, not including the trailing NUL. */ -- nls_uint32 length; -- /* Offset of string in file. */ -- nls_uint32 offset; --}; -- --/* The following are only used in .mo files with minor revision >= 1. */ -- --/* Descriptor for system dependent string segment. */ --struct sysdep_segment --{ -- /* Length of addressed string, including the trailing NUL. */ -- nls_uint32 length; -- /* Offset of string in file. */ -- nls_uint32 offset; --}; -- --/* Pair of a static and a system dependent segment, in struct sysdep_string. */ --struct segment_pair --{ -- /* Size of static segment. */ -- nls_uint32 segsize; -- /* Reference to system dependent string segment, or ~0 at the end. */ -- nls_uint32 sysdepref; --}; -- --/* Descriptor for system dependent string. */ --struct sysdep_string --{ -- /* Offset of static string segments in file. */ -- nls_uint32 offset; -- /* Alternating sequence of static and system dependent segments. -- The last segment is a static segment, including the trailing NUL. */ -- struct segment_pair segments[1]; --}; -- --/* Marker for the end of the segments[] array. This has the value 0xFFFFFFFF, -- regardless whether 'int' is 16 bit, 32 bit, or 64 bit. */ --#define SEGMENTS_END ((nls_uint32) ~0) -- --/* @@ begin of epilog @@ */ -- --#endif /* gettext.h */ ---- a/intl/hash-string.c -+++ /dev/null -@@ -1,51 +0,0 @@ --/* Implements a string hashing function. -- Copyright (C) 1995, 1997, 1998, 2000, 2003 Free Software Foundation, Inc. -- This file is part of the GNU C Library. -- -- The GNU C Library is free software; you can redistribute it and/or -- modify it under the terms of the GNU Lesser General Public -- License as published by the Free Software Foundation; either -- version 2.1 of the License, or (at your option) any later version. -- -- The GNU C Library is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Lesser General Public License for more details. -- -- You should have received a copy of the GNU Lesser General Public -- License along with the GNU C Library; if not, write to the Free -- Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -- Boston, MA 02110-1301, USA. */ -- --#ifdef HAVE_CONFIG_H --# include <config.h> --#endif -- --/* Specification. */ --#include "hash-string.h" -- -- --/* Defines the so called `hashpjw' function by P.J. Weinberger -- [see Aho/Sethi/Ullman, COMPILERS: Principles, Techniques and Tools, -- 1986, 1987 Bell Telephone Laboratories, Inc.] */ --unsigned long int --__hash_string (const char *str_param) --{ -- unsigned long int hval, g; -- const char *str = str_param; -- -- /* Compute the hash value for the given string. */ -- hval = 0; -- while (*str != '\0') -- { -- hval <<= 4; -- hval += (unsigned char) *str++; -- g = hval & ((unsigned long int) 0xf << (HASHWORDBITS - 4)); -- if (g != 0) -- { -- hval ^= g >> (HASHWORDBITS - 8); -- hval ^= g; -- } -- } -- return hval; --} ---- a/intl/hash-string.h -+++ /dev/null -@@ -1,36 +0,0 @@ --/* Description of GNU message catalog format: string hashing function. -- Copyright (C) 1995, 1997-1998, 2000-2003, 2005 Free Software Foundation, Inc. -- -- This program is free software; you can redistribute it and/or modify it -- under the terms of the GNU Library General Public License as published -- by the Free Software Foundation; either version 2, or (at your option) -- any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Library General Public License for more details. -- -- You should have received a copy of the GNU Library General Public -- License along with this program; if not, write to the Free Software -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, -- USA. */ -- --/* @@ end of prolog @@ */ -- --/* We assume to have `unsigned long int' value with at least 32 bits. */ --#define HASHWORDBITS 32 -- -- --#ifndef _LIBC --# ifdef IN_LIBINTL --# define __hash_string libintl_hash_string --# else --# define __hash_string hash_string --# endif --#endif -- --/* Defines the so called `hashpjw' function by P.J. Weinberger -- [see Aho/Sethi/Ullman, COMPILERS: Principles, Techniques and Tools, -- 1986, 1987 Bell Telephone Laboratories, Inc.] */ --extern unsigned long int __hash_string (const char *str_param); ---- a/intl/intl-compat.c -+++ /dev/null -@@ -1,133 +0,0 @@ --/* intl-compat.c - Stub functions to call gettext functions from GNU gettext -- Library. -- Copyright (C) 1995, 2000-2003, 2005 Software Foundation, Inc. -- -- This program is free software; you can redistribute it and/or modify it -- under the terms of the GNU Library General Public License as published -- by the Free Software Foundation; either version 2, or (at your option) -- any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Library General Public License for more details. -- -- You should have received a copy of the GNU Library General Public -- License along with this program; if not, write to the Free Software -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, -- USA. */ -- --#ifdef HAVE_CONFIG_H --# include <config.h> --#endif -- --#include "gettextP.h" -- --/* @@ end of prolog @@ */ -- --/* This file redirects the gettext functions (without prefix) to those -- defined in the included GNU libintl library (with "libintl_" prefix). -- It is compiled into libintl in order to make the AM_GNU_GETTEXT test -- of gettext <= 0.11.2 work with the libintl library >= 0.11.3 which -- has the redirections primarily in the <libintl.h> include file. -- It is also compiled into libgnuintl so that libgnuintl.so can be used -- as LD_PRELOADable library on glibc systems, to provide the extra -- features that the functions in the libc don't have (namely, logging). */ -- -- --#undef gettext --#undef dgettext --#undef dcgettext --#undef ngettext --#undef dngettext --#undef dcngettext --#undef textdomain --#undef bindtextdomain --#undef bind_textdomain_codeset -- -- --/* When building a DLL, we must export some functions. Note that because -- the functions are only defined for binary backward compatibility, we -- don't need to use __declspec(dllimport) in any case. */ --#if HAVE_VISIBILITY && BUILDING_DLL --# define DLL_EXPORTED __attribute__((__visibility__("default"))) --#elif defined _MSC_VER && BUILDING_DLL --# define DLL_EXPORTED __declspec(dllexport) --#else --# define DLL_EXPORTED --#endif -- -- --DLL_EXPORTED --char * --gettext (const char *msgid) --{ -- return libintl_gettext (msgid); --} -- -- --DLL_EXPORTED --char * --dgettext (const char *domainname, const char *msgid) --{ -- return libintl_dgettext (domainname, msgid); --} -- -- --DLL_EXPORTED --char * --dcgettext (const char *domainname, const char *msgid, int category) --{ -- return libintl_dcgettext (domainname, msgid, category); --} -- -- --DLL_EXPORTED --char * --ngettext (const char *msgid1, const char *msgid2, unsigned long int n) --{ -- return libintl_ngettext (msgid1, msgid2, n); --} -- -- --DLL_EXPORTED --char * --dngettext (const char *domainname, -- const char *msgid1, const char *msgid2, unsigned long int n) --{ -- return libintl_dngettext (domainname, msgid1, msgid2, n); --} -- -- --DLL_EXPORTED --char * --dcngettext (const char *domainname, -- const char *msgid1, const char *msgid2, unsigned long int n, -- int category) --{ -- return libintl_dcngettext (domainname, msgid1, msgid2, n, category); --} -- -- --DLL_EXPORTED --char * --textdomain (const char *domainname) --{ -- return libintl_textdomain (domainname); --} -- -- --DLL_EXPORTED --char * --bindtextdomain (const char *domainname, const char *dirname) --{ -- return libintl_bindtextdomain (domainname, dirname); --} -- -- --DLL_EXPORTED --char * --bind_textdomain_codeset (const char *domainname, const char *codeset) --{ -- return libintl_bind_textdomain_codeset (domainname, codeset); --} ---- a/intl/intl-exports.c -+++ /dev/null -@@ -1,36 +0,0 @@ --/* List of exported symbols of libintl on Cygwin. -- Copyright (C) 2006 Free Software Foundation, Inc. -- Written by Bruno Haible <bruno@clisp.org>, 2006. -- -- This program is free software; you can redistribute it and/or modify it -- under the terms of the GNU Library General Public License as published -- by the Free Software Foundation; either version 2, or (at your option) -- any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Library General Public License for more details. -- -- You should have received a copy of the GNU Library General Public -- License along with this program; if not, write to the Free Software -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, -- USA. */ -- -- /* IMP(x) is a symbol that contains the address of x. */ --#define IMP(x) _imp__##x -- -- /* Ensure that the variable x is exported from the library, and that a -- pseudo-variable IMP(x) is available. */ --#define VARIABLE(x) \ -- /* Export x without redefining x. This code was found by compiling a \ -- snippet: \ -- extern __declspec(dllexport) int x; int x = 42; */ \ -- asm (".section .drectve\n"); \ -- asm (".ascii \" -export:" #x ",data\"\n"); \ -- asm (".data\n"); \ -- /* Allocate a pseudo-variable IMP(x). */ \ -- extern int x; \ -- void * IMP(x) = &x; -- --VARIABLE(libintl_version) ---- a/intl/l10nflist.c -+++ /dev/null -@@ -1,400 +0,0 @@ --/* Copyright (C) 1995-1999, 2000-2006 Free Software Foundation, Inc. -- Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. -- -- This program is free software; you can redistribute it and/or modify it -- under the terms of the GNU Library General Public License as published -- by the Free Software Foundation; either version 2, or (at your option) -- any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Library General Public License for more details. -- -- You should have received a copy of the GNU Library General Public -- License along with this program; if not, write to the Free Software -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, -- USA. */ -- --/* Tell glibc's <string.h> to provide a prototype for stpcpy(). -- This must come before <config.h> because <config.h> may include -- <features.h>, and once <features.h> has been included, it's too late. */ --#ifndef _GNU_SOURCE --# define _GNU_SOURCE 1 --#endif -- --#ifdef HAVE_CONFIG_H --# include <config.h> --#endif -- --#include <string.h> -- --#if defined _LIBC || defined HAVE_ARGZ_H --# include <argz.h> --#endif --#include <ctype.h> --#include <sys/types.h> --#include <stdlib.h> -- --#include "loadinfo.h" -- --/* On some strange systems still no definition of NULL is found. Sigh! */ --#ifndef NULL --# if defined __STDC__ && __STDC__ --# define NULL ((void *) 0) --# else --# define NULL 0 --# endif --#endif -- --/* @@ end of prolog @@ */ -- --#ifdef _LIBC --/* Rename the non ANSI C functions. This is required by the standard -- because some ANSI C functions will require linking with this object -- file and the name space must not be polluted. */ --# ifndef stpcpy --# define stpcpy(dest, src) __stpcpy(dest, src) --# endif --#else --# ifndef HAVE_STPCPY --static char *stpcpy (char *dest, const char *src); --# endif --#endif -- --/* Pathname support. -- ISSLASH(C) tests whether C is a directory separator character. -- IS_ABSOLUTE_PATH(P) tests whether P is an absolute path. If it is not, -- it may be concatenated to a directory pathname. -- */ --#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__ -- /* Win32, Cygwin, OS/2, DOS */ --# define ISSLASH(C) ((C) == '/' || (C) == '\\') --# define HAS_DEVICE(P) \ -- ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \ -- && (P)[1] == ':') --# define IS_ABSOLUTE_PATH(P) (ISSLASH ((P)[0]) || HAS_DEVICE (P)) --#else -- /* Unix */ --# define ISSLASH(C) ((C) == '/') --# define IS_ABSOLUTE_PATH(P) ISSLASH ((P)[0]) --#endif -- --/* Define function which are usually not available. */ -- --#ifdef _LIBC --# define __argz_count(argz, len) INTUSE(__argz_count) (argz, len) --#elif defined HAVE_ARGZ_COUNT --# undef __argz_count --# define __argz_count argz_count --#else --/* Returns the number of strings in ARGZ. */ --static size_t --argz_count__ (const char *argz, size_t len) --{ -- size_t count = 0; -- while (len > 0) -- { -- size_t part_len = strlen (argz); -- argz += part_len + 1; -- len -= part_len + 1; -- count++; -- } -- return count; --} --# undef __argz_count --# define __argz_count(argz, len) argz_count__ (argz, len) --#endif /* !_LIBC && !HAVE_ARGZ_COUNT */ -- --#ifdef _LIBC --# define __argz_stringify(argz, len, sep) \ -- INTUSE(__argz_stringify) (argz, len, sep) --#elif defined HAVE_ARGZ_STRINGIFY --# undef __argz_stringify --# define __argz_stringify argz_stringify --#else --/* Make '\0' separated arg vector ARGZ printable by converting all the '\0's -- except the last into the character SEP. */ --static void --argz_stringify__ (char *argz, size_t len, int sep) --{ -- while (len > 0) -- { -- size_t part_len = strlen (argz); -- argz += part_len; -- len -= part_len + 1; -- if (len > 0) -- *argz++ = sep; -- } --} --# undef __argz_stringify --# define __argz_stringify(argz, len, sep) argz_stringify__ (argz, len, sep) --#endif /* !_LIBC && !HAVE_ARGZ_STRINGIFY */ -- --#ifdef _LIBC --#elif defined HAVE_ARGZ_NEXT --# undef __argz_next --# define __argz_next argz_next --#else --static char * --argz_next__ (char *argz, size_t argz_len, const char *entry) --{ -- if (entry) -- { -- if (entry < argz + argz_len) -- entry = strchr (entry, '\0') + 1; -- -- return entry >= argz + argz_len ? NULL : (char *) entry; -- } -- else -- if (argz_len > 0) -- return argz; -- else -- return 0; --} --# undef __argz_next --# define __argz_next(argz, len, entry) argz_next__ (argz, len, entry) --#endif /* !_LIBC && !HAVE_ARGZ_NEXT */ -- -- --/* Return number of bits set in X. */ --static inline int --pop (int x) --{ -- /* We assume that no more than 16 bits are used. */ -- x = ((x & ~0x5555) >> 1) + (x & 0x5555); -- x = ((x & ~0x3333) >> 2) + (x & 0x3333); -- x = ((x >> 4) + x) & 0x0f0f; -- x = ((x >> 8) + x) & 0xff; -- -- return x; --} -- -- --struct loaded_l10nfile * --_nl_make_l10nflist (struct loaded_l10nfile **l10nfile_list, -- const char *dirlist, size_t dirlist_len, -- int mask, const char *language, const char *territory, -- const char *codeset, const char *normalized_codeset, -- const char *modifier, -- const char *filename, int do_allocate) --{ -- char *abs_filename; -- struct loaded_l10nfile **lastp; -- struct loaded_l10nfile *retval; -- char *cp; -- size_t dirlist_count; -- size_t entries; -- int cnt; -- -- /* If LANGUAGE contains an absolute directory specification, we ignore -- DIRLIST. */ -- if (IS_ABSOLUTE_PATH (language)) -- dirlist_len = 0; -- -- /* Allocate room for the full file name. */ -- abs_filename = (char *) malloc (dirlist_len -- + strlen (language) -- + ((mask & XPG_TERRITORY) != 0 -- ? strlen (territory) + 1 : 0) -- + ((mask & XPG_CODESET) != 0 -- ? strlen (codeset) + 1 : 0) -- + ((mask & XPG_NORM_CODESET) != 0 -- ? strlen (normalized_codeset) + 1 : 0) -- + ((mask & XPG_MODIFIER) != 0 -- ? strlen (modifier) + 1 : 0) -- + 1 + strlen (filename) + 1); -- -- if (abs_filename == NULL) -- return NULL; -- -- /* Construct file name. */ -- cp = abs_filename; -- if (dirlist_len > 0) -- { -- memcpy (cp, dirlist, dirlist_len); -- __argz_stringify (cp, dirlist_len, PATH_SEPARATOR); -- cp += dirlist_len; -- cp[-1] = '/'; -- } -- -- cp = stpcpy (cp, language); -- -- if ((mask & XPG_TERRITORY) != 0) -- { -- *cp++ = '_'; -- cp = stpcpy (cp, territory); -- } -- if ((mask & XPG_CODESET) != 0) -- { -- *cp++ = '.'; -- cp = stpcpy (cp, codeset); -- } -- if ((mask & XPG_NORM_CODESET) != 0) -- { -- *cp++ = '.'; -- cp = stpcpy (cp, normalized_codeset); -- } -- if ((mask & XPG_MODIFIER) != 0) -- { -- *cp++ = '@'; -- cp = stpcpy (cp, modifier); -- } -- -- *cp++ = '/'; -- stpcpy (cp, filename); -- -- /* Look in list of already loaded domains whether it is already -- available. */ -- lastp = l10nfile_list; -- for (retval = *l10nfile_list; retval != NULL; retval = retval->next) -- if (retval->filename != NULL) -- { -- int compare = strcmp (retval->filename, abs_filename); -- if (compare == 0) -- /* We found it! */ -- break; -- if (compare < 0) -- { -- /* It's not in the list. */ -- retval = NULL; -- break; -- } -- -- lastp = &retval->next; -- } -- -- if (retval != NULL || do_allocate == 0) -- { -- free (abs_filename); -- return retval; -- } -- -- dirlist_count = (dirlist_len > 0 ? __argz_count (dirlist, dirlist_len) : 1); -- -- /* Allocate a new loaded_l10nfile. */ -- retval = -- (struct loaded_l10nfile *) -- malloc (sizeof (*retval) -- + (((dirlist_count << pop (mask)) + (dirlist_count > 1 ? 1 : 0)) -- * sizeof (struct loaded_l10nfile *))); -- if (retval == NULL) -- { -- free (abs_filename); -- return NULL; -- } -- -- retval->filename = abs_filename; -- -- /* We set retval->data to NULL here; it is filled in later. -- Setting retval->decided to 1 here means that retval does not -- correspond to a real file (dirlist_count > 1) or is not worth -- looking up (if an unnormalized codeset was specified). */ -- retval->decided = (dirlist_count > 1 -- || ((mask & XPG_CODESET) != 0 -- && (mask & XPG_NORM_CODESET) != 0)); -- retval->data = NULL; -- -- retval->next = *lastp; -- *lastp = retval; -- -- entries = 0; -- /* Recurse to fill the inheritance list of RETVAL. -- If the DIRLIST is a real list (i.e. DIRLIST_COUNT > 1), the RETVAL -- entry does not correspond to a real file; retval->filename contains -- colons. In this case we loop across all elements of DIRLIST and -- across all bit patterns dominated by MASK. -- If the DIRLIST is a single directory or entirely redundant (i.e. -- DIRLIST_COUNT == 1), we loop across all bit patterns dominated by -- MASK, excluding MASK itself. -- In either case, we loop down from MASK to 0. This has the effect -- that the extra bits in the locale name are dropped in this order: -- first the modifier, then the territory, then the codeset, then the -- normalized_codeset. */ -- for (cnt = dirlist_count > 1 ? mask : mask - 1; cnt >= 0; --cnt) -- if ((cnt & ~mask) == 0 -- && !((cnt & XPG_CODESET) != 0 && (cnt & XPG_NORM_CODESET) != 0)) -- { -- if (dirlist_count > 1) -- { -- /* Iterate over all elements of the DIRLIST. */ -- char *dir = NULL; -- -- while ((dir = __argz_next ((char *) dirlist, dirlist_len, dir)) -- != NULL) -- retval->successor[entries++] -- = _nl_make_l10nflist (l10nfile_list, dir, strlen (dir) + 1, -- cnt, language, territory, codeset, -- normalized_codeset, modifier, filename, -- 1); -- } -- else -- retval->successor[entries++] -- = _nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, -- cnt, language, territory, codeset, -- normalized_codeset, modifier, filename, 1); -- } -- retval->successor[entries] = NULL; -- -- return retval; --} -- --/* Normalize codeset name. There is no standard for the codeset -- names. Normalization allows the user to use any of the common -- names. The return value is dynamically allocated and has to be -- freed by the caller. */ --const char * --_nl_normalize_codeset (const char *codeset, size_t name_len) --{ -- int len = 0; -- int only_digit = 1; -- char *retval; -- char *wp; -- size_t cnt; -- -- for (cnt = 0; cnt < name_len; ++cnt) -- if (isalnum ((unsigned char) codeset[cnt])) -- { -- ++len; -- -- if (isalpha ((unsigned char) codeset[cnt])) -- only_digit = 0; -- } -- -- retval = (char *) malloc ((only_digit ? 3 : 0) + len + 1); -- -- if (retval != NULL) -- { -- if (only_digit) -- wp = stpcpy (retval, "iso"); -- else -- wp = retval; -- -- for (cnt = 0; cnt < name_len; ++cnt) -- if (isalpha ((unsigned char) codeset[cnt])) -- *wp++ = tolower ((unsigned char) codeset[cnt]); -- else if (isdigit ((unsigned char) codeset[cnt])) -- *wp++ = codeset[cnt]; -- -- *wp = '\0'; -- } -- -- return (const char *) retval; --} -- -- --/* @@ begin of epilog @@ */ -- --/* We don't want libintl.a to depend on any other library. So we -- avoid the non-standard function stpcpy. In GNU C Library this -- function is available, though. Also allow the symbol HAVE_STPCPY -- to be defined. */ --#if !_LIBC && !HAVE_STPCPY --static char * --stpcpy (char *dest, const char *src) --{ -- while ((*dest++ = *src++) != '\0') -- /* Do nothing. */ ; -- return dest - 1; --} --#endif ---- a/intl/langprefs.c -+++ /dev/null -@@ -1,130 +0,0 @@ --/* Determine the user's language preferences. -- Copyright (C) 2004-2006 Free Software Foundation, Inc. -- -- This program is free software; you can redistribute it and/or modify it -- under the terms of the GNU Library General Public License as published -- by the Free Software Foundation; either version 2, or (at your option) -- any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Library General Public License for more details. -- -- You should have received a copy of the GNU Library General Public -- License along with this program; if not, write to the Free Software -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, -- USA. */ -- --/* Written by Bruno Haible <bruno@clisp.org>. */ -- --#ifdef HAVE_CONFIG_H --# include <config.h> --#endif -- --#include <stdlib.h> -- --#if HAVE_CFPREFERENCESCOPYAPPVALUE --# include <string.h> --# include <CoreFoundation/CFPreferences.h> --# include <CoreFoundation/CFPropertyList.h> --# include <CoreFoundation/CFArray.h> --# include <CoreFoundation/CFString.h> --extern void _nl_locale_name_canonicalize (char *name); --#endif -- --/* Determine the user's language preferences, as a colon separated list of -- locale names in XPG syntax -- language[_territory][.codeset][@modifier] -- The result must not be freed; it is statically allocated. -- The LANGUAGE environment variable does not need to be considered; it is -- already taken into account by the caller. */ -- --const char * --_nl_language_preferences_default (void) --{ --#if HAVE_CFPREFERENCESCOPYAPPVALUE /* MacOS X 10.2 or newer */ -- { -- /* Cache the preferences list, since CoreFoundation calls are expensive. */ -- static const char *cached_languages; -- static int cache_initialized; -- -- if (!cache_initialized) -- { -- CFTypeRef preferences = -- CFPreferencesCopyAppValue (CFSTR ("AppleLanguages"), -- kCFPreferencesCurrentApplication); -- if (preferences != NULL -- && CFGetTypeID (preferences) == CFArrayGetTypeID ()) -- { -- CFArrayRef prefArray = (CFArrayRef)preferences; -- int n = CFArrayGetCount (prefArray); -- char buf[256]; -- size_t size = 0; -- int i; -- -- for (i = 0; i < n; i++) -- { -- CFTypeRef element = CFArrayGetValueAtIndex (prefArray, i); -- if (element != NULL -- && CFGetTypeID (element) == CFStringGetTypeID () -- && CFStringGetCString ((CFStringRef)element, -- buf, sizeof (buf), -- kCFStringEncodingASCII)) -- { -- _nl_locale_name_canonicalize (buf); -- size += strlen (buf) + 1; -- /* Most GNU programs use msgids in English and don't ship -- an en.mo message catalog. Therefore when we see "en" -- in the preferences list, arrange for gettext() to -- return the msgid, and ignore all further elements of -- the preferences list. */ -- if (strcmp (buf, "en") == 0) -- break; -- } -- else -- break; -- } -- if (size > 0) -- { -- char *languages = (char *) malloc (size); -- -- if (languages != NULL) -- { -- char *p = languages; -- -- for (i = 0; i < n; i++) -- { -- CFTypeRef element = -- CFArrayGetValueAtIndex (prefArray, i); -- if (element != NULL -- && CFGetTypeID (element) == CFStringGetTypeID () -- && CFStringGetCString ((CFStringRef)element, -- buf, sizeof (buf), -- kCFStringEncodingASCII)) -- { -- _nl_locale_name_canonicalize (buf); -- strcpy (p, buf); -- p += strlen (buf); -- *p++ = ':'; -- if (strcmp (buf, "en") == 0) -- break; -- } -- else -- break; -- } -- *--p = '\0'; -- -- cached_languages = languages; -- } -- } -- } -- cache_initialized = 1; -- } -- if (cached_languages != NULL) -- return cached_languages; -- } --#endif -- -- return NULL; --} ---- a/intl/libgnuintl.h.in -+++ /dev/null -@@ -1,419 +0,0 @@ --/* Message catalogs for internationalization. -- Copyright (C) 1995-1997, 2000-2007 Free Software Foundation, Inc. -- -- This program is free software; you can redistribute it and/or modify it -- under the terms of the GNU Library General Public License as published -- by the Free Software Foundation; either version 2, or (at your option) -- any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Library General Public License for more details. -- -- You should have received a copy of the GNU Library General Public -- License along with this program; if not, write to the Free Software -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, -- USA. */ -- --#ifndef _LIBINTL_H --#define _LIBINTL_H 1 -- --#include <locale.h> -- --/* The LC_MESSAGES locale category is the category used by the functions -- gettext() and dgettext(). It is specified in POSIX, but not in ANSI C. -- On systems that don't define it, use an arbitrary value instead. -- On Solaris, <locale.h> defines __LOCALE_H (or _LOCALE_H in Solaris 2.5) -- then includes <libintl.h> (i.e. this file!) and then only defines -- LC_MESSAGES. To avoid a redefinition warning, don't define LC_MESSAGES -- in this case. */ --#if !defined LC_MESSAGES && !(defined __LOCALE_H || (defined _LOCALE_H && defined __sun)) --# define LC_MESSAGES 1729 --#endif -- --/* We define an additional symbol to signal that we use the GNU -- implementation of gettext. */ --#define __USE_GNU_GETTEXT 1 -- --/* Provide information about the supported file formats. Returns the -- maximum minor revision number supported for a given major revision. */ --#define __GNU_GETTEXT_SUPPORTED_REVISION(major) \ -- ((major) == 0 || (major) == 1 ? 1 : -1) -- --/* Resolve a platform specific conflict on DJGPP. GNU gettext takes -- precedence over _conio_gettext. */ --#ifdef __DJGPP__ --# undef gettext --#endif -- --#ifdef __cplusplus --extern "C" { --#endif -- -- --/* Version number: (major<<16) + (minor<<8) + subminor */ --#define LIBINTL_VERSION 0x001100 --extern int libintl_version; -- -- --/* We redirect the functions to those prefixed with "libintl_". This is -- necessary, because some systems define gettext/textdomain/... in the C -- library (namely, Solaris 2.4 and newer, and GNU libc 2.0 and newer). -- If we used the unprefixed names, there would be cases where the -- definition in the C library would override the one in the libintl.so -- shared library. Recall that on ELF systems, the symbols are looked -- up in the following order: -- 1. in the executable, -- 2. in the shared libraries specified on the link command line, in order, -- 3. in the dependencies of the shared libraries specified on the link -- command line, -- 4. in the dlopen()ed shared libraries, in the order in which they were -- dlopen()ed. -- The definition in the C library would override the one in libintl.so if -- either -- * -lc is given on the link command line and -lintl isn't, or -- * -lc is given on the link command line before -lintl, or -- * libintl.so is a dependency of a dlopen()ed shared library but not -- linked to the executable at link time. -- Since Solaris gettext() behaves differently than GNU gettext(), this -- would be unacceptable. -- -- The redirection happens by default through macros in C, so that &gettext -- is independent of the compilation unit, but through inline functions in -- C++, in order not to interfere with the name mangling of class fields or -- class methods called 'gettext'. */ -- --/* The user can define _INTL_REDIRECT_INLINE or _INTL_REDIRECT_MACROS. -- If he doesn't, we choose the method. A third possible method is -- _INTL_REDIRECT_ASM, supported only by GCC. */ --#if !(defined _INTL_REDIRECT_INLINE || defined _INTL_REDIRECT_MACROS) --# if __GNUC__ >= 2 && !(__APPLE_CC__ > 1) && !defined __MINGW32__ && !(__GNUC__ == 2 && defined _AIX) && (defined __STDC__ || defined __cplusplus) --# define _INTL_REDIRECT_ASM --# else --# ifdef __cplusplus --# define _INTL_REDIRECT_INLINE --# else --# define _INTL_REDIRECT_MACROS --# endif --# endif --#endif --/* Auxiliary macros. */ --#ifdef _INTL_REDIRECT_ASM --# define _INTL_ASM(cname) __asm__ (_INTL_ASMNAME (__USER_LABEL_PREFIX__, #cname)) --# define _INTL_ASMNAME(prefix,cnamestring) _INTL_STRINGIFY (prefix) cnamestring --# define _INTL_STRINGIFY(prefix) #prefix --#else --# define _INTL_ASM(cname) --#endif -- --/* _INTL_MAY_RETURN_STRING_ARG(n) declares that the given function may return -- its n-th argument literally. This enables GCC to warn for example about -- printf (gettext ("foo %y")). */ --#if __GNUC__ >= 3 && !(__APPLE_CC__ > 1 && defined __cplusplus) --# define _INTL_MAY_RETURN_STRING_ARG(n) __attribute__ ((__format_arg__ (n))) --#else --# define _INTL_MAY_RETURN_STRING_ARG(n) --#endif -- --/* Look up MSGID in the current default message catalog for the current -- LC_MESSAGES locale. If not found, returns MSGID itself (the default -- text). */ --#ifdef _INTL_REDIRECT_INLINE --extern char *libintl_gettext (const char *__msgid) -- _INTL_MAY_RETURN_STRING_ARG (1); --static inline char *gettext (const char *__msgid) --{ -- return libintl_gettext (__msgid); --} --#else --#ifdef _INTL_REDIRECT_MACROS --# define gettext libintl_gettext --#endif --extern char *gettext (const char *__msgid) -- _INTL_ASM (libintl_gettext) -- _INTL_MAY_RETURN_STRING_ARG (1); --#endif -- --/* Look up MSGID in the DOMAINNAME message catalog for the current -- LC_MESSAGES locale. */ --#ifdef _INTL_REDIRECT_INLINE --extern char *libintl_dgettext (const char *__domainname, const char *__msgid) -- _INTL_MAY_RETURN_STRING_ARG (2); --static inline char *dgettext (const char *__domainname, const char *__msgid) --{ -- return libintl_dgettext (__domainname, __msgid); --} --#else --#ifdef _INTL_REDIRECT_MACROS --# define dgettext libintl_dgettext --#endif --extern char *dgettext (const char *__domainname, const char *__msgid) -- _INTL_ASM (libintl_dgettext) -- _INTL_MAY_RETURN_STRING_ARG (2); --#endif -- --/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY -- locale. */ --#ifdef _INTL_REDIRECT_INLINE --extern char *libintl_dcgettext (const char *__domainname, const char *__msgid, -- int __category) -- _INTL_MAY_RETURN_STRING_ARG (2); --static inline char *dcgettext (const char *__domainname, const char *__msgid, -- int __category) --{ -- return libintl_dcgettext (__domainname, __msgid, __category); --} --#else --#ifdef _INTL_REDIRECT_MACROS --# define dcgettext libintl_dcgettext --#endif --extern char *dcgettext (const char *__domainname, const char *__msgid, -- int __category) -- _INTL_ASM (libintl_dcgettext) -- _INTL_MAY_RETURN_STRING_ARG (2); --#endif -- -- --/* Similar to `gettext' but select the plural form corresponding to the -- number N. */ --#ifdef _INTL_REDIRECT_INLINE --extern char *libintl_ngettext (const char *__msgid1, const char *__msgid2, -- unsigned long int __n) -- _INTL_MAY_RETURN_STRING_ARG (1) _INTL_MAY_RETURN_STRING_ARG (2); --static inline char *ngettext (const char *__msgid1, const char *__msgid2, -- unsigned long int __n) --{ -- return libintl_ngettext (__msgid1, __msgid2, __n); --} --#else --#ifdef _INTL_REDIRECT_MACROS --# define ngettext libintl_ngettext --#endif --extern char *ngettext (const char *__msgid1, const char *__msgid2, -- unsigned long int __n) -- _INTL_ASM (libintl_ngettext) -- _INTL_MAY_RETURN_STRING_ARG (1) _INTL_MAY_RETURN_STRING_ARG (2); --#endif -- --/* Similar to `dgettext' but select the plural form corresponding to the -- number N. */ --#ifdef _INTL_REDIRECT_INLINE --extern char *libintl_dngettext (const char *__domainname, const char *__msgid1, -- const char *__msgid2, unsigned long int __n) -- _INTL_MAY_RETURN_STRING_ARG (2) _INTL_MAY_RETURN_STRING_ARG (3); --static inline char *dngettext (const char *__domainname, const char *__msgid1, -- const char *__msgid2, unsigned long int __n) --{ -- return libintl_dngettext (__domainname, __msgid1, __msgid2, __n); --} --#else --#ifdef _INTL_REDIRECT_MACROS --# define dngettext libintl_dngettext --#endif --extern char *dngettext (const char *__domainname, -- const char *__msgid1, const char *__msgid2, -- unsigned long int __n) -- _INTL_ASM (libintl_dngettext) -- _INTL_MAY_RETURN_STRING_ARG (2) _INTL_MAY_RETURN_STRING_ARG (3); --#endif -- --/* Similar to `dcgettext' but select the plural form corresponding to the -- number N. */ --#ifdef _INTL_REDIRECT_INLINE --extern char *libintl_dcngettext (const char *__domainname, -- const char *__msgid1, const char *__msgid2, -- unsigned long int __n, int __category) -- _INTL_MAY_RETURN_STRING_ARG (2) _INTL_MAY_RETURN_STRING_ARG (3); --static inline char *dcngettext (const char *__domainname, -- const char *__msgid1, const char *__msgid2, -- unsigned long int __n, int __category) --{ -- return libintl_dcngettext (__domainname, __msgid1, __msgid2, __n, __category); --} --#else --#ifdef _INTL_REDIRECT_MACROS --# define dcngettext libintl_dcngettext --#endif --extern char *dcngettext (const char *__domainname, -- const char *__msgid1, const char *__msgid2, -- unsigned long int __n, int __category) -- _INTL_ASM (libintl_dcngettext) -- _INTL_MAY_RETURN_STRING_ARG (2) _INTL_MAY_RETURN_STRING_ARG (3); --#endif -- -- --#ifndef IN_LIBGLOCALE -- --/* Set the current default message catalog to DOMAINNAME. -- If DOMAINNAME is null, return the current default. -- If DOMAINNAME is "", reset to the default of "messages". */ --#ifdef _INTL_REDIRECT_INLINE --extern char *libintl_textdomain (const char *__domainname); --static inline char *textdomain (const char *__domainname) --{ -- return libintl_textdomain (__domainname); --} --#else --#ifdef _INTL_REDIRECT_MACROS --# define textdomain libintl_textdomain --#endif --extern char *textdomain (const char *__domainname) -- _INTL_ASM (libintl_textdomain); --#endif -- --/* Specify that the DOMAINNAME message catalog will be found -- in DIRNAME rather than in the system locale data base. */ --#ifdef _INTL_REDIRECT_INLINE --extern char *libintl_bindtextdomain (const char *__domainname, -- const char *__dirname); --static inline char *bindtextdomain (const char *__domainname, -- const char *__dirname) --{ -- return libintl_bindtextdomain (__domainname, __dirname); --} --#else --#ifdef _INTL_REDIRECT_MACROS --# define bindtextdomain libintl_bindtextdomain --#endif --extern char *bindtextdomain (const char *__domainname, const char *__dirname) -- _INTL_ASM (libintl_bindtextdomain); --#endif -- --/* Specify the character encoding in which the messages from the -- DOMAINNAME message catalog will be returned. */ --#ifdef _INTL_REDIRECT_INLINE --extern char *libintl_bind_textdomain_codeset (const char *__domainname, -- const char *__codeset); --static inline char *bind_textdomain_codeset (const char *__domainname, -- const char *__codeset) --{ -- return libintl_bind_textdomain_codeset (__domainname, __codeset); --} --#else --#ifdef _INTL_REDIRECT_MACROS --# define bind_textdomain_codeset libintl_bind_textdomain_codeset --#endif --extern char *bind_textdomain_codeset (const char *__domainname, -- const char *__codeset) -- _INTL_ASM (libintl_bind_textdomain_codeset); --#endif -- --#endif /* IN_LIBGLOCALE */ -- -- --/* Support for format strings with positions in *printf(), following the -- POSIX/XSI specification. -- Note: These replacements for the *printf() functions are visible only -- in source files that #include <libintl.h> or #include "gettext.h". -- Packages that use *printf() in source files that don't refer to _() -- or gettext() but for which the format string could be the return value -- of _() or gettext() need to add this #include. Oh well. */ -- --#if !@HAVE_POSIX_PRINTF@ -- --#include <stdio.h> --#include <stddef.h> -- --/* Get va_list. */ --#if __STDC__ || defined __cplusplus || defined _MSC_VER --# include <stdarg.h> --#else --# include <varargs.h> --#endif -- --#undef fprintf --#define fprintf libintl_fprintf --extern int fprintf (FILE *, const char *, ...); --#undef vfprintf --#define vfprintf libintl_vfprintf --extern int vfprintf (FILE *, const char *, va_list); -- --#undef printf --#if defined __NetBSD__ || defined __BEOS__ || defined __CYGWIN__ || defined __MINGW32__ --/* Don't break __attribute__((format(printf,M,N))). -- This redefinition is only possible because the libc in NetBSD, Cygwin, -- mingw does not have a function __printf__. */ --# define libintl_printf __printf__ --#endif --#define printf libintl_printf --extern int printf (const char *, ...); --#undef vprintf --#define vprintf libintl_vprintf --extern int vprintf (const char *, va_list); -- --#undef sprintf --#define sprintf libintl_sprintf --extern int sprintf (char *, const char *, ...); --#undef vsprintf --#define vsprintf libintl_vsprintf --extern int vsprintf (char *, const char *, va_list); -- --#if @HAVE_SNPRINTF@ -- --#undef snprintf --#define snprintf libintl_snprintf --extern int snprintf (char *, size_t, const char *, ...); --#undef vsnprintf --#define vsnprintf libintl_vsnprintf --extern int vsnprintf (char *, size_t, const char *, va_list); -- --#endif -- --#if @HAVE_ASPRINTF@ -- --#undef asprintf --#define asprintf libintl_asprintf --extern int asprintf (char **, const char *, ...); --#undef vasprintf --#define vasprintf libintl_vasprintf --extern int vasprintf (char **, const char *, va_list); -- --#endif -- --#if @HAVE_WPRINTF@ -- --#undef fwprintf --#define fwprintf libintl_fwprintf --extern int fwprintf (FILE *, const wchar_t *, ...); --#undef vfwprintf --#define vfwprintf libintl_vfwprintf --extern int vfwprintf (FILE *, const wchar_t *, va_list); -- --#undef wprintf --#define wprintf libintl_wprintf --extern int wprintf (const wchar_t *, ...); --#undef vwprintf --#define vwprintf libintl_vwprintf --extern int vwprintf (const wchar_t *, va_list); -- --#undef swprintf --#define swprintf libintl_swprintf --extern int swprintf (wchar_t *, size_t, const wchar_t *, ...); --#undef vswprintf --#define vswprintf libintl_vswprintf --extern int vswprintf (wchar_t *, size_t, const wchar_t *, va_list); -- --#endif -- --#endif -- -- --/* Support for relocatable packages. */ -- --/* Sets the original and the current installation prefix of the package. -- Relocation simply replaces a pathname starting with the original prefix -- by the corresponding pathname with the current prefix instead. Both -- prefixes should be directory names without trailing slash (i.e. use "" -- instead of "/"). */ --#define libintl_set_relocation_prefix libintl_set_relocation_prefix --extern void -- libintl_set_relocation_prefix (const char *orig_prefix, -- const char *curr_prefix); -- -- --#ifdef __cplusplus --} --#endif -- --#endif /* libintl.h */ ---- a/intl/libintl.rc -+++ /dev/null -@@ -1,38 +0,0 @@ --/* Resources for intl.dll */ -- --#include <winver.h> -- --VS_VERSION_INFO VERSIONINFO -- FILEVERSION PACKAGE_VERSION_MAJOR,PACKAGE_VERSION_MINOR,PACKAGE_VERSION_SUBMINOR,0 -- PRODUCTVERSION PACKAGE_VERSION_MAJOR,PACKAGE_VERSION_MINOR,PACKAGE_VERSION_SUBMINOR,0 -- FILEFLAGSMASK 0x3fL /* VS_FFI_FILEFLAGSMASK */ --#ifdef _DEBUG -- FILEFLAGS 0x1L /* VS_FF_DEBUG */ --#else -- FILEFLAGS 0x0L --#endif -- FILEOS 0x10004L /* VOS_DOS_WINDOWS32 */ -- FILETYPE 0x2L /* VFT_DLL */ -- FILESUBTYPE 0x0L /* VFT2_UNKNOWN */ --BEGIN -- BLOCK "StringFileInfo" -- BEGIN -- BLOCK "04090000" /* Lang = US English, Charset = ASCII */ -- BEGIN -- VALUE "Comments", "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License. You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA\0" -- VALUE "CompanyName", "Free Software Foundation\0" -- VALUE "FileDescription", "LGPLed libintl for Windows NT/2000/XP/Vista and Windows 95/98/ME\0" -- VALUE "FileVersion", PACKAGE_VERSION_STRING "\0" -- VALUE "InternalName", "intl.dll\0" -- VALUE "LegalCopyright", "Copyright (C) 1995-2007\0" -- VALUE "LegalTrademarks", "\0" -- VALUE "OriginalFilename", "intl.dll\0" -- VALUE "ProductName", "libintl: accessing NLS message catalogs\0" -- VALUE "ProductVersion", PACKAGE_VERSION_STRING "\0" -- END -- END -- BLOCK "VarFileInfo" -- BEGIN -- VALUE "Translation", 0x0409, 0 /* US English, ASCII */ -- END --END ---- a/intl/loadinfo.h -+++ /dev/null -@@ -1,132 +0,0 @@ --/* Copyright (C) 1996-1999, 2000-2003, 2005-2006 Free Software Foundation, Inc. -- This file is part of the GNU C Library. -- Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. -- -- This program is free software; you can redistribute it and/or modify it -- under the terms of the GNU Library General Public License as published -- by the Free Software Foundation; either version 2, or (at your option) -- any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Library General Public License for more details. -- -- You should have received a copy of the GNU Library General Public -- License along with this program; if not, write to the Free Software -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, -- USA. */ -- --#ifndef _LOADINFO_H --#define _LOADINFO_H 1 -- --/* Declarations of locale dependent catalog lookup functions. -- Implemented in -- -- localealias.c Possibly replace a locale name by another. -- explodename.c Split a locale name into its various fields. -- l10nflist.c Generate a list of filenames of possible message catalogs. -- finddomain.c Find and open the relevant message catalogs. -- -- The main function _nl_find_domain() in finddomain.c is declared -- in gettextP.h. -- */ -- --#ifndef internal_function --# define internal_function --#endif -- --#ifndef LIBINTL_DLL_EXPORTED --# define LIBINTL_DLL_EXPORTED --#endif -- --/* Tell the compiler when a conditional or integer expression is -- almost always true or almost always false. */ --#ifndef HAVE_BUILTIN_EXPECT --# define __builtin_expect(expr, val) (expr) --#endif -- --/* Separator in PATH like lists of pathnames. */ --#if ((defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__) || defined __EMX__ || defined __DJGPP__ -- /* Win32, OS/2, DOS */ --# define PATH_SEPARATOR ';' --#else -- /* Unix */ --# define PATH_SEPARATOR ':' --#endif -- --/* Encoding of locale name parts. */ --#define XPG_NORM_CODESET 1 --#define XPG_CODESET 2 --#define XPG_TERRITORY 4 --#define XPG_MODIFIER 8 -- -- --struct loaded_l10nfile --{ -- const char *filename; -- int decided; -- -- const void *data; -- -- struct loaded_l10nfile *next; -- struct loaded_l10nfile *successor[1]; --}; -- -- --/* Normalize codeset name. There is no standard for the codeset -- names. Normalization allows the user to use any of the common -- names. The return value is dynamically allocated and has to be -- freed by the caller. */ --extern const char *_nl_normalize_codeset (const char *codeset, -- size_t name_len); -- --/* Lookup a locale dependent file. -- *L10NFILE_LIST denotes a pool of lookup results of locale dependent -- files of the same kind, sorted in decreasing order of ->filename. -- DIRLIST and DIRLIST_LEN are an argz list of directories in which to -- look, containing at least one directory (i.e. DIRLIST_LEN > 0). -- MASK, LANGUAGE, TERRITORY, CODESET, NORMALIZED_CODESET, MODIFIER -- are the pieces of the locale name, as produced by _nl_explode_name(). -- FILENAME is the filename suffix. -- The return value is the lookup result, either found in *L10NFILE_LIST, -- or - if DO_ALLOCATE is nonzero - freshly allocated, or possibly NULL. -- If the return value is non-NULL, it is added to *L10NFILE_LIST, and -- its ->next field denotes the chaining inside *L10NFILE_LIST, and -- furthermore its ->successor[] field contains a list of other lookup -- results from which this lookup result inherits. */ --extern struct loaded_l10nfile * --_nl_make_l10nflist (struct loaded_l10nfile **l10nfile_list, -- const char *dirlist, size_t dirlist_len, int mask, -- const char *language, const char *territory, -- const char *codeset, const char *normalized_codeset, -- const char *modifier, -- const char *filename, int do_allocate); -- --/* Lookup the real locale name for a locale alias NAME, or NULL if -- NAME is not a locale alias (but possibly a real locale name). -- The return value is statically allocated and must not be freed. */ --/* Part of the libintl ABI only for the sake of the gettext.m4 macro. */ --extern LIBINTL_DLL_EXPORTED const char *_nl_expand_alias (const char *name); -- --/* Split a locale name NAME into its pieces: language, modifier, -- territory, codeset. -- NAME gets destructively modified: NUL bytes are inserted here and -- there. *LANGUAGE gets assigned NAME. Each of *MODIFIER, *TERRITORY, -- *CODESET gets assigned either a pointer into the old NAME string, or -- NULL. *NORMALIZED_CODESET gets assigned the expanded *CODESET, if it -- is different from *CODESET; this one is dynamically allocated and has -- to be freed by the caller. -- The return value is a bitmask, where each bit corresponds to one -- filled-in value: -- XPG_MODIFIER for *MODIFIER, -- XPG_TERRITORY for *TERRITORY, -- XPG_CODESET for *CODESET, -- XPG_NORM_CODESET for *NORMALIZED_CODESET. -- */ --extern int _nl_explode_name (char *name, const char **language, -- const char **modifier, const char **territory, -- const char **codeset, -- const char **normalized_codeset); -- --#endif /* loadinfo.h */ ---- a/intl/loadmsgcat.c -+++ /dev/null -@@ -1,1336 +0,0 @@ --/* Load needed message catalogs. -- Copyright (C) 1995-1999, 2000-2007 Free Software Foundation, Inc. -- -- This program is free software; you can redistribute it and/or modify it -- under the terms of the GNU Library General Public License as published -- by the Free Software Foundation; either version 2, or (at your option) -- any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Library General Public License for more details. -- -- You should have received a copy of the GNU Library General Public -- License along with this program; if not, write to the Free Software -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, -- USA. */ -- --/* Tell glibc's <string.h> to provide a prototype for mempcpy(). -- This must come before <config.h> because <config.h> may include -- <features.h>, and once <features.h> has been included, it's too late. */ --#ifndef _GNU_SOURCE --# define _GNU_SOURCE 1 --#endif -- --#ifdef HAVE_CONFIG_H --# include <config.h> --#endif -- --#include <ctype.h> --#include <errno.h> --#include <fcntl.h> --#include <sys/types.h> --#include <sys/stat.h> -- --#ifdef __GNUC__ --# undef alloca --# define alloca __builtin_alloca --# define HAVE_ALLOCA 1 --#else --# ifdef _MSC_VER --# include <malloc.h> --# define alloca _alloca --# else --# if defined HAVE_ALLOCA_H || defined _LIBC --# include <alloca.h> --# else --# ifdef _AIX -- #pragma alloca --# else --# ifndef alloca --char *alloca (); --# endif --# endif --# endif --# endif --#endif -- --#include <stdlib.h> --#include <string.h> -- --#if defined HAVE_UNISTD_H || defined _LIBC --# include <unistd.h> --#endif -- --#ifdef _LIBC --# include <langinfo.h> --# include <locale.h> --#endif -- --#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \ -- || (defined _LIBC && defined _POSIX_MAPPED_FILES) --# include <sys/mman.h> --# undef HAVE_MMAP --# define HAVE_MMAP 1 --#else --# undef HAVE_MMAP --#endif -- --#if defined HAVE_STDINT_H_WITH_UINTMAX || defined _LIBC --# include <stdint.h> --#endif --#if defined HAVE_INTTYPES_H || defined _LIBC --# include <inttypes.h> --#endif -- --#include "gmo.h" --#include "gettextP.h" --#include "hash-string.h" --#include "plural-exp.h" -- --#ifdef _LIBC --# include "../locale/localeinfo.h" --# include <not-cancel.h> --#endif -- --/* Handle multi-threaded applications. */ --#ifdef _LIBC --# include <bits/libc-lock.h> --#else --# include "lock.h" --#endif -- --/* Provide fallback values for macros that ought to be defined in <inttypes.h>. -- Note that our fallback values need not be literal strings, because we don't -- use them with preprocessor string concatenation. */ --#if !defined PRId8 || PRI_MACROS_BROKEN --# undef PRId8 --# define PRId8 "d" --#endif --#if !defined PRIi8 || PRI_MACROS_BROKEN --# undef PRIi8 --# define PRIi8 "i" --#endif --#if !defined PRIo8 || PRI_MACROS_BROKEN --# undef PRIo8 --# define PRIo8 "o" --#endif --#if !defined PRIu8 || PRI_MACROS_BROKEN --# undef PRIu8 --# define PRIu8 "u" --#endif --#if !defined PRIx8 || PRI_MACROS_BROKEN --# undef PRIx8 --# define PRIx8 "x" --#endif --#if !defined PRIX8 || PRI_MACROS_BROKEN --# undef PRIX8 --# define PRIX8 "X" --#endif --#if !defined PRId16 || PRI_MACROS_BROKEN --# undef PRId16 --# define PRId16 "d" --#endif --#if !defined PRIi16 || PRI_MACROS_BROKEN --# undef PRIi16 --# define PRIi16 "i" --#endif --#if !defined PRIo16 || PRI_MACROS_BROKEN --# undef PRIo16 --# define PRIo16 "o" --#endif --#if !defined PRIu16 || PRI_MACROS_BROKEN --# undef PRIu16 --# define PRIu16 "u" --#endif --#if !defined PRIx16 || PRI_MACROS_BROKEN --# undef PRIx16 --# define PRIx16 "x" --#endif --#if !defined PRIX16 || PRI_MACROS_BROKEN --# undef PRIX16 --# define PRIX16 "X" --#endif --#if !defined PRId32 || PRI_MACROS_BROKEN --# undef PRId32 --# define PRId32 "d" --#endif --#if !defined PRIi32 || PRI_MACROS_BROKEN --# undef PRIi32 --# define PRIi32 "i" --#endif --#if !defined PRIo32 || PRI_MACROS_BROKEN --# undef PRIo32 --# define PRIo32 "o" --#endif --#if !defined PRIu32 || PRI_MACROS_BROKEN --# undef PRIu32 --# define PRIu32 "u" --#endif --#if !defined PRIx32 || PRI_MACROS_BROKEN --# undef PRIx32 --# define PRIx32 "x" --#endif --#if !defined PRIX32 || PRI_MACROS_BROKEN --# undef PRIX32 --# define PRIX32 "X" --#endif --#if !defined PRId64 || PRI_MACROS_BROKEN --# undef PRId64 --# define PRId64 (sizeof (long) == 8 ? "ld" : "lld") --#endif --#if !defined PRIi64 || PRI_MACROS_BROKEN --# undef PRIi64 --# define PRIi64 (sizeof (long) == 8 ? "li" : "lli") --#endif --#if !defined PRIo64 || PRI_MACROS_BROKEN --# undef PRIo64 --# define PRIo64 (sizeof (long) == 8 ? "lo" : "llo") --#endif --#if !defined PRIu64 || PRI_MACROS_BROKEN --# undef PRIu64 --# define PRIu64 (sizeof (long) == 8 ? "lu" : "llu") --#endif --#if !defined PRIx64 || PRI_MACROS_BROKEN --# undef PRIx64 --# define PRIx64 (sizeof (long) == 8 ? "lx" : "llx") --#endif --#if !defined PRIX64 || PRI_MACROS_BROKEN --# undef PRIX64 --# define PRIX64 (sizeof (long) == 8 ? "lX" : "llX") --#endif --#if !defined PRIdLEAST8 || PRI_MACROS_BROKEN --# undef PRIdLEAST8 --# define PRIdLEAST8 "d" --#endif --#if !defined PRIiLEAST8 || PRI_MACROS_BROKEN --# undef PRIiLEAST8 --# define PRIiLEAST8 "i" --#endif --#if !defined PRIoLEAST8 || PRI_MACROS_BROKEN --# undef PRIoLEAST8 --# define PRIoLEAST8 "o" --#endif --#if !defined PRIuLEAST8 || PRI_MACROS_BROKEN --# undef PRIuLEAST8 --# define PRIuLEAST8 "u" --#endif --#if !defined PRIxLEAST8 || PRI_MACROS_BROKEN --# undef PRIxLEAST8 --# define PRIxLEAST8 "x" --#endif --#if !defined PRIXLEAST8 || PRI_MACROS_BROKEN --# undef PRIXLEAST8 --# define PRIXLEAST8 "X" --#endif --#if !defined PRIdLEAST16 || PRI_MACROS_BROKEN --# undef PRIdLEAST16 --# define PRIdLEAST16 "d" --#endif --#if !defined PRIiLEAST16 || PRI_MACROS_BROKEN --# undef PRIiLEAST16 --# define PRIiLEAST16 "i" --#endif --#if !defined PRIoLEAST16 || PRI_MACROS_BROKEN --# undef PRIoLEAST16 --# define PRIoLEAST16 "o" --#endif --#if !defined PRIuLEAST16 || PRI_MACROS_BROKEN --# undef PRIuLEAST16 --# define PRIuLEAST16 "u" --#endif --#if !defined PRIxLEAST16 || PRI_MACROS_BROKEN --# undef PRIxLEAST16 --# define PRIxLEAST16 "x" --#endif --#if !defined PRIXLEAST16 || PRI_MACROS_BROKEN --# undef PRIXLEAST16 --# define PRIXLEAST16 "X" --#endif --#if !defined PRIdLEAST32 || PRI_MACROS_BROKEN --# undef PRIdLEAST32 --# define PRIdLEAST32 "d" --#endif --#if !defined PRIiLEAST32 || PRI_MACROS_BROKEN --# undef PRIiLEAST32 --# define PRIiLEAST32 "i" --#endif --#if !defined PRIoLEAST32 || PRI_MACROS_BROKEN --# undef PRIoLEAST32 --# define PRIoLEAST32 "o" --#endif --#if !defined PRIuLEAST32 || PRI_MACROS_BROKEN --# undef PRIuLEAST32 --# define PRIuLEAST32 "u" --#endif --#if !defined PRIxLEAST32 || PRI_MACROS_BROKEN --# undef PRIxLEAST32 --# define PRIxLEAST32 "x" --#endif --#if !defined PRIXLEAST32 || PRI_MACROS_BROKEN --# undef PRIXLEAST32 --# define PRIXLEAST32 "X" --#endif --#if !defined PRIdLEAST64 || PRI_MACROS_BROKEN --# undef PRIdLEAST64 --# define PRIdLEAST64 PRId64 --#endif --#if !defined PRIiLEAST64 || PRI_MACROS_BROKEN --# undef PRIiLEAST64 --# define PRIiLEAST64 PRIi64 --#endif --#if !defined PRIoLEAST64 || PRI_MACROS_BROKEN --# undef PRIoLEAST64 --# define PRIoLEAST64 PRIo64 --#endif --#if !defined PRIuLEAST64 || PRI_MACROS_BROKEN --# undef PRIuLEAST64 --# define PRIuLEAST64 PRIu64 --#endif --#if !defined PRIxLEAST64 || PRI_MACROS_BROKEN --# undef PRIxLEAST64 --# define PRIxLEAST64 PRIx64 --#endif --#if !defined PRIXLEAST64 || PRI_MACROS_BROKEN --# undef PRIXLEAST64 --# define PRIXLEAST64 PRIX64 --#endif --#if !defined PRIdFAST8 || PRI_MACROS_BROKEN --# undef PRIdFAST8 --# define PRIdFAST8 "d" --#endif --#if !defined PRIiFAST8 || PRI_MACROS_BROKEN --# undef PRIiFAST8 --# define PRIiFAST8 "i" --#endif --#if !defined PRIoFAST8 || PRI_MACROS_BROKEN --# undef PRIoFAST8 --# define PRIoFAST8 "o" --#endif --#if !defined PRIuFAST8 || PRI_MACROS_BROKEN --# undef PRIuFAST8 --# define PRIuFAST8 "u" --#endif --#if !defined PRIxFAST8 || PRI_MACROS_BROKEN --# undef PRIxFAST8 --# define PRIxFAST8 "x" --#endif --#if !defined PRIXFAST8 || PRI_MACROS_BROKEN --# undef PRIXFAST8 --# define PRIXFAST8 "X" --#endif --#if !defined PRIdFAST16 || PRI_MACROS_BROKEN --# undef PRIdFAST16 --# define PRIdFAST16 "d" --#endif --#if !defined PRIiFAST16 || PRI_MACROS_BROKEN --# undef PRIiFAST16 --# define PRIiFAST16 "i" --#endif --#if !defined PRIoFAST16 || PRI_MACROS_BROKEN --# undef PRIoFAST16 --# define PRIoFAST16 "o" --#endif --#if !defined PRIuFAST16 || PRI_MACROS_BROKEN --# undef PRIuFAST16 --# define PRIuFAST16 "u" --#endif --#if !defined PRIxFAST16 || PRI_MACROS_BROKEN --# undef PRIxFAST16 --# define PRIxFAST16 "x" --#endif --#if !defined PRIXFAST16 || PRI_MACROS_BROKEN --# undef PRIXFAST16 --# define PRIXFAST16 "X" --#endif --#if !defined PRIdFAST32 || PRI_MACROS_BROKEN --# undef PRIdFAST32 --# define PRIdFAST32 "d" --#endif --#if !defined PRIiFAST32 || PRI_MACROS_BROKEN --# undef PRIiFAST32 --# define PRIiFAST32 "i" --#endif --#if !defined PRIoFAST32 || PRI_MACROS_BROKEN --# undef PRIoFAST32 --# define PRIoFAST32 "o" --#endif --#if !defined PRIuFAST32 || PRI_MACROS_BROKEN --# undef PRIuFAST32 --# define PRIuFAST32 "u" --#endif --#if !defined PRIxFAST32 || PRI_MACROS_BROKEN --# undef PRIxFAST32 --# define PRIxFAST32 "x" --#endif --#if !defined PRIXFAST32 || PRI_MACROS_BROKEN --# undef PRIXFAST32 --# define PRIXFAST32 "X" --#endif --#if !defined PRIdFAST64 || PRI_MACROS_BROKEN --# undef PRIdFAST64 --# define PRIdFAST64 PRId64 --#endif --#if !defined PRIiFAST64 || PRI_MACROS_BROKEN --# undef PRIiFAST64 --# define PRIiFAST64 PRIi64 --#endif --#if !defined PRIoFAST64 || PRI_MACROS_BROKEN --# undef PRIoFAST64 --# define PRIoFAST64 PRIo64 --#endif --#if !defined PRIuFAST64 || PRI_MACROS_BROKEN --# undef PRIuFAST64 --# define PRIuFAST64 PRIu64 --#endif --#if !defined PRIxFAST64 || PRI_MACROS_BROKEN --# undef PRIxFAST64 --# define PRIxFAST64 PRIx64 --#endif --#if !defined PRIXFAST64 || PRI_MACROS_BROKEN --# undef PRIXFAST64 --# define PRIXFAST64 PRIX64 --#endif --#if !defined PRIdMAX || PRI_MACROS_BROKEN --# undef PRIdMAX --# define PRIdMAX (sizeof (uintmax_t) == sizeof (long) ? "ld" : "lld") --#endif --#if !defined PRIiMAX || PRI_MACROS_BROKEN --# undef PRIiMAX --# define PRIiMAX (sizeof (uintmax_t) == sizeof (long) ? "li" : "lli") --#endif --#if !defined PRIoMAX || PRI_MACROS_BROKEN --# undef PRIoMAX --# define PRIoMAX (sizeof (uintmax_t) == sizeof (long) ? "lo" : "llo") --#endif --#if !defined PRIuMAX || PRI_MACROS_BROKEN --# undef PRIuMAX --# define PRIuMAX (sizeof (uintmax_t) == sizeof (long) ? "lu" : "llu") --#endif --#if !defined PRIxMAX || PRI_MACROS_BROKEN --# undef PRIxMAX --# define PRIxMAX (sizeof (uintmax_t) == sizeof (long) ? "lx" : "llx") --#endif --#if !defined PRIXMAX || PRI_MACROS_BROKEN --# undef PRIXMAX --# define PRIXMAX (sizeof (uintmax_t) == sizeof (long) ? "lX" : "llX") --#endif --#if !defined PRIdPTR || PRI_MACROS_BROKEN --# undef PRIdPTR --# define PRIdPTR \ -- (sizeof (void *) == sizeof (long) ? "ld" : \ -- sizeof (void *) == sizeof (int) ? "d" : \ -- "lld") --#endif --#if !defined PRIiPTR || PRI_MACROS_BROKEN --# undef PRIiPTR --# define PRIiPTR \ -- (sizeof (void *) == sizeof (long) ? "li" : \ -- sizeof (void *) == sizeof (int) ? "i" : \ -- "lli") --#endif --#if !defined PRIoPTR || PRI_MACROS_BROKEN --# undef PRIoPTR --# define PRIoPTR \ -- (sizeof (void *) == sizeof (long) ? "lo" : \ -- sizeof (void *) == sizeof (int) ? "o" : \ -- "llo") --#endif --#if !defined PRIuPTR || PRI_MACROS_BROKEN --# undef PRIuPTR --# define PRIuPTR \ -- (sizeof (void *) == sizeof (long) ? "lu" : \ -- sizeof (void *) == sizeof (int) ? "u" : \ -- "llu") --#endif --#if !defined PRIxPTR || PRI_MACROS_BROKEN --# undef PRIxPTR --# define PRIxPTR \ -- (sizeof (void *) == sizeof (long) ? "lx" : \ -- sizeof (void *) == sizeof (int) ? "x" : \ -- "llx") --#endif --#if !defined PRIXPTR || PRI_MACROS_BROKEN --# undef PRIXPTR --# define PRIXPTR \ -- (sizeof (void *) == sizeof (long) ? "lX" : \ -- sizeof (void *) == sizeof (int) ? "X" : \ -- "llX") --#endif -- --/* @@ end of prolog @@ */ -- --#ifdef _LIBC --/* Rename the non ISO C functions. This is required by the standard -- because some ISO C functions will require linking with this object -- file and the name space must not be polluted. */ --# define open(name, flags) open_not_cancel_2 (name, flags) --# define close(fd) close_not_cancel_no_status (fd) --# define read(fd, buf, n) read_not_cancel (fd, buf, n) --# define mmap(addr, len, prot, flags, fd, offset) \ -- __mmap (addr, len, prot, flags, fd, offset) --# define munmap(addr, len) __munmap (addr, len) --#endif -- --/* For those losing systems which don't have `alloca' we have to add -- some additional code emulating it. */ --#ifdef HAVE_ALLOCA --# define freea(p) /* nothing */ --#else --# define alloca(n) malloc (n) --# define freea(p) free (p) --#endif -- --/* For systems that distinguish between text and binary I/O. -- O_BINARY is usually declared in <fcntl.h>. */ --#if !defined O_BINARY && defined _O_BINARY -- /* For MSC-compatible compilers. */ --# define O_BINARY _O_BINARY --# define O_TEXT _O_TEXT --#endif --#ifdef __BEOS__ -- /* BeOS 5 has O_BINARY and O_TEXT, but they have no effect. */ --# undef O_BINARY --# undef O_TEXT --#endif --/* On reasonable systems, binary I/O is the default. */ --#ifndef O_BINARY --# define O_BINARY 0 --#endif -- -- --/* We need a sign, whether a new catalog was loaded, which can be associated -- with all translations. This is important if the translations are -- cached by one of GCC's features. */ --int _nl_msg_cat_cntr; -- -- --/* Expand a system dependent string segment. Return NULL if unsupported. */ --static const char * --get_sysdep_segment_value (const char *name) --{ -- /* Test for an ISO C 99 section 7.8.1 format string directive. -- Syntax: -- P R I { d | i | o | u | x | X } -- { { | LEAST | FAST } { 8 | 16 | 32 | 64 } | MAX | PTR } */ -- /* We don't use a table of 14 times 6 'const char *' strings here, because -- data relocations cost startup time. */ -- if (name[0] == 'P' && name[1] == 'R' && name[2] == 'I') -- { -- if (name[3] == 'd' || name[3] == 'i' || name[3] == 'o' || name[3] == 'u' -- || name[3] == 'x' || name[3] == 'X') -- { -- if (name[4] == '8' && name[5] == '\0') -- { -- if (name[3] == 'd') -- return PRId8; -- if (name[3] == 'i') -- return PRIi8; -- if (name[3] == 'o') -- return PRIo8; -- if (name[3] == 'u') -- return PRIu8; -- if (name[3] == 'x') -- return PRIx8; -- if (name[3] == 'X') -- return PRIX8; -- abort (); -- } -- if (name[4] == '1' && name[5] == '6' && name[6] == '\0') -- { -- if (name[3] == 'd') -- return PRId16; -- if (name[3] == 'i') -- return PRIi16; -- if (name[3] == 'o') -- return PRIo16; -- if (name[3] == 'u') -- return PRIu16; -- if (name[3] == 'x') -- return PRIx16; -- if (name[3] == 'X') -- return PRIX16; -- abort (); -- } -- if (name[4] == '3' && name[5] == '2' && name[6] == '\0') -- { -- if (name[3] == 'd') -- return PRId32; -- if (name[3] == 'i') -- return PRIi32; -- if (name[3] == 'o') -- return PRIo32; -- if (name[3] == 'u') -- return PRIu32; -- if (name[3] == 'x') -- return PRIx32; -- if (name[3] == 'X') -- return PRIX32; -- abort (); -- } -- if (name[4] == '6' && name[5] == '4' && name[6] == '\0') -- { -- if (name[3] == 'd') -- return PRId64; -- if (name[3] == 'i') -- return PRIi64; -- if (name[3] == 'o') -- return PRIo64; -- if (name[3] == 'u') -- return PRIu64; -- if (name[3] == 'x') -- return PRIx64; -- if (name[3] == 'X') -- return PRIX64; -- abort (); -- } -- if (name[4] == 'L' && name[5] == 'E' && name[6] == 'A' -- && name[7] == 'S' && name[8] == 'T') -- { -- if (name[9] == '8' && name[10] == '\0') -- { -- if (name[3] == 'd') -- return PRIdLEAST8; -- if (name[3] == 'i') -- return PRIiLEAST8; -- if (name[3] == 'o') -- return PRIoLEAST8; -- if (name[3] == 'u') -- return PRIuLEAST8; -- if (name[3] == 'x') -- return PRIxLEAST8; -- if (name[3] == 'X') -- return PRIXLEAST8; -- abort (); -- } -- if (name[9] == '1' && name[10] == '6' && name[11] == '\0') -- { -- if (name[3] == 'd') -- return PRIdLEAST16; -- if (name[3] == 'i') -- return PRIiLEAST16; -- if (name[3] == 'o') -- return PRIoLEAST16; -- if (name[3] == 'u') -- return PRIuLEAST16; -- if (name[3] == 'x') -- return PRIxLEAST16; -- if (name[3] == 'X') -- return PRIXLEAST16; -- abort (); -- } -- if (name[9] == '3' && name[10] == '2' && name[11] == '\0') -- { -- if (name[3] == 'd') -- return PRIdLEAST32; -- if (name[3] == 'i') -- return PRIiLEAST32; -- if (name[3] == 'o') -- return PRIoLEAST32; -- if (name[3] == 'u') -- return PRIuLEAST32; -- if (name[3] == 'x') -- return PRIxLEAST32; -- if (name[3] == 'X') -- return PRIXLEAST32; -- abort (); -- } -- if (name[9] == '6' && name[10] == '4' && name[11] == '\0') -- { -- if (name[3] == 'd') -- return PRIdLEAST64; -- if (name[3] == 'i') -- return PRIiLEAST64; -- if (name[3] == 'o') -- return PRIoLEAST64; -- if (name[3] == 'u') -- return PRIuLEAST64; -- if (name[3] == 'x') -- return PRIxLEAST64; -- if (name[3] == 'X') -- return PRIXLEAST64; -- abort (); -- } -- } -- if (name[4] == 'F' && name[5] == 'A' && name[6] == 'S' -- && name[7] == 'T') -- { -- if (name[8] == '8' && name[9] == '\0') -- { -- if (name[3] == 'd') -- return PRIdFAST8; -- if (name[3] == 'i') -- return PRIiFAST8; -- if (name[3] == 'o') -- return PRIoFAST8; -- if (name[3] == 'u') -- return PRIuFAST8; -- if (name[3] == 'x') -- return PRIxFAST8; -- if (name[3] == 'X') -- return PRIXFAST8; -- abort (); -- } -- if (name[8] == '1' && name[9] == '6' && name[10] == '\0') -- { -- if (name[3] == 'd') -- return PRIdFAST16; -- if (name[3] == 'i') -- return PRIiFAST16; -- if (name[3] == 'o') -- return PRIoFAST16; -- if (name[3] == 'u') -- return PRIuFAST16; -- if (name[3] == 'x') -- return PRIxFAST16; -- if (name[3] == 'X') -- return PRIXFAST16; -- abort (); -- } -- if (name[8] == '3' && name[9] == '2' && name[10] == '\0') -- { -- if (name[3] == 'd') -- return PRIdFAST32; -- if (name[3] == 'i') -- return PRIiFAST32; -- if (name[3] == 'o') -- return PRIoFAST32; -- if (name[3] == 'u') -- return PRIuFAST32; -- if (name[3] == 'x') -- return PRIxFAST32; -- if (name[3] == 'X') -- return PRIXFAST32; -- abort (); -- } -- if (name[8] == '6' && name[9] == '4' && name[10] == '\0') -- { -- if (name[3] == 'd') -- return PRIdFAST64; -- if (name[3] == 'i') -- return PRIiFAST64; -- if (name[3] == 'o') -- return PRIoFAST64; -- if (name[3] == 'u') -- return PRIuFAST64; -- if (name[3] == 'x') -- return PRIxFAST64; -- if (name[3] == 'X') -- return PRIXFAST64; -- abort (); -- } -- } -- if (name[4] == 'M' && name[5] == 'A' && name[6] == 'X' -- && name[7] == '\0') -- { -- if (name[3] == 'd') -- return PRIdMAX; -- if (name[3] == 'i') -- return PRIiMAX; -- if (name[3] == 'o') -- return PRIoMAX; -- if (name[3] == 'u') -- return PRIuMAX; -- if (name[3] == 'x') -- return PRIxMAX; -- if (name[3] == 'X') -- return PRIXMAX; -- abort (); -- } -- if (name[4] == 'P' && name[5] == 'T' && name[6] == 'R' -- && name[7] == '\0') -- { -- if (name[3] == 'd') -- return PRIdPTR; -- if (name[3] == 'i') -- return PRIiPTR; -- if (name[3] == 'o') -- return PRIoPTR; -- if (name[3] == 'u') -- return PRIuPTR; -- if (name[3] == 'x') -- return PRIxPTR; -- if (name[3] == 'X') -- return PRIXPTR; -- abort (); -- } -- } -- } -- /* Test for a glibc specific printf() format directive flag. */ -- if (name[0] == 'I' && name[1] == '\0') -- { --#if defined _LIBC || __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) -- /* The 'I' flag, in numeric format directives, replaces ASCII digits -- with the 'outdigits' defined in the LC_CTYPE locale facet. This is -- used for Farsi (Persian) and maybe Arabic. */ -- return "I"; --#else -- return ""; --#endif -- } -- /* Other system dependent strings are not valid. */ -- return NULL; --} -- --/* Load the message catalogs specified by FILENAME. If it is no valid -- message catalog do nothing. */ --void --internal_function --_nl_load_domain (struct loaded_l10nfile *domain_file, -- struct binding *domainbinding) --{ -- __libc_lock_define_initialized_recursive (static, lock) -- int fd = -1; -- size_t size; --#ifdef _LIBC -- struct stat64 st; --#else -- struct stat st; --#endif -- struct mo_file_header *data = (struct mo_file_header *) -1; -- int use_mmap = 0; -- struct loaded_domain *domain; -- int revision; -- const char *nullentry; -- size_t nullentrylen; -- -- __libc_lock_lock_recursive (lock); -- if (domain_file->decided != 0) -- { -- /* There are two possibilities: -- -- + this is the same thread calling again during this initialization -- via _nl_find_msg. We have initialized everything this call needs. -- -- + this is another thread which tried to initialize this object. -- Not necessary anymore since if the lock is available this -- is finished. -- */ -- goto done; -- } -- -- domain_file->decided = -1; -- domain_file->data = NULL; -- -- /* Note that it would be useless to store domainbinding in domain_file -- because domainbinding might be == NULL now but != NULL later (after -- a call to bind_textdomain_codeset). */ -- -- /* If the record does not represent a valid locale the FILENAME -- might be NULL. This can happen when according to the given -- specification the locale file name is different for XPG and CEN -- syntax. */ -- if (domain_file->filename == NULL) -- goto out; -- -- /* Try to open the addressed file. */ -- fd = open (domain_file->filename, O_RDONLY | O_BINARY); -- if (fd == -1) -- goto out; -- -- /* We must know about the size of the file. */ -- if ( --#ifdef _LIBC -- __builtin_expect (fstat64 (fd, &st) != 0, 0) --#else -- __builtin_expect (fstat (fd, &st) != 0, 0) --#endif -- || __builtin_expect ((size = (size_t) st.st_size) != st.st_size, 0) -- || __builtin_expect (size < sizeof (struct mo_file_header), 0)) -- /* Something went wrong. */ -- goto out; -- --#ifdef HAVE_MMAP -- /* Now we are ready to load the file. If mmap() is available we try -- this first. If not available or it failed we try to load it. */ -- data = (struct mo_file_header *) mmap (NULL, size, PROT_READ, -- MAP_PRIVATE, fd, 0); -- -- if (__builtin_expect (data != (struct mo_file_header *) -1, 1)) -- { -- /* mmap() call was successful. */ -- close (fd); -- fd = -1; -- use_mmap = 1; -- } --#endif -- -- /* If the data is not yet available (i.e. mmap'ed) we try to load -- it manually. */ -- if (data == (struct mo_file_header *) -1) -- { -- size_t to_read; -- char *read_ptr; -- -- data = (struct mo_file_header *) malloc (size); -- if (data == NULL) -- goto out; -- -- to_read = size; -- read_ptr = (char *) data; -- do -- { -- long int nb = (long int) read (fd, read_ptr, to_read); -- if (nb <= 0) -- { --#ifdef EINTR -- if (nb == -1 && errno == EINTR) -- continue; --#endif -- goto out; -- } -- read_ptr += nb; -- to_read -= nb; -- } -- while (to_read > 0); -- -- close (fd); -- fd = -1; -- } -- -- /* Using the magic number we can test whether it really is a message -- catalog file. */ -- if (__builtin_expect (data->magic != _MAGIC && data->magic != _MAGIC_SWAPPED, -- 0)) -- { -- /* The magic number is wrong: not a message catalog file. */ --#ifdef HAVE_MMAP -- if (use_mmap) -- munmap ((caddr_t) data, size); -- else --#endif -- free (data); -- goto out; -- } -- -- domain = (struct loaded_domain *) malloc (sizeof (struct loaded_domain)); -- if (domain == NULL) -- goto out; -- domain_file->data = domain; -- -- domain->data = (char *) data; -- domain->use_mmap = use_mmap; -- domain->mmap_size = size; -- domain->must_swap = data->magic != _MAGIC; -- domain->malloced = NULL; -- -- /* Fill in the information about the available tables. */ -- revision = W (domain->must_swap, data->revision); -- /* We support only the major revisions 0 and 1. */ -- switch (revision >> 16) -- { -- case 0: -- case 1: -- domain->nstrings = W (domain->must_swap, data->nstrings); -- domain->orig_tab = (const struct string_desc *) -- ((char *) data + W (domain->must_swap, data->orig_tab_offset)); -- domain->trans_tab = (const struct string_desc *) -- ((char *) data + W (domain->must_swap, data->trans_tab_offset)); -- domain->hash_size = W (domain->must_swap, data->hash_tab_size); -- domain->hash_tab = -- (domain->hash_size > 2 -- ? (const nls_uint32 *) -- ((char *) data + W (domain->must_swap, data->hash_tab_offset)) -- : NULL); -- domain->must_swap_hash_tab = domain->must_swap; -- -- /* Now dispatch on the minor revision. */ -- switch (revision & 0xffff) -- { -- case 0: -- domain->n_sysdep_strings = 0; -- domain->orig_sysdep_tab = NULL; -- domain->trans_sysdep_tab = NULL; -- break; -- case 1: -- default: -- { -- nls_uint32 n_sysdep_strings; -- -- if (domain->hash_tab == NULL) -- /* This is invalid. These minor revisions need a hash table. */ -- goto invalid; -- -- n_sysdep_strings = -- W (domain->must_swap, data->n_sysdep_strings); -- if (n_sysdep_strings > 0) -- { -- nls_uint32 n_sysdep_segments; -- const struct sysdep_segment *sysdep_segments; -- const char **sysdep_segment_values; -- const nls_uint32 *orig_sysdep_tab; -- const nls_uint32 *trans_sysdep_tab; -- nls_uint32 n_inmem_sysdep_strings; -- size_t memneed; -- char *mem; -- struct sysdep_string_desc *inmem_orig_sysdep_tab; -- struct sysdep_string_desc *inmem_trans_sysdep_tab; -- nls_uint32 *inmem_hash_tab; -- unsigned int i, j; -- -- /* Get the values of the system dependent segments. */ -- n_sysdep_segments = -- W (domain->must_swap, data->n_sysdep_segments); -- sysdep_segments = (const struct sysdep_segment *) -- ((char *) data -- + W (domain->must_swap, data->sysdep_segments_offset)); -- sysdep_segment_values = -- (const char **) -- alloca (n_sysdep_segments * sizeof (const char *)); -- for (i = 0; i < n_sysdep_segments; i++) -- { -- const char *name = -- (char *) data -- + W (domain->must_swap, sysdep_segments[i].offset); -- nls_uint32 namelen = -- W (domain->must_swap, sysdep_segments[i].length); -- -- if (!(namelen > 0 && name[namelen - 1] == '\0')) -- { -- freea (sysdep_segment_values); -- goto invalid; -- } -- -- sysdep_segment_values[i] = get_sysdep_segment_value (name); -- } -- -- orig_sysdep_tab = (const nls_uint32 *) -- ((char *) data -- + W (domain->must_swap, data->orig_sysdep_tab_offset)); -- trans_sysdep_tab = (const nls_uint32 *) -- ((char *) data -- + W (domain->must_swap, data->trans_sysdep_tab_offset)); -- -- /* Compute the amount of additional memory needed for the -- system dependent strings and the augmented hash table. -- At the same time, also drop string pairs which refer to -- an undefined system dependent segment. */ -- n_inmem_sysdep_strings = 0; -- memneed = domain->hash_size * sizeof (nls_uint32); -- for (i = 0; i < n_sysdep_strings; i++) -- { -- int valid = 1; -- size_t needs[2]; -- -- for (j = 0; j < 2; j++) -- { -- const struct sysdep_string *sysdep_string = -- (const struct sysdep_string *) -- ((char *) data -- + W (domain->must_swap, -- j == 0 -- ? orig_sysdep_tab[i] -- : trans_sysdep_tab[i])); -- size_t need = 0; -- const struct segment_pair *p = sysdep_string->segments; -- -- if (W (domain->must_swap, p->sysdepref) != SEGMENTS_END) -- for (p = sysdep_string->segments;; p++) -- { -- nls_uint32 sysdepref; -- -- need += W (domain->must_swap, p->segsize); -- -- sysdepref = W (domain->must_swap, p->sysdepref); -- if (sysdepref == SEGMENTS_END) -- break; -- -- if (sysdepref >= n_sysdep_segments) -- { -- /* Invalid. */ -- freea (sysdep_segment_values); -- goto invalid; -- } -- -- if (sysdep_segment_values[sysdepref] == NULL) -- { -- /* This particular string pair is invalid. */ -- valid = 0; -- break; -- } -- -- need += strlen (sysdep_segment_values[sysdepref]); -- } -- -- needs[j] = need; -- if (!valid) -- break; -- } -- -- if (valid) -- { -- n_inmem_sysdep_strings++; -- memneed += needs[0] + needs[1]; -- } -- } -- memneed += 2 * n_inmem_sysdep_strings -- * sizeof (struct sysdep_string_desc); -- -- if (n_inmem_sysdep_strings > 0) -- { -- unsigned int k; -- -- /* Allocate additional memory. */ -- mem = (char *) malloc (memneed); -- if (mem == NULL) -- goto invalid; -- -- domain->malloced = mem; -- inmem_orig_sysdep_tab = (struct sysdep_string_desc *) mem; -- mem += n_inmem_sysdep_strings -- * sizeof (struct sysdep_string_desc); -- inmem_trans_sysdep_tab = (struct sysdep_string_desc *) mem; -- mem += n_inmem_sysdep_strings -- * sizeof (struct sysdep_string_desc); -- inmem_hash_tab = (nls_uint32 *) mem; -- mem += domain->hash_size * sizeof (nls_uint32); -- -- /* Compute the system dependent strings. */ -- k = 0; -- for (i = 0; i < n_sysdep_strings; i++) -- { -- int valid = 1; -- -- for (j = 0; j < 2; j++) -- { -- const struct sysdep_string *sysdep_string = -- (const struct sysdep_string *) -- ((char *) data -- + W (domain->must_swap, -- j == 0 -- ? orig_sysdep_tab[i] -- : trans_sysdep_tab[i])); -- const struct segment_pair *p = -- sysdep_string->segments; -- -- if (W (domain->must_swap, p->sysdepref) -- != SEGMENTS_END) -- for (p = sysdep_string->segments;; p++) -- { -- nls_uint32 sysdepref; -- -- sysdepref = -- W (domain->must_swap, p->sysdepref); -- if (sysdepref == SEGMENTS_END) -- break; -- -- if (sysdep_segment_values[sysdepref] == NULL) -- { -- /* This particular string pair is -- invalid. */ -- valid = 0; -- break; -- } -- } -- -- if (!valid) -- break; -- } -- -- if (valid) -- { -- for (j = 0; j < 2; j++) -- { -- const struct sysdep_string *sysdep_string = -- (const struct sysdep_string *) -- ((char *) data -- + W (domain->must_swap, -- j == 0 -- ? orig_sysdep_tab[i] -- : trans_sysdep_tab[i])); -- const char *static_segments = -- (char *) data -- + W (domain->must_swap, sysdep_string->offset); -- const struct segment_pair *p = -- sysdep_string->segments; -- -- /* Concatenate the segments, and fill -- inmem_orig_sysdep_tab[k] (for j == 0) and -- inmem_trans_sysdep_tab[k] (for j == 1). */ -- -- struct sysdep_string_desc *inmem_tab_entry = -- (j == 0 -- ? inmem_orig_sysdep_tab -- : inmem_trans_sysdep_tab) -- + k; -- -- if (W (domain->must_swap, p->sysdepref) -- == SEGMENTS_END) -- { -- /* Only one static segment. */ -- inmem_tab_entry->length = -- W (domain->must_swap, p->segsize); -- inmem_tab_entry->pointer = static_segments; -- } -- else -- { -- inmem_tab_entry->pointer = mem; -- -- for (p = sysdep_string->segments;; p++) -- { -- nls_uint32 segsize = -- W (domain->must_swap, p->segsize); -- nls_uint32 sysdepref = -- W (domain->must_swap, p->sysdepref); -- size_t n; -- -- if (segsize > 0) -- { -- memcpy (mem, static_segments, segsize); -- mem += segsize; -- static_segments += segsize; -- } -- -- if (sysdepref == SEGMENTS_END) -- break; -- -- n = strlen (sysdep_segment_values[sysdepref]); -- memcpy (mem, sysdep_segment_values[sysdepref], n); -- mem += n; -- } -- -- inmem_tab_entry->length = -- mem - inmem_tab_entry->pointer; -- } -- } -- -- k++; -- } -- } -- if (k != n_inmem_sysdep_strings) -- abort (); -- -- /* Compute the augmented hash table. */ -- for (i = 0; i < domain->hash_size; i++) -- inmem_hash_tab[i] = -- W (domain->must_swap_hash_tab, domain->hash_tab[i]); -- for (i = 0; i < n_inmem_sysdep_strings; i++) -- { -- const char *msgid = inmem_orig_sysdep_tab[i].pointer; -- nls_uint32 hash_val = __hash_string (msgid); -- nls_uint32 idx = hash_val % domain->hash_size; -- nls_uint32 incr = -- 1 + (hash_val % (domain->hash_size - 2)); -- -- for (;;) -- { -- if (inmem_hash_tab[idx] == 0) -- { -- /* Hash table entry is empty. Use it. */ -- inmem_hash_tab[idx] = 1 + domain->nstrings + i; -- break; -- } -- -- if (idx >= domain->hash_size - incr) -- idx -= domain->hash_size - incr; -- else -- idx += incr; -- } -- } -- -- domain->n_sysdep_strings = n_inmem_sysdep_strings; -- domain->orig_sysdep_tab = inmem_orig_sysdep_tab; -- domain->trans_sysdep_tab = inmem_trans_sysdep_tab; -- -- domain->hash_tab = inmem_hash_tab; -- domain->must_swap_hash_tab = 0; -- } -- else -- { -- domain->n_sysdep_strings = 0; -- domain->orig_sysdep_tab = NULL; -- domain->trans_sysdep_tab = NULL; -- } -- -- freea (sysdep_segment_values); -- } -- else -- { -- domain->n_sysdep_strings = 0; -- domain->orig_sysdep_tab = NULL; -- domain->trans_sysdep_tab = NULL; -- } -- } -- break; -- } -- break; -- default: -- /* This is an invalid revision. */ -- invalid: -- /* This is an invalid .mo file. */ -- if (domain->malloced) -- free (domain->malloced); --#ifdef HAVE_MMAP -- if (use_mmap) -- munmap ((caddr_t) data, size); -- else --#endif -- free (data); -- free (domain); -- domain_file->data = NULL; -- goto out; -- } -- -- /* No caches of converted translations so far. */ -- domain->conversions = NULL; -- domain->nconversions = 0; -- gl_rwlock_init (domain->conversions_lock); -- -- /* Get the header entry and look for a plural specification. */ --#ifdef IN_LIBGLOCALE -- nullentry = -- _nl_find_msg (domain_file, domainbinding, NULL, "", &nullentrylen); --#else -- nullentry = _nl_find_msg (domain_file, domainbinding, "", 0, &nullentrylen); --#endif -- EXTRACT_PLURAL_EXPRESSION (nullentry, &domain->plural, &domain->nplurals); -- -- out: -- if (fd != -1) -- close (fd); -- -- domain_file->decided = 1; -- -- done: -- __libc_lock_unlock_recursive (lock); --} -- -- --#ifdef _LIBC --void --internal_function __libc_freeres_fn_section --_nl_unload_domain (struct loaded_domain *domain) --{ -- size_t i; -- -- if (domain->plural != &__gettext_germanic_plural) -- __gettext_free_exp ((struct expression *) domain->plural); -- -- for (i = 0; i < domain->nconversions; i++) -- { -- struct converted_domain *convd = &domain->conversions[i]; -- -- free (convd->encoding); -- if (convd->conv_tab != NULL && convd->conv_tab != (char **) -1) -- free (convd->conv_tab); -- if (convd->conv != (__gconv_t) -1) -- __gconv_close (convd->conv); -- } -- if (domain->conversions != NULL) -- free (domain->conversions); -- __libc_rwlock_fini (domain->conversions_lock); -- -- if (domain->malloced) -- free (domain->malloced); -- --# ifdef _POSIX_MAPPED_FILES -- if (domain->use_mmap) -- munmap ((caddr_t) domain->data, domain->mmap_size); -- else --# endif /* _POSIX_MAPPED_FILES */ -- free ((void *) domain->data); -- -- free (domain); --} --#endif ---- a/intl/localcharset.c -+++ /dev/null -@@ -1,461 +0,0 @@ --/* Determine a canonical name for the current locale's character encoding. -- -- Copyright (C) 2000-2006 Free Software Foundation, Inc. -- -- This program is free software; you can redistribute it and/or modify it -- under the terms of the GNU Library General Public License as published -- by the Free Software Foundation; either version 2, or (at your option) -- any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Library General Public License for more details. -- -- You should have received a copy of the GNU Library General Public -- License along with this program; if not, write to the Free Software -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, -- USA. */ -- --/* Written by Bruno Haible <bruno@clisp.org>. */ -- --#include <config.h> -- --/* Specification. */ --#include "localcharset.h" -- --#include <stddef.h> --#include <stdio.h> --#include <string.h> --#include <stdlib.h> -- --#if defined _WIN32 || defined __WIN32__ --# define WIN32_NATIVE --#endif -- --#if defined __EMX__ --/* Assume EMX program runs on OS/2, even if compiled under DOS. */ --# define OS2 --#endif -- --#if !defined WIN32_NATIVE --# if HAVE_LANGINFO_CODESET --# include <langinfo.h> --# else --# if 0 /* see comment below */ --# include <locale.h> --# endif --# endif --# ifdef __CYGWIN__ --# define WIN32_LEAN_AND_MEAN --# include <windows.h> --# endif --#elif defined WIN32_NATIVE --# define WIN32_LEAN_AND_MEAN --# include <windows.h> --#endif --#if defined OS2 --# define INCL_DOS --# include <os2.h> --#endif -- --#if ENABLE_RELOCATABLE --# include "relocatable.h" --#else --# define relocate(pathname) (pathname) --#endif -- --/* Get LIBDIR. */ --#ifndef LIBDIR --# include "configmake.h" --#endif -- --#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__ -- /* Win32, Cygwin, OS/2, DOS */ --# define ISSLASH(C) ((C) == '/' || (C) == '\\') --#endif -- --#ifndef DIRECTORY_SEPARATOR --# define DIRECTORY_SEPARATOR '/' --#endif -- --#ifndef ISSLASH --# define ISSLASH(C) ((C) == DIRECTORY_SEPARATOR) --#endif -- --#if HAVE_DECL_GETC_UNLOCKED --# undef getc --# define getc getc_unlocked --#endif -- --/* The following static variable is declared 'volatile' to avoid a -- possible multithread problem in the function get_charset_aliases. If we -- are running in a threaded environment, and if two threads initialize -- 'charset_aliases' simultaneously, both will produce the same value, -- and everything will be ok if the two assignments to 'charset_aliases' -- are atomic. But I don't know what will happen if the two assignments mix. */ --#if __STDC__ != 1 --# define volatile /* empty */ --#endif --/* Pointer to the contents of the charset.alias file, if it has already been -- read, else NULL. Its format is: -- ALIAS_1 '\0' CANONICAL_1 '\0' ... ALIAS_n '\0' CANONICAL_n '\0' '\0' */ --static const char * volatile charset_aliases; -- --/* Return a pointer to the contents of the charset.alias file. */ --static const char * --get_charset_aliases (void) --{ -- const char *cp; -- -- cp = charset_aliases; -- if (cp == NULL) -- { --#if !(defined VMS || defined WIN32_NATIVE || defined __CYGWIN__) -- FILE *fp; -- const char *dir; -- const char *base = "charset.alias"; -- char *file_name; -- -- /* Make it possible to override the charset.alias location. This is -- necessary for running the testsuite before "make install". */ -- dir = getenv ("CHARSETALIASDIR"); -- if (dir == NULL || dir[0] == '\0') -- dir = relocate (LIBDIR); -- -- /* Concatenate dir and base into freshly allocated file_name. */ -- { -- size_t dir_len = strlen (dir); -- size_t base_len = strlen (base); -- int add_slash = (dir_len > 0 && !ISSLASH (dir[dir_len - 1])); -- file_name = (char *) malloc (dir_len + add_slash + base_len + 1); -- if (file_name != NULL) -- { -- memcpy (file_name, dir, dir_len); -- if (add_slash) -- file_name[dir_len] = DIRECTORY_SEPARATOR; -- memcpy (file_name + dir_len + add_slash, base, base_len + 1); -- } -- } -- -- if (file_name == NULL || (fp = fopen (file_name, "r")) == NULL) -- /* Out of memory or file not found, treat it as empty. */ -- cp = ""; -- else -- { -- /* Parse the file's contents. */ -- char *res_ptr = NULL; -- size_t res_size = 0; -- -- for (;;) -- { -- int c; -- char buf1[50+1]; -- char buf2[50+1]; -- size_t l1, l2; -- char *old_res_ptr; -- -- c = getc (fp); -- if (c == EOF) -- break; -- if (c == '\n' || c == ' ' || c == '\t') -- continue; -- if (c == '#') -- { -- /* Skip comment, to end of line. */ -- do -- c = getc (fp); -- while (!(c == EOF || c == '\n')); -- if (c == EOF) -- break; -- continue; -- } -- ungetc (c, fp); -- if (fscanf (fp, "%50s %50s", buf1, buf2) < 2) -- break; -- l1 = strlen (buf1); -- l2 = strlen (buf2); -- old_res_ptr = res_ptr; -- if (res_size == 0) -- { -- res_size = l1 + 1 + l2 + 1; -- res_ptr = (char *) malloc (res_size + 1); -- } -- else -- { -- res_size += l1 + 1 + l2 + 1; -- res_ptr = (char *) realloc (res_ptr, res_size + 1); -- } -- if (res_ptr == NULL) -- { -- /* Out of memory. */ -- res_size = 0; -- if (old_res_ptr != NULL) -- free (old_res_ptr); -- break; -- } -- strcpy (res_ptr + res_size - (l2 + 1) - (l1 + 1), buf1); -- strcpy (res_ptr + res_size - (l2 + 1), buf2); -- } -- fclose (fp); -- if (res_size == 0) -- cp = ""; -- else -- { -- *(res_ptr + res_size) = '\0'; -- cp = res_ptr; -- } -- } -- -- if (file_name != NULL) -- free (file_name); -- --#else -- --# if defined VMS -- /* To avoid the troubles of an extra file charset.alias_vms in the -- sources of many GNU packages, simply inline the aliases here. */ -- /* The list of encodings is taken from the OpenVMS 7.3-1 documentation -- "Compaq C Run-Time Library Reference Manual for OpenVMS systems" -- section 10.7 "Handling Different Character Sets". */ -- cp = "ISO8859-1" "\0" "ISO-8859-1" "\0" -- "ISO8859-2" "\0" "ISO-8859-2" "\0" -- "ISO8859-5" "\0" "ISO-8859-5" "\0" -- "ISO8859-7" "\0" "ISO-8859-7" "\0" -- "ISO8859-8" "\0" "ISO-8859-8" "\0" -- "ISO8859-9" "\0" "ISO-8859-9" "\0" -- /* Japanese */ -- "eucJP" "\0" "EUC-JP" "\0" -- "SJIS" "\0" "SHIFT_JIS" "\0" -- "DECKANJI" "\0" "DEC-KANJI" "\0" -- "SDECKANJI" "\0" "EUC-JP" "\0" -- /* Chinese */ -- "eucTW" "\0" "EUC-TW" "\0" -- "DECHANYU" "\0" "DEC-HANYU" "\0" -- "DECHANZI" "\0" "GB2312" "\0" -- /* Korean */ -- "DECKOREAN" "\0" "EUC-KR" "\0"; --# endif -- --# if defined WIN32_NATIVE || defined __CYGWIN__ -- /* To avoid the troubles of installing a separate file in the same -- directory as the DLL and of retrieving the DLL's directory at -- runtime, simply inline the aliases here. */ -- -- cp = "CP936" "\0" "GBK" "\0" -- "CP1361" "\0" "JOHAB" "\0" -- "CP20127" "\0" "ASCII" "\0" -- "CP20866" "\0" "KOI8-R" "\0" -- "CP20936" "\0" "GB2312" "\0" -- "CP21866" "\0" "KOI8-RU" "\0" -- "CP28591" "\0" "ISO-8859-1" "\0" -- "CP28592" "\0" "ISO-8859-2" "\0" -- "CP28593" "\0" "ISO-8859-3" "\0" -- "CP28594" "\0" "ISO-8859-4" "\0" -- "CP28595" "\0" "ISO-8859-5" "\0" -- "CP28596" "\0" "ISO-8859-6" "\0" -- "CP28597" "\0" "ISO-8859-7" "\0" -- "CP28598" "\0" "ISO-8859-8" "\0" -- "CP28599" "\0" "ISO-8859-9" "\0" -- "CP28605" "\0" "ISO-8859-15" "\0" -- "CP38598" "\0" "ISO-8859-8" "\0" -- "CP51932" "\0" "EUC-JP" "\0" -- "CP51936" "\0" "GB2312" "\0" -- "CP51949" "\0" "EUC-KR" "\0" -- "CP51950" "\0" "EUC-TW" "\0" -- "CP54936" "\0" "GB18030" "\0" -- "CP65001" "\0" "UTF-8" "\0"; --# endif --#endif -- -- charset_aliases = cp; -- } -- -- return cp; --} -- --/* Determine the current locale's character encoding, and canonicalize it -- into one of the canonical names listed in config.charset. -- The result must not be freed; it is statically allocated. -- If the canonical name cannot be determined, the result is a non-canonical -- name. */ -- --#ifdef STATIC --STATIC --#endif --const char * --locale_charset (void) --{ -- const char *codeset; -- const char *aliases; -- --#if !(defined WIN32_NATIVE || defined OS2) -- --# if HAVE_LANGINFO_CODESET -- -- /* Most systems support nl_langinfo (CODESET) nowadays. */ -- codeset = nl_langinfo (CODESET); -- --# ifdef __CYGWIN__ -- /* Cygwin 2006 does not have locales. nl_langinfo (CODESET) always -- returns "US-ASCII". As long as this is not fixed, return the suffix -- of the locale name from the environment variables (if present) or -- the codepage as a number. */ -- if (codeset != NULL && strcmp (codeset, "US-ASCII") == 0) -- { -- const char *locale; -- static char buf[2 + 10 + 1]; -- -- locale = getenv ("LC_ALL"); -- if (locale == NULL || locale[0] == '\0') -- { -- locale = getenv ("LC_CTYPE"); -- if (locale == NULL || locale[0] == '\0') -- locale = getenv ("LANG"); -- } -- if (locale != NULL && locale[0] != '\0') -- { -- /* If the locale name contains an encoding after the dot, return -- it. */ -- const char *dot = strchr (locale, '.'); -- -- if (dot != NULL) -- { -- const char *modifier; -- -- dot++; -- /* Look for the possible @... trailer and remove it, if any. */ -- modifier = strchr (dot, '@'); -- if (modifier == NULL) -- return dot; -- if (modifier - dot < sizeof (buf)) -- { -- memcpy (buf, dot, modifier - dot); -- buf [modifier - dot] = '\0'; -- return buf; -- } -- } -- } -- -- /* Woe32 has a function returning the locale's codepage as a number. */ -- sprintf (buf, "CP%u", GetACP ()); -- codeset = buf; -- } --# endif -- --# else -- -- /* On old systems which lack it, use setlocale or getenv. */ -- const char *locale = NULL; -- -- /* But most old systems don't have a complete set of locales. Some -- (like SunOS 4 or DJGPP) have only the C locale. Therefore we don't -- use setlocale here; it would return "C" when it doesn't support the -- locale name the user has set. */ --# if 0 -- locale = setlocale (LC_CTYPE, NULL); --# endif -- if (locale == NULL || locale[0] == '\0') -- { -- locale = getenv ("LC_ALL"); -- if (locale == NULL || locale[0] == '\0') -- { -- locale = getenv ("LC_CTYPE"); -- if (locale == NULL || locale[0] == '\0') -- locale = getenv ("LANG"); -- } -- } -- -- /* On some old systems, one used to set locale = "iso8859_1". On others, -- you set it to "language_COUNTRY.charset". In any case, we resolve it -- through the charset.alias file. */ -- codeset = locale; -- --# endif -- --#elif defined WIN32_NATIVE -- -- static char buf[2 + 10 + 1]; -- -- /* Woe32 has a function returning the locale's codepage as a number. */ -- sprintf (buf, "CP%u", GetACP ()); -- codeset = buf; -- --#elif defined OS2 -- -- const char *locale; -- static char buf[2 + 10 + 1]; -- ULONG cp[3]; -- ULONG cplen; -- -- /* Allow user to override the codeset, as set in the operating system, -- with standard language environment variables. */ -- locale = getenv ("LC_ALL"); -- if (locale == NULL || locale[0] == '\0') -- { -- locale = getenv ("LC_CTYPE"); -- if (locale == NULL || locale[0] == '\0') -- locale = getenv ("LANG"); -- } -- if (locale != NULL && locale[0] != '\0') -- { -- /* If the locale name contains an encoding after the dot, return it. */ -- const char *dot = strchr (locale, '.'); -- -- if (dot != NULL) -- { -- const char *modifier; -- -- dot++; -- /* Look for the possible @... trailer and remove it, if any. */ -- modifier = strchr (dot, '@'); -- if (modifier == NULL) -- return dot; -- if (modifier - dot < sizeof (buf)) -- { -- memcpy (buf, dot, modifier - dot); -- buf [modifier - dot] = '\0'; -- return buf; -- } -- } -- -- /* Resolve through the charset.alias file. */ -- codeset = locale; -- } -- else -- { -- /* OS/2 has a function returning the locale's codepage as a number. */ -- if (DosQueryCp (sizeof (cp), cp, &cplen)) -- codeset = ""; -- else -- { -- sprintf (buf, "CP%u", cp[0]); -- codeset = buf; -- } -- } -- --#endif -- -- if (codeset == NULL) -- /* The canonical name cannot be determined. */ -- codeset = ""; -- -- /* Resolve alias. */ -- for (aliases = get_charset_aliases (); -- *aliases != '\0'; -- aliases += strlen (aliases) + 1, aliases += strlen (aliases) + 1) -- if (strcmp (codeset, aliases) == 0 -- || (aliases[0] == '*' && aliases[1] == '\0')) -- { -- codeset = aliases + strlen (aliases) + 1; -- break; -- } -- -- /* Don't return an empty string. GNU libc and GNU libiconv interpret -- the empty string as denoting "the locale's character encoding", -- thus GNU libiconv would call this function a second time. */ -- if (codeset[0] == '\0') -- codeset = "ASCII"; -- -- return codeset; --} ---- a/intl/localcharset.h -+++ /dev/null -@@ -1,42 +0,0 @@ --/* Determine a canonical name for the current locale's character encoding. -- Copyright (C) 2000-2003 Free Software Foundation, Inc. -- This file is part of the GNU CHARSET Library. -- -- This program is free software; you can redistribute it and/or modify it -- under the terms of the GNU Library General Public License as published -- by the Free Software Foundation; either version 2, or (at your option) -- any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Library General Public License for more details. -- -- You should have received a copy of the GNU Library General Public -- License along with this program; if not, write to the Free Software -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, -- USA. */ -- --#ifndef _LOCALCHARSET_H --#define _LOCALCHARSET_H -- -- --#ifdef __cplusplus --extern "C" { --#endif -- -- --/* Determine the current locale's character encoding, and canonicalize it -- into one of the canonical names listed in config.charset. -- The result must not be freed; it is statically allocated. -- If the canonical name cannot be determined, the result is a non-canonical -- name. */ --extern const char * locale_charset (void); -- -- --#ifdef __cplusplus --} --#endif -- -- --#endif /* _LOCALCHARSET_H */ ---- a/intl/locale.alias -+++ /dev/null -@@ -1,77 +0,0 @@ --# Locale name alias data base. --# Copyright (C) 1996-2001,2003,2007 Free Software Foundation, Inc. --# --# This program is free software; you can redistribute it and/or modify it --# under the terms of the GNU Library General Public License as published --# by the Free Software Foundation; either version 2, or (at your option) --# any later version. --# --# This program is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU --# Library General Public License for more details. --# --# You should have received a copy of the GNU Library General Public --# License along with this program; if not, write to the Free Software --# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, --# USA. -- --# The format of this file is the same as for the corresponding file of --# the X Window System, which normally can be found in --# /usr/lib/X11/locale/locale.alias --# A single line contains two fields: an alias and a substitution value. --# All entries are case independent. -- --# Note: This file is obsolete and is kept around for the time being for --# backward compatibility. Nobody should rely on the names defined here. --# Locales should always be specified by their full name. -- --# Packages using this file: -- --bokmal nb_NO.ISO-8859-1 --bokmål nb_NO.ISO-8859-1 --catalan ca_ES.ISO-8859-1 --croatian hr_HR.ISO-8859-2 --czech cs_CZ.ISO-8859-2 --danish da_DK.ISO-8859-1 --dansk da_DK.ISO-8859-1 --deutsch de_DE.ISO-8859-1 --dutch nl_NL.ISO-8859-1 --eesti et_EE.ISO-8859-1 --estonian et_EE.ISO-8859-1 --finnish fi_FI.ISO-8859-1 --français fr_FR.ISO-8859-1 --french fr_FR.ISO-8859-1 --galego gl_ES.ISO-8859-1 --galician gl_ES.ISO-8859-1 --german de_DE.ISO-8859-1 --greek el_GR.ISO-8859-7 --hebrew he_IL.ISO-8859-8 --hrvatski hr_HR.ISO-8859-2 --hungarian hu_HU.ISO-8859-2 --icelandic is_IS.ISO-8859-1 --italian it_IT.ISO-8859-1 --japanese ja_JP.eucJP --japanese.euc ja_JP.eucJP --ja_JP ja_JP.eucJP --ja_JP.ujis ja_JP.eucJP --japanese.sjis ja_JP.SJIS --korean ko_KR.eucKR --korean.euc ko_KR.eucKR --ko_KR ko_KR.eucKR --lithuanian lt_LT.ISO-8859-13 --no_NO nb_NO.ISO-8859-1 --no_NO.ISO-8859-1 nb_NO.ISO-8859-1 --norwegian nb_NO.ISO-8859-1 --nynorsk nn_NO.ISO-8859-1 --polish pl_PL.ISO-8859-2 --portuguese pt_PT.ISO-8859-1 --romanian ro_RO.ISO-8859-2 --russian ru_RU.ISO-8859-5 --slovak sk_SK.ISO-8859-2 --slovene sl_SI.ISO-8859-2 --slovenian sl_SI.ISO-8859-2 --spanish es_ES.ISO-8859-1 --swedish sv_SE.ISO-8859-1 --thai th_TH.TIS-620 --turkish tr_TR.ISO-8859-9 ---- a/intl/localealias.c -+++ /dev/null -@@ -1,439 +0,0 @@ --/* Handle aliases for locale names. -- Copyright (C) 1995-1999, 2000-2001, 2003, 2005-2006 Free Software Foundation, Inc. -- -- This program is free software; you can redistribute it and/or modify it -- under the terms of the GNU Library General Public License as published -- by the Free Software Foundation; either version 2, or (at your option) -- any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Library General Public License for more details. -- -- You should have received a copy of the GNU Library General Public -- License along with this program; if not, write to the Free Software -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, -- USA. */ -- --/* Tell glibc's <string.h> to provide a prototype for mempcpy(). -- This must come before <config.h> because <config.h> may include -- <features.h>, and once <features.h> has been included, it's too late. */ --#ifndef _GNU_SOURCE --# define _GNU_SOURCE 1 --#endif -- --#ifdef HAVE_CONFIG_H --# include <config.h> --#endif -- --#include <ctype.h> --#include <stdio.h> --#if defined _LIBC || defined HAVE___FSETLOCKING --# include <stdio_ext.h> --#endif --#include <sys/types.h> -- --#ifdef __GNUC__ --# undef alloca --# define alloca __builtin_alloca --# define HAVE_ALLOCA 1 --#else --# ifdef _MSC_VER --# include <malloc.h> --# define alloca _alloca --# else --# if defined HAVE_ALLOCA_H || defined _LIBC --# include <alloca.h> --# else --# ifdef _AIX -- #pragma alloca --# else --# ifndef alloca --char *alloca (); --# endif --# endif --# endif --# endif --#endif -- --#include <stdlib.h> --#include <string.h> -- --#include "gettextP.h" -- --#if ENABLE_RELOCATABLE --# include "relocatable.h" --#else --# define relocate(pathname) (pathname) --#endif -- --/* @@ end of prolog @@ */ -- --#ifdef _LIBC --/* Rename the non ANSI C functions. This is required by the standard -- because some ANSI C functions will require linking with this object -- file and the name space must not be polluted. */ --# define strcasecmp __strcasecmp -- --# ifndef mempcpy --# define mempcpy __mempcpy --# endif --# define HAVE_MEMPCPY 1 --# define HAVE___FSETLOCKING 1 --#endif -- --/* Handle multi-threaded applications. */ --#ifdef _LIBC --# include <bits/libc-lock.h> --#else --# include "lock.h" --#endif -- --#ifndef internal_function --# define internal_function --#endif -- --/* Some optimizations for glibc. */ --#ifdef _LIBC --# define FEOF(fp) feof_unlocked (fp) --# define FGETS(buf, n, fp) fgets_unlocked (buf, n, fp) --#else --# define FEOF(fp) feof (fp) --# define FGETS(buf, n, fp) fgets (buf, n, fp) --#endif -- --/* For those losing systems which don't have `alloca' we have to add -- some additional code emulating it. */ --#ifdef HAVE_ALLOCA --# define freea(p) /* nothing */ --#else --# define alloca(n) malloc (n) --# define freea(p) free (p) --#endif -- --#if defined _LIBC_REENTRANT || HAVE_DECL_FGETS_UNLOCKED --# undef fgets --# define fgets(buf, len, s) fgets_unlocked (buf, len, s) --#endif --#if defined _LIBC_REENTRANT || HAVE_DECL_FEOF_UNLOCKED --# undef feof --# define feof(s) feof_unlocked (s) --#endif -- -- --__libc_lock_define_initialized (static, lock) -- -- --struct alias_map --{ -- const char *alias; -- const char *value; --}; -- -- --#ifndef _LIBC --# define libc_freeres_ptr(decl) decl --#endif -- --libc_freeres_ptr (static char *string_space); --static size_t string_space_act; --static size_t string_space_max; --libc_freeres_ptr (static struct alias_map *map); --static size_t nmap; --static size_t maxmap; -- -- --/* Prototypes for local functions. */ --static size_t read_alias_file (const char *fname, int fname_len) -- internal_function; --static int extend_alias_table (void); --static int alias_compare (const struct alias_map *map1, -- const struct alias_map *map2); -- -- --const char * --_nl_expand_alias (const char *name) --{ -- static const char *locale_alias_path; -- struct alias_map *retval; -- const char *result = NULL; -- size_t added; -- -- __libc_lock_lock (lock); -- -- if (locale_alias_path == NULL) -- locale_alias_path = LOCALE_ALIAS_PATH; -- -- do -- { -- struct alias_map item; -- -- item.alias = name; -- -- if (nmap > 0) -- retval = (struct alias_map *) bsearch (&item, map, nmap, -- sizeof (struct alias_map), -- (int (*) (const void *, -- const void *) -- ) alias_compare); -- else -- retval = NULL; -- -- /* We really found an alias. Return the value. */ -- if (retval != NULL) -- { -- result = retval->value; -- break; -- } -- -- /* Perhaps we can find another alias file. */ -- added = 0; -- while (added == 0 && locale_alias_path[0] != '\0') -- { -- const char *start; -- -- while (locale_alias_path[0] == PATH_SEPARATOR) -- ++locale_alias_path; -- start = locale_alias_path; -- -- while (locale_alias_path[0] != '\0' -- && locale_alias_path[0] != PATH_SEPARATOR) -- ++locale_alias_path; -- -- if (start < locale_alias_path) -- added = read_alias_file (start, locale_alias_path - start); -- } -- } -- while (added != 0); -- -- __libc_lock_unlock (lock); -- -- return result; --} -- -- --static size_t --internal_function --read_alias_file (const char *fname, int fname_len) --{ -- FILE *fp; -- char *full_fname; -- size_t added; -- static const char aliasfile[] = "/locale.alias"; -- -- full_fname = (char *) alloca (fname_len + sizeof aliasfile); --#ifdef HAVE_MEMPCPY -- mempcpy (mempcpy (full_fname, fname, fname_len), -- aliasfile, sizeof aliasfile); --#else -- memcpy (full_fname, fname, fname_len); -- memcpy (&full_fname[fname_len], aliasfile, sizeof aliasfile); --#endif -- --#ifdef _LIBC -- /* Note the file is opened with cancellation in the I/O functions -- disabled. */ -- fp = fopen (relocate (full_fname), "rc"); --#else -- fp = fopen (relocate (full_fname), "r"); --#endif -- freea (full_fname); -- if (fp == NULL) -- return 0; -- --#ifdef HAVE___FSETLOCKING -- /* No threads present. */ -- __fsetlocking (fp, FSETLOCKING_BYCALLER); --#endif -- -- added = 0; -- while (!FEOF (fp)) -- { -- /* It is a reasonable approach to use a fix buffer here because -- a) we are only interested in the first two fields -- b) these fields must be usable as file names and so must not -- be that long -- We avoid a multi-kilobyte buffer here since this would use up -- stack space which we might not have if the program ran out of -- memory. */ -- char buf[400]; -- char *alias; -- char *value; -- char *cp; -- int complete_line; -- -- if (FGETS (buf, sizeof buf, fp) == NULL) -- /* EOF reached. */ -- break; -- -- /* Determine whether the line is complete. */ -- complete_line = strchr (buf, '\n') != NULL; -- -- cp = buf; -- /* Ignore leading white space. */ -- while (isspace ((unsigned char) cp[0])) -- ++cp; -- -- /* A leading '#' signals a comment line. */ -- if (cp[0] != '\0' && cp[0] != '#') -- { -- alias = cp++; -- while (cp[0] != '\0' && !isspace ((unsigned char) cp[0])) -- ++cp; -- /* Terminate alias name. */ -- if (cp[0] != '\0') -- *cp++ = '\0'; -- -- /* Now look for the beginning of the value. */ -- while (isspace ((unsigned char) cp[0])) -- ++cp; -- -- if (cp[0] != '\0') -- { -- value = cp++; -- while (cp[0] != '\0' && !isspace ((unsigned char) cp[0])) -- ++cp; -- /* Terminate value. */ -- if (cp[0] == '\n') -- { -- /* This has to be done to make the following test -- for the end of line possible. We are looking for -- the terminating '\n' which do not overwrite here. */ -- *cp++ = '\0'; -- *cp = '\n'; -- } -- else if (cp[0] != '\0') -- *cp++ = '\0'; -- --#ifdef IN_LIBGLOCALE -- /* glibc's locale.alias contains entries for ja_JP and ko_KR -- that make it impossible to use a Japanese or Korean UTF-8 -- locale under the name "ja_JP" or "ko_KR". Ignore these -- entries. */ -- if (strchr (alias, '_') == NULL) --#endif -- { -- size_t alias_len; -- size_t value_len; -- -- if (nmap >= maxmap) -- if (__builtin_expect (extend_alias_table (), 0)) -- goto out; -- -- alias_len = strlen (alias) + 1; -- value_len = strlen (value) + 1; -- -- if (string_space_act + alias_len + value_len > string_space_max) -- { -- /* Increase size of memory pool. */ -- size_t new_size = (string_space_max -- + (alias_len + value_len > 1024 -- ? alias_len + value_len : 1024)); -- char *new_pool = (char *) realloc (string_space, new_size); -- if (new_pool == NULL) -- goto out; -- -- if (__builtin_expect (string_space != new_pool, 0)) -- { -- size_t i; -- -- for (i = 0; i < nmap; i++) -- { -- map[i].alias += new_pool - string_space; -- map[i].value += new_pool - string_space; -- } -- } -- -- string_space = new_pool; -- string_space_max = new_size; -- } -- -- map[nmap].alias = -- (const char *) memcpy (&string_space[string_space_act], -- alias, alias_len); -- string_space_act += alias_len; -- -- map[nmap].value = -- (const char *) memcpy (&string_space[string_space_act], -- value, value_len); -- string_space_act += value_len; -- -- ++nmap; -- ++added; -- } -- } -- } -- -- /* Possibly not the whole line fits into the buffer. Ignore -- the rest of the line. */ -- if (! complete_line) -- do -- if (FGETS (buf, sizeof buf, fp) == NULL) -- /* Make sure the inner loop will be left. The outer loop -- will exit at the `feof' test. */ -- break; -- while (strchr (buf, '\n') == NULL); -- } -- -- out: -- /* Should we test for ferror()? I think we have to silently ignore -- errors. --drepper */ -- fclose (fp); -- -- if (added > 0) -- qsort (map, nmap, sizeof (struct alias_map), -- (int (*) (const void *, const void *)) alias_compare); -- -- return added; --} -- -- --static int --extend_alias_table () --{ -- size_t new_size; -- struct alias_map *new_map; -- -- new_size = maxmap == 0 ? 100 : 2 * maxmap; -- new_map = (struct alias_map *) realloc (map, (new_size -- * sizeof (struct alias_map))); -- if (new_map == NULL) -- /* Simply don't extend: we don't have any more core. */ -- return -1; -- -- map = new_map; -- maxmap = new_size; -- return 0; --} -- -- --static int --alias_compare (const struct alias_map *map1, const struct alias_map *map2) --{ --#if defined _LIBC || defined HAVE_STRCASECMP -- return strcasecmp (map1->alias, map2->alias); --#else -- const unsigned char *p1 = (const unsigned char *) map1->alias; -- const unsigned char *p2 = (const unsigned char *) map2->alias; -- unsigned char c1, c2; -- -- if (p1 == p2) -- return 0; -- -- do -- { -- /* I know this seems to be odd but the tolower() function in -- some systems libc cannot handle nonalpha characters. */ -- c1 = isupper (*p1) ? tolower (*p1) : *p1; -- c2 = isupper (*p2) ? tolower (*p2) : *p2; -- if (c1 == '\0') -- break; -- ++p1; -- ++p2; -- } -- while (c1 == c2); -- -- return c1 - c2; --#endif --} ---- a/intl/localename.c -+++ /dev/null -@@ -1,1507 +0,0 @@ --/* Determine name of the currently selected locale. -- Copyright (C) 1995-1999, 2000-2007 Free Software Foundation, Inc. -- -- This program is free software; you can redistribute it and/or modify it -- under the terms of the GNU Library General Public License as published -- by the Free Software Foundation; either version 2, or (at your option) -- any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Library General Public License for more details. -- -- You should have received a copy of the GNU Library General Public -- License along with this program; if not, write to the Free Software -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, -- USA. */ -- --/* Written by Ulrich Drepper <drepper@gnu.org>, 1995. */ --/* Win32 code written by Tor Lillqvist <tml@iki.fi>. */ --/* MacOS X code written by Bruno Haible <bruno@clisp.org>. */ -- --#include <config.h> -- --/* Specification. */ --#ifdef IN_LIBINTL --# include "gettextP.h" --#else --# include "localename.h" --#endif -- --#include <stdlib.h> --#include <locale.h> -- --#if HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE --# include <string.h> --# include <CoreFoundation/CFString.h> --# if HAVE_CFLOCALECOPYCURRENT --# include <CoreFoundation/CFLocale.h> --# elif HAVE_CFPREFERENCESCOPYAPPVALUE --# include <CoreFoundation/CFPreferences.h> --# endif --#endif -- --#if defined _WIN32 || defined __WIN32__ --# define WIN32_NATIVE --#endif -- --#ifdef WIN32_NATIVE --# define WIN32_LEAN_AND_MEAN --# include <windows.h> --/* List of language codes, sorted by value: -- 0x01 LANG_ARABIC -- 0x02 LANG_BULGARIAN -- 0x03 LANG_CATALAN -- 0x04 LANG_CHINESE -- 0x05 LANG_CZECH -- 0x06 LANG_DANISH -- 0x07 LANG_GERMAN -- 0x08 LANG_GREEK -- 0x09 LANG_ENGLISH -- 0x0a LANG_SPANISH -- 0x0b LANG_FINNISH -- 0x0c LANG_FRENCH -- 0x0d LANG_HEBREW -- 0x0e LANG_HUNGARIAN -- 0x0f LANG_ICELANDIC -- 0x10 LANG_ITALIAN -- 0x11 LANG_JAPANESE -- 0x12 LANG_KOREAN -- 0x13 LANG_DUTCH -- 0x14 LANG_NORWEGIAN -- 0x15 LANG_POLISH -- 0x16 LANG_PORTUGUESE -- 0x17 LANG_RHAETO_ROMANCE -- 0x18 LANG_ROMANIAN -- 0x19 LANG_RUSSIAN -- 0x1a LANG_CROATIAN == LANG_SERBIAN -- 0x1b LANG_SLOVAK -- 0x1c LANG_ALBANIAN -- 0x1d LANG_SWEDISH -- 0x1e LANG_THAI -- 0x1f LANG_TURKISH -- 0x20 LANG_URDU -- 0x21 LANG_INDONESIAN -- 0x22 LANG_UKRAINIAN -- 0x23 LANG_BELARUSIAN -- 0x24 LANG_SLOVENIAN -- 0x25 LANG_ESTONIAN -- 0x26 LANG_LATVIAN -- 0x27 LANG_LITHUANIAN -- 0x28 LANG_TAJIK -- 0x29 LANG_FARSI -- 0x2a LANG_VIETNAMESE -- 0x2b LANG_ARMENIAN -- 0x2c LANG_AZERI -- 0x2d LANG_BASQUE -- 0x2e LANG_SORBIAN -- 0x2f LANG_MACEDONIAN -- 0x30 LANG_SUTU -- 0x31 LANG_TSONGA -- 0x32 LANG_TSWANA -- 0x33 LANG_VENDA -- 0x34 LANG_XHOSA -- 0x35 LANG_ZULU -- 0x36 LANG_AFRIKAANS -- 0x37 LANG_GEORGIAN -- 0x38 LANG_FAEROESE -- 0x39 LANG_HINDI -- 0x3a LANG_MALTESE -- 0x3b LANG_SAAMI -- 0x3c LANG_GAELIC -- 0x3d LANG_YIDDISH -- 0x3e LANG_MALAY -- 0x3f LANG_KAZAK -- 0x40 LANG_KYRGYZ -- 0x41 LANG_SWAHILI -- 0x42 LANG_TURKMEN -- 0x43 LANG_UZBEK -- 0x44 LANG_TATAR -- 0x45 LANG_BENGALI -- 0x46 LANG_PUNJABI -- 0x47 LANG_GUJARATI -- 0x48 LANG_ORIYA -- 0x49 LANG_TAMIL -- 0x4a LANG_TELUGU -- 0x4b LANG_KANNADA -- 0x4c LANG_MALAYALAM -- 0x4d LANG_ASSAMESE -- 0x4e LANG_MARATHI -- 0x4f LANG_SANSKRIT -- 0x50 LANG_MONGOLIAN -- 0x51 LANG_TIBETAN -- 0x52 LANG_WELSH -- 0x53 LANG_CAMBODIAN -- 0x54 LANG_LAO -- 0x55 LANG_BURMESE -- 0x56 LANG_GALICIAN -- 0x57 LANG_KONKANI -- 0x58 LANG_MANIPURI -- 0x59 LANG_SINDHI -- 0x5a LANG_SYRIAC -- 0x5b LANG_SINHALESE -- 0x5c LANG_CHEROKEE -- 0x5d LANG_INUKTITUT -- 0x5e LANG_AMHARIC -- 0x5f LANG_TAMAZIGHT -- 0x60 LANG_KASHMIRI -- 0x61 LANG_NEPALI -- 0x62 LANG_FRISIAN -- 0x63 LANG_PASHTO -- 0x64 LANG_TAGALOG -- 0x65 LANG_DIVEHI -- 0x66 LANG_EDO -- 0x67 LANG_FULFULDE -- 0x68 LANG_HAUSA -- 0x69 LANG_IBIBIO -- 0x6a LANG_YORUBA -- 0x70 LANG_IGBO -- 0x71 LANG_KANURI -- 0x72 LANG_OROMO -- 0x73 LANG_TIGRINYA -- 0x74 LANG_GUARANI -- 0x75 LANG_HAWAIIAN -- 0x76 LANG_LATIN -- 0x77 LANG_SOMALI -- 0x78 LANG_YI -- 0x79 LANG_PAPIAMENTU --*/ --/* Mingw headers don't have latest language and sublanguage codes. */ --# ifndef LANG_AFRIKAANS --# define LANG_AFRIKAANS 0x36 --# endif --# ifndef LANG_ALBANIAN --# define LANG_ALBANIAN 0x1c --# endif --# ifndef LANG_AMHARIC --# define LANG_AMHARIC 0x5e --# endif --# ifndef LANG_ARABIC --# define LANG_ARABIC 0x01 --# endif --# ifndef LANG_ARMENIAN --# define LANG_ARMENIAN 0x2b --# endif --# ifndef LANG_ASSAMESE --# define LANG_ASSAMESE 0x4d --# endif --# ifndef LANG_AZERI --# define LANG_AZERI 0x2c --# endif --# ifndef LANG_BASQUE --# define LANG_BASQUE 0x2d --# endif --# ifndef LANG_BELARUSIAN --# define LANG_BELARUSIAN 0x23 --# endif --# ifndef LANG_BENGALI --# define LANG_BENGALI 0x45 --# endif --# ifndef LANG_BURMESE --# define LANG_BURMESE 0x55 --# endif --# ifndef LANG_CAMBODIAN --# define LANG_CAMBODIAN 0x53 --# endif --# ifndef LANG_CATALAN --# define LANG_CATALAN 0x03 --# endif --# ifndef LANG_CHEROKEE --# define LANG_CHEROKEE 0x5c --# endif --# ifndef LANG_DIVEHI --# define LANG_DIVEHI 0x65 --# endif --# ifndef LANG_EDO --# define LANG_EDO 0x66 --# endif --# ifndef LANG_ESTONIAN --# define LANG_ESTONIAN 0x25 --# endif --# ifndef LANG_FAEROESE --# define LANG_FAEROESE 0x38 --# endif --# ifndef LANG_FARSI --# define LANG_FARSI 0x29 --# endif --# ifndef LANG_FRISIAN --# define LANG_FRISIAN 0x62 --# endif --# ifndef LANG_FULFULDE --# define LANG_FULFULDE 0x67 --# endif --# ifndef LANG_GAELIC --# define LANG_GAELIC 0x3c --# endif --# ifndef LANG_GALICIAN --# define LANG_GALICIAN 0x56 --# endif --# ifndef LANG_GEORGIAN --# define LANG_GEORGIAN 0x37 --# endif --# ifndef LANG_GUARANI --# define LANG_GUARANI 0x74 --# endif --# ifndef LANG_GUJARATI --# define LANG_GUJARATI 0x47 --# endif --# ifndef LANG_HAUSA --# define LANG_HAUSA 0x68 --# endif --# ifndef LANG_HAWAIIAN --# define LANG_HAWAIIAN 0x75 --# endif --# ifndef LANG_HEBREW --# define LANG_HEBREW 0x0d --# endif --# ifndef LANG_HINDI --# define LANG_HINDI 0x39 --# endif --# ifndef LANG_IBIBIO --# define LANG_IBIBIO 0x69 --# endif --# ifndef LANG_IGBO --# define LANG_IGBO 0x70 --# endif --# ifndef LANG_INDONESIAN --# define LANG_INDONESIAN 0x21 --# endif --# ifndef LANG_INUKTITUT --# define LANG_INUKTITUT 0x5d --# endif --# ifndef LANG_KANNADA --# define LANG_KANNADA 0x4b --# endif --# ifndef LANG_KANURI --# define LANG_KANURI 0x71 --# endif --# ifndef LANG_KASHMIRI --# define LANG_KASHMIRI 0x60 --# endif --# ifndef LANG_KAZAK --# define LANG_KAZAK 0x3f --# endif --# ifndef LANG_KONKANI --# define LANG_KONKANI 0x57 --# endif --# ifndef LANG_KYRGYZ --# define LANG_KYRGYZ 0x40 --# endif --# ifndef LANG_LAO --# define LANG_LAO 0x54 --# endif --# ifndef LANG_LATIN --# define LANG_LATIN 0x76 --# endif --# ifndef LANG_LATVIAN --# define LANG_LATVIAN 0x26 --# endif --# ifndef LANG_LITHUANIAN --# define LANG_LITHUANIAN 0x27 --# endif --# ifndef LANG_MACEDONIAN --# define LANG_MACEDONIAN 0x2f --# endif --# ifndef LANG_MALAY --# define LANG_MALAY 0x3e --# endif --# ifndef LANG_MALAYALAM --# define LANG_MALAYALAM 0x4c --# endif --# ifndef LANG_MALTESE --# define LANG_MALTESE 0x3a --# endif --# ifndef LANG_MANIPURI --# define LANG_MANIPURI 0x58 --# endif --# ifndef LANG_MARATHI --# define LANG_MARATHI 0x4e --# endif --# ifndef LANG_MONGOLIAN --# define LANG_MONGOLIAN 0x50 --# endif --# ifndef LANG_NEPALI --# define LANG_NEPALI 0x61 --# endif --# ifndef LANG_ORIYA --# define LANG_ORIYA 0x48 --# endif --# ifndef LANG_OROMO --# define LANG_OROMO 0x72 --# endif --# ifndef LANG_PAPIAMENTU --# define LANG_PAPIAMENTU 0x79 --# endif --# ifndef LANG_PASHTO --# define LANG_PASHTO 0x63 --# endif --# ifndef LANG_PUNJABI --# define LANG_PUNJABI 0x46 --# endif --# ifndef LANG_RHAETO_ROMANCE --# define LANG_RHAETO_ROMANCE 0x17 --# endif --# ifndef LANG_SAAMI --# define LANG_SAAMI 0x3b --# endif --# ifndef LANG_SANSKRIT --# define LANG_SANSKRIT 0x4f --# endif --# ifndef LANG_SERBIAN --# define LANG_SERBIAN 0x1a --# endif --# ifndef LANG_SINDHI --# define LANG_SINDHI 0x59 --# endif --# ifndef LANG_SINHALESE --# define LANG_SINHALESE 0x5b --# endif --# ifndef LANG_SLOVAK --# define LANG_SLOVAK 0x1b --# endif --# ifndef LANG_SOMALI --# define LANG_SOMALI 0x77 --# endif --# ifndef LANG_SORBIAN --# define LANG_SORBIAN 0x2e --# endif --# ifndef LANG_SUTU --# define LANG_SUTU 0x30 --# endif --# ifndef LANG_SWAHILI --# define LANG_SWAHILI 0x41 --# endif --# ifndef LANG_SYRIAC --# define LANG_SYRIAC 0x5a --# endif --# ifndef LANG_TAGALOG --# define LANG_TAGALOG 0x64 --# endif --# ifndef LANG_TAJIK --# define LANG_TAJIK 0x28 --# endif --# ifndef LANG_TAMAZIGHT --# define LANG_TAMAZIGHT 0x5f --# endif --# ifndef LANG_TAMIL --# define LANG_TAMIL 0x49 --# endif --# ifndef LANG_TATAR --# define LANG_TATAR 0x44 --# endif --# ifndef LANG_TELUGU --# define LANG_TELUGU 0x4a --# endif --# ifndef LANG_THAI --# define LANG_THAI 0x1e --# endif --# ifndef LANG_TIBETAN --# define LANG_TIBETAN 0x51 --# endif --# ifndef LANG_TIGRINYA --# define LANG_TIGRINYA 0x73 --# endif --# ifndef LANG_TSONGA --# define LANG_TSONGA 0x31 --# endif --# ifndef LANG_TSWANA --# define LANG_TSWANA 0x32 --# endif --# ifndef LANG_TURKMEN --# define LANG_TURKMEN 0x42 --# endif --# ifndef LANG_UKRAINIAN --# define LANG_UKRAINIAN 0x22 --# endif --# ifndef LANG_URDU --# define LANG_URDU 0x20 --# endif --# ifndef LANG_UZBEK --# define LANG_UZBEK 0x43 --# endif --# ifndef LANG_VENDA --# define LANG_VENDA 0x33 --# endif --# ifndef LANG_VIETNAMESE --# define LANG_VIETNAMESE 0x2a --# endif --# ifndef LANG_WELSH --# define LANG_WELSH 0x52 --# endif --# ifndef LANG_XHOSA --# define LANG_XHOSA 0x34 --# endif --# ifndef LANG_YI --# define LANG_YI 0x78 --# endif --# ifndef LANG_YIDDISH --# define LANG_YIDDISH 0x3d --# endif --# ifndef LANG_YORUBA --# define LANG_YORUBA 0x6a --# endif --# ifndef LANG_ZULU --# define LANG_ZULU 0x35 --# endif --# ifndef SUBLANG_ARABIC_SAUDI_ARABIA --# define SUBLANG_ARABIC_SAUDI_ARABIA 0x01 --# endif --# ifndef SUBLANG_ARABIC_IRAQ --# define SUBLANG_ARABIC_IRAQ 0x02 --# endif --# ifndef SUBLANG_ARABIC_EGYPT --# define SUBLANG_ARABIC_EGYPT 0x03 --# endif --# ifndef SUBLANG_ARABIC_LIBYA --# define SUBLANG_ARABIC_LIBYA 0x04 --# endif --# ifndef SUBLANG_ARABIC_ALGERIA --# define SUBLANG_ARABIC_ALGERIA 0x05 --# endif --# ifndef SUBLANG_ARABIC_MOROCCO --# define SUBLANG_ARABIC_MOROCCO 0x06 --# endif --# ifndef SUBLANG_ARABIC_TUNISIA --# define SUBLANG_ARABIC_TUNISIA 0x07 --# endif --# ifndef SUBLANG_ARABIC_OMAN --# define SUBLANG_ARABIC_OMAN 0x08 --# endif --# ifndef SUBLANG_ARABIC_YEMEN --# define SUBLANG_ARABIC_YEMEN 0x09 --# endif --# ifndef SUBLANG_ARABIC_SYRIA --# define SUBLANG_ARABIC_SYRIA 0x0a --# endif --# ifndef SUBLANG_ARABIC_JORDAN --# define SUBLANG_ARABIC_JORDAN 0x0b --# endif --# ifndef SUBLANG_ARABIC_LEBANON --# define SUBLANG_ARABIC_LEBANON 0x0c --# endif --# ifndef SUBLANG_ARABIC_KUWAIT --# define SUBLANG_ARABIC_KUWAIT 0x0d --# endif --# ifndef SUBLANG_ARABIC_UAE --# define SUBLANG_ARABIC_UAE 0x0e --# endif --# ifndef SUBLANG_ARABIC_BAHRAIN --# define SUBLANG_ARABIC_BAHRAIN 0x0f --# endif --# ifndef SUBLANG_ARABIC_QATAR --# define SUBLANG_ARABIC_QATAR 0x10 --# endif --# ifndef SUBLANG_AZERI_LATIN --# define SUBLANG_AZERI_LATIN 0x01 --# endif --# ifndef SUBLANG_AZERI_CYRILLIC --# define SUBLANG_AZERI_CYRILLIC 0x02 --# endif --# ifndef SUBLANG_BENGALI_INDIA --# define SUBLANG_BENGALI_INDIA 0x01 --# endif --# ifndef SUBLANG_BENGALI_BANGLADESH --# define SUBLANG_BENGALI_BANGLADESH 0x02 --# endif --# ifndef SUBLANG_CHINESE_MACAU --# define SUBLANG_CHINESE_MACAU 0x05 --# endif --# ifndef SUBLANG_ENGLISH_SOUTH_AFRICA --# define SUBLANG_ENGLISH_SOUTH_AFRICA 0x07 --# endif --# ifndef SUBLANG_ENGLISH_JAMAICA --# define SUBLANG_ENGLISH_JAMAICA 0x08 --# endif --# ifndef SUBLANG_ENGLISH_CARIBBEAN --# define SUBLANG_ENGLISH_CARIBBEAN 0x09 --# endif --# ifndef SUBLANG_ENGLISH_BELIZE --# define SUBLANG_ENGLISH_BELIZE 0x0a --# endif --# ifndef SUBLANG_ENGLISH_TRINIDAD --# define SUBLANG_ENGLISH_TRINIDAD 0x0b --# endif --# ifndef SUBLANG_ENGLISH_ZIMBABWE --# define SUBLANG_ENGLISH_ZIMBABWE 0x0c --# endif --# ifndef SUBLANG_ENGLISH_PHILIPPINES --# define SUBLANG_ENGLISH_PHILIPPINES 0x0d --# endif --# ifndef SUBLANG_ENGLISH_INDONESIA --# define SUBLANG_ENGLISH_INDONESIA 0x0e --# endif --# ifndef SUBLANG_ENGLISH_HONGKONG --# define SUBLANG_ENGLISH_HONGKONG 0x0f --# endif --# ifndef SUBLANG_ENGLISH_INDIA --# define SUBLANG_ENGLISH_INDIA 0x10 --# endif --# ifndef SUBLANG_ENGLISH_MALAYSIA --# define SUBLANG_ENGLISH_MALAYSIA 0x11 --# endif --# ifndef SUBLANG_ENGLISH_SINGAPORE --# define SUBLANG_ENGLISH_SINGAPORE 0x12 --# endif --# ifndef SUBLANG_FRENCH_LUXEMBOURG --# define SUBLANG_FRENCH_LUXEMBOURG 0x05 --# endif --# ifndef SUBLANG_FRENCH_MONACO --# define SUBLANG_FRENCH_MONACO 0x06 --# endif --# ifndef SUBLANG_FRENCH_WESTINDIES --# define SUBLANG_FRENCH_WESTINDIES 0x07 --# endif --# ifndef SUBLANG_FRENCH_REUNION --# define SUBLANG_FRENCH_REUNION 0x08 --# endif --# ifndef SUBLANG_FRENCH_CONGO --# define SUBLANG_FRENCH_CONGO 0x09 --# endif --# ifndef SUBLANG_FRENCH_SENEGAL --# define SUBLANG_FRENCH_SENEGAL 0x0a --# endif --# ifndef SUBLANG_FRENCH_CAMEROON --# define SUBLANG_FRENCH_CAMEROON 0x0b --# endif --# ifndef SUBLANG_FRENCH_COTEDIVOIRE --# define SUBLANG_FRENCH_COTEDIVOIRE 0x0c --# endif --# ifndef SUBLANG_FRENCH_MALI --# define SUBLANG_FRENCH_MALI 0x0d --# endif --# ifndef SUBLANG_FRENCH_MOROCCO --# define SUBLANG_FRENCH_MOROCCO 0x0e --# endif --# ifndef SUBLANG_FRENCH_HAITI --# define SUBLANG_FRENCH_HAITI 0x0f --# endif --# ifndef SUBLANG_GERMAN_LUXEMBOURG --# define SUBLANG_GERMAN_LUXEMBOURG 0x04 --# endif --# ifndef SUBLANG_GERMAN_LIECHTENSTEIN --# define SUBLANG_GERMAN_LIECHTENSTEIN 0x05 --# endif --# ifndef SUBLANG_KASHMIRI_INDIA --# define SUBLANG_KASHMIRI_INDIA 0x02 --# endif --# ifndef SUBLANG_MALAY_MALAYSIA --# define SUBLANG_MALAY_MALAYSIA 0x01 --# endif --# ifndef SUBLANG_MALAY_BRUNEI_DARUSSALAM --# define SUBLANG_MALAY_BRUNEI_DARUSSALAM 0x02 --# endif --# ifndef SUBLANG_NEPALI_INDIA --# define SUBLANG_NEPALI_INDIA 0x02 --# endif --# ifndef SUBLANG_PUNJABI_INDIA --# define SUBLANG_PUNJABI_INDIA 0x01 --# endif --# ifndef SUBLANG_PUNJABI_PAKISTAN --# define SUBLANG_PUNJABI_PAKISTAN 0x02 --# endif --# ifndef SUBLANG_ROMANIAN_ROMANIA --# define SUBLANG_ROMANIAN_ROMANIA 0x01 --# endif --# ifndef SUBLANG_ROMANIAN_MOLDOVA --# define SUBLANG_ROMANIAN_MOLDOVA 0x02 --# endif --# ifndef SUBLANG_SERBIAN_LATIN --# define SUBLANG_SERBIAN_LATIN 0x02 --# endif --# ifndef SUBLANG_SERBIAN_CYRILLIC --# define SUBLANG_SERBIAN_CYRILLIC 0x03 --# endif --# ifndef SUBLANG_SINDHI_PAKISTAN --# define SUBLANG_SINDHI_PAKISTAN 0x01 --# endif --# ifndef SUBLANG_SINDHI_AFGHANISTAN --# define SUBLANG_SINDHI_AFGHANISTAN 0x02 --# endif --# ifndef SUBLANG_SPANISH_GUATEMALA --# define SUBLANG_SPANISH_GUATEMALA 0x04 --# endif --# ifndef SUBLANG_SPANISH_COSTA_RICA --# define SUBLANG_SPANISH_COSTA_RICA 0x05 --# endif --# ifndef SUBLANG_SPANISH_PANAMA --# define SUBLANG_SPANISH_PANAMA 0x06 --# endif --# ifndef SUBLANG_SPANISH_DOMINICAN_REPUBLIC --# define SUBLANG_SPANISH_DOMINICAN_REPUBLIC 0x07 --# endif --# ifndef SUBLANG_SPANISH_VENEZUELA --# define SUBLANG_SPANISH_VENEZUELA 0x08 --# endif --# ifndef SUBLANG_SPANISH_COLOMBIA --# define SUBLANG_SPANISH_COLOMBIA 0x09 --# endif --# ifndef SUBLANG_SPANISH_PERU --# define SUBLANG_SPANISH_PERU 0x0a --# endif --# ifndef SUBLANG_SPANISH_ARGENTINA --# define SUBLANG_SPANISH_ARGENTINA 0x0b --# endif --# ifndef SUBLANG_SPANISH_ECUADOR --# define SUBLANG_SPANISH_ECUADOR 0x0c --# endif --# ifndef SUBLANG_SPANISH_CHILE --# define SUBLANG_SPANISH_CHILE 0x0d --# endif --# ifndef SUBLANG_SPANISH_URUGUAY --# define SUBLANG_SPANISH_URUGUAY 0x0e --# endif --# ifndef SUBLANG_SPANISH_PARAGUAY --# define SUBLANG_SPANISH_PARAGUAY 0x0f --# endif --# ifndef SUBLANG_SPANISH_BOLIVIA --# define SUBLANG_SPANISH_BOLIVIA 0x10 --# endif --# ifndef SUBLANG_SPANISH_EL_SALVADOR --# define SUBLANG_SPANISH_EL_SALVADOR 0x11 --# endif --# ifndef SUBLANG_SPANISH_HONDURAS --# define SUBLANG_SPANISH_HONDURAS 0x12 --# endif --# ifndef SUBLANG_SPANISH_NICARAGUA --# define SUBLANG_SPANISH_NICARAGUA 0x13 --# endif --# ifndef SUBLANG_SPANISH_PUERTO_RICO --# define SUBLANG_SPANISH_PUERTO_RICO 0x14 --# endif --# ifndef SUBLANG_SWEDISH_FINLAND --# define SUBLANG_SWEDISH_FINLAND 0x02 --# endif --# ifndef SUBLANG_TAMAZIGHT_ARABIC --# define SUBLANG_TAMAZIGHT_ARABIC 0x01 --# endif --# ifndef SUBLANG_TAMAZIGHT_ALGERIA_LATIN --# define SUBLANG_TAMAZIGHT_ALGERIA_LATIN 0x02 --# endif --# ifndef SUBLANG_TIGRINYA_ETHIOPIA --# define SUBLANG_TIGRINYA_ETHIOPIA 0x01 --# endif --# ifndef SUBLANG_TIGRINYA_ERITREA --# define SUBLANG_TIGRINYA_ERITREA 0x02 --# endif --# ifndef SUBLANG_URDU_PAKISTAN --# define SUBLANG_URDU_PAKISTAN 0x01 --# endif --# ifndef SUBLANG_URDU_INDIA --# define SUBLANG_URDU_INDIA 0x02 --# endif --# ifndef SUBLANG_UZBEK_LATIN --# define SUBLANG_UZBEK_LATIN 0x01 --# endif --# ifndef SUBLANG_UZBEK_CYRILLIC --# define SUBLANG_UZBEK_CYRILLIC 0x02 --# endif --#endif -- --# if HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE --/* MacOS X 10.2 or newer */ -- --/* Canonicalize a MacOS X locale name to a Unix locale name. -- NAME is a sufficiently large buffer. -- On input, it contains the MacOS X locale name. -- On output, it contains the Unix locale name. */ --# if !defined IN_LIBINTL --static --# endif --void --gl_locale_name_canonicalize (char *name) --{ -- /* This conversion is based on a posting by -- Deborah GoldSmith <goldsmit@apple.com> on 2005-03-08, -- http://lists.apple.com/archives/carbon-dev/2005/Mar/msg00293.html */ -- -- /* Convert legacy (NeXTstep inherited) English names to Unix (ISO 639 and -- ISO 3166) names. Prior to MacOS X 10.3, there is no API for doing this. -- Therefore we do it ourselves, using a table based on the results of the -- MacOS X 10.3.8 function -- CFLocaleCreateCanonicalLocaleIdentifierFromString(). */ -- typedef struct { const char legacy[21+1]; const char unixy[5+1]; } -- legacy_entry; -- static const legacy_entry legacy_table[] = { -- { "Afrikaans", "af" }, -- { "Albanian", "sq" }, -- { "Amharic", "am" }, -- { "Arabic", "ar" }, -- { "Armenian", "hy" }, -- { "Assamese", "as" }, -- { "Aymara", "ay" }, -- { "Azerbaijani", "az" }, -- { "Basque", "eu" }, -- { "Belarusian", "be" }, -- { "Belorussian", "be" }, -- { "Bengali", "bn" }, -- { "Brazilian Portugese", "pt_BR" }, -- { "Brazilian Portuguese", "pt_BR" }, -- { "Breton", "br" }, -- { "Bulgarian", "bg" }, -- { "Burmese", "my" }, -- { "Byelorussian", "be" }, -- { "Catalan", "ca" }, -- { "Chewa", "ny" }, -- { "Chichewa", "ny" }, -- { "Chinese", "zh" }, -- { "Chinese, Simplified", "zh_CN" }, -- { "Chinese, Traditional", "zh_TW" }, -- { "Chinese, Tradtional", "zh_TW" }, -- { "Croatian", "hr" }, -- { "Czech", "cs" }, -- { "Danish", "da" }, -- { "Dutch", "nl" }, -- { "Dzongkha", "dz" }, -- { "English", "en" }, -- { "Esperanto", "eo" }, -- { "Estonian", "et" }, -- { "Faroese", "fo" }, -- { "Farsi", "fa" }, -- { "Finnish", "fi" }, -- { "Flemish", "nl_BE" }, -- { "French", "fr" }, -- { "Galician", "gl" }, -- { "Gallegan", "gl" }, -- { "Georgian", "ka" }, -- { "German", "de" }, -- { "Greek", "el" }, -- { "Greenlandic", "kl" }, -- { "Guarani", "gn" }, -- { "Gujarati", "gu" }, -- { "Hawaiian", "haw" }, /* Yes, "haw", not "cpe". */ -- { "Hebrew", "he" }, -- { "Hindi", "hi" }, -- { "Hungarian", "hu" }, -- { "Icelandic", "is" }, -- { "Indonesian", "id" }, -- { "Inuktitut", "iu" }, -- { "Irish", "ga" }, -- { "Italian", "it" }, -- { "Japanese", "ja" }, -- { "Javanese", "jv" }, -- { "Kalaallisut", "kl" }, -- { "Kannada", "kn" }, -- { "Kashmiri", "ks" }, -- { "Kazakh", "kk" }, -- { "Khmer", "km" }, -- { "Kinyarwanda", "rw" }, -- { "Kirghiz", "ky" }, -- { "Korean", "ko" }, -- { "Kurdish", "ku" }, -- { "Latin", "la" }, -- { "Latvian", "lv" }, -- { "Lithuanian", "lt" }, -- { "Macedonian", "mk" }, -- { "Malagasy", "mg" }, -- { "Malay", "ms" }, -- { "Malayalam", "ml" }, -- { "Maltese", "mt" }, -- { "Manx", "gv" }, -- { "Marathi", "mr" }, -- { "Moldavian", "mo" }, -- { "Mongolian", "mn" }, -- { "Nepali", "ne" }, -- { "Norwegian", "nb" }, /* Yes, "nb", not the obsolete "no". */ -- { "Nyanja", "ny" }, -- { "Nynorsk", "nn" }, -- { "Oriya", "or" }, -- { "Oromo", "om" }, -- { "Panjabi", "pa" }, -- { "Pashto", "ps" }, -- { "Persian", "fa" }, -- { "Polish", "pl" }, -- { "Portuguese", "pt" }, -- { "Portuguese, Brazilian", "pt_BR" }, -- { "Punjabi", "pa" }, -- { "Pushto", "ps" }, -- { "Quechua", "qu" }, -- { "Romanian", "ro" }, -- { "Ruanda", "rw" }, -- { "Rundi", "rn" }, -- { "Russian", "ru" }, -- { "Sami", "se_NO" }, /* Not just "se". */ -- { "Sanskrit", "sa" }, -- { "Scottish", "gd" }, -- { "Serbian", "sr" }, -- { "Simplified Chinese", "zh_CN" }, -- { "Sindhi", "sd" }, -- { "Sinhalese", "si" }, -- { "Slovak", "sk" }, -- { "Slovenian", "sl" }, -- { "Somali", "so" }, -- { "Spanish", "es" }, -- { "Sundanese", "su" }, -- { "Swahili", "sw" }, -- { "Swedish", "sv" }, -- { "Tagalog", "tl" }, -- { "Tajik", "tg" }, -- { "Tajiki", "tg" }, -- { "Tamil", "ta" }, -- { "Tatar", "tt" }, -- { "Telugu", "te" }, -- { "Thai", "th" }, -- { "Tibetan", "bo" }, -- { "Tigrinya", "ti" }, -- { "Tongan", "to" }, -- { "Traditional Chinese", "zh_TW" }, -- { "Turkish", "tr" }, -- { "Turkmen", "tk" }, -- { "Uighur", "ug" }, -- { "Ukrainian", "uk" }, -- { "Urdu", "ur" }, -- { "Uzbek", "uz" }, -- { "Vietnamese", "vi" }, -- { "Welsh", "cy" }, -- { "Yiddish", "yi" } -- }; -- -- /* Convert new-style locale names with language tags (ISO 639 and ISO 15924) -- to Unix (ISO 639 and ISO 3166) names. */ -- typedef struct { const char langtag[7+1]; const char unixy[12+1]; } -- langtag_entry; -- static const langtag_entry langtag_table[] = { -- /* MacOS X has "az-Arab", "az-Cyrl", "az-Latn". -- The default script for az on Unix is Latin. */ -- { "az-Latn", "az" }, -- /* MacOS X has "ga-dots". Does not yet exist on Unix. */ -- { "ga-dots", "ga" }, -- /* MacOS X has "kk-Cyrl". Does not yet exist on Unix. */ -- /* MacOS X has "mn-Cyrl", "mn-Mong". -- The default script for mn on Unix is Cyrillic. */ -- { "mn-Cyrl", "mn" }, -- /* MacOS X has "ms-Arab", "ms-Latn". -- The default script for ms on Unix is Latin. */ -- { "ms-Latn", "ms" }, -- /* MacOS X has "tg-Cyrl". -- The default script for tg on Unix is Cyrillic. */ -- { "tg-Cyrl", "tg" }, -- /* MacOS X has "tk-Cyrl". Does not yet exist on Unix. */ -- /* MacOS X has "tt-Cyrl". -- The default script for tt on Unix is Cyrillic. */ -- { "tt-Cyrl", "tt" }, -- /* MacOS X has "zh-Hans", "zh-Hant". -- Country codes are used to distinguish these on Unix. */ -- { "zh-Hans", "zh_CN" }, -- { "zh-Hant", "zh_TW" } -- }; -- -- /* Convert script names (ISO 15924) to Unix conventions. -- See http://www.unicode.org/iso15924/iso15924-codes.html */ -- typedef struct { const char script[4+1]; const char unixy[9+1]; } -- script_entry; -- static const script_entry script_table[] = { -- { "Arab", "arabic" }, -- { "Cyrl", "cyrillic" }, -- { "Mong", "mongolian" } -- }; -- -- /* Step 1: Convert using legacy_table. */ -- if (name[0] >= 'A' && name[0] <= 'Z') -- { -- unsigned int i1, i2; -- i1 = 0; -- i2 = sizeof (legacy_table) / sizeof (legacy_entry); -- while (i2 - i1 > 1) -- { -- /* At this point we know that if name occurs in legacy_table, -- its index must be >= i1 and < i2. */ -- unsigned int i = (i1 + i2) >> 1; -- const legacy_entry *p = &legacy_table[i]; -- if (strcmp (name, p->legacy) < 0) -- i2 = i; -- else -- i1 = i; -- } -- if (strcmp (name, legacy_table[i1].legacy) == 0) -- { -- strcpy (name, legacy_table[i1].unixy); -- return; -- } -- } -- -- /* Step 2: Convert using langtag_table and script_table. */ -- if (strlen (name) == 7 && name[2] == '-') -- { -- unsigned int i1, i2; -- i1 = 0; -- i2 = sizeof (langtag_table) / sizeof (langtag_entry); -- while (i2 - i1 > 1) -- { -- /* At this point we know that if name occurs in langtag_table, -- its index must be >= i1 and < i2. */ -- unsigned int i = (i1 + i2) >> 1; -- const langtag_entry *p = &langtag_table[i]; -- if (strcmp (name, p->langtag) < 0) -- i2 = i; -- else -- i1 = i; -- } -- if (strcmp (name, langtag_table[i1].langtag) == 0) -- { -- strcpy (name, langtag_table[i1].unixy); -- return; -- } -- -- i1 = 0; -- i2 = sizeof (script_table) / sizeof (script_entry); -- while (i2 - i1 > 1) -- { -- /* At this point we know that if (name + 3) occurs in script_table, -- its index must be >= i1 and < i2. */ -- unsigned int i = (i1 + i2) >> 1; -- const script_entry *p = &script_table[i]; -- if (strcmp (name + 3, p->script) < 0) -- i2 = i; -- else -- i1 = i; -- } -- if (strcmp (name + 3, script_table[i1].script) == 0) -- { -- name[2] = '@'; -- strcpy (name + 3, script_table[i1].unixy); -- return; -- } -- } -- -- /* Step 3: Convert new-style dash to Unix underscore. */ -- { -- char *p; -- for (p = name; *p != '\0'; p++) -- if (*p == '-') -- *p = '_'; -- } --} -- --#endif -- --/* XPG3 defines the result of 'setlocale (category, NULL)' as: -- "Directs 'setlocale()' to query 'category' and return the current -- setting of 'local'." -- However it does not specify the exact format. Neither do SUSV2 and -- ISO C 99. So we can use this feature only on selected systems (e.g. -- those using GNU C Library). */ --#if defined _LIBC || (defined __GLIBC__ && __GLIBC__ >= 2) --# define HAVE_LOCALE_NULL --#endif -- --/* Determine the current locale's name, and canonicalize it into XPG syntax -- language[_territory][.codeset][@modifier] -- The codeset part in the result is not reliable; the locale_charset() -- should be used for codeset information instead. -- The result must not be freed; it is statically allocated. */ -- --const char * --gl_locale_name_posix (int category, const char *categoryname) --{ -- /* Use the POSIX methods of looking to 'LC_ALL', 'LC_xxx', and 'LANG'. -- On some systems this can be done by the 'setlocale' function itself. */ --#if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES && defined HAVE_LOCALE_NULL -- return setlocale (category, NULL); --#else -- const char *retval; -- -- /* Setting of LC_ALL overrides all other. */ -- retval = getenv ("LC_ALL"); -- if (retval != NULL && retval[0] != '\0') -- return retval; -- /* Next comes the name of the desired category. */ -- retval = getenv (categoryname); -- if (retval != NULL && retval[0] != '\0') -- return retval; -- /* Last possibility is the LANG environment variable. */ -- retval = getenv ("LANG"); -- if (retval != NULL && retval[0] != '\0') -- return retval; -- -- return NULL; --#endif --} -- --const char * --gl_locale_name_default (void) --{ -- /* POSIX:2001 says: -- "All implementations shall define a locale as the default locale, to be -- invoked when no environment variables are set, or set to the empty -- string. This default locale can be the POSIX locale or any other -- implementation-defined locale. Some implementations may provide -- facilities for local installation administrators to set the default -- locale, customizing it for each location. POSIX:2001 does not require -- such a facility. */ -- --#if !(HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE || defined(WIN32_NATIVE)) -- -- /* The system does not have a way of setting the locale, other than the -- POSIX specified environment variables. We use C as default locale. */ -- return "C"; -- --#else -- -- /* Return an XPG style locale name language[_territory][@modifier]. -- Don't even bother determining the codeset; it's not useful in this -- context, because message catalogs are not specific to a single -- codeset. */ -- --# if HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE -- /* MacOS X 10.2 or newer */ -- { -- /* Cache the locale name, since CoreFoundation calls are expensive. */ -- static const char *cached_localename; -- -- if (cached_localename == NULL) -- { -- char namebuf[256]; --# if HAVE_CFLOCALECOPYCURRENT /* MacOS X 10.3 or newer */ -- CFLocaleRef locale = CFLocaleCopyCurrent (); -- CFStringRef name = CFLocaleGetIdentifier (locale); -- -- if (CFStringGetCString (name, namebuf, sizeof(namebuf), -- kCFStringEncodingASCII)) -- { -- gl_locale_name_canonicalize (namebuf); -- cached_localename = strdup (namebuf); -- } -- CFRelease (locale); --# elif HAVE_CFPREFERENCESCOPYAPPVALUE /* MacOS X 10.2 or newer */ -- CFTypeRef value = -- CFPreferencesCopyAppValue (CFSTR ("AppleLocale"), -- kCFPreferencesCurrentApplication); -- if (value != NULL -- && CFGetTypeID (value) == CFStringGetTypeID () -- && CFStringGetCString ((CFStringRef)value, namebuf, sizeof(namebuf), -- kCFStringEncodingASCII)) -- { -- gl_locale_name_canonicalize (namebuf); -- cached_localename = strdup (namebuf); -- } --# endif -- if (cached_localename == NULL) -- cached_localename = "C"; -- } -- return cached_localename; -- } -- --# endif -- --# if defined(WIN32_NATIVE) /* WIN32, not Cygwin */ -- { -- LCID lcid; -- LANGID langid; -- int primary, sub; -- -- /* Use native Win32 API locale ID. */ -- lcid = GetThreadLocale (); -- -- /* Strip off the sorting rules, keep only the language part. */ -- langid = LANGIDFROMLCID (lcid); -- -- /* Split into language and territory part. */ -- primary = PRIMARYLANGID (langid); -- sub = SUBLANGID (langid); -- -- /* Dispatch on language. -- See also http://www.unicode.org/unicode/onlinedat/languages.html . -- For details about languages, see http://www.ethnologue.com/ . */ -- switch (primary) -- { -- case LANG_AFRIKAANS: return "af_ZA"; -- case LANG_ALBANIAN: return "sq_AL"; -- case LANG_AMHARIC: return "am_ET"; -- case LANG_ARABIC: -- switch (sub) -- { -- case SUBLANG_ARABIC_SAUDI_ARABIA: return "ar_SA"; -- case SUBLANG_ARABIC_IRAQ: return "ar_IQ"; -- case SUBLANG_ARABIC_EGYPT: return "ar_EG"; -- case SUBLANG_ARABIC_LIBYA: return "ar_LY"; -- case SUBLANG_ARABIC_ALGERIA: return "ar_DZ"; -- case SUBLANG_ARABIC_MOROCCO: return "ar_MA"; -- case SUBLANG_ARABIC_TUNISIA: return "ar_TN"; -- case SUBLANG_ARABIC_OMAN: return "ar_OM"; -- case SUBLANG_ARABIC_YEMEN: return "ar_YE"; -- case SUBLANG_ARABIC_SYRIA: return "ar_SY"; -- case SUBLANG_ARABIC_JORDAN: return "ar_JO"; -- case SUBLANG_ARABIC_LEBANON: return "ar_LB"; -- case SUBLANG_ARABIC_KUWAIT: return "ar_KW"; -- case SUBLANG_ARABIC_UAE: return "ar_AE"; -- case SUBLANG_ARABIC_BAHRAIN: return "ar_BH"; -- case SUBLANG_ARABIC_QATAR: return "ar_QA"; -- } -- return "ar"; -- case LANG_ARMENIAN: return "hy_AM"; -- case LANG_ASSAMESE: return "as_IN"; -- case LANG_AZERI: -- switch (sub) -- { -- /* FIXME: Adjust this when Azerbaijani locales appear on Unix. */ -- case SUBLANG_AZERI_LATIN: return "az_AZ@latin"; -- case SUBLANG_AZERI_CYRILLIC: return "az_AZ@cyrillic"; -- } -- return "az"; -- case LANG_BASQUE: -- switch (sub) -- { -- case SUBLANG_DEFAULT: return "eu_ES"; -- } -- return "eu"; /* Ambiguous: could be "eu_ES" or "eu_FR". */ -- case LANG_BELARUSIAN: return "be_BY"; -- case LANG_BENGALI: -- switch (sub) -- { -- case SUBLANG_BENGALI_INDIA: return "bn_IN"; -- case SUBLANG_BENGALI_BANGLADESH: return "bn_BD"; -- } -- return "bn"; -- case LANG_BULGARIAN: return "bg_BG"; -- case LANG_BURMESE: return "my_MM"; -- case LANG_CAMBODIAN: return "km_KH"; -- case LANG_CATALAN: return "ca_ES"; -- case LANG_CHEROKEE: return "chr_US"; -- case LANG_CHINESE: -- switch (sub) -- { -- case SUBLANG_CHINESE_TRADITIONAL: return "zh_TW"; -- case SUBLANG_CHINESE_SIMPLIFIED: return "zh_CN"; -- case SUBLANG_CHINESE_HONGKONG: return "zh_HK"; -- case SUBLANG_CHINESE_SINGAPORE: return "zh_SG"; -- case SUBLANG_CHINESE_MACAU: return "zh_MO"; -- } -- return "zh"; -- case LANG_CROATIAN: /* LANG_CROATIAN == LANG_SERBIAN -- * What used to be called Serbo-Croatian -- * should really now be two separate -- * languages because of political reasons. -- * (Says tml, who knows nothing about Serbian -- * or Croatian.) -- * (I can feel those flames coming already.) -- */ -- switch (sub) -- { -- case SUBLANG_DEFAULT: return "hr_HR"; -- case SUBLANG_SERBIAN_LATIN: return "sr_CS"; -- case SUBLANG_SERBIAN_CYRILLIC: return "sr_CS@cyrillic"; -- } -- return "hr"; -- case LANG_CZECH: return "cs_CZ"; -- case LANG_DANISH: return "da_DK"; -- case LANG_DIVEHI: return "dv_MV"; -- case LANG_DUTCH: -- switch (sub) -- { -- case SUBLANG_DUTCH: return "nl_NL"; -- case SUBLANG_DUTCH_BELGIAN: /* FLEMISH, VLAAMS */ return "nl_BE"; -- } -- return "nl"; -- case LANG_EDO: return "bin_NG"; -- case LANG_ENGLISH: -- switch (sub) -- { -- /* SUBLANG_ENGLISH_US == SUBLANG_DEFAULT. Heh. I thought -- * English was the language spoken in England. -- * Oh well. -- */ -- case SUBLANG_ENGLISH_US: return "en_US"; -- case SUBLANG_ENGLISH_UK: return "en_GB"; -- case SUBLANG_ENGLISH_AUS: return "en_AU"; -- case SUBLANG_ENGLISH_CAN: return "en_CA"; -- case SUBLANG_ENGLISH_NZ: return "en_NZ"; -- case SUBLANG_ENGLISH_EIRE: return "en_IE"; -- case SUBLANG_ENGLISH_SOUTH_AFRICA: return "en_ZA"; -- case SUBLANG_ENGLISH_JAMAICA: return "en_JM"; -- case SUBLANG_ENGLISH_CARIBBEAN: return "en_GD"; /* Grenada? */ -- case SUBLANG_ENGLISH_BELIZE: return "en_BZ"; -- case SUBLANG_ENGLISH_TRINIDAD: return "en_TT"; -- case SUBLANG_ENGLISH_ZIMBABWE: return "en_ZW"; -- case SUBLANG_ENGLISH_PHILIPPINES: return "en_PH"; -- case SUBLANG_ENGLISH_INDONESIA: return "en_ID"; -- case SUBLANG_ENGLISH_HONGKONG: return "en_HK"; -- case SUBLANG_ENGLISH_INDIA: return "en_IN"; -- case SUBLANG_ENGLISH_MALAYSIA: return "en_MY"; -- case SUBLANG_ENGLISH_SINGAPORE: return "en_SG"; -- } -- return "en"; -- case LANG_ESTONIAN: return "et_EE"; -- case LANG_FAEROESE: return "fo_FO"; -- case LANG_FARSI: return "fa_IR"; -- case LANG_FINNISH: return "fi_FI"; -- case LANG_FRENCH: -- switch (sub) -- { -- case SUBLANG_FRENCH: return "fr_FR"; -- case SUBLANG_FRENCH_BELGIAN: /* WALLOON */ return "fr_BE"; -- case SUBLANG_FRENCH_CANADIAN: return "fr_CA"; -- case SUBLANG_FRENCH_SWISS: return "fr_CH"; -- case SUBLANG_FRENCH_LUXEMBOURG: return "fr_LU"; -- case SUBLANG_FRENCH_MONACO: return "fr_MC"; -- case SUBLANG_FRENCH_WESTINDIES: return "fr"; /* Caribbean? */ -- case SUBLANG_FRENCH_REUNION: return "fr_RE"; -- case SUBLANG_FRENCH_CONGO: return "fr_CG"; -- case SUBLANG_FRENCH_SENEGAL: return "fr_SN"; -- case SUBLANG_FRENCH_CAMEROON: return "fr_CM"; -- case SUBLANG_FRENCH_COTEDIVOIRE: return "fr_CI"; -- case SUBLANG_FRENCH_MALI: return "fr_ML"; -- case SUBLANG_FRENCH_MOROCCO: return "fr_MA"; -- case SUBLANG_FRENCH_HAITI: return "fr_HT"; -- } -- return "fr"; -- case LANG_FRISIAN: return "fy_NL"; -- case LANG_FULFULDE: -- /* Spoken in Nigeria, Guinea, Senegal, Mali, Niger, Cameroon, Benin. */ -- return "ff_NG"; -- case LANG_GAELIC: -- switch (sub) -- { -- case 0x01: /* SCOTTISH */ return "gd_GB"; -- case 0x02: /* IRISH */ return "ga_IE"; -- } -- return "C"; -- case LANG_GALICIAN: return "gl_ES"; -- case LANG_GEORGIAN: return "ka_GE"; -- case LANG_GERMAN: -- switch (sub) -- { -- case SUBLANG_GERMAN: return "de_DE"; -- case SUBLANG_GERMAN_SWISS: return "de_CH"; -- case SUBLANG_GERMAN_AUSTRIAN: return "de_AT"; -- case SUBLANG_GERMAN_LUXEMBOURG: return "de_LU"; -- case SUBLANG_GERMAN_LIECHTENSTEIN: return "de_LI"; -- } -- return "de"; -- case LANG_GREEK: return "el_GR"; -- case LANG_GUARANI: return "gn_PY"; -- case LANG_GUJARATI: return "gu_IN"; -- case LANG_HAUSA: return "ha_NG"; -- case LANG_HAWAIIAN: -- /* FIXME: Do they mean Hawaiian ("haw_US", 1000 speakers) -- or Hawaii Creole English ("cpe_US", 600000 speakers)? */ -- return "cpe_US"; -- case LANG_HEBREW: return "he_IL"; -- case LANG_HINDI: return "hi_IN"; -- case LANG_HUNGARIAN: return "hu_HU"; -- case LANG_IBIBIO: return "nic_NG"; -- case LANG_ICELANDIC: return "is_IS"; -- case LANG_IGBO: return "ig_NG"; -- case LANG_INDONESIAN: return "id_ID"; -- case LANG_INUKTITUT: return "iu_CA"; -- case LANG_ITALIAN: -- switch (sub) -- { -- case SUBLANG_ITALIAN: return "it_IT"; -- case SUBLANG_ITALIAN_SWISS: return "it_CH"; -- } -- return "it"; -- case LANG_JAPANESE: return "ja_JP"; -- case LANG_KANNADA: return "kn_IN"; -- case LANG_KANURI: return "kr_NG"; -- case LANG_KASHMIRI: -- switch (sub) -- { -- case SUBLANG_DEFAULT: return "ks_PK"; -- case SUBLANG_KASHMIRI_INDIA: return "ks_IN"; -- } -- return "ks"; -- case LANG_KAZAK: return "kk_KZ"; -- case LANG_KONKANI: -- /* FIXME: Adjust this when such locales appear on Unix. */ -- return "kok_IN"; -- case LANG_KOREAN: return "ko_KR"; -- case LANG_KYRGYZ: return "ky_KG"; -- case LANG_LAO: return "lo_LA"; -- case LANG_LATIN: return "la_VA"; -- case LANG_LATVIAN: return "lv_LV"; -- case LANG_LITHUANIAN: return "lt_LT"; -- case LANG_MACEDONIAN: return "mk_MK"; -- case LANG_MALAY: -- switch (sub) -- { -- case SUBLANG_MALAY_MALAYSIA: return "ms_MY"; -- case SUBLANG_MALAY_BRUNEI_DARUSSALAM: return "ms_BN"; -- } -- return "ms"; -- case LANG_MALAYALAM: return "ml_IN"; -- case LANG_MALTESE: return "mt_MT"; -- case LANG_MANIPURI: -- /* FIXME: Adjust this when such locales appear on Unix. */ -- return "mni_IN"; -- case LANG_MARATHI: return "mr_IN"; -- case LANG_MONGOLIAN: -- switch (sub) -- { -- case SUBLANG_DEFAULT: return "mn_MN"; -- } -- return "mn"; /* Ambiguous: could be "mn_CN" or "mn_MN". */ -- case LANG_NEPALI: -- switch (sub) -- { -- case SUBLANG_DEFAULT: return "ne_NP"; -- case SUBLANG_NEPALI_INDIA: return "ne_IN"; -- } -- return "ne"; -- case LANG_NORWEGIAN: -- switch (sub) -- { -- case SUBLANG_NORWEGIAN_BOKMAL: return "nb_NO"; -- case SUBLANG_NORWEGIAN_NYNORSK: return "nn_NO"; -- } -- return "no"; -- case LANG_ORIYA: return "or_IN"; -- case LANG_OROMO: return "om_ET"; -- case LANG_PAPIAMENTU: return "pap_AN"; -- case LANG_PASHTO: -- return "ps"; /* Ambiguous: could be "ps_PK" or "ps_AF". */ -- case LANG_POLISH: return "pl_PL"; -- case LANG_PORTUGUESE: -- switch (sub) -- { -- case SUBLANG_PORTUGUESE: return "pt_PT"; -- /* Hmm. SUBLANG_PORTUGUESE_BRAZILIAN == SUBLANG_DEFAULT. -- Same phenomenon as SUBLANG_ENGLISH_US == SUBLANG_DEFAULT. */ -- case SUBLANG_PORTUGUESE_BRAZILIAN: return "pt_BR"; -- } -- return "pt"; -- case LANG_PUNJABI: -- switch (sub) -- { -- case SUBLANG_PUNJABI_INDIA: return "pa_IN"; /* Gurmukhi script */ -- case SUBLANG_PUNJABI_PAKISTAN: return "pa_PK"; /* Arabic script */ -- } -- return "pa"; -- case LANG_RHAETO_ROMANCE: return "rm_CH"; -- case LANG_ROMANIAN: -- switch (sub) -- { -- case SUBLANG_ROMANIAN_ROMANIA: return "ro_RO"; -- case SUBLANG_ROMANIAN_MOLDOVA: return "ro_MD"; -- } -- return "ro"; -- case LANG_RUSSIAN: -- switch (sub) -- { -- case SUBLANG_DEFAULT: return "ru_RU"; -- } -- return "ru"; /* Ambiguous: could be "ru_RU" or "ru_UA" or "ru_MD". */ -- case LANG_SAAMI: /* actually Northern Sami */ return "se_NO"; -- case LANG_SANSKRIT: return "sa_IN"; -- case LANG_SINDHI: -- switch (sub) -- { -- case SUBLANG_SINDHI_PAKISTAN: return "sd_PK"; -- case SUBLANG_SINDHI_AFGHANISTAN: return "sd_AF"; -- } -- return "sd"; -- case LANG_SINHALESE: return "si_LK"; -- case LANG_SLOVAK: return "sk_SK"; -- case LANG_SLOVENIAN: return "sl_SI"; -- case LANG_SOMALI: return "so_SO"; -- case LANG_SORBIAN: -- /* FIXME: Adjust this when such locales appear on Unix. */ -- return "wen_DE"; -- case LANG_SPANISH: -- switch (sub) -- { -- case SUBLANG_SPANISH: return "es_ES"; -- case SUBLANG_SPANISH_MEXICAN: return "es_MX"; -- case SUBLANG_SPANISH_MODERN: -- return "es_ES@modern"; /* not seen on Unix */ -- case SUBLANG_SPANISH_GUATEMALA: return "es_GT"; -- case SUBLANG_SPANISH_COSTA_RICA: return "es_CR"; -- case SUBLANG_SPANISH_PANAMA: return "es_PA"; -- case SUBLANG_SPANISH_DOMINICAN_REPUBLIC: return "es_DO"; -- case SUBLANG_SPANISH_VENEZUELA: return "es_VE"; -- case SUBLANG_SPANISH_COLOMBIA: return "es_CO"; -- case SUBLANG_SPANISH_PERU: return "es_PE"; -- case SUBLANG_SPANISH_ARGENTINA: return "es_AR"; -- case SUBLANG_SPANISH_ECUADOR: return "es_EC"; -- case SUBLANG_SPANISH_CHILE: return "es_CL"; -- case SUBLANG_SPANISH_URUGUAY: return "es_UY"; -- case SUBLANG_SPANISH_PARAGUAY: return "es_PY"; -- case SUBLANG_SPANISH_BOLIVIA: return "es_BO"; -- case SUBLANG_SPANISH_EL_SALVADOR: return "es_SV"; -- case SUBLANG_SPANISH_HONDURAS: return "es_HN"; -- case SUBLANG_SPANISH_NICARAGUA: return "es_NI"; -- case SUBLANG_SPANISH_PUERTO_RICO: return "es_PR"; -- } -- return "es"; -- case LANG_SUTU: return "bnt_TZ"; /* or "st_LS" or "nso_ZA"? */ -- case LANG_SWAHILI: return "sw_KE"; -- case LANG_SWEDISH: -- switch (sub) -- { -- case SUBLANG_DEFAULT: return "sv_SE"; -- case SUBLANG_SWEDISH_FINLAND: return "sv_FI"; -- } -- return "sv"; -- case LANG_SYRIAC: return "syr_TR"; /* An extinct language. */ -- case LANG_TAGALOG: return "tl_PH"; -- case LANG_TAJIK: return "tg_TJ"; -- case LANG_TAMAZIGHT: -- switch (sub) -- { -- /* FIXME: Adjust this when Tamazight locales appear on Unix. */ -- case SUBLANG_TAMAZIGHT_ARABIC: return "ber_MA@arabic"; -- case SUBLANG_TAMAZIGHT_ALGERIA_LATIN: return "ber_DZ@latin"; -- } -- return "ber_MA"; -- case LANG_TAMIL: -- switch (sub) -- { -- case SUBLANG_DEFAULT: return "ta_IN"; -- } -- return "ta"; /* Ambiguous: could be "ta_IN" or "ta_LK" or "ta_SG". */ -- case LANG_TATAR: return "tt_RU"; -- case LANG_TELUGU: return "te_IN"; -- case LANG_THAI: return "th_TH"; -- case LANG_TIBETAN: return "bo_CN"; -- case LANG_TIGRINYA: -- switch (sub) -- { -- case SUBLANG_TIGRINYA_ETHIOPIA: return "ti_ET"; -- case SUBLANG_TIGRINYA_ERITREA: return "ti_ER"; -- } -- return "ti"; -- case LANG_TSONGA: return "ts_ZA"; -- case LANG_TSWANA: return "tn_BW"; -- case LANG_TURKISH: return "tr_TR"; -- case LANG_TURKMEN: return "tk_TM"; -- case LANG_UKRAINIAN: return "uk_UA"; -- case LANG_URDU: -- switch (sub) -- { -- case SUBLANG_URDU_PAKISTAN: return "ur_PK"; -- case SUBLANG_URDU_INDIA: return "ur_IN"; -- } -- return "ur"; -- case LANG_UZBEK: -- switch (sub) -- { -- case SUBLANG_UZBEK_LATIN: return "uz_UZ"; -- case SUBLANG_UZBEK_CYRILLIC: return "uz_UZ@cyrillic"; -- } -- return "uz"; -- case LANG_VENDA: return "ve_ZA"; -- case LANG_VIETNAMESE: return "vi_VN"; -- case LANG_WELSH: return "cy_GB"; -- case LANG_XHOSA: return "xh_ZA"; -- case LANG_YI: return "sit_CN"; -- case LANG_YIDDISH: return "yi_IL"; -- case LANG_YORUBA: return "yo_NG"; -- case LANG_ZULU: return "zu_ZA"; -- default: return "C"; -- } -- } --# endif --#endif --} -- --const char * --gl_locale_name (int category, const char *categoryname) --{ -- const char *retval; -- -- retval = gl_locale_name_posix (category, categoryname); -- if (retval != NULL) -- return retval; -- -- return gl_locale_name_default (); --} ---- a/intl/lock.c -+++ /dev/null -@@ -1,922 +0,0 @@ --/* Locking in multithreaded situations. -- Copyright (C) 2005-2006 Free Software Foundation, Inc. -- -- This program is free software; you can redistribute it and/or modify it -- under the terms of the GNU Library General Public License as published -- by the Free Software Foundation; either version 2, or (at your option) -- any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Library General Public License for more details. -- -- You should have received a copy of the GNU Library General Public -- License along with this program; if not, write to the Free Software -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, -- USA. */ -- --/* Written by Bruno Haible <bruno@clisp.org>, 2005. -- Based on GCC's gthr-posix.h, gthr-posix95.h, gthr-solaris.h, -- gthr-win32.h. */ -- --#include <config.h> -- --#include "lock.h" -- --/* ========================================================================= */ -- --#if USE_POSIX_THREADS -- --/* Use the POSIX threads library. */ -- --# if PTHREAD_IN_USE_DETECTION_HARD -- --/* The function to be executed by a dummy thread. */ --static void * --dummy_thread_func (void *arg) --{ -- return arg; --} -- --int --glthread_in_use (void) --{ -- static int tested; -- static int result; /* 1: linked with -lpthread, 0: only with libc */ -- -- if (!tested) -- { -- pthread_t thread; -- -- if (pthread_create (&thread, NULL, dummy_thread_func, NULL) != 0) -- /* Thread creation failed. */ -- result = 0; -- else -- { -- /* Thread creation works. */ -- void *retval; -- if (pthread_join (thread, &retval) != 0) -- abort (); -- result = 1; -- } -- tested = 1; -- } -- return result; --} -- --# endif -- --/* -------------------------- gl_lock_t datatype -------------------------- */ -- --/* ------------------------- gl_rwlock_t datatype ------------------------- */ -- --# if HAVE_PTHREAD_RWLOCK -- --# if !defined PTHREAD_RWLOCK_INITIALIZER -- --void --glthread_rwlock_init (gl_rwlock_t *lock) --{ -- if (pthread_rwlock_init (&lock->rwlock, NULL) != 0) -- abort (); -- lock->initialized = 1; --} -- --void --glthread_rwlock_rdlock (gl_rwlock_t *lock) --{ -- if (!lock->initialized) -- { -- if (pthread_mutex_lock (&lock->guard) != 0) -- abort (); -- if (!lock->initialized) -- glthread_rwlock_init (lock); -- if (pthread_mutex_unlock (&lock->guard) != 0) -- abort (); -- } -- if (pthread_rwlock_rdlock (&lock->rwlock) != 0) -- abort (); --} -- --void --glthread_rwlock_wrlock (gl_rwlock_t *lock) --{ -- if (!lock->initialized) -- { -- if (pthread_mutex_lock (&lock->guard) != 0) -- abort (); -- if (!lock->initialized) -- glthread_rwlock_init (lock); -- if (pthread_mutex_unlock (&lock->guard) != 0) -- abort (); -- } -- if (pthread_rwlock_wrlock (&lock->rwlock) != 0) -- abort (); --} -- --void --glthread_rwlock_unlock (gl_rwlock_t *lock) --{ -- if (!lock->initialized) -- abort (); -- if (pthread_rwlock_unlock (&lock->rwlock) != 0) -- abort (); --} -- --void --glthread_rwlock_destroy (gl_rwlock_t *lock) --{ -- if (!lock->initialized) -- abort (); -- if (pthread_rwlock_destroy (&lock->rwlock) != 0) -- abort (); -- lock->initialized = 0; --} -- --# endif -- --# else -- --void --glthread_rwlock_init (gl_rwlock_t *lock) --{ -- if (pthread_mutex_init (&lock->lock, NULL) != 0) -- abort (); -- if (pthread_cond_init (&lock->waiting_readers, NULL) != 0) -- abort (); -- if (pthread_cond_init (&lock->waiting_writers, NULL) != 0) -- abort (); -- lock->waiting_writers_count = 0; -- lock->runcount = 0; --} -- --void --glthread_rwlock_rdlock (gl_rwlock_t *lock) --{ -- if (pthread_mutex_lock (&lock->lock) != 0) -- abort (); -- /* Test whether only readers are currently running, and whether the runcount -- field will not overflow. */ -- /* POSIX says: "It is implementation-defined whether the calling thread -- acquires the lock when a writer does not hold the lock and there are -- writers blocked on the lock." Let's say, no: give the writers a higher -- priority. */ -- while (!(lock->runcount + 1 > 0 && lock->waiting_writers_count == 0)) -- { -- /* This thread has to wait for a while. Enqueue it among the -- waiting_readers. */ -- if (pthread_cond_wait (&lock->waiting_readers, &lock->lock) != 0) -- abort (); -- } -- lock->runcount++; -- if (pthread_mutex_unlock (&lock->lock) != 0) -- abort (); --} -- --void --glthread_rwlock_wrlock (gl_rwlock_t *lock) --{ -- if (pthread_mutex_lock (&lock->lock) != 0) -- abort (); -- /* Test whether no readers or writers are currently running. */ -- while (!(lock->runcount == 0)) -- { -- /* This thread has to wait for a while. Enqueue it among the -- waiting_writers. */ -- lock->waiting_writers_count++; -- if (pthread_cond_wait (&lock->waiting_writers, &lock->lock) != 0) -- abort (); -- lock->waiting_writers_count--; -- } -- lock->runcount--; /* runcount becomes -1 */ -- if (pthread_mutex_unlock (&lock->lock) != 0) -- abort (); --} -- --void --glthread_rwlock_unlock (gl_rwlock_t *lock) --{ -- if (pthread_mutex_lock (&lock->lock) != 0) -- abort (); -- if (lock->runcount < 0) -- { -- /* Drop a writer lock. */ -- if (!(lock->runcount == -1)) -- abort (); -- lock->runcount = 0; -- } -- else -- { -- /* Drop a reader lock. */ -- if (!(lock->runcount > 0)) -- abort (); -- lock->runcount--; -- } -- if (lock->runcount == 0) -- { -- /* POSIX recommends that "write locks shall take precedence over read -- locks", to avoid "writer starvation". */ -- if (lock->waiting_writers_count > 0) -- { -- /* Wake up one of the waiting writers. */ -- if (pthread_cond_signal (&lock->waiting_writers) != 0) -- abort (); -- } -- else -- { -- /* Wake up all waiting readers. */ -- if (pthread_cond_broadcast (&lock->waiting_readers) != 0) -- abort (); -- } -- } -- if (pthread_mutex_unlock (&lock->lock) != 0) -- abort (); --} -- --void --glthread_rwlock_destroy (gl_rwlock_t *lock) --{ -- if (pthread_mutex_destroy (&lock->lock) != 0) -- abort (); -- if (pthread_cond_destroy (&lock->waiting_readers) != 0) -- abort (); -- if (pthread_cond_destroy (&lock->waiting_writers) != 0) -- abort (); --} -- --# endif -- --/* --------------------- gl_recursive_lock_t datatype --------------------- */ -- --# if HAVE_PTHREAD_MUTEX_RECURSIVE -- --# if !(defined PTHREAD_RECURSIVE_MUTEX_INITIALIZER || defined PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP) -- --void --glthread_recursive_lock_init (gl_recursive_lock_t *lock) --{ -- pthread_mutexattr_t attributes; -- -- if (pthread_mutexattr_init (&attributes) != 0) -- abort (); -- if (pthread_mutexattr_settype (&attributes, PTHREAD_MUTEX_RECURSIVE) != 0) -- abort (); -- if (pthread_mutex_init (&lock->recmutex, &attributes) != 0) -- abort (); -- if (pthread_mutexattr_destroy (&attributes) != 0) -- abort (); -- lock->initialized = 1; --} -- --void --glthread_recursive_lock_lock (gl_recursive_lock_t *lock) --{ -- if (!lock->initialized) -- { -- if (pthread_mutex_lock (&lock->guard) != 0) -- abort (); -- if (!lock->initialized) -- glthread_recursive_lock_init (lock); -- if (pthread_mutex_unlock (&lock->guard) != 0) -- abort (); -- } -- if (pthread_mutex_lock (&lock->recmutex) != 0) -- abort (); --} -- --void --glthread_recursive_lock_unlock (gl_recursive_lock_t *lock) --{ -- if (!lock->initialized) -- abort (); -- if (pthread_mutex_unlock (&lock->recmutex) != 0) -- abort (); --} -- --void --glthread_recursive_lock_destroy (gl_recursive_lock_t *lock) --{ -- if (!lock->initialized) -- abort (); -- if (pthread_mutex_destroy (&lock->recmutex) != 0) -- abort (); -- lock->initialized = 0; --} -- --# endif -- --# else -- --void --glthread_recursive_lock_init (gl_recursive_lock_t *lock) --{ -- if (pthread_mutex_init (&lock->mutex, NULL) != 0) -- abort (); -- lock->owner = (pthread_t) 0; -- lock->depth = 0; --} -- --void --glthread_recursive_lock_lock (gl_recursive_lock_t *lock) --{ -- pthread_t self = pthread_self (); -- if (lock->owner != self) -- { -- if (pthread_mutex_lock (&lock->mutex) != 0) -- abort (); -- lock->owner = self; -- } -- if (++(lock->depth) == 0) /* wraparound? */ -- abort (); --} -- --void --glthread_recursive_lock_unlock (gl_recursive_lock_t *lock) --{ -- if (lock->owner != pthread_self ()) -- abort (); -- if (lock->depth == 0) -- abort (); -- if (--(lock->depth) == 0) -- { -- lock->owner = (pthread_t) 0; -- if (pthread_mutex_unlock (&lock->mutex) != 0) -- abort (); -- } --} -- --void --glthread_recursive_lock_destroy (gl_recursive_lock_t *lock) --{ -- if (lock->owner != (pthread_t) 0) -- abort (); -- if (pthread_mutex_destroy (&lock->mutex) != 0) -- abort (); --} -- --# endif -- --/* -------------------------- gl_once_t datatype -------------------------- */ -- --static const pthread_once_t fresh_once = PTHREAD_ONCE_INIT; -- --int --glthread_once_singlethreaded (pthread_once_t *once_control) --{ -- /* We don't know whether pthread_once_t is an integer type, a floating-point -- type, a pointer type, or a structure type. */ -- char *firstbyte = (char *)once_control; -- if (*firstbyte == *(const char *)&fresh_once) -- { -- /* First time use of once_control. Invert the first byte. */ -- *firstbyte = ~ *(const char *)&fresh_once; -- return 1; -- } -- else -- return 0; --} -- --#endif -- --/* ========================================================================= */ -- --#if USE_PTH_THREADS -- --/* Use the GNU Pth threads library. */ -- --/* -------------------------- gl_lock_t datatype -------------------------- */ -- --/* ------------------------- gl_rwlock_t datatype ------------------------- */ -- --/* --------------------- gl_recursive_lock_t datatype --------------------- */ -- --/* -------------------------- gl_once_t datatype -------------------------- */ -- --void --glthread_once_call (void *arg) --{ -- void (**gl_once_temp_addr) (void) = (void (**) (void)) arg; -- void (*initfunction) (void) = *gl_once_temp_addr; -- initfunction (); --} -- --int --glthread_once_singlethreaded (pth_once_t *once_control) --{ -- /* We know that pth_once_t is an integer type. */ -- if (*once_control == PTH_ONCE_INIT) -- { -- /* First time use of once_control. Invert the marker. */ -- *once_control = ~ PTH_ONCE_INIT; -- return 1; -- } -- else -- return 0; --} -- --#endif -- --/* ========================================================================= */ -- --#if USE_SOLARIS_THREADS -- --/* Use the old Solaris threads library. */ -- --/* -------------------------- gl_lock_t datatype -------------------------- */ -- --/* ------------------------- gl_rwlock_t datatype ------------------------- */ -- --/* --------------------- gl_recursive_lock_t datatype --------------------- */ -- --void --glthread_recursive_lock_init (gl_recursive_lock_t *lock) --{ -- if (mutex_init (&lock->mutex, USYNC_THREAD, NULL) != 0) -- abort (); -- lock->owner = (thread_t) 0; -- lock->depth = 0; --} -- --void --glthread_recursive_lock_lock (gl_recursive_lock_t *lock) --{ -- thread_t self = thr_self (); -- if (lock->owner != self) -- { -- if (mutex_lock (&lock->mutex) != 0) -- abort (); -- lock->owner = self; -- } -- if (++(lock->depth) == 0) /* wraparound? */ -- abort (); --} -- --void --glthread_recursive_lock_unlock (gl_recursive_lock_t *lock) --{ -- if (lock->owner != thr_self ()) -- abort (); -- if (lock->depth == 0) -- abort (); -- if (--(lock->depth) == 0) -- { -- lock->owner = (thread_t) 0; -- if (mutex_unlock (&lock->mutex) != 0) -- abort (); -- } --} -- --void --glthread_recursive_lock_destroy (gl_recursive_lock_t *lock) --{ -- if (lock->owner != (thread_t) 0) -- abort (); -- if (mutex_destroy (&lock->mutex) != 0) -- abort (); --} -- --/* -------------------------- gl_once_t datatype -------------------------- */ -- --void --glthread_once (gl_once_t *once_control, void (*initfunction) (void)) --{ -- if (!once_control->inited) -- { -- /* Use the mutex to guarantee that if another thread is already calling -- the initfunction, this thread waits until it's finished. */ -- if (mutex_lock (&once_control->mutex) != 0) -- abort (); -- if (!once_control->inited) -- { -- once_control->inited = 1; -- initfunction (); -- } -- if (mutex_unlock (&once_control->mutex) != 0) -- abort (); -- } --} -- --int --glthread_once_singlethreaded (gl_once_t *once_control) --{ -- /* We know that gl_once_t contains an integer type. */ -- if (!once_control->inited) -- { -- /* First time use of once_control. Invert the marker. */ -- once_control->inited = ~ 0; -- return 1; -- } -- else -- return 0; --} -- --#endif -- --/* ========================================================================= */ -- --#if USE_WIN32_THREADS -- --/* -------------------------- gl_lock_t datatype -------------------------- */ -- --void --glthread_lock_init (gl_lock_t *lock) --{ -- InitializeCriticalSection (&lock->lock); -- lock->guard.done = 1; --} -- --void --glthread_lock_lock (gl_lock_t *lock) --{ -- if (!lock->guard.done) -- { -- if (InterlockedIncrement (&lock->guard.started) == 0) -- /* This thread is the first one to need this lock. Initialize it. */ -- glthread_lock_init (lock); -- else -- /* Yield the CPU while waiting for another thread to finish -- initializing this lock. */ -- while (!lock->guard.done) -- Sleep (0); -- } -- EnterCriticalSection (&lock->lock); --} -- --void --glthread_lock_unlock (gl_lock_t *lock) --{ -- if (!lock->guard.done) -- abort (); -- LeaveCriticalSection (&lock->lock); --} -- --void --glthread_lock_destroy (gl_lock_t *lock) --{ -- if (!lock->guard.done) -- abort (); -- DeleteCriticalSection (&lock->lock); -- lock->guard.done = 0; --} -- --/* ------------------------- gl_rwlock_t datatype ------------------------- */ -- --static inline void --gl_waitqueue_init (gl_waitqueue_t *wq) --{ -- wq->array = NULL; -- wq->count = 0; -- wq->alloc = 0; -- wq->offset = 0; --} -- --/* Enqueues the current thread, represented by an event, in a wait queue. -- Returns INVALID_HANDLE_VALUE if an allocation failure occurs. */ --static HANDLE --gl_waitqueue_add (gl_waitqueue_t *wq) --{ -- HANDLE event; -- unsigned int index; -- -- if (wq->count == wq->alloc) -- { -- unsigned int new_alloc = 2 * wq->alloc + 1; -- HANDLE *new_array = -- (HANDLE *) realloc (wq->array, new_alloc * sizeof (HANDLE)); -- if (new_array == NULL) -- /* No more memory. */ -- return INVALID_HANDLE_VALUE; -- /* Now is a good opportunity to rotate the array so that its contents -- starts at offset 0. */ -- if (wq->offset > 0) -- { -- unsigned int old_count = wq->count; -- unsigned int old_alloc = wq->alloc; -- unsigned int old_offset = wq->offset; -- unsigned int i; -- if (old_offset + old_count > old_alloc) -- { -- unsigned int limit = old_offset + old_count - old_alloc; -- for (i = 0; i < limit; i++) -- new_array[old_alloc + i] = new_array[i]; -- } -- for (i = 0; i < old_count; i++) -- new_array[i] = new_array[old_offset + i]; -- wq->offset = 0; -- } -- wq->array = new_array; -- wq->alloc = new_alloc; -- } -- event = CreateEvent (NULL, TRUE, FALSE, NULL); -- if (event == INVALID_HANDLE_VALUE) -- /* No way to allocate an event. */ -- return INVALID_HANDLE_VALUE; -- index = wq->offset + wq->count; -- if (index >= wq->alloc) -- index -= wq->alloc; -- wq->array[index] = event; -- wq->count++; -- return event; --} -- --/* Notifies the first thread from a wait queue and dequeues it. */ --static inline void --gl_waitqueue_notify_first (gl_waitqueue_t *wq) --{ -- SetEvent (wq->array[wq->offset + 0]); -- wq->offset++; -- wq->count--; -- if (wq->count == 0 || wq->offset == wq->alloc) -- wq->offset = 0; --} -- --/* Notifies all threads from a wait queue and dequeues them all. */ --static inline void --gl_waitqueue_notify_all (gl_waitqueue_t *wq) --{ -- unsigned int i; -- -- for (i = 0; i < wq->count; i++) -- { -- unsigned int index = wq->offset + i; -- if (index >= wq->alloc) -- index -= wq->alloc; -- SetEvent (wq->array[index]); -- } -- wq->count = 0; -- wq->offset = 0; --} -- --void --glthread_rwlock_init (gl_rwlock_t *lock) --{ -- InitializeCriticalSection (&lock->lock); -- gl_waitqueue_init (&lock->waiting_readers); -- gl_waitqueue_init (&lock->waiting_writers); -- lock->runcount = 0; -- lock->guard.done = 1; --} -- --void --glthread_rwlock_rdlock (gl_rwlock_t *lock) --{ -- if (!lock->guard.done) -- { -- if (InterlockedIncrement (&lock->guard.started) == 0) -- /* This thread is the first one to need this lock. Initialize it. */ -- glthread_rwlock_init (lock); -- else -- /* Yield the CPU while waiting for another thread to finish -- initializing this lock. */ -- while (!lock->guard.done) -- Sleep (0); -- } -- EnterCriticalSection (&lock->lock); -- /* Test whether only readers are currently running, and whether the runcount -- field will not overflow. */ -- if (!(lock->runcount + 1 > 0)) -- { -- /* This thread has to wait for a while. Enqueue it among the -- waiting_readers. */ -- HANDLE event = gl_waitqueue_add (&lock->waiting_readers); -- if (event != INVALID_HANDLE_VALUE) -- { -- DWORD result; -- LeaveCriticalSection (&lock->lock); -- /* Wait until another thread signals this event. */ -- result = WaitForSingleObject (event, INFINITE); -- if (result == WAIT_FAILED || result == WAIT_TIMEOUT) -- abort (); -- CloseHandle (event); -- /* The thread which signalled the event already did the bookkeeping: -- removed us from the waiting_readers, incremented lock->runcount. */ -- if (!(lock->runcount > 0)) -- abort (); -- return; -- } -- else -- { -- /* Allocation failure. Weird. */ -- do -- { -- LeaveCriticalSection (&lock->lock); -- Sleep (1); -- EnterCriticalSection (&lock->lock); -- } -- while (!(lock->runcount + 1 > 0)); -- } -- } -- lock->runcount++; -- LeaveCriticalSection (&lock->lock); --} -- --void --glthread_rwlock_wrlock (gl_rwlock_t *lock) --{ -- if (!lock->guard.done) -- { -- if (InterlockedIncrement (&lock->guard.started) == 0) -- /* This thread is the first one to need this lock. Initialize it. */ -- glthread_rwlock_init (lock); -- else -- /* Yield the CPU while waiting for another thread to finish -- initializing this lock. */ -- while (!lock->guard.done) -- Sleep (0); -- } -- EnterCriticalSection (&lock->lock); -- /* Test whether no readers or writers are currently running. */ -- if (!(lock->runcount == 0)) -- { -- /* This thread has to wait for a while. Enqueue it among the -- waiting_writers. */ -- HANDLE event = gl_waitqueue_add (&lock->waiting_writers); -- if (event != INVALID_HANDLE_VALUE) -- { -- DWORD result; -- LeaveCriticalSection (&lock->lock); -- /* Wait until another thread signals this event. */ -- result = WaitForSingleObject (event, INFINITE); -- if (result == WAIT_FAILED || result == WAIT_TIMEOUT) -- abort (); -- CloseHandle (event); -- /* The thread which signalled the event already did the bookkeeping: -- removed us from the waiting_writers, set lock->runcount = -1. */ -- if (!(lock->runcount == -1)) -- abort (); -- return; -- } -- else -- { -- /* Allocation failure. Weird. */ -- do -- { -- LeaveCriticalSection (&lock->lock); -- Sleep (1); -- EnterCriticalSection (&lock->lock); -- } -- while (!(lock->runcount == 0)); -- } -- } -- lock->runcount--; /* runcount becomes -1 */ -- LeaveCriticalSection (&lock->lock); --} -- --void --glthread_rwlock_unlock (gl_rwlock_t *lock) --{ -- if (!lock->guard.done) -- abort (); -- EnterCriticalSection (&lock->lock); -- if (lock->runcount < 0) -- { -- /* Drop a writer lock. */ -- if (!(lock->runcount == -1)) -- abort (); -- lock->runcount = 0; -- } -- else -- { -- /* Drop a reader lock. */ -- if (!(lock->runcount > 0)) -- abort (); -- lock->runcount--; -- } -- if (lock->runcount == 0) -- { -- /* POSIX recommends that "write locks shall take precedence over read -- locks", to avoid "writer starvation". */ -- if (lock->waiting_writers.count > 0) -- { -- /* Wake up one of the waiting writers. */ -- lock->runcount--; -- gl_waitqueue_notify_first (&lock->waiting_writers); -- } -- else -- { -- /* Wake up all waiting readers. */ -- lock->runcount += lock->waiting_readers.count; -- gl_waitqueue_notify_all (&lock->waiting_readers); -- } -- } -- LeaveCriticalSection (&lock->lock); --} -- --void --glthread_rwlock_destroy (gl_rwlock_t *lock) --{ -- if (!lock->guard.done) -- abort (); -- if (lock->runcount != 0) -- abort (); -- DeleteCriticalSection (&lock->lock); -- if (lock->waiting_readers.array != NULL) -- free (lock->waiting_readers.array); -- if (lock->waiting_writers.array != NULL) -- free (lock->waiting_writers.array); -- lock->guard.done = 0; --} -- --/* --------------------- gl_recursive_lock_t datatype --------------------- */ -- --void --glthread_recursive_lock_init (gl_recursive_lock_t *lock) --{ -- lock->owner = 0; -- lock->depth = 0; -- InitializeCriticalSection (&lock->lock); -- lock->guard.done = 1; --} -- --void --glthread_recursive_lock_lock (gl_recursive_lock_t *lock) --{ -- if (!lock->guard.done) -- { -- if (InterlockedIncrement (&lock->guard.started) == 0) -- /* This thread is the first one to need this lock. Initialize it. */ -- glthread_recursive_lock_init (lock); -- else -- /* Yield the CPU while waiting for another thread to finish -- initializing this lock. */ -- while (!lock->guard.done) -- Sleep (0); -- } -- { -- DWORD self = GetCurrentThreadId (); -- if (lock->owner != self) -- { -- EnterCriticalSection (&lock->lock); -- lock->owner = self; -- } -- if (++(lock->depth) == 0) /* wraparound? */ -- abort (); -- } --} -- --void --glthread_recursive_lock_unlock (gl_recursive_lock_t *lock) --{ -- if (lock->owner != GetCurrentThreadId ()) -- abort (); -- if (lock->depth == 0) -- abort (); -- if (--(lock->depth) == 0) -- { -- lock->owner = 0; -- LeaveCriticalSection (&lock->lock); -- } --} -- --void --glthread_recursive_lock_destroy (gl_recursive_lock_t *lock) --{ -- if (lock->owner != 0) -- abort (); -- DeleteCriticalSection (&lock->lock); -- lock->guard.done = 0; --} -- --/* -------------------------- gl_once_t datatype -------------------------- */ -- --void --glthread_once (gl_once_t *once_control, void (*initfunction) (void)) --{ -- if (once_control->inited <= 0) -- { -- if (InterlockedIncrement (&once_control->started) == 0) -- { -- /* This thread is the first one to come to this once_control. */ -- InitializeCriticalSection (&once_control->lock); -- EnterCriticalSection (&once_control->lock); -- once_control->inited = 0; -- initfunction (); -- once_control->inited = 1; -- LeaveCriticalSection (&once_control->lock); -- } -- else -- { -- /* Undo last operation. */ -- InterlockedDecrement (&once_control->started); -- /* Some other thread has already started the initialization. -- Yield the CPU while waiting for the other thread to finish -- initializing and taking the lock. */ -- while (once_control->inited < 0) -- Sleep (0); -- if (once_control->inited <= 0) -- { -- /* Take the lock. This blocks until the other thread has -- finished calling the initfunction. */ -- EnterCriticalSection (&once_control->lock); -- LeaveCriticalSection (&once_control->lock); -- if (!(once_control->inited > 0)) -- abort (); -- } -- } -- } --} -- --#endif -- --/* ========================================================================= */ ---- a/intl/lock.h -+++ /dev/null -@@ -1,1105 +0,0 @@ --/* Locking in multithreaded situations. -- Copyright (C) 2005-2007 Free Software Foundation, Inc. -- -- This program is free software; you can redistribute it and/or modify it -- under the terms of the GNU Library General Public License as published -- by the Free Software Foundation; either version 2, or (at your option) -- any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Library General Public License for more details. -- -- You should have received a copy of the GNU Library General Public -- License along with this program; if not, write to the Free Software -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, -- USA. */ -- --/* Written by Bruno Haible <bruno@clisp.org>, 2005. -- Based on GCC's gthr-posix.h, gthr-posix95.h, gthr-solaris.h, -- gthr-win32.h. */ -- --/* This file contains locking primitives for use with a given thread library. -- It does not contain primitives for creating threads or for other -- synchronization primitives. -- -- Normal (non-recursive) locks: -- Type: gl_lock_t -- Declaration: gl_lock_define(extern, name) -- Initializer: gl_lock_define_initialized(, name) -- Initialization: gl_lock_init (name); -- Taking the lock: gl_lock_lock (name); -- Releasing the lock: gl_lock_unlock (name); -- De-initialization: gl_lock_destroy (name); -- -- Read-Write (non-recursive) locks: -- Type: gl_rwlock_t -- Declaration: gl_rwlock_define(extern, name) -- Initializer: gl_rwlock_define_initialized(, name) -- Initialization: gl_rwlock_init (name); -- Taking the lock: gl_rwlock_rdlock (name); -- gl_rwlock_wrlock (name); -- Releasing the lock: gl_rwlock_unlock (name); -- De-initialization: gl_rwlock_destroy (name); -- -- Recursive locks: -- Type: gl_recursive_lock_t -- Declaration: gl_recursive_lock_define(extern, name) -- Initializer: gl_recursive_lock_define_initialized(, name) -- Initialization: gl_recursive_lock_init (name); -- Taking the lock: gl_recursive_lock_lock (name); -- Releasing the lock: gl_recursive_lock_unlock (name); -- De-initialization: gl_recursive_lock_destroy (name); -- -- Once-only execution: -- Type: gl_once_t -- Initializer: gl_once_define(extern, name) -- Execution: gl_once (name, initfunction); --*/ -- -- --#ifndef _LOCK_H --#define _LOCK_H -- --/* ========================================================================= */ -- --#if USE_POSIX_THREADS -- --/* Use the POSIX threads library. */ -- --# include <pthread.h> --# include <stdlib.h> -- --# ifdef __cplusplus --extern "C" { --# endif -- --# if PTHREAD_IN_USE_DETECTION_HARD -- --/* The pthread_in_use() detection needs to be done at runtime. */ --# define pthread_in_use() \ -- glthread_in_use () --extern int glthread_in_use (void); -- --# endif -- --# if USE_POSIX_THREADS_WEAK -- --/* Use weak references to the POSIX threads library. */ -- --/* Weak references avoid dragging in external libraries if the other parts -- of the program don't use them. Here we use them, because we don't want -- every program that uses libintl to depend on libpthread. This assumes -- that libpthread would not be loaded after libintl; i.e. if libintl is -- loaded first, by an executable that does not depend on libpthread, and -- then a module is dynamically loaded that depends on libpthread, libintl -- will not be multithread-safe. */ -- --/* The way to test at runtime whether libpthread is present is to test -- whether a function pointer's value, such as &pthread_mutex_init, is -- non-NULL. However, some versions of GCC have a bug through which, in -- PIC mode, &foo != NULL always evaluates to true if there is a direct -- call to foo(...) in the same function. To avoid this, we test the -- address of a function in libpthread that we don't use. */ -- --# pragma weak pthread_mutex_init --# pragma weak pthread_mutex_lock --# pragma weak pthread_mutex_unlock --# pragma weak pthread_mutex_destroy --# pragma weak pthread_rwlock_init --# pragma weak pthread_rwlock_rdlock --# pragma weak pthread_rwlock_wrlock --# pragma weak pthread_rwlock_unlock --# pragma weak pthread_rwlock_destroy --# pragma weak pthread_once --# pragma weak pthread_cond_init --# pragma weak pthread_cond_wait --# pragma weak pthread_cond_signal --# pragma weak pthread_cond_broadcast --# pragma weak pthread_cond_destroy --# pragma weak pthread_mutexattr_init --# pragma weak pthread_mutexattr_settype --# pragma weak pthread_mutexattr_destroy --# ifndef pthread_self --# pragma weak pthread_self --# endif -- --# if !PTHREAD_IN_USE_DETECTION_HARD --# pragma weak pthread_cancel --# define pthread_in_use() (pthread_cancel != NULL) --# endif -- --# else -- --# if !PTHREAD_IN_USE_DETECTION_HARD --# define pthread_in_use() 1 --# endif -- --# endif -- --/* -------------------------- gl_lock_t datatype -------------------------- */ -- --typedef pthread_mutex_t gl_lock_t; --# define gl_lock_define(STORAGECLASS, NAME) \ -- STORAGECLASS pthread_mutex_t NAME; --# define gl_lock_define_initialized(STORAGECLASS, NAME) \ -- STORAGECLASS pthread_mutex_t NAME = gl_lock_initializer; --# define gl_lock_initializer \ -- PTHREAD_MUTEX_INITIALIZER --# define gl_lock_init(NAME) \ -- do \ -- { \ -- if (pthread_in_use () && pthread_mutex_init (&NAME, NULL) != 0) \ -- abort (); \ -- } \ -- while (0) --# define gl_lock_lock(NAME) \ -- do \ -- { \ -- if (pthread_in_use () && pthread_mutex_lock (&NAME) != 0) \ -- abort (); \ -- } \ -- while (0) --# define gl_lock_unlock(NAME) \ -- do \ -- { \ -- if (pthread_in_use () && pthread_mutex_unlock (&NAME) != 0) \ -- abort (); \ -- } \ -- while (0) --# define gl_lock_destroy(NAME) \ -- do \ -- { \ -- if (pthread_in_use () && pthread_mutex_destroy (&NAME) != 0) \ -- abort (); \ -- } \ -- while (0) -- --/* ------------------------- gl_rwlock_t datatype ------------------------- */ -- --# if HAVE_PTHREAD_RWLOCK -- --# ifdef PTHREAD_RWLOCK_INITIALIZER -- --typedef pthread_rwlock_t gl_rwlock_t; --# define gl_rwlock_define(STORAGECLASS, NAME) \ -- STORAGECLASS pthread_rwlock_t NAME; --# define gl_rwlock_define_initialized(STORAGECLASS, NAME) \ -- STORAGECLASS pthread_rwlock_t NAME = gl_rwlock_initializer; --# define gl_rwlock_initializer \ -- PTHREAD_RWLOCK_INITIALIZER --# define gl_rwlock_init(NAME) \ -- do \ -- { \ -- if (pthread_in_use () && pthread_rwlock_init (&NAME, NULL) != 0) \ -- abort (); \ -- } \ -- while (0) --# define gl_rwlock_rdlock(NAME) \ -- do \ -- { \ -- if (pthread_in_use () && pthread_rwlock_rdlock (&NAME) != 0) \ -- abort (); \ -- } \ -- while (0) --# define gl_rwlock_wrlock(NAME) \ -- do \ -- { \ -- if (pthread_in_use () && pthread_rwlock_wrlock (&NAME) != 0) \ -- abort (); \ -- } \ -- while (0) --# define gl_rwlock_unlock(NAME) \ -- do \ -- { \ -- if (pthread_in_use () && pthread_rwlock_unlock (&NAME) != 0) \ -- abort (); \ -- } \ -- while (0) --# define gl_rwlock_destroy(NAME) \ -- do \ -- { \ -- if (pthread_in_use () && pthread_rwlock_destroy (&NAME) != 0) \ -- abort (); \ -- } \ -- while (0) -- --# else -- --typedef struct -- { -- int initialized; -- pthread_mutex_t guard; /* protects the initialization */ -- pthread_rwlock_t rwlock; /* read-write lock */ -- } -- gl_rwlock_t; --# define gl_rwlock_define(STORAGECLASS, NAME) \ -- STORAGECLASS gl_rwlock_t NAME; --# define gl_rwlock_define_initialized(STORAGECLASS, NAME) \ -- STORAGECLASS gl_rwlock_t NAME = gl_rwlock_initializer; --# define gl_rwlock_initializer \ -- { 0, PTHREAD_MUTEX_INITIALIZER } --# define gl_rwlock_init(NAME) \ -- do \ -- { \ -- if (pthread_in_use ()) \ -- glthread_rwlock_init (&NAME); \ -- } \ -- while (0) --# define gl_rwlock_rdlock(NAME) \ -- do \ -- { \ -- if (pthread_in_use ()) \ -- glthread_rwlock_rdlock (&NAME); \ -- } \ -- while (0) --# define gl_rwlock_wrlock(NAME) \ -- do \ -- { \ -- if (pthread_in_use ()) \ -- glthread_rwlock_wrlock (&NAME); \ -- } \ -- while (0) --# define gl_rwlock_unlock(NAME) \ -- do \ -- { \ -- if (pthread_in_use ()) \ -- glthread_rwlock_unlock (&NAME); \ -- } \ -- while (0) --# define gl_rwlock_destroy(NAME) \ -- do \ -- { \ -- if (pthread_in_use ()) \ -- glthread_rwlock_destroy (&NAME); \ -- } \ -- while (0) --extern void glthread_rwlock_init (gl_rwlock_t *lock); --extern void glthread_rwlock_rdlock (gl_rwlock_t *lock); --extern void glthread_rwlock_wrlock (gl_rwlock_t *lock); --extern void glthread_rwlock_unlock (gl_rwlock_t *lock); --extern void glthread_rwlock_destroy (gl_rwlock_t *lock); -- --# endif -- --# else -- --typedef struct -- { -- pthread_mutex_t lock; /* protects the remaining fields */ -- pthread_cond_t waiting_readers; /* waiting readers */ -- pthread_cond_t waiting_writers; /* waiting writers */ -- unsigned int waiting_writers_count; /* number of waiting writers */ -- int runcount; /* number of readers running, or -1 when a writer runs */ -- } -- gl_rwlock_t; --# define gl_rwlock_define(STORAGECLASS, NAME) \ -- STORAGECLASS gl_rwlock_t NAME; --# define gl_rwlock_define_initialized(STORAGECLASS, NAME) \ -- STORAGECLASS gl_rwlock_t NAME = gl_rwlock_initializer; --# define gl_rwlock_initializer \ -- { PTHREAD_MUTEX_INITIALIZER, PTHREAD_COND_INITIALIZER, PTHREAD_COND_INITIALIZER, 0, 0 } --# define gl_rwlock_init(NAME) \ -- do \ -- { \ -- if (pthread_in_use ()) \ -- glthread_rwlock_init (&NAME); \ -- } \ -- while (0) --# define gl_rwlock_rdlock(NAME) \ -- do \ -- { \ -- if (pthread_in_use ()) \ -- glthread_rwlock_rdlock (&NAME); \ -- } \ -- while (0) --# define gl_rwlock_wrlock(NAME) \ -- do \ -- { \ -- if (pthread_in_use ()) \ -- glthread_rwlock_wrlock (&NAME); \ -- } \ -- while (0) --# define gl_rwlock_unlock(NAME) \ -- do \ -- { \ -- if (pthread_in_use ()) \ -- glthread_rwlock_unlock (&NAME); \ -- } \ -- while (0) --# define gl_rwlock_destroy(NAME) \ -- do \ -- { \ -- if (pthread_in_use ()) \ -- glthread_rwlock_destroy (&NAME); \ -- } \ -- while (0) --extern void glthread_rwlock_init (gl_rwlock_t *lock); --extern void glthread_rwlock_rdlock (gl_rwlock_t *lock); --extern void glthread_rwlock_wrlock (gl_rwlock_t *lock); --extern void glthread_rwlock_unlock (gl_rwlock_t *lock); --extern void glthread_rwlock_destroy (gl_rwlock_t *lock); -- --# endif -- --/* --------------------- gl_recursive_lock_t datatype --------------------- */ -- --# if HAVE_PTHREAD_MUTEX_RECURSIVE -- --# if defined PTHREAD_RECURSIVE_MUTEX_INITIALIZER || defined PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP -- --typedef pthread_mutex_t gl_recursive_lock_t; --# define gl_recursive_lock_define(STORAGECLASS, NAME) \ -- STORAGECLASS pthread_mutex_t NAME; --# define gl_recursive_lock_define_initialized(STORAGECLASS, NAME) \ -- STORAGECLASS pthread_mutex_t NAME = gl_recursive_lock_initializer; --# ifdef PTHREAD_RECURSIVE_MUTEX_INITIALIZER --# define gl_recursive_lock_initializer \ -- PTHREAD_RECURSIVE_MUTEX_INITIALIZER --# else --# define gl_recursive_lock_initializer \ -- PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP --# endif --# define gl_recursive_lock_init(NAME) \ -- do \ -- { \ -- if (pthread_in_use () && pthread_mutex_init (&NAME, NULL) != 0) \ -- abort (); \ -- } \ -- while (0) --# define gl_recursive_lock_lock(NAME) \ -- do \ -- { \ -- if (pthread_in_use () && pthread_mutex_lock (&NAME) != 0) \ -- abort (); \ -- } \ -- while (0) --# define gl_recursive_lock_unlock(NAME) \ -- do \ -- { \ -- if (pthread_in_use () && pthread_mutex_unlock (&NAME) != 0) \ -- abort (); \ -- } \ -- while (0) --# define gl_recursive_lock_destroy(NAME) \ -- do \ -- { \ -- if (pthread_in_use () && pthread_mutex_destroy (&NAME) != 0) \ -- abort (); \ -- } \ -- while (0) -- --# else -- --typedef struct -- { -- pthread_mutex_t recmutex; /* recursive mutex */ -- pthread_mutex_t guard; /* protects the initialization */ -- int initialized; -- } -- gl_recursive_lock_t; --# define gl_recursive_lock_define(STORAGECLASS, NAME) \ -- STORAGECLASS gl_recursive_lock_t NAME; --# define gl_recursive_lock_define_initialized(STORAGECLASS, NAME) \ -- STORAGECLASS gl_recursive_lock_t NAME = gl_recursive_lock_initializer; --# define gl_recursive_lock_initializer \ -- { PTHREAD_MUTEX_INITIALIZER, PTHREAD_MUTEX_INITIALIZER, 0 } --# define gl_recursive_lock_init(NAME) \ -- do \ -- { \ -- if (pthread_in_use ()) \ -- glthread_recursive_lock_init (&NAME); \ -- } \ -- while (0) --# define gl_recursive_lock_lock(NAME) \ -- do \ -- { \ -- if (pthread_in_use ()) \ -- glthread_recursive_lock_lock (&NAME); \ -- } \ -- while (0) --# define gl_recursive_lock_unlock(NAME) \ -- do \ -- { \ -- if (pthread_in_use ()) \ -- glthread_recursive_lock_unlock (&NAME); \ -- } \ -- while (0) --# define gl_recursive_lock_destroy(NAME) \ -- do \ -- { \ -- if (pthread_in_use ()) \ -- glthread_recursive_lock_destroy (&NAME); \ -- } \ -- while (0) --extern void glthread_recursive_lock_init (gl_recursive_lock_t *lock); --extern void glthread_recursive_lock_lock (gl_recursive_lock_t *lock); --extern void glthread_recursive_lock_unlock (gl_recursive_lock_t *lock); --extern void glthread_recursive_lock_destroy (gl_recursive_lock_t *lock); -- --# endif -- --# else -- --/* Old versions of POSIX threads on Solaris did not have recursive locks. -- We have to implement them ourselves. */ -- --typedef struct -- { -- pthread_mutex_t mutex; -- pthread_t owner; -- unsigned long depth; -- } -- gl_recursive_lock_t; --# define gl_recursive_lock_define(STORAGECLASS, NAME) \ -- STORAGECLASS gl_recursive_lock_t NAME; --# define gl_recursive_lock_define_initialized(STORAGECLASS, NAME) \ -- STORAGECLASS gl_recursive_lock_t NAME = gl_recursive_lock_initializer; --# define gl_recursive_lock_initializer \ -- { PTHREAD_MUTEX_INITIALIZER, (pthread_t) 0, 0 } --# define gl_recursive_lock_init(NAME) \ -- do \ -- { \ -- if (pthread_in_use ()) \ -- glthread_recursive_lock_init (&NAME); \ -- } \ -- while (0) --# define gl_recursive_lock_lock(NAME) \ -- do \ -- { \ -- if (pthread_in_use ()) \ -- glthread_recursive_lock_lock (&NAME); \ -- } \ -- while (0) --# define gl_recursive_lock_unlock(NAME) \ -- do \ -- { \ -- if (pthread_in_use ()) \ -- glthread_recursive_lock_unlock (&NAME); \ -- } \ -- while (0) --# define gl_recursive_lock_destroy(NAME) \ -- do \ -- { \ -- if (pthread_in_use ()) \ -- glthread_recursive_lock_destroy (&NAME); \ -- } \ -- while (0) --extern void glthread_recursive_lock_init (gl_recursive_lock_t *lock); --extern void glthread_recursive_lock_lock (gl_recursive_lock_t *lock); --extern void glthread_recursive_lock_unlock (gl_recursive_lock_t *lock); --extern void glthread_recursive_lock_destroy (gl_recursive_lock_t *lock); -- --# endif -- --/* -------------------------- gl_once_t datatype -------------------------- */ -- --typedef pthread_once_t gl_once_t; --# define gl_once_define(STORAGECLASS, NAME) \ -- STORAGECLASS pthread_once_t NAME = PTHREAD_ONCE_INIT; --# define gl_once(NAME, INITFUNCTION) \ -- do \ -- { \ -- if (pthread_in_use ()) \ -- { \ -- if (pthread_once (&NAME, INITFUNCTION) != 0) \ -- abort (); \ -- } \ -- else \ -- { \ -- if (glthread_once_singlethreaded (&NAME)) \ -- INITFUNCTION (); \ -- } \ -- } \ -- while (0) --extern int glthread_once_singlethreaded (pthread_once_t *once_control); -- --# ifdef __cplusplus --} --# endif -- --#endif -- --/* ========================================================================= */ -- --#if USE_PTH_THREADS -- --/* Use the GNU Pth threads library. */ -- --# include <pth.h> --# include <stdlib.h> -- --# ifdef __cplusplus --extern "C" { --# endif -- --# if USE_PTH_THREADS_WEAK -- --/* Use weak references to the GNU Pth threads library. */ -- --# pragma weak pth_mutex_init --# pragma weak pth_mutex_acquire --# pragma weak pth_mutex_release --# pragma weak pth_rwlock_init --# pragma weak pth_rwlock_acquire --# pragma weak pth_rwlock_release --# pragma weak pth_once -- --# pragma weak pth_cancel --# define pth_in_use() (pth_cancel != NULL) -- --# else -- --# define pth_in_use() 1 -- --# endif -- --/* -------------------------- gl_lock_t datatype -------------------------- */ -- --typedef pth_mutex_t gl_lock_t; --# define gl_lock_define(STORAGECLASS, NAME) \ -- STORAGECLASS pth_mutex_t NAME; --# define gl_lock_define_initialized(STORAGECLASS, NAME) \ -- STORAGECLASS pth_mutex_t NAME = gl_lock_initializer; --# define gl_lock_initializer \ -- PTH_MUTEX_INIT --# define gl_lock_init(NAME) \ -- do \ -- { \ -- if (pth_in_use() && !pth_mutex_init (&NAME)) \ -- abort (); \ -- } \ -- while (0) --# define gl_lock_lock(NAME) \ -- do \ -- { \ -- if (pth_in_use() && !pth_mutex_acquire (&NAME, 0, NULL)) \ -- abort (); \ -- } \ -- while (0) --# define gl_lock_unlock(NAME) \ -- do \ -- { \ -- if (pth_in_use() && !pth_mutex_release (&NAME)) \ -- abort (); \ -- } \ -- while (0) --# define gl_lock_destroy(NAME) \ -- (void)(&NAME) -- --/* ------------------------- gl_rwlock_t datatype ------------------------- */ -- --typedef pth_rwlock_t gl_rwlock_t; --# define gl_rwlock_define(STORAGECLASS, NAME) \ -- STORAGECLASS pth_rwlock_t NAME; --# define gl_rwlock_define_initialized(STORAGECLASS, NAME) \ -- STORAGECLASS pth_rwlock_t NAME = gl_rwlock_initializer; --# define gl_rwlock_initializer \ -- PTH_RWLOCK_INIT --# define gl_rwlock_init(NAME) \ -- do \ -- { \ -- if (pth_in_use() && !pth_rwlock_init (&NAME)) \ -- abort (); \ -- } \ -- while (0) --# define gl_rwlock_rdlock(NAME) \ -- do \ -- { \ -- if (pth_in_use() \ -- && !pth_rwlock_acquire (&NAME, PTH_RWLOCK_RD, 0, NULL)) \ -- abort (); \ -- } \ -- while (0) --# define gl_rwlock_wrlock(NAME) \ -- do \ -- { \ -- if (pth_in_use() \ -- && !pth_rwlock_acquire (&NAME, PTH_RWLOCK_RW, 0, NULL)) \ -- abort (); \ -- } \ -- while (0) --# define gl_rwlock_unlock(NAME) \ -- do \ -- { \ -- if (pth_in_use() && !pth_rwlock_release (&NAME)) \ -- abort (); \ -- } \ -- while (0) --# define gl_rwlock_destroy(NAME) \ -- (void)(&NAME) -- --/* --------------------- gl_recursive_lock_t datatype --------------------- */ -- --/* In Pth, mutexes are recursive by default. */ --typedef pth_mutex_t gl_recursive_lock_t; --# define gl_recursive_lock_define(STORAGECLASS, NAME) \ -- STORAGECLASS pth_mutex_t NAME; --# define gl_recursive_lock_define_initialized(STORAGECLASS, NAME) \ -- STORAGECLASS pth_mutex_t NAME = gl_recursive_lock_initializer; --# define gl_recursive_lock_initializer \ -- PTH_MUTEX_INIT --# define gl_recursive_lock_init(NAME) \ -- do \ -- { \ -- if (pth_in_use() && !pth_mutex_init (&NAME)) \ -- abort (); \ -- } \ -- while (0) --# define gl_recursive_lock_lock(NAME) \ -- do \ -- { \ -- if (pth_in_use() && !pth_mutex_acquire (&NAME, 0, NULL)) \ -- abort (); \ -- } \ -- while (0) --# define gl_recursive_lock_unlock(NAME) \ -- do \ -- { \ -- if (pth_in_use() && !pth_mutex_release (&NAME)) \ -- abort (); \ -- } \ -- while (0) --# define gl_recursive_lock_destroy(NAME) \ -- (void)(&NAME) -- --/* -------------------------- gl_once_t datatype -------------------------- */ -- --typedef pth_once_t gl_once_t; --# define gl_once_define(STORAGECLASS, NAME) \ -- STORAGECLASS pth_once_t NAME = PTH_ONCE_INIT; --# define gl_once(NAME, INITFUNCTION) \ -- do \ -- { \ -- if (pth_in_use ()) \ -- { \ -- void (*gl_once_temp) (void) = INITFUNCTION; \ -- if (!pth_once (&NAME, glthread_once_call, &gl_once_temp)) \ -- abort (); \ -- } \ -- else \ -- { \ -- if (glthread_once_singlethreaded (&NAME)) \ -- INITFUNCTION (); \ -- } \ -- } \ -- while (0) --extern void glthread_once_call (void *arg); --extern int glthread_once_singlethreaded (pth_once_t *once_control); -- --# ifdef __cplusplus --} --# endif -- --#endif -- --/* ========================================================================= */ -- --#if USE_SOLARIS_THREADS -- --/* Use the old Solaris threads library. */ -- --# include <thread.h> --# include <synch.h> --# include <stdlib.h> -- --# ifdef __cplusplus --extern "C" { --# endif -- --# if USE_SOLARIS_THREADS_WEAK -- --/* Use weak references to the old Solaris threads library. */ -- --# pragma weak mutex_init --# pragma weak mutex_lock --# pragma weak mutex_unlock --# pragma weak mutex_destroy --# pragma weak rwlock_init --# pragma weak rw_rdlock --# pragma weak rw_wrlock --# pragma weak rw_unlock --# pragma weak rwlock_destroy --# pragma weak thr_self -- --# pragma weak thr_suspend --# define thread_in_use() (thr_suspend != NULL) -- --# else -- --# define thread_in_use() 1 -- --# endif -- --/* -------------------------- gl_lock_t datatype -------------------------- */ -- --typedef mutex_t gl_lock_t; --# define gl_lock_define(STORAGECLASS, NAME) \ -- STORAGECLASS mutex_t NAME; --# define gl_lock_define_initialized(STORAGECLASS, NAME) \ -- STORAGECLASS mutex_t NAME = gl_lock_initializer; --# define gl_lock_initializer \ -- DEFAULTMUTEX --# define gl_lock_init(NAME) \ -- do \ -- { \ -- if (thread_in_use () && mutex_init (&NAME, USYNC_THREAD, NULL) != 0) \ -- abort (); \ -- } \ -- while (0) --# define gl_lock_lock(NAME) \ -- do \ -- { \ -- if (thread_in_use () && mutex_lock (&NAME) != 0) \ -- abort (); \ -- } \ -- while (0) --# define gl_lock_unlock(NAME) \ -- do \ -- { \ -- if (thread_in_use () && mutex_unlock (&NAME) != 0) \ -- abort (); \ -- } \ -- while (0) --# define gl_lock_destroy(NAME) \ -- do \ -- { \ -- if (thread_in_use () && mutex_destroy (&NAME) != 0) \ -- abort (); \ -- } \ -- while (0) -- --/* ------------------------- gl_rwlock_t datatype ------------------------- */ -- --typedef rwlock_t gl_rwlock_t; --# define gl_rwlock_define(STORAGECLASS, NAME) \ -- STORAGECLASS rwlock_t NAME; --# define gl_rwlock_define_initialized(STORAGECLASS, NAME) \ -- STORAGECLASS rwlock_t NAME = gl_rwlock_initializer; --# define gl_rwlock_initializer \ -- DEFAULTRWLOCK --# define gl_rwlock_init(NAME) \ -- do \ -- { \ -- if (thread_in_use () && rwlock_init (&NAME, USYNC_THREAD, NULL) != 0) \ -- abort (); \ -- } \ -- while (0) --# define gl_rwlock_rdlock(NAME) \ -- do \ -- { \ -- if (thread_in_use () && rw_rdlock (&NAME) != 0) \ -- abort (); \ -- } \ -- while (0) --# define gl_rwlock_wrlock(NAME) \ -- do \ -- { \ -- if (thread_in_use () && rw_wrlock (&NAME) != 0) \ -- abort (); \ -- } \ -- while (0) --# define gl_rwlock_unlock(NAME) \ -- do \ -- { \ -- if (thread_in_use () && rw_unlock (&NAME) != 0) \ -- abort (); \ -- } \ -- while (0) --# define gl_rwlock_destroy(NAME) \ -- do \ -- { \ -- if (thread_in_use () && rwlock_destroy (&NAME) != 0) \ -- abort (); \ -- } \ -- while (0) -- --/* --------------------- gl_recursive_lock_t datatype --------------------- */ -- --/* Old Solaris threads did not have recursive locks. -- We have to implement them ourselves. */ -- --typedef struct -- { -- mutex_t mutex; -- thread_t owner; -- unsigned long depth; -- } -- gl_recursive_lock_t; --# define gl_recursive_lock_define(STORAGECLASS, NAME) \ -- STORAGECLASS gl_recursive_lock_t NAME; --# define gl_recursive_lock_define_initialized(STORAGECLASS, NAME) \ -- STORAGECLASS gl_recursive_lock_t NAME = gl_recursive_lock_initializer; --# define gl_recursive_lock_initializer \ -- { DEFAULTMUTEX, (thread_t) 0, 0 } --# define gl_recursive_lock_init(NAME) \ -- do \ -- { \ -- if (thread_in_use ()) \ -- glthread_recursive_lock_init (&NAME); \ -- } \ -- while (0) --# define gl_recursive_lock_lock(NAME) \ -- do \ -- { \ -- if (thread_in_use ()) \ -- glthread_recursive_lock_lock (&NAME); \ -- } \ -- while (0) --# define gl_recursive_lock_unlock(NAME) \ -- do \ -- { \ -- if (thread_in_use ()) \ -- glthread_recursive_lock_unlock (&NAME); \ -- } \ -- while (0) --# define gl_recursive_lock_destroy(NAME) \ -- do \ -- { \ -- if (thread_in_use ()) \ -- glthread_recursive_lock_destroy (&NAME); \ -- } \ -- while (0) --extern void glthread_recursive_lock_init (gl_recursive_lock_t *lock); --extern void glthread_recursive_lock_lock (gl_recursive_lock_t *lock); --extern void glthread_recursive_lock_unlock (gl_recursive_lock_t *lock); --extern void glthread_recursive_lock_destroy (gl_recursive_lock_t *lock); -- --/* -------------------------- gl_once_t datatype -------------------------- */ -- --typedef struct -- { -- volatile int inited; -- mutex_t mutex; -- } -- gl_once_t; --# define gl_once_define(STORAGECLASS, NAME) \ -- STORAGECLASS gl_once_t NAME = { 0, DEFAULTMUTEX }; --# define gl_once(NAME, INITFUNCTION) \ -- do \ -- { \ -- if (thread_in_use ()) \ -- { \ -- glthread_once (&NAME, INITFUNCTION); \ -- } \ -- else \ -- { \ -- if (glthread_once_singlethreaded (&NAME)) \ -- INITFUNCTION (); \ -- } \ -- } \ -- while (0) --extern void glthread_once (gl_once_t *once_control, void (*initfunction) (void)); --extern int glthread_once_singlethreaded (gl_once_t *once_control); -- --# ifdef __cplusplus --} --# endif -- --#endif -- --/* ========================================================================= */ -- --#if USE_WIN32_THREADS -- --# include <windows.h> -- --# ifdef __cplusplus --extern "C" { --# endif -- --/* We can use CRITICAL_SECTION directly, rather than the Win32 Event, Mutex, -- Semaphore types, because -- - we need only to synchronize inside a single process (address space), -- not inter-process locking, -- - we don't need to support trylock operations. (TryEnterCriticalSection -- does not work on Windows 95/98/ME. Packages that need trylock usually -- define their own mutex type.) */ -- --/* There is no way to statically initialize a CRITICAL_SECTION. It needs -- to be done lazily, once only. For this we need spinlocks. */ -- --typedef struct { volatile int done; volatile long started; } gl_spinlock_t; -- --/* -------------------------- gl_lock_t datatype -------------------------- */ -- --typedef struct -- { -- gl_spinlock_t guard; /* protects the initialization */ -- CRITICAL_SECTION lock; -- } -- gl_lock_t; --# define gl_lock_define(STORAGECLASS, NAME) \ -- STORAGECLASS gl_lock_t NAME; --# define gl_lock_define_initialized(STORAGECLASS, NAME) \ -- STORAGECLASS gl_lock_t NAME = gl_lock_initializer; --# define gl_lock_initializer \ -- { { 0, -1 } } --# define gl_lock_init(NAME) \ -- glthread_lock_init (&NAME) --# define gl_lock_lock(NAME) \ -- glthread_lock_lock (&NAME) --# define gl_lock_unlock(NAME) \ -- glthread_lock_unlock (&NAME) --# define gl_lock_destroy(NAME) \ -- glthread_lock_destroy (&NAME) --extern void glthread_lock_init (gl_lock_t *lock); --extern void glthread_lock_lock (gl_lock_t *lock); --extern void glthread_lock_unlock (gl_lock_t *lock); --extern void glthread_lock_destroy (gl_lock_t *lock); -- --/* ------------------------- gl_rwlock_t datatype ------------------------- */ -- --/* It is impossible to implement read-write locks using plain locks, without -- introducing an extra thread dedicated to managing read-write locks. -- Therefore here we need to use the low-level Event type. */ -- --typedef struct -- { -- HANDLE *array; /* array of waiting threads, each represented by an event */ -- unsigned int count; /* number of waiting threads */ -- unsigned int alloc; /* length of allocated array */ -- unsigned int offset; /* index of first waiting thread in array */ -- } -- gl_waitqueue_t; --typedef struct -- { -- gl_spinlock_t guard; /* protects the initialization */ -- CRITICAL_SECTION lock; /* protects the remaining fields */ -- gl_waitqueue_t waiting_readers; /* waiting readers */ -- gl_waitqueue_t waiting_writers; /* waiting writers */ -- int runcount; /* number of readers running, or -1 when a writer runs */ -- } -- gl_rwlock_t; --# define gl_rwlock_define(STORAGECLASS, NAME) \ -- STORAGECLASS gl_rwlock_t NAME; --# define gl_rwlock_define_initialized(STORAGECLASS, NAME) \ -- STORAGECLASS gl_rwlock_t NAME = gl_rwlock_initializer; --# define gl_rwlock_initializer \ -- { { 0, -1 } } --# define gl_rwlock_init(NAME) \ -- glthread_rwlock_init (&NAME) --# define gl_rwlock_rdlock(NAME) \ -- glthread_rwlock_rdlock (&NAME) --# define gl_rwlock_wrlock(NAME) \ -- glthread_rwlock_wrlock (&NAME) --# define gl_rwlock_unlock(NAME) \ -- glthread_rwlock_unlock (&NAME) --# define gl_rwlock_destroy(NAME) \ -- glthread_rwlock_destroy (&NAME) --extern void glthread_rwlock_init (gl_rwlock_t *lock); --extern void glthread_rwlock_rdlock (gl_rwlock_t *lock); --extern void glthread_rwlock_wrlock (gl_rwlock_t *lock); --extern void glthread_rwlock_unlock (gl_rwlock_t *lock); --extern void glthread_rwlock_destroy (gl_rwlock_t *lock); -- --/* --------------------- gl_recursive_lock_t datatype --------------------- */ -- --/* The Win32 documentation says that CRITICAL_SECTION already implements a -- recursive lock. But we need not rely on it: It's easy to implement a -- recursive lock without this assumption. */ -- --typedef struct -- { -- gl_spinlock_t guard; /* protects the initialization */ -- DWORD owner; -- unsigned long depth; -- CRITICAL_SECTION lock; -- } -- gl_recursive_lock_t; --# define gl_recursive_lock_define(STORAGECLASS, NAME) \ -- STORAGECLASS gl_recursive_lock_t NAME; --# define gl_recursive_lock_define_initialized(STORAGECLASS, NAME) \ -- STORAGECLASS gl_recursive_lock_t NAME = gl_recursive_lock_initializer; --# define gl_recursive_lock_initializer \ -- { { 0, -1 }, 0, 0 } --# define gl_recursive_lock_init(NAME) \ -- glthread_recursive_lock_init (&NAME) --# define gl_recursive_lock_lock(NAME) \ -- glthread_recursive_lock_lock (&NAME) --# define gl_recursive_lock_unlock(NAME) \ -- glthread_recursive_lock_unlock (&NAME) --# define gl_recursive_lock_destroy(NAME) \ -- glthread_recursive_lock_destroy (&NAME) --extern void glthread_recursive_lock_init (gl_recursive_lock_t *lock); --extern void glthread_recursive_lock_lock (gl_recursive_lock_t *lock); --extern void glthread_recursive_lock_unlock (gl_recursive_lock_t *lock); --extern void glthread_recursive_lock_destroy (gl_recursive_lock_t *lock); -- --/* -------------------------- gl_once_t datatype -------------------------- */ -- --typedef struct -- { -- volatile int inited; -- volatile long started; -- CRITICAL_SECTION lock; -- } -- gl_once_t; --# define gl_once_define(STORAGECLASS, NAME) \ -- STORAGECLASS gl_once_t NAME = { -1, -1 }; --# define gl_once(NAME, INITFUNCTION) \ -- glthread_once (&NAME, INITFUNCTION) --extern void glthread_once (gl_once_t *once_control, void (*initfunction) (void)); -- --# ifdef __cplusplus --} --# endif -- --#endif -- --/* ========================================================================= */ -- --#if !(USE_POSIX_THREADS || USE_PTH_THREADS || USE_SOLARIS_THREADS || USE_WIN32_THREADS) -- --/* Provide dummy implementation if threads are not supported. */ -- --/* -------------------------- gl_lock_t datatype -------------------------- */ -- --typedef int gl_lock_t; --# define gl_lock_define(STORAGECLASS, NAME) --# define gl_lock_define_initialized(STORAGECLASS, NAME) --# define gl_lock_init(NAME) --# define gl_lock_lock(NAME) --# define gl_lock_unlock(NAME) -- --/* ------------------------- gl_rwlock_t datatype ------------------------- */ -- --typedef int gl_rwlock_t; --# define gl_rwlock_define(STORAGECLASS, NAME) --# define gl_rwlock_define_initialized(STORAGECLASS, NAME) --# define gl_rwlock_init(NAME) --# define gl_rwlock_rdlock(NAME) --# define gl_rwlock_wrlock(NAME) --# define gl_rwlock_unlock(NAME) -- --/* --------------------- gl_recursive_lock_t datatype --------------------- */ -- --typedef int gl_recursive_lock_t; --# define gl_recursive_lock_define(STORAGECLASS, NAME) --# define gl_recursive_lock_define_initialized(STORAGECLASS, NAME) --# define gl_recursive_lock_init(NAME) --# define gl_recursive_lock_lock(NAME) --# define gl_recursive_lock_unlock(NAME) -- --/* -------------------------- gl_once_t datatype -------------------------- */ -- --typedef int gl_once_t; --# define gl_once_define(STORAGECLASS, NAME) \ -- STORAGECLASS gl_once_t NAME = 0; --# define gl_once(NAME, INITFUNCTION) \ -- do \ -- { \ -- if (NAME == 0) \ -- { \ -- NAME = ~ 0; \ -- INITFUNCTION (); \ -- } \ -- } \ -- while (0) -- --#endif -- --/* ========================================================================= */ -- --#endif /* _LOCK_H */ ---- a/intl/log.c -+++ /dev/null -@@ -1,116 +0,0 @@ --/* Log file output. -- Copyright (C) 2003, 2005 Free Software Foundation, Inc. -- -- This program is free software; you can redistribute it and/or modify it -- under the terms of the GNU Library General Public License as published -- by the Free Software Foundation; either version 2, or (at your option) -- any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Library General Public License for more details. -- -- You should have received a copy of the GNU Library General Public -- License along with this program; if not, write to the Free Software -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, -- USA. */ -- --/* Written by Bruno Haible <bruno@clisp.org>. */ -- --#ifdef HAVE_CONFIG_H --# include <config.h> --#endif -- --#include <stdio.h> --#include <stdlib.h> --#include <string.h> -- --/* Handle multi-threaded applications. */ --#ifdef _LIBC --# include <bits/libc-lock.h> --#else --# include "lock.h" --#endif -- --/* Print an ASCII string with quotes and escape sequences where needed. */ --static void --print_escaped (FILE *stream, const char *str) --{ -- putc ('"', stream); -- for (; *str != '\0'; str++) -- if (*str == '\n') -- { -- fputs ("\\n\"", stream); -- if (str[1] == '\0') -- return; -- fputs ("\n\"", stream); -- } -- else -- { -- if (*str == '"' || *str == '\\') -- putc ('\\', stream); -- putc (*str, stream); -- } -- putc ('"', stream); --} -- --static char *last_logfilename = NULL; --static FILE *last_logfile = NULL; --__libc_lock_define_initialized (static, lock) -- --static inline void --_nl_log_untranslated_locked (const char *logfilename, const char *domainname, -- const char *msgid1, const char *msgid2, int plural) --{ -- FILE *logfile; -- -- /* Can we reuse the last opened logfile? */ -- if (last_logfilename == NULL || strcmp (logfilename, last_logfilename) != 0) -- { -- /* Close the last used logfile. */ -- if (last_logfilename != NULL) -- { -- if (last_logfile != NULL) -- { -- fclose (last_logfile); -- last_logfile = NULL; -- } -- free (last_logfilename); -- last_logfilename = NULL; -- } -- /* Open the logfile. */ -- last_logfilename = (char *) malloc (strlen (logfilename) + 1); -- if (last_logfilename == NULL) -- return; -- strcpy (last_logfilename, logfilename); -- last_logfile = fopen (logfilename, "a"); -- if (last_logfile == NULL) -- return; -- } -- logfile = last_logfile; -- -- fprintf (logfile, "domain "); -- print_escaped (logfile, domainname); -- fprintf (logfile, "\nmsgid "); -- print_escaped (logfile, msgid1); -- if (plural) -- { -- fprintf (logfile, "\nmsgid_plural "); -- print_escaped (logfile, msgid2); -- fprintf (logfile, "\nmsgstr[0] \"\"\n"); -- } -- else -- fprintf (logfile, "\nmsgstr \"\"\n"); -- putc ('\n', logfile); --} -- --/* Add to the log file an entry denoting a failed translation. */ --void --_nl_log_untranslated (const char *logfilename, const char *domainname, -- const char *msgid1, const char *msgid2, int plural) --{ -- __libc_lock_lock (lock); -- _nl_log_untranslated_locked (logfilename, domainname, msgid1, msgid2, plural); -- __libc_lock_unlock (lock); --} ---- a/intl/ngettext.c -+++ /dev/null -@@ -1,65 +0,0 @@ --/* Implementation of ngettext(3) function. -- Copyright (C) 1995, 1997, 2000-2003 Free Software Foundation, Inc. -- -- This program is free software; you can redistribute it and/or modify it -- under the terms of the GNU Library General Public License as published -- by the Free Software Foundation; either version 2, or (at your option) -- any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Library General Public License for more details. -- -- You should have received a copy of the GNU Library General Public -- License along with this program; if not, write to the Free Software -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, -- USA. */ -- --#ifdef HAVE_CONFIG_H --# include <config.h> --#endif -- --#ifdef _LIBC --# define __need_NULL --# include <stddef.h> --#else --# include <stdlib.h> /* Just for NULL. */ --#endif -- --#include "gettextP.h" --#ifdef _LIBC --# include <libintl.h> --#else --# include "libgnuintl.h" --#endif -- --#include <locale.h> -- --/* @@ end of prolog @@ */ -- --/* Names for the libintl functions are a problem. They must not clash -- with existing names and they should follow ANSI C. But this source -- code is also used in GNU C Library where the names have a __ -- prefix. So we have to make a difference here. */ --#ifdef _LIBC --# define NGETTEXT __ngettext --# define DCNGETTEXT __dcngettext --#else --# define NGETTEXT libintl_ngettext --# define DCNGETTEXT libintl_dcngettext --#endif -- --/* Look up MSGID in the current default message catalog for the current -- LC_MESSAGES locale. If not found, returns MSGID itself (the default -- text). */ --char * --NGETTEXT (const char *msgid1, const char *msgid2, unsigned long int n) --{ -- return DCNGETTEXT (NULL, msgid1, msgid2, n, LC_MESSAGES); --} -- --#ifdef _LIBC --/* Alias for function name in GNU C Library. */ --weak_alias (__ngettext, ngettext); --#endif ---- a/intl/os2compat.c -+++ /dev/null -@@ -1,98 +0,0 @@ --/* OS/2 compatibility functions. -- Copyright (C) 2001-2002 Free Software Foundation, Inc. -- -- This program is free software; you can redistribute it and/or modify it -- under the terms of the GNU Library General Public License as published -- by the Free Software Foundation; either version 2, or (at your option) -- any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Library General Public License for more details. -- -- You should have received a copy of the GNU Library General Public -- License along with this program; if not, write to the Free Software -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, -- USA. */ -- --#define OS2_AWARE --#ifdef HAVE_CONFIG_H --#include <config.h> --#endif -- --#include <stdlib.h> --#include <string.h> --#include <sys/param.h> -- --/* A version of getenv() that works from DLLs */ --extern unsigned long DosScanEnv (const unsigned char *pszName, unsigned char **ppszValue); -- --char * --_nl_getenv (const char *name) --{ -- unsigned char *value; -- if (DosScanEnv (name, &value)) -- return NULL; -- else -- return value; --} -- --/* A fixed size buffer. */ --char libintl_nl_default_dirname[MAXPATHLEN+1]; -- --char *_nlos2_libdir = NULL; --char *_nlos2_localealiaspath = NULL; --char *_nlos2_localedir = NULL; -- --static __attribute__((constructor)) void --nlos2_initialize () --{ -- char *root = getenv ("UNIXROOT"); -- char *gnulocaledir = getenv ("GNULOCALEDIR"); -- -- _nlos2_libdir = gnulocaledir; -- if (!_nlos2_libdir) -- { -- if (root) -- { -- size_t sl = strlen (root); -- _nlos2_libdir = (char *) malloc (sl + strlen (LIBDIR) + 1); -- memcpy (_nlos2_libdir, root, sl); -- memcpy (_nlos2_libdir + sl, LIBDIR, strlen (LIBDIR) + 1); -- } -- else -- _nlos2_libdir = LIBDIR; -- } -- -- _nlos2_localealiaspath = gnulocaledir; -- if (!_nlos2_localealiaspath) -- { -- if (root) -- { -- size_t sl = strlen (root); -- _nlos2_localealiaspath = (char *) malloc (sl + strlen (LOCALE_ALIAS_PATH) + 1); -- memcpy (_nlos2_localealiaspath, root, sl); -- memcpy (_nlos2_localealiaspath + sl, LOCALE_ALIAS_PATH, strlen (LOCALE_ALIAS_PATH) + 1); -- } -- else -- _nlos2_localealiaspath = LOCALE_ALIAS_PATH; -- } -- -- _nlos2_localedir = gnulocaledir; -- if (!_nlos2_localedir) -- { -- if (root) -- { -- size_t sl = strlen (root); -- _nlos2_localedir = (char *) malloc (sl + strlen (LOCALEDIR) + 1); -- memcpy (_nlos2_localedir, root, sl); -- memcpy (_nlos2_localedir + sl, LOCALEDIR, strlen (LOCALEDIR) + 1); -- } -- else -- _nlos2_localedir = LOCALEDIR; -- } -- -- if (strlen (_nlos2_localedir) <= MAXPATHLEN) -- strcpy (libintl_nl_default_dirname, _nlos2_localedir); --} ---- a/intl/os2compat.h -+++ /dev/null -@@ -1,46 +0,0 @@ --/* OS/2 compatibility defines. -- This file is intended to be included from config.h -- Copyright (C) 2001-2002 Free Software Foundation, Inc. -- -- This program is free software; you can redistribute it and/or modify it -- under the terms of the GNU Library General Public License as published -- by the Free Software Foundation; either version 2, or (at your option) -- any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Library General Public License for more details. -- -- You should have received a copy of the GNU Library General Public -- License along with this program; if not, write to the Free Software -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, -- USA. */ -- --/* When included from os2compat.h we need all the original definitions */ --#ifndef OS2_AWARE -- --#undef LIBDIR --#define LIBDIR _nlos2_libdir --extern char *_nlos2_libdir; -- --#undef LOCALEDIR --#define LOCALEDIR _nlos2_localedir --extern char *_nlos2_localedir; -- --#undef LOCALE_ALIAS_PATH --#define LOCALE_ALIAS_PATH _nlos2_localealiaspath --extern char *_nlos2_localealiaspath; -- --#endif -- --#undef HAVE_STRCASECMP --#define HAVE_STRCASECMP 1 --#define strcasecmp stricmp --#define strncasecmp strnicmp -- --/* We have our own getenv() which works even if library is compiled as DLL */ --#define getenv _nl_getenv -- --/* Older versions of gettext used -1 as the value of LC_MESSAGES */ --#define LC_MESSAGES_COMPAT (-1) ---- a/intl/osdep.c -+++ /dev/null -@@ -1,26 +0,0 @@ --/* OS dependent parts of libintl. -- Copyright (C) 2001-2002, 2006 Free Software Foundation, Inc. -- -- This program is free software; you can redistribute it and/or modify it -- under the terms of the GNU Library General Public License as published -- by the Free Software Foundation; either version 2, or (at your option) -- any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Library General Public License for more details. -- -- You should have received a copy of the GNU Library General Public -- License along with this program; if not, write to the Free Software -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, -- USA. */ -- --#if defined __CYGWIN__ --# include "intl-exports.c" --#elif defined __EMX__ --# include "os2compat.c" --#else --/* Avoid AIX compiler warning. */ --typedef int dummy; --#endif ---- a/intl/plural-exp.c -+++ /dev/null -@@ -1,155 +0,0 @@ --/* Expression parsing for plural form selection. -- Copyright (C) 2000-2001, 2003, 2005-2007 Free Software Foundation, Inc. -- Written by Ulrich Drepper <drepper@cygnus.com>, 2000. -- -- This program is free software; you can redistribute it and/or modify it -- under the terms of the GNU Library General Public License as published -- by the Free Software Foundation; either version 2, or (at your option) -- any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Library General Public License for more details. -- -- You should have received a copy of the GNU Library General Public -- License along with this program; if not, write to the Free Software -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, -- USA. */ -- --#ifdef HAVE_CONFIG_H --# include <config.h> --#endif -- --#include <ctype.h> --#include <stdlib.h> --#include <string.h> -- --#include "plural-exp.h" -- --#if (defined __GNUC__ && !(__APPLE_CC__ > 1) && !defined __cplusplus) \ -- || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L) -- --/* These structs are the constant expression for the germanic plural -- form determination. It represents the expression "n != 1". */ --static const struct expression plvar = --{ -- .nargs = 0, -- .operation = var, --}; --static const struct expression plone = --{ -- .nargs = 0, -- .operation = num, -- .val = -- { -- .num = 1 -- } --}; --struct expression GERMANIC_PLURAL = --{ -- .nargs = 2, -- .operation = not_equal, -- .val = -- { -- .args = -- { -- [0] = (struct expression *) &plvar, -- [1] = (struct expression *) &plone -- } -- } --}; -- --# define INIT_GERMANIC_PLURAL() -- --#else -- --/* For compilers without support for ISO C 99 struct/union initializers: -- Initialization at run-time. */ -- --static struct expression plvar; --static struct expression plone; --struct expression GERMANIC_PLURAL; -- --static void --init_germanic_plural () --{ -- if (plone.val.num == 0) -- { -- plvar.nargs = 0; -- plvar.operation = var; -- -- plone.nargs = 0; -- plone.operation = num; -- plone.val.num = 1; -- -- GERMANIC_PLURAL.nargs = 2; -- GERMANIC_PLURAL.operation = not_equal; -- GERMANIC_PLURAL.val.args[0] = &plvar; -- GERMANIC_PLURAL.val.args[1] = &plone; -- } --} -- --# define INIT_GERMANIC_PLURAL() init_germanic_plural () -- --#endif -- --void --internal_function --EXTRACT_PLURAL_EXPRESSION (const char *nullentry, -- const struct expression **pluralp, -- unsigned long int *npluralsp) --{ -- if (nullentry != NULL) -- { -- const char *plural; -- const char *nplurals; -- -- plural = strstr (nullentry, "plural="); -- nplurals = strstr (nullentry, "nplurals="); -- if (plural == NULL || nplurals == NULL) -- goto no_plural; -- else -- { -- char *endp; -- unsigned long int n; -- struct parse_args args; -- -- /* First get the number. */ -- nplurals += 9; -- while (*nplurals != '\0' && isspace ((unsigned char) *nplurals)) -- ++nplurals; -- if (!(*nplurals >= '0' && *nplurals <= '9')) -- goto no_plural; --#if defined HAVE_STRTOUL || defined _LIBC -- n = strtoul (nplurals, &endp, 10); --#else -- for (endp = nplurals, n = 0; *endp >= '0' && *endp <= '9'; endp++) -- n = n * 10 + (*endp - '0'); --#endif -- if (nplurals == endp) -- goto no_plural; -- *npluralsp = n; -- -- /* Due to the restrictions bison imposes onto the interface of the -- scanner function we have to put the input string and the result -- passed up from the parser into the same structure which address -- is passed down to the parser. */ -- plural += 7; -- args.cp = plural; -- if (PLURAL_PARSE (&args) != 0) -- goto no_plural; -- *pluralp = args.res; -- } -- } -- else -- { -- /* By default we are using the Germanic form: singular form only -- for `one', the plural form otherwise. Yes, this is also what -- English is using since English is a Germanic language. */ -- no_plural: -- INIT_GERMANIC_PLURAL (); -- *pluralp = &GERMANIC_PLURAL; -- *npluralsp = 2; -- } --} ---- a/intl/plural-exp.h -+++ /dev/null -@@ -1,129 +0,0 @@ --/* Expression parsing and evaluation for plural form selection. -- Copyright (C) 2000-2003, 2005-2007 Free Software Foundation, Inc. -- Written by Ulrich Drepper <drepper@cygnus.com>, 2000. -- -- This program is free software; you can redistribute it and/or modify it -- under the terms of the GNU Library General Public License as published -- by the Free Software Foundation; either version 2, or (at your option) -- any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Library General Public License for more details. -- -- You should have received a copy of the GNU Library General Public -- License along with this program; if not, write to the Free Software -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, -- USA. */ -- --#ifndef _PLURAL_EXP_H --#define _PLURAL_EXP_H -- --#ifndef internal_function --# define internal_function --#endif -- --#ifndef attribute_hidden --# define attribute_hidden --#endif -- --#ifdef __cplusplus --extern "C" { --#endif -- -- --enum expression_operator --{ -- /* Without arguments: */ -- var, /* The variable "n". */ -- num, /* Decimal number. */ -- /* Unary operators: */ -- lnot, /* Logical NOT. */ -- /* Binary operators: */ -- mult, /* Multiplication. */ -- divide, /* Division. */ -- module, /* Modulo operation. */ -- plus, /* Addition. */ -- minus, /* Subtraction. */ -- less_than, /* Comparison. */ -- greater_than, /* Comparison. */ -- less_or_equal, /* Comparison. */ -- greater_or_equal, /* Comparison. */ -- equal, /* Comparison for equality. */ -- not_equal, /* Comparison for inequality. */ -- land, /* Logical AND. */ -- lor, /* Logical OR. */ -- /* Ternary operators: */ -- qmop /* Question mark operator. */ --}; -- --/* This is the representation of the expressions to determine the -- plural form. */ --struct expression --{ -- int nargs; /* Number of arguments. */ -- enum expression_operator operation; -- union -- { -- unsigned long int num; /* Number value for `num'. */ -- struct expression *args[3]; /* Up to three arguments. */ -- } val; --}; -- --/* This is the data structure to pass information to the parser and get -- the result in a thread-safe way. */ --struct parse_args --{ -- const char *cp; -- struct expression *res; --}; -- -- --/* Names for the libintl functions are a problem. This source code is used -- 1. in the GNU C Library library, -- 2. in the GNU libintl library, -- 3. in the GNU gettext tools. -- The function names in each situation must be different, to allow for -- binary incompatible changes in 'struct expression'. Furthermore, -- 1. in the GNU C Library library, the names have a __ prefix, -- 2.+3. in the GNU libintl library and in the GNU gettext tools, the names -- must follow ANSI C and not start with __. -- So we have to distinguish the three cases. */ --#ifdef _LIBC --# define FREE_EXPRESSION __gettext_free_exp --# define PLURAL_PARSE __gettextparse --# define GERMANIC_PLURAL __gettext_germanic_plural --# define EXTRACT_PLURAL_EXPRESSION __gettext_extract_plural --#elif defined (IN_LIBINTL) --# define FREE_EXPRESSION libintl_gettext_free_exp --# define PLURAL_PARSE libintl_gettextparse --# define GERMANIC_PLURAL libintl_gettext_germanic_plural --# define EXTRACT_PLURAL_EXPRESSION libintl_gettext_extract_plural --#else --# define FREE_EXPRESSION free_plural_expression --# define PLURAL_PARSE parse_plural_expression --# define GERMANIC_PLURAL germanic_plural --# define EXTRACT_PLURAL_EXPRESSION extract_plural_expression --#endif -- --extern void FREE_EXPRESSION (struct expression *exp) -- internal_function; --extern int PLURAL_PARSE (void *arg); --extern struct expression GERMANIC_PLURAL attribute_hidden; --extern void EXTRACT_PLURAL_EXPRESSION (const char *nullentry, -- const struct expression **pluralp, -- unsigned long int *npluralsp) -- internal_function; -- --#if !defined (_LIBC) && !defined (IN_LIBINTL) && !defined (IN_LIBGLOCALE) --extern unsigned long int plural_eval (const struct expression *pexp, -- unsigned long int n); --#endif -- -- --#ifdef __cplusplus --} --#endif -- --#endif /* _PLURAL_EXP_H */ ---- a/intl/plural.c -+++ /dev/null -@@ -1,1981 +0,0 @@ -- --/* A Bison parser, made by GNU Bison 2.4.1. */ -- --/* Skeleton implementation for Bison's Yacc-like parsers in C -- -- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 -- Free Software Foundation, Inc. -- -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation, either version 3 of the License, or -- (at your option) any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License -- along with this program. If not, see <http://www.gnu.org/licenses/>. */ -- --/* As a special exception, you may create a larger work that contains -- part or all of the Bison parser skeleton and distribute that work -- under terms of your choice, so long as that work isn't itself a -- parser generator using the skeleton or a modified version thereof -- as a parser skeleton. Alternatively, if you modify or redistribute -- the parser skeleton itself, you may (at your option) remove this -- special exception, which will cause the skeleton and the resulting -- Bison output files to be licensed under the GNU General Public -- License without this special exception. -- -- This special exception was added by the Free Software Foundation in -- version 2.2 of Bison. */ -- --/* C LALR(1) parser skeleton written by Richard Stallman, by -- simplifying the original so-called "semantic" parser. */ -- --/* All symbols defined below should begin with yy or YY, to avoid -- infringing on user name space. This should be done even for local -- variables, as they might otherwise be expanded by user macros. -- There are some unavoidable exceptions within include files to -- define necessary library symbols; they are noted "INFRINGES ON -- USER NAME SPACE" below. */ -- --/* Identify Bison output. */ --#define YYBISON 1 -- --/* Bison version. */ --#define YYBISON_VERSION "2.4.1" -- --/* Skeleton name. */ --#define YYSKELETON_NAME "yacc.c" -- --/* Pure parsers. */ --#define YYPURE 1 -- --/* Push parsers. */ --#define YYPUSH 0 -- --/* Pull parsers. */ --#define YYPULL 1 -- --/* Using locations. */ --#define YYLSP_NEEDED 0 -- --/* Substitute the variable and function names. */ --#define yyparse __gettextparse --#define yylex __gettextlex --#define yyerror __gettexterror --#define yylval __gettextlval --#define yychar __gettextchar --#define yydebug __gettextdebug --#define yynerrs __gettextnerrs -- -- --/* Copy the first part of user declarations. */ -- --/* Line 189 of yacc.c */ --#line 1 "plural.y" -- --/* Expression parsing for plural form selection. -- Copyright (C) 2000-2001, 2003, 2005-2006 Free Software Foundation, Inc. -- Written by Ulrich Drepper <drepper@cygnus.com>, 2000. -- -- This program is free software; you can redistribute it and/or modify it -- under the terms of the GNU Library General Public License as published -- by the Free Software Foundation; either version 2, or (at your option) -- any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Library General Public License for more details. -- -- You should have received a copy of the GNU Library General Public -- License along with this program; if not, write to the Free Software -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, -- USA. */ -- --/* For bison < 2.0, the bison generated parser uses alloca. AIX 3 forces us -- to put this declaration at the beginning of the file. The declaration in -- bison's skeleton file comes too late. This must come before <config.h> -- because <config.h> may include arbitrary system headers. -- This can go away once the AM_INTL_SUBDIR macro requires bison >= 2.0. */ --#if defined _AIX && !defined __GNUC__ -- #pragma alloca --#endif -- --#ifdef HAVE_CONFIG_H --# include <config.h> --#endif -- --#include <stddef.h> --#include <stdlib.h> --#include <string.h> --#include "plural-exp.h" -- --/* The main function generated by the parser is called __gettextparse, -- but we want it to be called PLURAL_PARSE. */ --#ifndef _LIBC --# define __gettextparse PLURAL_PARSE --#endif -- --#define YYLEX_PARAM &((struct parse_args *) arg)->cp --#define YYPARSE_PARAM arg -- -- --/* Line 189 of yacc.c */ --#line 130 "plural.c" -- --/* Enabling traces. */ --#ifndef YYDEBUG --# define YYDEBUG 0 --#endif -- --/* Enabling verbose error messages. */ --#ifdef YYERROR_VERBOSE --# undef YYERROR_VERBOSE --# define YYERROR_VERBOSE 1 --#else --# define YYERROR_VERBOSE 0 --#endif -- --/* Enabling the token table. */ --#ifndef YYTOKEN_TABLE --# define YYTOKEN_TABLE 0 --#endif -- -- --/* Tokens. */ --#ifndef YYTOKENTYPE --# define YYTOKENTYPE -- /* Put the tokens into the symbol table, so that GDB and other debuggers -- know about them. */ -- enum yytokentype { -- EQUOP2 = 258, -- CMPOP2 = 259, -- ADDOP2 = 260, -- MULOP2 = 261, -- NUMBER = 262 -- }; --#endif --/* Tokens. */ --#define EQUOP2 258 --#define CMPOP2 259 --#define ADDOP2 260 --#define MULOP2 261 --#define NUMBER 262 -- -- -- -- --#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED --typedef union YYSTYPE --{ -- --/* Line 214 of yacc.c */ --#line 51 "plural.y" -- -- unsigned long int num; -- enum expression_operator op; -- struct expression *exp; -- -- -- --/* Line 214 of yacc.c */ --#line 188 "plural.c" --} YYSTYPE; --# define YYSTYPE_IS_TRIVIAL 1 --# define yystype YYSTYPE /* obsolescent; will be withdrawn */ --# define YYSTYPE_IS_DECLARED 1 --#endif -- -- --/* Copy the second part of user declarations. */ -- --/* Line 264 of yacc.c */ --#line 57 "plural.y" -- --/* Prototypes for local functions. */ --static int yylex (YYSTYPE *lval, const char **pexp); --static void yyerror (const char *str); -- --/* Allocation of expressions. */ -- --static struct expression * --new_exp (int nargs, enum expression_operator op, -- struct expression * const *args) --{ -- int i; -- struct expression *newp; -- -- /* If any of the argument could not be malloc'ed, just return NULL. */ -- for (i = nargs - 1; i >= 0; i--) -- if (args[i] == NULL) -- goto fail; -- -- /* Allocate a new expression. */ -- newp = (struct expression *) malloc (sizeof (*newp)); -- if (newp != NULL) -- { -- newp->nargs = nargs; -- newp->operation = op; -- for (i = nargs - 1; i >= 0; i--) -- newp->val.args[i] = args[i]; -- return newp; -- } -- -- fail: -- for (i = nargs - 1; i >= 0; i--) -- FREE_EXPRESSION (args[i]); -- -- return NULL; --} -- --static inline struct expression * --new_exp_0 (enum expression_operator op) --{ -- return new_exp (0, op, NULL); --} -- --static inline struct expression * --new_exp_1 (enum expression_operator op, struct expression *right) --{ -- struct expression *args[1]; -- -- args[0] = right; -- return new_exp (1, op, args); --} -- --static struct expression * --new_exp_2 (enum expression_operator op, struct expression *left, -- struct expression *right) --{ -- struct expression *args[2]; -- -- args[0] = left; -- args[1] = right; -- return new_exp (2, op, args); --} -- --static inline struct expression * --new_exp_3 (enum expression_operator op, struct expression *bexp, -- struct expression *tbranch, struct expression *fbranch) --{ -- struct expression *args[3]; -- -- args[0] = bexp; -- args[1] = tbranch; -- args[2] = fbranch; -- return new_exp (3, op, args); --} -- -- -- --/* Line 264 of yacc.c */ --#line 278 "plural.c" -- --#ifdef short --# undef short --#endif -- --#ifdef YYTYPE_UINT8 --typedef YYTYPE_UINT8 yytype_uint8; --#else --typedef unsigned char yytype_uint8; --#endif -- --#ifdef YYTYPE_INT8 --typedef YYTYPE_INT8 yytype_int8; --#elif (defined __STDC__ || defined __C99__FUNC__ \ -- || defined __cplusplus || defined _MSC_VER) --typedef signed char yytype_int8; --#else --typedef short int yytype_int8; --#endif -- --#ifdef YYTYPE_UINT16 --typedef YYTYPE_UINT16 yytype_uint16; --#else --typedef unsigned short int yytype_uint16; --#endif -- --#ifdef YYTYPE_INT16 --typedef YYTYPE_INT16 yytype_int16; --#else --typedef short int yytype_int16; --#endif -- --#ifndef YYSIZE_T --# ifdef __SIZE_TYPE__ --# define YYSIZE_T __SIZE_TYPE__ --# elif defined size_t --# define YYSIZE_T size_t --# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \ -- || defined __cplusplus || defined _MSC_VER) --# include <stddef.h> /* INFRINGES ON USER NAME SPACE */ --# define YYSIZE_T size_t --# else --# define YYSIZE_T unsigned int --# endif --#endif -- --#define YYSIZE_MAXIMUM ((YYSIZE_T) -1) -- --#ifndef YY_ --# if YYENABLE_NLS --# if ENABLE_NLS --# include <libintl.h> /* INFRINGES ON USER NAME SPACE */ --# define YY_(msgid) dgettext ("bison-runtime", msgid) --# endif --# endif --# ifndef YY_ --# define YY_(msgid) msgid --# endif --#endif -- --/* Suppress unused-variable warnings by "using" E. */ --#if ! defined lint || defined __GNUC__ --# define YYUSE(e) ((void) (e)) --#else --# define YYUSE(e) /* empty */ --#endif -- --/* Identity function, used to suppress warnings about constant conditions. */ --#ifndef lint --# define YYID(n) (n) --#else --#if (defined __STDC__ || defined __C99__FUNC__ \ -- || defined __cplusplus || defined _MSC_VER) --static int --YYID (int yyi) --#else --static int --YYID (yyi) -- int yyi; --#endif --{ -- return yyi; --} --#endif -- --#if ! defined yyoverflow || YYERROR_VERBOSE -- --/* The parser invokes alloca or malloc; define the necessary symbols. */ -- --# ifdef YYSTACK_USE_ALLOCA --# if YYSTACK_USE_ALLOCA --# ifdef __GNUC__ --# define YYSTACK_ALLOC __builtin_alloca --# elif defined __BUILTIN_VA_ARG_INCR --# include <alloca.h> /* INFRINGES ON USER NAME SPACE */ --# elif defined _AIX --# define YYSTACK_ALLOC __alloca --# elif defined _MSC_VER --# include <malloc.h> /* INFRINGES ON USER NAME SPACE */ --# define alloca _alloca --# else --# define YYSTACK_ALLOC alloca --# if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ -- || defined __cplusplus || defined _MSC_VER) --# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */ --# ifndef _STDLIB_H --# define _STDLIB_H 1 --# endif --# endif --# endif --# endif --# endif -- --# ifdef YYSTACK_ALLOC -- /* Pacify GCC's `empty if-body' warning. */ --# define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0)) --# ifndef YYSTACK_ALLOC_MAXIMUM -- /* The OS might guarantee only one guard page at the bottom of the stack, -- and a page size can be as small as 4096 bytes. So we cannot safely -- invoke alloca (N) if N exceeds 4096. Use a slightly smaller number -- to allow for a few compiler-allocated temporary stack slots. */ --# define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */ --# endif --# else --# define YYSTACK_ALLOC YYMALLOC --# define YYSTACK_FREE YYFREE --# ifndef YYSTACK_ALLOC_MAXIMUM --# define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM --# endif --# if (defined __cplusplus && ! defined _STDLIB_H \ -- && ! ((defined YYMALLOC || defined malloc) \ -- && (defined YYFREE || defined free))) --# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */ --# ifndef _STDLIB_H --# define _STDLIB_H 1 --# endif --# endif --# ifndef YYMALLOC --# define YYMALLOC malloc --# if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ -- || defined __cplusplus || defined _MSC_VER) --void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ --# endif --# endif --# ifndef YYFREE --# define YYFREE free --# if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ -- || defined __cplusplus || defined _MSC_VER) --void free (void *); /* INFRINGES ON USER NAME SPACE */ --# endif --# endif --# endif --#endif /* ! defined yyoverflow || YYERROR_VERBOSE */ -- -- --#if (! defined yyoverflow \ -- && (! defined __cplusplus \ -- || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) -- --/* A type that is properly aligned for any stack member. */ --union yyalloc --{ -- yytype_int16 yyss_alloc; -- YYSTYPE yyvs_alloc; --}; -- --/* The size of the maximum gap between one aligned stack and the next. */ --# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1) -- --/* The size of an array large to enough to hold all stacks, each with -- N elements. */ --# define YYSTACK_BYTES(N) \ -- ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \ -- + YYSTACK_GAP_MAXIMUM) -- --/* Copy COUNT objects from FROM to TO. The source and destination do -- not overlap. */ --# ifndef YYCOPY --# if defined __GNUC__ && 1 < __GNUC__ --# define YYCOPY(To, From, Count) \ -- __builtin_memcpy (To, From, (Count) * sizeof (*(From))) --# else --# define YYCOPY(To, From, Count) \ -- do \ -- { \ -- YYSIZE_T yyi; \ -- for (yyi = 0; yyi < (Count); yyi++) \ -- (To)[yyi] = (From)[yyi]; \ -- } \ -- while (YYID (0)) --# endif --# endif -- --/* Relocate STACK from its old location to the new one. The -- local variables YYSIZE and YYSTACKSIZE give the old and new number of -- elements in the stack, and YYPTR gives the new location of the -- stack. Advance YYPTR to a properly aligned location for the next -- stack. */ --# define YYSTACK_RELOCATE(Stack_alloc, Stack) \ -- do \ -- { \ -- YYSIZE_T yynewbytes; \ -- YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \ -- Stack = &yyptr->Stack_alloc; \ -- yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ -- yyptr += yynewbytes / sizeof (*yyptr); \ -- } \ -- while (YYID (0)) -- --#endif -- --/* YYFINAL -- State number of the termination state. */ --#define YYFINAL 9 --/* YYLAST -- Last index in YYTABLE. */ --#define YYLAST 54 -- --/* YYNTOKENS -- Number of terminals. */ --#define YYNTOKENS 16 --/* YYNNTS -- Number of nonterminals. */ --#define YYNNTS 3 --/* YYNRULES -- Number of rules. */ --#define YYNRULES 13 --/* YYNRULES -- Number of states. */ --#define YYNSTATES 27 -- --/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ --#define YYUNDEFTOK 2 --#define YYMAXUTOK 262 -- --#define YYTRANSLATE(YYX) \ -- ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) -- --/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */ --static const yytype_uint8 yytranslate[] = --{ -- 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, -- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -- 2, 2, 2, 10, 2, 2, 2, 2, 5, 2, -- 14, 15, 2, 2, 2, 2, 2, 2, 2, 2, -- 2, 2, 2, 2, 2, 2, 2, 2, 12, 2, -- 2, 2, 2, 3, 2, 2, 2, 2, 2, 2, -- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -- 13, 2, 2, 2, 2, 2, 2, 2, 2, 2, -- 2, 2, 2, 2, 4, 2, 2, 2, 2, 2, -- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -- 2, 2, 2, 2, 2, 2, 1, 2, 6, 7, -- 8, 9, 11 --}; -- --#if YYDEBUG --/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in -- YYRHS. */ --static const yytype_uint8 yyprhs[] = --{ -- 0, 0, 3, 5, 11, 15, 19, 23, 27, 31, -- 35, 38, 40, 42 --}; -- --/* YYRHS -- A `-1'-separated list of the rules' RHS. */ --static const yytype_int8 yyrhs[] = --{ -- 17, 0, -1, 18, -1, 18, 3, 18, 12, 18, -- -1, 18, 4, 18, -1, 18, 5, 18, -1, 18, -- 6, 18, -1, 18, 7, 18, -1, 18, 8, 18, -- -1, 18, 9, 18, -1, 10, 18, -1, 13, -1, -- 11, -1, 14, 18, 15, -1 --}; -- --/* YYRLINE[YYN] -- source line where rule number YYN was defined. */ --static const yytype_uint8 yyrline[] = --{ -- 0, 154, 154, 162, 166, 170, 174, 178, 182, 186, -- 190, 194, 198, 203 --}; --#endif -- --#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE --/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. -- First, the terminals, then, starting at YYNTOKENS, nonterminals. */ --static const char *const yytname[] = --{ -- "$end", "error", "$undefined", "'?'", "'|'", "'&'", "EQUOP2", "CMPOP2", -- "ADDOP2", "MULOP2", "'!'", "NUMBER", "':'", "'n'", "'('", "')'", -- "$accept", "start", "exp", 0 --}; --#endif -- --# ifdef YYPRINT --/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to -- token YYLEX-NUM. */ --static const yytype_uint16 yytoknum[] = --{ -- 0, 256, 257, 63, 124, 38, 258, 259, 260, 261, -- 33, 262, 58, 110, 40, 41 --}; --# endif -- --/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ --static const yytype_uint8 yyr1[] = --{ -- 0, 16, 17, 18, 18, 18, 18, 18, 18, 18, -- 18, 18, 18, 18 --}; -- --/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ --static const yytype_uint8 yyr2[] = --{ -- 0, 2, 1, 5, 3, 3, 3, 3, 3, 3, -- 2, 1, 1, 3 --}; -- --/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state -- STATE-NUM when YYTABLE doesn't specify something else to do. Zero -- means the default is an error. */ --static const yytype_uint8 yydefact[] = --{ -- 0, 0, 12, 11, 0, 0, 2, 10, 0, 1, -- 0, 0, 0, 0, 0, 0, 0, 13, 0, 4, -- 5, 6, 7, 8, 9, 0, 3 --}; -- --/* YYDEFGOTO[NTERM-NUM]. */ --static const yytype_int8 yydefgoto[] = --{ -- -1, 5, 6 --}; -- --/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing -- STATE-NUM. */ --#define YYPACT_NINF -10 --static const yytype_int8 yypact[] = --{ -- -9, -9, -10, -10, -9, 8, 36, -10, 13, -10, -- -9, -9, -9, -9, -9, -9, -9, -10, 26, 41, -- 45, 18, -2, 14, -10, -9, 36 --}; -- --/* YYPGOTO[NTERM-NUM]. */ --static const yytype_int8 yypgoto[] = --{ -- -10, -10, -1 --}; -- --/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If -- positive, shift that token. If negative, reduce the rule which -- number is the opposite. If zero, do what YYDEFACT says. -- If YYTABLE_NINF, syntax error. */ --#define YYTABLE_NINF -1 --static const yytype_uint8 yytable[] = --{ -- 7, 1, 2, 8, 3, 4, 15, 16, 9, 18, -- 19, 20, 21, 22, 23, 24, 10, 11, 12, 13, -- 14, 15, 16, 16, 26, 14, 15, 16, 17, 10, -- 11, 12, 13, 14, 15, 16, 0, 0, 25, 10, -- 11, 12, 13, 14, 15, 16, 12, 13, 14, 15, -- 16, 13, 14, 15, 16 --}; -- --static const yytype_int8 yycheck[] = --{ -- 1, 10, 11, 4, 13, 14, 8, 9, 0, 10, -- 11, 12, 13, 14, 15, 16, 3, 4, 5, 6, -- 7, 8, 9, 9, 25, 7, 8, 9, 15, 3, -- 4, 5, 6, 7, 8, 9, -1, -1, 12, 3, -- 4, 5, 6, 7, 8, 9, 5, 6, 7, 8, -- 9, 6, 7, 8, 9 --}; -- --/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing -- symbol of state STATE-NUM. */ --static const yytype_uint8 yystos[] = --{ -- 0, 10, 11, 13, 14, 17, 18, 18, 18, 0, -- 3, 4, 5, 6, 7, 8, 9, 15, 18, 18, -- 18, 18, 18, 18, 18, 12, 18 --}; -- --#define yyerrok (yyerrstatus = 0) --#define yyclearin (yychar = YYEMPTY) --#define YYEMPTY (-2) --#define YYEOF 0 -- --#define YYACCEPT goto yyacceptlab --#define YYABORT goto yyabortlab --#define YYERROR goto yyerrorlab -- -- --/* Like YYERROR except do call yyerror. This remains here temporarily -- to ease the transition to the new meaning of YYERROR, for GCC. -- Once GCC version 2 has supplanted version 1, this can go. */ -- --#define YYFAIL goto yyerrlab -- --#define YYRECOVERING() (!!yyerrstatus) -- --#define YYBACKUP(Token, Value) \ --do \ -- if (yychar == YYEMPTY && yylen == 1) \ -- { \ -- yychar = (Token); \ -- yylval = (Value); \ -- yytoken = YYTRANSLATE (yychar); \ -- YYPOPSTACK (1); \ -- goto yybackup; \ -- } \ -- else \ -- { \ -- yyerror (YY_("syntax error: cannot back up")); \ -- YYERROR; \ -- } \ --while (YYID (0)) -- -- --#define YYTERROR 1 --#define YYERRCODE 256 -- -- --/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N]. -- If N is 0, then set CURRENT to the empty location which ends -- the previous symbol: RHS[0] (always defined). */ -- --#define YYRHSLOC(Rhs, K) ((Rhs)[K]) --#ifndef YYLLOC_DEFAULT --# define YYLLOC_DEFAULT(Current, Rhs, N) \ -- do \ -- if (YYID (N)) \ -- { \ -- (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \ -- (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \ -- (Current).last_line = YYRHSLOC (Rhs, N).last_line; \ -- (Current).last_column = YYRHSLOC (Rhs, N).last_column; \ -- } \ -- else \ -- { \ -- (Current).first_line = (Current).last_line = \ -- YYRHSLOC (Rhs, 0).last_line; \ -- (Current).first_column = (Current).last_column = \ -- YYRHSLOC (Rhs, 0).last_column; \ -- } \ -- while (YYID (0)) --#endif -- -- --/* YY_LOCATION_PRINT -- Print the location on the stream. -- This macro was not mandated originally: define only if we know -- we won't break user code: when these are the locations we know. */ -- --#ifndef YY_LOCATION_PRINT --# if YYLTYPE_IS_TRIVIAL --# define YY_LOCATION_PRINT(File, Loc) \ -- fprintf (File, "%d.%d-%d.%d", \ -- (Loc).first_line, (Loc).first_column, \ -- (Loc).last_line, (Loc).last_column) --# else --# define YY_LOCATION_PRINT(File, Loc) ((void) 0) --# endif --#endif -- -- --/* YYLEX -- calling `yylex' with the right arguments. */ -- --#ifdef YYLEX_PARAM --# define YYLEX yylex (&yylval, YYLEX_PARAM) --#else --# define YYLEX yylex (&yylval) --#endif -- --/* Enable debugging if requested. */ --#if YYDEBUG -- --# ifndef YYFPRINTF --# include <stdio.h> /* INFRINGES ON USER NAME SPACE */ --# define YYFPRINTF fprintf --# endif -- --# define YYDPRINTF(Args) \ --do { \ -- if (yydebug) \ -- YYFPRINTF Args; \ --} while (YYID (0)) -- --# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ --do { \ -- if (yydebug) \ -- { \ -- YYFPRINTF (stderr, "%s ", Title); \ -- yy_symbol_print (stderr, \ -- Type, Value); \ -- YYFPRINTF (stderr, "\n"); \ -- } \ --} while (YYID (0)) -- -- --/*--------------------------------. --| Print this symbol on YYOUTPUT. | --`--------------------------------*/ -- --/*ARGSUSED*/ --#if (defined __STDC__ || defined __C99__FUNC__ \ -- || defined __cplusplus || defined _MSC_VER) --static void --yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) --#else --static void --yy_symbol_value_print (yyoutput, yytype, yyvaluep) -- FILE *yyoutput; -- int yytype; -- YYSTYPE const * const yyvaluep; --#endif --{ -- if (!yyvaluep) -- return; --# ifdef YYPRINT -- if (yytype < YYNTOKENS) -- YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); --# else -- YYUSE (yyoutput); --# endif -- switch (yytype) -- { -- default: -- break; -- } --} -- -- --/*--------------------------------. --| Print this symbol on YYOUTPUT. | --`--------------------------------*/ -- --#if (defined __STDC__ || defined __C99__FUNC__ \ -- || defined __cplusplus || defined _MSC_VER) --static void --yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) --#else --static void --yy_symbol_print (yyoutput, yytype, yyvaluep) -- FILE *yyoutput; -- int yytype; -- YYSTYPE const * const yyvaluep; --#endif --{ -- if (yytype < YYNTOKENS) -- YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); -- else -- YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); -- -- yy_symbol_value_print (yyoutput, yytype, yyvaluep); -- YYFPRINTF (yyoutput, ")"); --} -- --/*------------------------------------------------------------------. --| yy_stack_print -- Print the state stack from its BOTTOM up to its | --| TOP (included). | --`------------------------------------------------------------------*/ -- --#if (defined __STDC__ || defined __C99__FUNC__ \ -- || defined __cplusplus || defined _MSC_VER) --static void --yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop) --#else --static void --yy_stack_print (yybottom, yytop) -- yytype_int16 *yybottom; -- yytype_int16 *yytop; --#endif --{ -- YYFPRINTF (stderr, "Stack now"); -- for (; yybottom <= yytop; yybottom++) -- { -- int yybot = *yybottom; -- YYFPRINTF (stderr, " %d", yybot); -- } -- YYFPRINTF (stderr, "\n"); --} -- --# define YY_STACK_PRINT(Bottom, Top) \ --do { \ -- if (yydebug) \ -- yy_stack_print ((Bottom), (Top)); \ --} while (YYID (0)) -- -- --/*------------------------------------------------. --| Report that the YYRULE is going to be reduced. | --`------------------------------------------------*/ -- --#if (defined __STDC__ || defined __C99__FUNC__ \ -- || defined __cplusplus || defined _MSC_VER) --static void --yy_reduce_print (YYSTYPE *yyvsp, int yyrule) --#else --static void --yy_reduce_print (yyvsp, yyrule) -- YYSTYPE *yyvsp; -- int yyrule; --#endif --{ -- int yynrhs = yyr2[yyrule]; -- int yyi; -- unsigned long int yylno = yyrline[yyrule]; -- YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n", -- yyrule - 1, yylno); -- /* The symbols being reduced. */ -- for (yyi = 0; yyi < yynrhs; yyi++) -- { -- YYFPRINTF (stderr, " $%d = ", yyi + 1); -- yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi], -- &(yyvsp[(yyi + 1) - (yynrhs)]) -- ); -- YYFPRINTF (stderr, "\n"); -- } --} -- --# define YY_REDUCE_PRINT(Rule) \ --do { \ -- if (yydebug) \ -- yy_reduce_print (yyvsp, Rule); \ --} while (YYID (0)) -- --/* Nonzero means print parse trace. It is left uninitialized so that -- multiple parsers can coexist. */ --int yydebug; --#else /* !YYDEBUG */ --# define YYDPRINTF(Args) --# define YY_SYMBOL_PRINT(Title, Type, Value, Location) --# define YY_STACK_PRINT(Bottom, Top) --# define YY_REDUCE_PRINT(Rule) --#endif /* !YYDEBUG */ -- -- --/* YYINITDEPTH -- initial size of the parser's stacks. */ --#ifndef YYINITDEPTH --# define YYINITDEPTH 200 --#endif -- --/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only -- if the built-in stack extension method is used). -- -- Do not make this value too large; the results are undefined if -- YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH) -- evaluated with infinite-precision integer arithmetic. */ -- --#ifndef YYMAXDEPTH --# define YYMAXDEPTH 10000 --#endif -- -- -- --#if YYERROR_VERBOSE -- --# ifndef yystrlen --# if defined __GLIBC__ && defined _STRING_H --# define yystrlen strlen --# else --/* Return the length of YYSTR. */ --#if (defined __STDC__ || defined __C99__FUNC__ \ -- || defined __cplusplus || defined _MSC_VER) --static YYSIZE_T --yystrlen (const char *yystr) --#else --static YYSIZE_T --yystrlen (yystr) -- const char *yystr; --#endif --{ -- YYSIZE_T yylen; -- for (yylen = 0; yystr[yylen]; yylen++) -- continue; -- return yylen; --} --# endif --# endif -- --# ifndef yystpcpy --# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE --# define yystpcpy stpcpy --# else --/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in -- YYDEST. */ --#if (defined __STDC__ || defined __C99__FUNC__ \ -- || defined __cplusplus || defined _MSC_VER) --static char * --yystpcpy (char *yydest, const char *yysrc) --#else --static char * --yystpcpy (yydest, yysrc) -- char *yydest; -- const char *yysrc; --#endif --{ -- char *yyd = yydest; -- const char *yys = yysrc; -- -- while ((*yyd++ = *yys++) != '\0') -- continue; -- -- return yyd - 1; --} --# endif --# endif -- --# ifndef yytnamerr --/* Copy to YYRES the contents of YYSTR after stripping away unnecessary -- quotes and backslashes, so that it's suitable for yyerror. The -- heuristic is that double-quoting is unnecessary unless the string -- contains an apostrophe, a comma, or backslash (other than -- backslash-backslash). YYSTR is taken from yytname. If YYRES is -- null, do not copy; instead, return the length of what the result -- would have been. */ --static YYSIZE_T --yytnamerr (char *yyres, const char *yystr) --{ -- if (*yystr == '"') -- { -- YYSIZE_T yyn = 0; -- char const *yyp = yystr; -- -- for (;;) -- switch (*++yyp) -- { -- case '\'': -- case ',': -- goto do_not_strip_quotes; -- -- case '\\': -- if (*++yyp != '\\') -- goto do_not_strip_quotes; -- /* Fall through. */ -- default: -- if (yyres) -- yyres[yyn] = *yyp; -- yyn++; -- break; -- -- case '"': -- if (yyres) -- yyres[yyn] = '\0'; -- return yyn; -- } -- do_not_strip_quotes: ; -- } -- -- if (! yyres) -- return yystrlen (yystr); -- -- return yystpcpy (yyres, yystr) - yyres; --} --# endif -- --/* Copy into YYRESULT an error message about the unexpected token -- YYCHAR while in state YYSTATE. Return the number of bytes copied, -- including the terminating null byte. If YYRESULT is null, do not -- copy anything; just return the number of bytes that would be -- copied. As a special case, return 0 if an ordinary "syntax error" -- message will do. Return YYSIZE_MAXIMUM if overflow occurs during -- size calculation. */ --static YYSIZE_T --yysyntax_error (char *yyresult, int yystate, int yychar) --{ -- int yyn = yypact[yystate]; -- -- if (! (YYPACT_NINF < yyn && yyn <= YYLAST)) -- return 0; -- else -- { -- int yytype = YYTRANSLATE (yychar); -- YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]); -- YYSIZE_T yysize = yysize0; -- YYSIZE_T yysize1; -- int yysize_overflow = 0; -- enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; -- char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; -- int yyx; -- --# if 0 -- /* This is so xgettext sees the translatable formats that are -- constructed on the fly. */ -- YY_("syntax error, unexpected %s"); -- YY_("syntax error, unexpected %s, expecting %s"); -- YY_("syntax error, unexpected %s, expecting %s or %s"); -- YY_("syntax error, unexpected %s, expecting %s or %s or %s"); -- YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"); --# endif -- char *yyfmt; -- char const *yyf; -- static char const yyunexpected[] = "syntax error, unexpected %s"; -- static char const yyexpecting[] = ", expecting %s"; -- static char const yyor[] = " or %s"; -- char yyformat[sizeof yyunexpected -- + sizeof yyexpecting - 1 -- + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2) -- * (sizeof yyor - 1))]; -- char const *yyprefix = yyexpecting; -- -- /* Start YYX at -YYN if negative to avoid negative indexes in -- YYCHECK. */ -- int yyxbegin = yyn < 0 ? -yyn : 0; -- -- /* Stay within bounds of both yycheck and yytname. */ -- int yychecklim = YYLAST - yyn + 1; -- int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; -- int yycount = 1; -- -- yyarg[0] = yytname[yytype]; -- yyfmt = yystpcpy (yyformat, yyunexpected); -- -- for (yyx = yyxbegin; yyx < yyxend; ++yyx) -- if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) -- { -- if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) -- { -- yycount = 1; -- yysize = yysize0; -- yyformat[sizeof yyunexpected - 1] = '\0'; -- break; -- } -- yyarg[yycount++] = yytname[yyx]; -- yysize1 = yysize + yytnamerr (0, yytname[yyx]); -- yysize_overflow |= (yysize1 < yysize); -- yysize = yysize1; -- yyfmt = yystpcpy (yyfmt, yyprefix); -- yyprefix = yyor; -- } -- -- yyf = YY_(yyformat); -- yysize1 = yysize + yystrlen (yyf); -- yysize_overflow |= (yysize1 < yysize); -- yysize = yysize1; -- -- if (yysize_overflow) -- return YYSIZE_MAXIMUM; -- -- if (yyresult) -- { -- /* Avoid sprintf, as that infringes on the user's name space. -- Don't have undefined behavior even if the translation -- produced a string with the wrong number of "%s"s. */ -- char *yyp = yyresult; -- int yyi = 0; -- while ((*yyp = *yyf) != '\0') -- { -- if (*yyp == '%' && yyf[1] == 's' && yyi < yycount) -- { -- yyp += yytnamerr (yyp, yyarg[yyi++]); -- yyf += 2; -- } -- else -- { -- yyp++; -- yyf++; -- } -- } -- } -- return yysize; -- } --} --#endif /* YYERROR_VERBOSE */ -- -- --/*-----------------------------------------------. --| Release the memory associated to this symbol. | --`-----------------------------------------------*/ -- --/*ARGSUSED*/ --#if (defined __STDC__ || defined __C99__FUNC__ \ -- || defined __cplusplus || defined _MSC_VER) --static void --yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep) --#else --static void --yydestruct (yymsg, yytype, yyvaluep) -- const char *yymsg; -- int yytype; -- YYSTYPE *yyvaluep; --#endif --{ -- YYUSE (yyvaluep); -- -- if (!yymsg) -- yymsg = "Deleting"; -- YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); -- -- switch (yytype) -- { -- -- default: -- break; -- } --} -- --/* Prevent warnings from -Wmissing-prototypes. */ --#ifdef YYPARSE_PARAM --#if defined __STDC__ || defined __cplusplus --int yyparse (void *YYPARSE_PARAM); --#else --int yyparse (); --#endif --#else /* ! YYPARSE_PARAM */ --#if defined __STDC__ || defined __cplusplus --int yyparse (void); --#else --int yyparse (); --#endif --#endif /* ! YYPARSE_PARAM */ -- -- -- -- -- --/*-------------------------. --| yyparse or yypush_parse. | --`-------------------------*/ -- --#ifdef YYPARSE_PARAM --#if (defined __STDC__ || defined __C99__FUNC__ \ -- || defined __cplusplus || defined _MSC_VER) --int --yyparse (void *YYPARSE_PARAM) --#else --int --yyparse (YYPARSE_PARAM) -- void *YYPARSE_PARAM; --#endif --#else /* ! YYPARSE_PARAM */ --#if (defined __STDC__ || defined __C99__FUNC__ \ -- || defined __cplusplus || defined _MSC_VER) --int --yyparse (void) --#else --int --yyparse () -- --#endif --#endif --{ --/* The lookahead symbol. */ --int yychar; -- --/* The semantic value of the lookahead symbol. */ --YYSTYPE yylval; -- -- /* Number of syntax errors so far. */ -- int yynerrs; -- -- int yystate; -- /* Number of tokens to shift before error messages enabled. */ -- int yyerrstatus; -- -- /* The stacks and their tools: -- `yyss': related to states. -- `yyvs': related to semantic values. -- -- Refer to the stacks thru separate pointers, to allow yyoverflow -- to reallocate them elsewhere. */ -- -- /* The state stack. */ -- yytype_int16 yyssa[YYINITDEPTH]; -- yytype_int16 *yyss; -- yytype_int16 *yyssp; -- -- /* The semantic value stack. */ -- YYSTYPE yyvsa[YYINITDEPTH]; -- YYSTYPE *yyvs; -- YYSTYPE *yyvsp; -- -- YYSIZE_T yystacksize; -- -- int yyn; -- int yyresult; -- /* Lookahead token as an internal (translated) token number. */ -- int yytoken; -- /* The variables used to return semantic value and location from the -- action routines. */ -- YYSTYPE yyval; -- --#if YYERROR_VERBOSE -- /* Buffer for error messages, and its allocated size. */ -- char yymsgbuf[128]; -- char *yymsg = yymsgbuf; -- YYSIZE_T yymsg_alloc = sizeof yymsgbuf; --#endif -- --#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N)) -- -- /* The number of symbols on the RHS of the reduced rule. -- Keep to zero when no symbol should be popped. */ -- int yylen = 0; -- -- yytoken = 0; -- yyss = yyssa; -- yyvs = yyvsa; -- yystacksize = YYINITDEPTH; -- -- YYDPRINTF ((stderr, "Starting parse\n")); -- -- yystate = 0; -- yyerrstatus = 0; -- yynerrs = 0; -- yychar = YYEMPTY; /* Cause a token to be read. */ -- -- /* Initialize stack pointers. -- Waste one element of value and location stack -- so that they stay on the same level as the state stack. -- The wasted elements are never initialized. */ -- yyssp = yyss; -- yyvsp = yyvs; -- -- goto yysetstate; -- --/*------------------------------------------------------------. --| yynewstate -- Push a new state, which is found in yystate. | --`------------------------------------------------------------*/ -- yynewstate: -- /* In all cases, when you get here, the value and location stacks -- have just been pushed. So pushing a state here evens the stacks. */ -- yyssp++; -- -- yysetstate: -- *yyssp = yystate; -- -- if (yyss + yystacksize - 1 <= yyssp) -- { -- /* Get the current used size of the three stacks, in elements. */ -- YYSIZE_T yysize = yyssp - yyss + 1; -- --#ifdef yyoverflow -- { -- /* Give user a chance to reallocate the stack. Use copies of -- these so that the &'s don't force the real ones into -- memory. */ -- YYSTYPE *yyvs1 = yyvs; -- yytype_int16 *yyss1 = yyss; -- -- /* Each stack pointer address is followed by the size of the -- data in use in that stack, in bytes. This used to be a -- conditional around just the two extra args, but that might -- be undefined if yyoverflow is a macro. */ -- yyoverflow (YY_("memory exhausted"), -- &yyss1, yysize * sizeof (*yyssp), -- &yyvs1, yysize * sizeof (*yyvsp), -- &yystacksize); -- -- yyss = yyss1; -- yyvs = yyvs1; -- } --#else /* no yyoverflow */ --# ifndef YYSTACK_RELOCATE -- goto yyexhaustedlab; --# else -- /* Extend the stack our own way. */ -- if (YYMAXDEPTH <= yystacksize) -- goto yyexhaustedlab; -- yystacksize *= 2; -- if (YYMAXDEPTH < yystacksize) -- yystacksize = YYMAXDEPTH; -- -- { -- yytype_int16 *yyss1 = yyss; -- union yyalloc *yyptr = -- (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); -- if (! yyptr) -- goto yyexhaustedlab; -- YYSTACK_RELOCATE (yyss_alloc, yyss); -- YYSTACK_RELOCATE (yyvs_alloc, yyvs); --# undef YYSTACK_RELOCATE -- if (yyss1 != yyssa) -- YYSTACK_FREE (yyss1); -- } --# endif --#endif /* no yyoverflow */ -- -- yyssp = yyss + yysize - 1; -- yyvsp = yyvs + yysize - 1; -- -- YYDPRINTF ((stderr, "Stack size increased to %lu\n", -- (unsigned long int) yystacksize)); -- -- if (yyss + yystacksize - 1 <= yyssp) -- YYABORT; -- } -- -- YYDPRINTF ((stderr, "Entering state %d\n", yystate)); -- -- if (yystate == YYFINAL) -- YYACCEPT; -- -- goto yybackup; -- --/*-----------. --| yybackup. | --`-----------*/ --yybackup: -- -- /* Do appropriate processing given the current state. Read a -- lookahead token if we need one and don't already have one. */ -- -- /* First try to decide what to do without reference to lookahead token. */ -- yyn = yypact[yystate]; -- if (yyn == YYPACT_NINF) -- goto yydefault; -- -- /* Not known => get a lookahead token if don't already have one. */ -- -- /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */ -- if (yychar == YYEMPTY) -- { -- YYDPRINTF ((stderr, "Reading a token: ")); -- yychar = YYLEX; -- } -- -- if (yychar <= YYEOF) -- { -- yychar = yytoken = YYEOF; -- YYDPRINTF ((stderr, "Now at end of input.\n")); -- } -- else -- { -- yytoken = YYTRANSLATE (yychar); -- YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc); -- } -- -- /* If the proper action on seeing token YYTOKEN is to reduce or to -- detect an error, take that action. */ -- yyn += yytoken; -- if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken) -- goto yydefault; -- yyn = yytable[yyn]; -- if (yyn <= 0) -- { -- if (yyn == 0 || yyn == YYTABLE_NINF) -- goto yyerrlab; -- yyn = -yyn; -- goto yyreduce; -- } -- -- /* Count tokens shifted since error; after three, turn off error -- status. */ -- if (yyerrstatus) -- yyerrstatus--; -- -- /* Shift the lookahead token. */ -- YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); -- -- /* Discard the shifted token. */ -- yychar = YYEMPTY; -- -- yystate = yyn; -- *++yyvsp = yylval; -- -- goto yynewstate; -- -- --/*-----------------------------------------------------------. --| yydefault -- do the default action for the current state. | --`-----------------------------------------------------------*/ --yydefault: -- yyn = yydefact[yystate]; -- if (yyn == 0) -- goto yyerrlab; -- goto yyreduce; -- -- --/*-----------------------------. --| yyreduce -- Do a reduction. | --`-----------------------------*/ --yyreduce: -- /* yyn is the number of a rule to reduce with. */ -- yylen = yyr2[yyn]; -- -- /* If YYLEN is nonzero, implement the default value of the action: -- `$$ = $1'. -- -- Otherwise, the following line sets YYVAL to garbage. -- This behavior is undocumented and Bison -- users should not rely upon it. Assigning to YYVAL -- unconditionally makes the parser a bit smaller, and it avoids a -- GCC warning that YYVAL may be used uninitialized. */ -- yyval = yyvsp[1-yylen]; -- -- -- YY_REDUCE_PRINT (yyn); -- switch (yyn) -- { -- case 2: -- --/* Line 1455 of yacc.c */ --#line 155 "plural.y" -- { -- if ((yyvsp[(1) - (1)].exp) == NULL) -- YYABORT; -- ((struct parse_args *) arg)->res = (yyvsp[(1) - (1)].exp); -- } -- break; -- -- case 3: -- --/* Line 1455 of yacc.c */ --#line 163 "plural.y" -- { -- (yyval.exp) = new_exp_3 (qmop, (yyvsp[(1) - (5)].exp), (yyvsp[(3) - (5)].exp), (yyvsp[(5) - (5)].exp)); -- } -- break; -- -- case 4: -- --/* Line 1455 of yacc.c */ --#line 167 "plural.y" -- { -- (yyval.exp) = new_exp_2 (lor, (yyvsp[(1) - (3)].exp), (yyvsp[(3) - (3)].exp)); -- } -- break; -- -- case 5: -- --/* Line 1455 of yacc.c */ --#line 171 "plural.y" -- { -- (yyval.exp) = new_exp_2 (land, (yyvsp[(1) - (3)].exp), (yyvsp[(3) - (3)].exp)); -- } -- break; -- -- case 6: -- --/* Line 1455 of yacc.c */ --#line 175 "plural.y" -- { -- (yyval.exp) = new_exp_2 ((yyvsp[(2) - (3)].op), (yyvsp[(1) - (3)].exp), (yyvsp[(3) - (3)].exp)); -- } -- break; -- -- case 7: -- --/* Line 1455 of yacc.c */ --#line 179 "plural.y" -- { -- (yyval.exp) = new_exp_2 ((yyvsp[(2) - (3)].op), (yyvsp[(1) - (3)].exp), (yyvsp[(3) - (3)].exp)); -- } -- break; -- -- case 8: -- --/* Line 1455 of yacc.c */ --#line 183 "plural.y" -- { -- (yyval.exp) = new_exp_2 ((yyvsp[(2) - (3)].op), (yyvsp[(1) - (3)].exp), (yyvsp[(3) - (3)].exp)); -- } -- break; -- -- case 9: -- --/* Line 1455 of yacc.c */ --#line 187 "plural.y" -- { -- (yyval.exp) = new_exp_2 ((yyvsp[(2) - (3)].op), (yyvsp[(1) - (3)].exp), (yyvsp[(3) - (3)].exp)); -- } -- break; -- -- case 10: -- --/* Line 1455 of yacc.c */ --#line 191 "plural.y" -- { -- (yyval.exp) = new_exp_1 (lnot, (yyvsp[(2) - (2)].exp)); -- } -- break; -- -- case 11: -- --/* Line 1455 of yacc.c */ --#line 195 "plural.y" -- { -- (yyval.exp) = new_exp_0 (var); -- } -- break; -- -- case 12: -- --/* Line 1455 of yacc.c */ --#line 199 "plural.y" -- { -- if (((yyval.exp) = new_exp_0 (num)) != NULL) -- (yyval.exp)->val.num = (yyvsp[(1) - (1)].num); -- } -- break; -- -- case 13: -- --/* Line 1455 of yacc.c */ --#line 204 "plural.y" -- { -- (yyval.exp) = (yyvsp[(2) - (3)].exp); -- } -- break; -- -- -- --/* Line 1455 of yacc.c */ --#line 1592 "plural.c" -- default: break; -- } -- YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); -- -- YYPOPSTACK (yylen); -- yylen = 0; -- YY_STACK_PRINT (yyss, yyssp); -- -- *++yyvsp = yyval; -- -- /* Now `shift' the result of the reduction. Determine what state -- that goes to, based on the state we popped back to and the rule -- number reduced by. */ -- -- yyn = yyr1[yyn]; -- -- yystate = yypgoto[yyn - YYNTOKENS] + *yyssp; -- if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp) -- yystate = yytable[yystate]; -- else -- yystate = yydefgoto[yyn - YYNTOKENS]; -- -- goto yynewstate; -- -- --/*------------------------------------. --| yyerrlab -- here on detecting error | --`------------------------------------*/ --yyerrlab: -- /* If not already recovering from an error, report this error. */ -- if (!yyerrstatus) -- { -- ++yynerrs; --#if ! YYERROR_VERBOSE -- yyerror (YY_("syntax error")); --#else -- { -- YYSIZE_T yysize = yysyntax_error (0, yystate, yychar); -- if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM) -- { -- YYSIZE_T yyalloc = 2 * yysize; -- if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM)) -- yyalloc = YYSTACK_ALLOC_MAXIMUM; -- if (yymsg != yymsgbuf) -- YYSTACK_FREE (yymsg); -- yymsg = (char *) YYSTACK_ALLOC (yyalloc); -- if (yymsg) -- yymsg_alloc = yyalloc; -- else -- { -- yymsg = yymsgbuf; -- yymsg_alloc = sizeof yymsgbuf; -- } -- } -- -- if (0 < yysize && yysize <= yymsg_alloc) -- { -- (void) yysyntax_error (yymsg, yystate, yychar); -- yyerror (yymsg); -- } -- else -- { -- yyerror (YY_("syntax error")); -- if (yysize != 0) -- goto yyexhaustedlab; -- } -- } --#endif -- } -- -- -- -- if (yyerrstatus == 3) -- { -- /* If just tried and failed to reuse lookahead token after an -- error, discard it. */ -- -- if (yychar <= YYEOF) -- { -- /* Return failure if at end of input. */ -- if (yychar == YYEOF) -- YYABORT; -- } -- else -- { -- yydestruct ("Error: discarding", -- yytoken, &yylval); -- yychar = YYEMPTY; -- } -- } -- -- /* Else will try to reuse lookahead token after shifting the error -- token. */ -- goto yyerrlab1; -- -- --/*---------------------------------------------------. --| yyerrorlab -- error raised explicitly by YYERROR. | --`---------------------------------------------------*/ --yyerrorlab: -- -- /* Pacify compilers like GCC when the user code never invokes -- YYERROR and the label yyerrorlab therefore never appears in user -- code. */ -- if (/*CONSTCOND*/ 0) -- goto yyerrorlab; -- -- /* Do not reclaim the symbols of the rule which action triggered -- this YYERROR. */ -- YYPOPSTACK (yylen); -- yylen = 0; -- YY_STACK_PRINT (yyss, yyssp); -- yystate = *yyssp; -- goto yyerrlab1; -- -- --/*-------------------------------------------------------------. --| yyerrlab1 -- common code for both syntax error and YYERROR. | --`-------------------------------------------------------------*/ --yyerrlab1: -- yyerrstatus = 3; /* Each real token shifted decrements this. */ -- -- for (;;) -- { -- yyn = yypact[yystate]; -- if (yyn != YYPACT_NINF) -- { -- yyn += YYTERROR; -- if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) -- { -- yyn = yytable[yyn]; -- if (0 < yyn) -- break; -- } -- } -- -- /* Pop the current state because it cannot handle the error token. */ -- if (yyssp == yyss) -- YYABORT; -- -- -- yydestruct ("Error: popping", -- yystos[yystate], yyvsp); -- YYPOPSTACK (1); -- yystate = *yyssp; -- YY_STACK_PRINT (yyss, yyssp); -- } -- -- *++yyvsp = yylval; -- -- -- /* Shift the error token. */ -- YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp); -- -- yystate = yyn; -- goto yynewstate; -- -- --/*-------------------------------------. --| yyacceptlab -- YYACCEPT comes here. | --`-------------------------------------*/ --yyacceptlab: -- yyresult = 0; -- goto yyreturn; -- --/*-----------------------------------. --| yyabortlab -- YYABORT comes here. | --`-----------------------------------*/ --yyabortlab: -- yyresult = 1; -- goto yyreturn; -- --#if !defined(yyoverflow) || YYERROR_VERBOSE --/*-------------------------------------------------. --| yyexhaustedlab -- memory exhaustion comes here. | --`-------------------------------------------------*/ --yyexhaustedlab: -- yyerror (YY_("memory exhausted")); -- yyresult = 2; -- /* Fall through. */ --#endif -- --yyreturn: -- if (yychar != YYEMPTY) -- yydestruct ("Cleanup: discarding lookahead", -- yytoken, &yylval); -- /* Do not reclaim the symbols of the rule which action triggered -- this YYABORT or YYACCEPT. */ -- YYPOPSTACK (yylen); -- YY_STACK_PRINT (yyss, yyssp); -- while (yyssp != yyss) -- { -- yydestruct ("Cleanup: popping", -- yystos[*yyssp], yyvsp); -- YYPOPSTACK (1); -- } --#ifndef yyoverflow -- if (yyss != yyssa) -- YYSTACK_FREE (yyss); --#endif --#if YYERROR_VERBOSE -- if (yymsg != yymsgbuf) -- YYSTACK_FREE (yymsg); --#endif -- /* Make sure YYID is used. */ -- return YYID (yyresult); --} -- -- -- --/* Line 1675 of yacc.c */ --#line 209 "plural.y" -- -- --void --internal_function --FREE_EXPRESSION (struct expression *exp) --{ -- if (exp == NULL) -- return; -- -- /* Handle the recursive case. */ -- switch (exp->nargs) -- { -- case 3: -- FREE_EXPRESSION (exp->val.args[2]); -- /* FALLTHROUGH */ -- case 2: -- FREE_EXPRESSION (exp->val.args[1]); -- /* FALLTHROUGH */ -- case 1: -- FREE_EXPRESSION (exp->val.args[0]); -- /* FALLTHROUGH */ -- default: -- break; -- } -- -- free (exp); --} -- -- --static int --yylex (YYSTYPE *lval, const char **pexp) --{ -- const char *exp = *pexp; -- int result; -- -- while (1) -- { -- if (exp[0] == '\0') -- { -- *pexp = exp; -- return YYEOF; -- } -- -- if (exp[0] != ' ' && exp[0] != '\t') -- break; -- -- ++exp; -- } -- -- result = *exp++; -- switch (result) -- { -- case '0': case '1': case '2': case '3': case '4': -- case '5': case '6': case '7': case '8': case '9': -- { -- unsigned long int n = result - '0'; -- while (exp[0] >= '0' && exp[0] <= '9') -- { -- n *= 10; -- n += exp[0] - '0'; -- ++exp; -- } -- lval->num = n; -- result = NUMBER; -- } -- break; -- -- case '=': -- if (exp[0] == '=') -- { -- ++exp; -- lval->op = equal; -- result = EQUOP2; -- } -- else -- result = YYERRCODE; -- break; -- -- case '!': -- if (exp[0] == '=') -- { -- ++exp; -- lval->op = not_equal; -- result = EQUOP2; -- } -- break; -- -- case '&': -- case '|': -- if (exp[0] == result) -- ++exp; -- else -- result = YYERRCODE; -- break; -- -- case '<': -- if (exp[0] == '=') -- { -- ++exp; -- lval->op = less_or_equal; -- } -- else -- lval->op = less_than; -- result = CMPOP2; -- break; -- -- case '>': -- if (exp[0] == '=') -- { -- ++exp; -- lval->op = greater_or_equal; -- } -- else -- lval->op = greater_than; -- result = CMPOP2; -- break; -- -- case '*': -- lval->op = mult; -- result = MULOP2; -- break; -- -- case '/': -- lval->op = divide; -- result = MULOP2; -- break; -- -- case '%': -- lval->op = module; -- result = MULOP2; -- break; -- -- case '+': -- lval->op = plus; -- result = ADDOP2; -- break; -- -- case '-': -- lval->op = minus; -- result = ADDOP2; -- break; -- -- case 'n': -- case '?': -- case ':': -- case '(': -- case ')': -- /* Nothing, just return the character. */ -- break; -- -- case ';': -- case '\n': -- case '\0': -- /* Be safe and let the user call this function again. */ -- --exp; -- result = YYEOF; -- break; -- -- default: -- result = YYERRCODE; --#if YYDEBUG != 0 -- --exp; --#endif -- break; -- } -- -- *pexp = exp; -- -- return result; --} -- -- --static void --yyerror (const char *str) --{ -- /* Do nothing. We don't print error messages here. */ --} -- ---- a/intl/plural.y -+++ /dev/null -@@ -1,385 +0,0 @@ --%{ --/* Expression parsing for plural form selection. -- Copyright (C) 2000-2001, 2003, 2005-2006 Free Software Foundation, Inc. -- Written by Ulrich Drepper <drepper@cygnus.com>, 2000. -- -- This program is free software; you can redistribute it and/or modify it -- under the terms of the GNU Library General Public License as published -- by the Free Software Foundation; either version 2, or (at your option) -- any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Library General Public License for more details. -- -- You should have received a copy of the GNU Library General Public -- License along with this program; if not, write to the Free Software -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, -- USA. */ -- --/* For bison < 2.0, the bison generated parser uses alloca. AIX 3 forces us -- to put this declaration at the beginning of the file. The declaration in -- bison's skeleton file comes too late. This must come before <config.h> -- because <config.h> may include arbitrary system headers. -- This can go away once the AM_INTL_SUBDIR macro requires bison >= 2.0. */ --#if defined _AIX && !defined __GNUC__ -- #pragma alloca --#endif -- --#ifdef HAVE_CONFIG_H --# include <config.h> --#endif -- --#include <stddef.h> --#include <stdlib.h> --#include <string.h> --#include "plural-exp.h" -- --/* The main function generated by the parser is called __gettextparse, -- but we want it to be called PLURAL_PARSE. */ --#ifndef _LIBC --# define __gettextparse PLURAL_PARSE --#endif -- --#define YYLEX_PARAM &((struct parse_args *) arg)->cp --#define YYPARSE_PARAM arg --%} --%pure_parser --%expect 7 -- --%union { -- unsigned long int num; -- enum expression_operator op; -- struct expression *exp; --} -- --%{ --/* Prototypes for local functions. */ --static int yylex (YYSTYPE *lval, const char **pexp); --static void yyerror (const char *str); -- --/* Allocation of expressions. */ -- --static struct expression * --new_exp (int nargs, enum expression_operator op, -- struct expression * const *args) --{ -- int i; -- struct expression *newp; -- -- /* If any of the argument could not be malloc'ed, just return NULL. */ -- for (i = nargs - 1; i >= 0; i--) -- if (args[i] == NULL) -- goto fail; -- -- /* Allocate a new expression. */ -- newp = (struct expression *) malloc (sizeof (*newp)); -- if (newp != NULL) -- { -- newp->nargs = nargs; -- newp->operation = op; -- for (i = nargs - 1; i >= 0; i--) -- newp->val.args[i] = args[i]; -- return newp; -- } -- -- fail: -- for (i = nargs - 1; i >= 0; i--) -- FREE_EXPRESSION (args[i]); -- -- return NULL; --} -- --static inline struct expression * --new_exp_0 (enum expression_operator op) --{ -- return new_exp (0, op, NULL); --} -- --static inline struct expression * --new_exp_1 (enum expression_operator op, struct expression *right) --{ -- struct expression *args[1]; -- -- args[0] = right; -- return new_exp (1, op, args); --} -- --static struct expression * --new_exp_2 (enum expression_operator op, struct expression *left, -- struct expression *right) --{ -- struct expression *args[2]; -- -- args[0] = left; -- args[1] = right; -- return new_exp (2, op, args); --} -- --static inline struct expression * --new_exp_3 (enum expression_operator op, struct expression *bexp, -- struct expression *tbranch, struct expression *fbranch) --{ -- struct expression *args[3]; -- -- args[0] = bexp; -- args[1] = tbranch; -- args[2] = fbranch; -- return new_exp (3, op, args); --} -- --%} -- --/* This declares that all operators have the same associativity and the -- precedence order as in C. See [Harbison, Steele: C, A Reference Manual]. -- There is no unary minus and no bitwise operators. -- Operators with the same syntactic behaviour have been merged into a single -- token, to save space in the array generated by bison. */ --%right '?' /* ? */ --%left '|' /* || */ --%left '&' /* && */ --%left EQUOP2 /* == != */ --%left CMPOP2 /* < > <= >= */ --%left ADDOP2 /* + - */ --%left MULOP2 /* * / % */ --%right '!' /* ! */ -- --%token <op> EQUOP2 CMPOP2 ADDOP2 MULOP2 --%token <num> NUMBER --%type <exp> exp -- --%% -- --start: exp -- { -- if ($1 == NULL) -- YYABORT; -- ((struct parse_args *) arg)->res = $1; -- } -- ; -- --exp: exp '?' exp ':' exp -- { -- $$ = new_exp_3 (qmop, $1, $3, $5); -- } -- | exp '|' exp -- { -- $$ = new_exp_2 (lor, $1, $3); -- } -- | exp '&' exp -- { -- $$ = new_exp_2 (land, $1, $3); -- } -- | exp EQUOP2 exp -- { -- $$ = new_exp_2 ($2, $1, $3); -- } -- | exp CMPOP2 exp -- { -- $$ = new_exp_2 ($2, $1, $3); -- } -- | exp ADDOP2 exp -- { -- $$ = new_exp_2 ($2, $1, $3); -- } -- | exp MULOP2 exp -- { -- $$ = new_exp_2 ($2, $1, $3); -- } -- | '!' exp -- { -- $$ = new_exp_1 (lnot, $2); -- } -- | 'n' -- { -- $$ = new_exp_0 (var); -- } -- | NUMBER -- { -- if (($$ = new_exp_0 (num)) != NULL) -- $$->val.num = $1; -- } -- | '(' exp ')' -- { -- $$ = $2; -- } -- ; -- --%% -- --void --internal_function --FREE_EXPRESSION (struct expression *exp) --{ -- if (exp == NULL) -- return; -- -- /* Handle the recursive case. */ -- switch (exp->nargs) -- { -- case 3: -- FREE_EXPRESSION (exp->val.args[2]); -- /* FALLTHROUGH */ -- case 2: -- FREE_EXPRESSION (exp->val.args[1]); -- /* FALLTHROUGH */ -- case 1: -- FREE_EXPRESSION (exp->val.args[0]); -- /* FALLTHROUGH */ -- default: -- break; -- } -- -- free (exp); --} -- -- --static int --yylex (YYSTYPE *lval, const char **pexp) --{ -- const char *exp = *pexp; -- int result; -- -- while (1) -- { -- if (exp[0] == '\0') -- { -- *pexp = exp; -- return YYEOF; -- } -- -- if (exp[0] != ' ' && exp[0] != '\t') -- break; -- -- ++exp; -- } -- -- result = *exp++; -- switch (result) -- { -- case '0': case '1': case '2': case '3': case '4': -- case '5': case '6': case '7': case '8': case '9': -- { -- unsigned long int n = result - '0'; -- while (exp[0] >= '0' && exp[0] <= '9') -- { -- n *= 10; -- n += exp[0] - '0'; -- ++exp; -- } -- lval->num = n; -- result = NUMBER; -- } -- break; -- -- case '=': -- if (exp[0] == '=') -- { -- ++exp; -- lval->op = equal; -- result = EQUOP2; -- } -- else -- result = YYERRCODE; -- break; -- -- case '!': -- if (exp[0] == '=') -- { -- ++exp; -- lval->op = not_equal; -- result = EQUOP2; -- } -- break; -- -- case '&': -- case '|': -- if (exp[0] == result) -- ++exp; -- else -- result = YYERRCODE; -- break; -- -- case '<': -- if (exp[0] == '=') -- { -- ++exp; -- lval->op = less_or_equal; -- } -- else -- lval->op = less_than; -- result = CMPOP2; -- break; -- -- case '>': -- if (exp[0] == '=') -- { -- ++exp; -- lval->op = greater_or_equal; -- } -- else -- lval->op = greater_than; -- result = CMPOP2; -- break; -- -- case '*': -- lval->op = mult; -- result = MULOP2; -- break; -- -- case '/': -- lval->op = divide; -- result = MULOP2; -- break; -- -- case '%': -- lval->op = module; -- result = MULOP2; -- break; -- -- case '+': -- lval->op = plus; -- result = ADDOP2; -- break; -- -- case '-': -- lval->op = minus; -- result = ADDOP2; -- break; -- -- case 'n': -- case '?': -- case ':': -- case '(': -- case ')': -- /* Nothing, just return the character. */ -- break; -- -- case ';': -- case '\n': -- case '\0': -- /* Be safe and let the user call this function again. */ -- --exp; -- result = YYEOF; -- break; -- -- default: -- result = YYERRCODE; --#if YYDEBUG != 0 -- --exp; --#endif -- break; -- } -- -- *pexp = exp; -- -- return result; --} -- -- --static void --yyerror (const char *str) --{ -- /* Do nothing. We don't print error messages here. */ --} ---- a/intl/printf-args.c -+++ /dev/null -@@ -1,188 +0,0 @@ --/* Decomposed printf argument list. -- Copyright (C) 1999, 2002-2003, 2005-2007 Free Software Foundation, Inc. -- -- This program is free software; you can redistribute it and/or modify it -- under the terms of the GNU Library General Public License as published -- by the Free Software Foundation; either version 2, or (at your option) -- any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Library General Public License for more details. -- -- You should have received a copy of the GNU Library General Public -- License along with this program; if not, write to the Free Software -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, -- USA. */ -- --/* This file can be parametrized with the following macros: -- ENABLE_UNISTDIO Set to 1 to enable the unistdio extensions. -- PRINTF_FETCHARGS Name of the function to be defined. -- STATIC Set to 'static' to declare the function static. */ -- --#ifndef PRINTF_FETCHARGS --# include <config.h> --#endif -- --/* Specification. */ --#ifndef PRINTF_FETCHARGS --# include "printf-args.h" --#endif -- --#ifdef STATIC --STATIC --#endif --int --PRINTF_FETCHARGS (va_list args, arguments *a) --{ -- size_t i; -- argument *ap; -- -- for (i = 0, ap = &a->arg[0]; i < a->count; i++, ap++) -- switch (ap->type) -- { -- case TYPE_SCHAR: -- ap->a.a_schar = va_arg (args, /*signed char*/ int); -- break; -- case TYPE_UCHAR: -- ap->a.a_uchar = va_arg (args, /*unsigned char*/ int); -- break; -- case TYPE_SHORT: -- ap->a.a_short = va_arg (args, /*short*/ int); -- break; -- case TYPE_USHORT: -- ap->a.a_ushort = va_arg (args, /*unsigned short*/ int); -- break; -- case TYPE_INT: -- ap->a.a_int = va_arg (args, int); -- break; -- case TYPE_UINT: -- ap->a.a_uint = va_arg (args, unsigned int); -- break; -- case TYPE_LONGINT: -- ap->a.a_longint = va_arg (args, long int); -- break; -- case TYPE_ULONGINT: -- ap->a.a_ulongint = va_arg (args, unsigned long int); -- break; --#if HAVE_LONG_LONG_INT -- case TYPE_LONGLONGINT: -- ap->a.a_longlongint = va_arg (args, long long int); -- break; -- case TYPE_ULONGLONGINT: -- ap->a.a_ulonglongint = va_arg (args, unsigned long long int); -- break; --#endif -- case TYPE_DOUBLE: -- ap->a.a_double = va_arg (args, double); -- break; -- case TYPE_LONGDOUBLE: -- ap->a.a_longdouble = va_arg (args, long double); -- break; -- case TYPE_CHAR: -- ap->a.a_char = va_arg (args, int); -- break; --#if HAVE_WINT_T -- case TYPE_WIDE_CHAR: -- /* Although ISO C 99 7.24.1.(2) says that wint_t is "unchanged by -- default argument promotions", this is not the case in mingw32, -- where wint_t is 'unsigned short'. */ -- ap->a.a_wide_char = -- (sizeof (wint_t) < sizeof (int) -- ? va_arg (args, int) -- : va_arg (args, wint_t)); -- break; --#endif -- case TYPE_STRING: -- ap->a.a_string = va_arg (args, const char *); -- /* A null pointer is an invalid argument for "%s", but in practice -- it occurs quite frequently in printf statements that produce -- debug output. Use a fallback in this case. */ -- if (ap->a.a_string == NULL) -- ap->a.a_string = "(NULL)"; -- break; --#if HAVE_WCHAR_T -- case TYPE_WIDE_STRING: -- ap->a.a_wide_string = va_arg (args, const wchar_t *); -- /* A null pointer is an invalid argument for "%ls", but in practice -- it occurs quite frequently in printf statements that produce -- debug output. Use a fallback in this case. */ -- if (ap->a.a_wide_string == NULL) -- { -- static const wchar_t wide_null_string[] = -- { -- (wchar_t)'(', -- (wchar_t)'N', (wchar_t)'U', (wchar_t)'L', (wchar_t)'L', -- (wchar_t)')', -- (wchar_t)0 -- }; -- ap->a.a_wide_string = wide_null_string; -- } -- break; --#endif -- case TYPE_POINTER: -- ap->a.a_pointer = va_arg (args, void *); -- break; -- case TYPE_COUNT_SCHAR_POINTER: -- ap->a.a_count_schar_pointer = va_arg (args, signed char *); -- break; -- case TYPE_COUNT_SHORT_POINTER: -- ap->a.a_count_short_pointer = va_arg (args, short *); -- break; -- case TYPE_COUNT_INT_POINTER: -- ap->a.a_count_int_pointer = va_arg (args, int *); -- break; -- case TYPE_COUNT_LONGINT_POINTER: -- ap->a.a_count_longint_pointer = va_arg (args, long int *); -- break; --#if HAVE_LONG_LONG_INT -- case TYPE_COUNT_LONGLONGINT_POINTER: -- ap->a.a_count_longlongint_pointer = va_arg (args, long long int *); -- break; --#endif --#if ENABLE_UNISTDIO -- /* The unistdio extensions. */ -- case TYPE_U8_STRING: -- ap->a.a_u8_string = va_arg (args, const uint8_t *); -- /* A null pointer is an invalid argument for "%U", but in practice -- it occurs quite frequently in printf statements that produce -- debug output. Use a fallback in this case. */ -- if (ap->a.a_u8_string == NULL) -- { -- static const uint8_t u8_null_string[] = -- { '(', 'N', 'U', 'L', 'L', ')', 0 }; -- ap->a.a_u8_string = u8_null_string; -- } -- break; -- case TYPE_U16_STRING: -- ap->a.a_u16_string = va_arg (args, const uint16_t *); -- /* A null pointer is an invalid argument for "%lU", but in practice -- it occurs quite frequently in printf statements that produce -- debug output. Use a fallback in this case. */ -- if (ap->a.a_u16_string == NULL) -- { -- static const uint16_t u16_null_string[] = -- { '(', 'N', 'U', 'L', 'L', ')', 0 }; -- ap->a.a_u16_string = u16_null_string; -- } -- break; -- case TYPE_U32_STRING: -- ap->a.a_u32_string = va_arg (args, const uint32_t *); -- /* A null pointer is an invalid argument for "%llU", but in practice -- it occurs quite frequently in printf statements that produce -- debug output. Use a fallback in this case. */ -- if (ap->a.a_u32_string == NULL) -- { -- static const uint32_t u32_null_string[] = -- { '(', 'N', 'U', 'L', 'L', ')', 0 }; -- ap->a.a_u32_string = u32_null_string; -- } -- break; --#endif -- default: -- /* Unknown type. */ -- return -1; -- } -- return 0; --} ---- a/intl/printf-args.h -+++ /dev/null -@@ -1,155 +0,0 @@ --/* Decomposed printf argument list. -- Copyright (C) 1999, 2002-2003, 2006-2007 Free Software Foundation, Inc. -- -- This program is free software; you can redistribute it and/or modify it -- under the terms of the GNU Library General Public License as published -- by the Free Software Foundation; either version 2, or (at your option) -- any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Library General Public License for more details. -- -- You should have received a copy of the GNU Library General Public -- License along with this program; if not, write to the Free Software -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, -- USA. */ -- --#ifndef _PRINTF_ARGS_H --#define _PRINTF_ARGS_H -- --/* This file can be parametrized with the following macros: -- ENABLE_UNISTDIO Set to 1 to enable the unistdio extensions. -- PRINTF_FETCHARGS Name of the function to be declared. -- STATIC Set to 'static' to declare the function static. */ -- --/* Default parameters. */ --#ifndef PRINTF_FETCHARGS --# define PRINTF_FETCHARGS printf_fetchargs --#endif -- --/* Get size_t. */ --#include <stddef.h> -- --/* Get wchar_t. */ --#if HAVE_WCHAR_T --# include <stddef.h> --#endif -- --/* Get wint_t. */ --#if HAVE_WINT_T --# include <wchar.h> --#endif -- --/* Get va_list. */ --#include <stdarg.h> -- -- --/* Argument types */ --typedef enum --{ -- TYPE_NONE, -- TYPE_SCHAR, -- TYPE_UCHAR, -- TYPE_SHORT, -- TYPE_USHORT, -- TYPE_INT, -- TYPE_UINT, -- TYPE_LONGINT, -- TYPE_ULONGINT, --#if HAVE_LONG_LONG_INT -- TYPE_LONGLONGINT, -- TYPE_ULONGLONGINT, --#endif -- TYPE_DOUBLE, -- TYPE_LONGDOUBLE, -- TYPE_CHAR, --#if HAVE_WINT_T -- TYPE_WIDE_CHAR, --#endif -- TYPE_STRING, --#if HAVE_WCHAR_T -- TYPE_WIDE_STRING, --#endif -- TYPE_POINTER, -- TYPE_COUNT_SCHAR_POINTER, -- TYPE_COUNT_SHORT_POINTER, -- TYPE_COUNT_INT_POINTER, -- TYPE_COUNT_LONGINT_POINTER --#if HAVE_LONG_LONG_INT --, TYPE_COUNT_LONGLONGINT_POINTER --#endif --#if ENABLE_UNISTDIO -- /* The unistdio extensions. */ --, TYPE_U8_STRING --, TYPE_U16_STRING --, TYPE_U32_STRING --#endif --} arg_type; -- --/* Polymorphic argument */ --typedef struct --{ -- arg_type type; -- union -- { -- signed char a_schar; -- unsigned char a_uchar; -- short a_short; -- unsigned short a_ushort; -- int a_int; -- unsigned int a_uint; -- long int a_longint; -- unsigned long int a_ulongint; --#if HAVE_LONG_LONG_INT -- long long int a_longlongint; -- unsigned long long int a_ulonglongint; --#endif -- float a_float; -- double a_double; -- long double a_longdouble; -- int a_char; --#if HAVE_WINT_T -- wint_t a_wide_char; --#endif -- const char* a_string; --#if HAVE_WCHAR_T -- const wchar_t* a_wide_string; --#endif -- void* a_pointer; -- signed char * a_count_schar_pointer; -- short * a_count_short_pointer; -- int * a_count_int_pointer; -- long int * a_count_longint_pointer; --#if HAVE_LONG_LONG_INT -- long long int * a_count_longlongint_pointer; --#endif --#if ENABLE_UNISTDIO -- /* The unistdio extensions. */ -- const uint8_t * a_u8_string; -- const uint16_t * a_u16_string; -- const uint32_t * a_u32_string; --#endif -- } -- a; --} --argument; -- --typedef struct --{ -- size_t count; -- argument *arg; --} --arguments; -- -- --/* Fetch the arguments, putting them into a. */ --#ifdef STATIC --STATIC --#else --extern --#endif --int PRINTF_FETCHARGS (va_list args, arguments *a); -- --#endif /* _PRINTF_ARGS_H */ ---- a/intl/printf-parse.c -+++ /dev/null -@@ -1,590 +0,0 @@ --/* Formatted output to strings. -- Copyright (C) 1999-2000, 2002-2003, 2006-2007 Free Software Foundation, Inc. -- -- This program is free software; you can redistribute it and/or modify it -- under the terms of the GNU Library General Public License as published -- by the Free Software Foundation; either version 2, or (at your option) -- any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Library General Public License for more details. -- -- You should have received a copy of the GNU Library General Public -- License along with this program; if not, write to the Free Software -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, -- USA. */ -- --/* This file can be parametrized with the following macros: -- CHAR_T The element type of the format string. -- CHAR_T_ONLY_ASCII Set to 1 to enable verification that all characters -- in the format string are ASCII. -- DIRECTIVE Structure denoting a format directive. -- Depends on CHAR_T. -- DIRECTIVES Structure denoting the set of format directives of a -- format string. Depends on CHAR_T. -- PRINTF_PARSE Function that parses a format string. -- Depends on CHAR_T. -- STATIC Set to 'static' to declare the function static. -- ENABLE_UNISTDIO Set to 1 to enable the unistdio extensions. */ -- --#ifndef PRINTF_PARSE --# include <config.h> --#endif -- --/* Specification. */ --#ifndef PRINTF_PARSE --# include "printf-parse.h" --#endif -- --/* Default parameters. */ --#ifndef PRINTF_PARSE --# define PRINTF_PARSE printf_parse --# define CHAR_T char --# define DIRECTIVE char_directive --# define DIRECTIVES char_directives --#endif -- --/* Get size_t, NULL. */ --#include <stddef.h> -- --/* Get intmax_t. */ --#if defined IN_LIBINTL || defined IN_LIBASPRINTF --# if HAVE_STDINT_H_WITH_UINTMAX --# include <stdint.h> --# endif --# if HAVE_INTTYPES_H_WITH_UINTMAX --# include <inttypes.h> --# endif --#else --# include <stdint.h> --#endif -- --/* malloc(), realloc(), free(). */ --#include <stdlib.h> -- --/* errno. */ --#include <errno.h> -- --/* Checked size_t computations. */ --#include "xsize.h" -- --#if CHAR_T_ONLY_ASCII --/* c_isascii(). */ --# include "c-ctype.h" --#endif -- --#ifdef STATIC --STATIC --#endif --int --PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a) --{ -- const CHAR_T *cp = format; /* pointer into format */ -- size_t arg_posn = 0; /* number of regular arguments consumed */ -- size_t d_allocated; /* allocated elements of d->dir */ -- size_t a_allocated; /* allocated elements of a->arg */ -- size_t max_width_length = 0; -- size_t max_precision_length = 0; -- -- d->count = 0; -- d_allocated = 1; -- d->dir = (DIRECTIVE *) malloc (d_allocated * sizeof (DIRECTIVE)); -- if (d->dir == NULL) -- /* Out of memory. */ -- goto out_of_memory_1; -- -- a->count = 0; -- a_allocated = 0; -- a->arg = NULL; -- --#define REGISTER_ARG(_index_,_type_) \ -- { \ -- size_t n = (_index_); \ -- if (n >= a_allocated) \ -- { \ -- size_t memory_size; \ -- argument *memory; \ -- \ -- a_allocated = xtimes (a_allocated, 2); \ -- if (a_allocated <= n) \ -- a_allocated = xsum (n, 1); \ -- memory_size = xtimes (a_allocated, sizeof (argument)); \ -- if (size_overflow_p (memory_size)) \ -- /* Overflow, would lead to out of memory. */ \ -- goto out_of_memory; \ -- memory = (argument *) (a->arg \ -- ? realloc (a->arg, memory_size) \ -- : malloc (memory_size)); \ -- if (memory == NULL) \ -- /* Out of memory. */ \ -- goto out_of_memory; \ -- a->arg = memory; \ -- } \ -- while (a->count <= n) \ -- a->arg[a->count++].type = TYPE_NONE; \ -- if (a->arg[n].type == TYPE_NONE) \ -- a->arg[n].type = (_type_); \ -- else if (a->arg[n].type != (_type_)) \ -- /* Ambiguous type for positional argument. */ \ -- goto error; \ -- } -- -- while (*cp != '\0') -- { -- CHAR_T c = *cp++; -- if (c == '%') -- { -- size_t arg_index = ARG_NONE; -- DIRECTIVE *dp = &d->dir[d->count]; /* pointer to next directive */ -- -- /* Initialize the next directive. */ -- dp->dir_start = cp - 1; -- dp->flags = 0; -- dp->width_start = NULL; -- dp->width_end = NULL; -- dp->width_arg_index = ARG_NONE; -- dp->precision_start = NULL; -- dp->precision_end = NULL; -- dp->precision_arg_index = ARG_NONE; -- dp->arg_index = ARG_NONE; -- -- /* Test for positional argument. */ -- if (*cp >= '0' && *cp <= '9') -- { -- const CHAR_T *np; -- -- for (np = cp; *np >= '0' && *np <= '9'; np++) -- ; -- if (*np == '$') -- { -- size_t n = 0; -- -- for (np = cp; *np >= '0' && *np <= '9'; np++) -- n = xsum (xtimes (n, 10), *np - '0'); -- if (n == 0) -- /* Positional argument 0. */ -- goto error; -- if (size_overflow_p (n)) -- /* n too large, would lead to out of memory later. */ -- goto error; -- arg_index = n - 1; -- cp = np + 1; -- } -- } -- -- /* Read the flags. */ -- for (;;) -- { -- if (*cp == '\'') -- { -- dp->flags |= FLAG_GROUP; -- cp++; -- } -- else if (*cp == '-') -- { -- dp->flags |= FLAG_LEFT; -- cp++; -- } -- else if (*cp == '+') -- { -- dp->flags |= FLAG_SHOWSIGN; -- cp++; -- } -- else if (*cp == ' ') -- { -- dp->flags |= FLAG_SPACE; -- cp++; -- } -- else if (*cp == '#') -- { -- dp->flags |= FLAG_ALT; -- cp++; -- } -- else if (*cp == '0') -- { -- dp->flags |= FLAG_ZERO; -- cp++; -- } -- else -- break; -- } -- -- /* Parse the field width. */ -- if (*cp == '*') -- { -- dp->width_start = cp; -- cp++; -- dp->width_end = cp; -- if (max_width_length < 1) -- max_width_length = 1; -- -- /* Test for positional argument. */ -- if (*cp >= '0' && *cp <= '9') -- { -- const CHAR_T *np; -- -- for (np = cp; *np >= '0' && *np <= '9'; np++) -- ; -- if (*np == '$') -- { -- size_t n = 0; -- -- for (np = cp; *np >= '0' && *np <= '9'; np++) -- n = xsum (xtimes (n, 10), *np - '0'); -- if (n == 0) -- /* Positional argument 0. */ -- goto error; -- if (size_overflow_p (n)) -- /* n too large, would lead to out of memory later. */ -- goto error; -- dp->width_arg_index = n - 1; -- cp = np + 1; -- } -- } -- if (dp->width_arg_index == ARG_NONE) -- { -- dp->width_arg_index = arg_posn++; -- if (dp->width_arg_index == ARG_NONE) -- /* arg_posn wrapped around. */ -- goto error; -- } -- REGISTER_ARG (dp->width_arg_index, TYPE_INT); -- } -- else if (*cp >= '0' && *cp <= '9') -- { -- size_t width_length; -- -- dp->width_start = cp; -- for (; *cp >= '0' && *cp <= '9'; cp++) -- ; -- dp->width_end = cp; -- width_length = dp->width_end - dp->width_start; -- if (max_width_length < width_length) -- max_width_length = width_length; -- } -- -- /* Parse the precision. */ -- if (*cp == '.') -- { -- cp++; -- if (*cp == '*') -- { -- dp->precision_start = cp - 1; -- cp++; -- dp->precision_end = cp; -- if (max_precision_length < 2) -- max_precision_length = 2; -- -- /* Test for positional argument. */ -- if (*cp >= '0' && *cp <= '9') -- { -- const CHAR_T *np; -- -- for (np = cp; *np >= '0' && *np <= '9'; np++) -- ; -- if (*np == '$') -- { -- size_t n = 0; -- -- for (np = cp; *np >= '0' && *np <= '9'; np++) -- n = xsum (xtimes (n, 10), *np - '0'); -- if (n == 0) -- /* Positional argument 0. */ -- goto error; -- if (size_overflow_p (n)) -- /* n too large, would lead to out of memory -- later. */ -- goto error; -- dp->precision_arg_index = n - 1; -- cp = np + 1; -- } -- } -- if (dp->precision_arg_index == ARG_NONE) -- { -- dp->precision_arg_index = arg_posn++; -- if (dp->precision_arg_index == ARG_NONE) -- /* arg_posn wrapped around. */ -- goto error; -- } -- REGISTER_ARG (dp->precision_arg_index, TYPE_INT); -- } -- else -- { -- size_t precision_length; -- -- dp->precision_start = cp - 1; -- for (; *cp >= '0' && *cp <= '9'; cp++) -- ; -- dp->precision_end = cp; -- precision_length = dp->precision_end - dp->precision_start; -- if (max_precision_length < precision_length) -- max_precision_length = precision_length; -- } -- } -- -- { -- arg_type type; -- -- /* Parse argument type/size specifiers. */ -- { -- int flags = 0; -- -- for (;;) -- { -- if (*cp == 'h') -- { -- flags |= (1 << (flags & 1)); -- cp++; -- } -- else if (*cp == 'L') -- { -- flags |= 4; -- cp++; -- } -- else if (*cp == 'l') -- { -- flags += 8; -- cp++; -- } -- else if (*cp == 'j') -- { -- if (sizeof (intmax_t) > sizeof (long)) -- { -- /* intmax_t = long long */ -- flags += 16; -- } -- else if (sizeof (intmax_t) > sizeof (int)) -- { -- /* intmax_t = long */ -- flags += 8; -- } -- cp++; -- } -- else if (*cp == 'z' || *cp == 'Z') -- { -- /* 'z' is standardized in ISO C 99, but glibc uses 'Z' -- because the warning facility in gcc-2.95.2 understands -- only 'Z' (see gcc-2.95.2/gcc/c-common.c:1784). */ -- if (sizeof (size_t) > sizeof (long)) -- { -- /* size_t = long long */ -- flags += 16; -- } -- else if (sizeof (size_t) > sizeof (int)) -- { -- /* size_t = long */ -- flags += 8; -- } -- cp++; -- } -- else if (*cp == 't') -- { -- if (sizeof (ptrdiff_t) > sizeof (long)) -- { -- /* ptrdiff_t = long long */ -- flags += 16; -- } -- else if (sizeof (ptrdiff_t) > sizeof (int)) -- { -- /* ptrdiff_t = long */ -- flags += 8; -- } -- cp++; -- } -- else -- break; -- } -- -- /* Read the conversion character. */ -- c = *cp++; -- switch (c) -- { -- case 'd': case 'i': --#if HAVE_LONG_LONG_INT -- /* If 'long long' exists and is larger than 'long': */ -- if (flags >= 16 || (flags & 4)) -- type = TYPE_LONGLONGINT; -- else --#endif -- /* If 'long long' exists and is the same as 'long', we parse -- "lld" into TYPE_LONGINT. */ -- if (flags >= 8) -- type = TYPE_LONGINT; -- else if (flags & 2) -- type = TYPE_SCHAR; -- else if (flags & 1) -- type = TYPE_SHORT; -- else -- type = TYPE_INT; -- break; -- case 'o': case 'u': case 'x': case 'X': --#if HAVE_LONG_LONG_INT -- /* If 'long long' exists and is larger than 'long': */ -- if (flags >= 16 || (flags & 4)) -- type = TYPE_ULONGLONGINT; -- else --#endif -- /* If 'unsigned long long' exists and is the same as -- 'unsigned long', we parse "llu" into TYPE_ULONGINT. */ -- if (flags >= 8) -- type = TYPE_ULONGINT; -- else if (flags & 2) -- type = TYPE_UCHAR; -- else if (flags & 1) -- type = TYPE_USHORT; -- else -- type = TYPE_UINT; -- break; -- case 'f': case 'F': case 'e': case 'E': case 'g': case 'G': -- case 'a': case 'A': -- if (flags >= 16 || (flags & 4)) -- type = TYPE_LONGDOUBLE; -- else -- type = TYPE_DOUBLE; -- break; -- case 'c': -- if (flags >= 8) --#if HAVE_WINT_T -- type = TYPE_WIDE_CHAR; --#else -- goto error; --#endif -- else -- type = TYPE_CHAR; -- break; --#if HAVE_WINT_T -- case 'C': -- type = TYPE_WIDE_CHAR; -- c = 'c'; -- break; --#endif -- case 's': -- if (flags >= 8) --#if HAVE_WCHAR_T -- type = TYPE_WIDE_STRING; --#else -- goto error; --#endif -- else -- type = TYPE_STRING; -- break; --#if HAVE_WCHAR_T -- case 'S': -- type = TYPE_WIDE_STRING; -- c = 's'; -- break; --#endif -- case 'p': -- type = TYPE_POINTER; -- break; -- case 'n': --#if HAVE_LONG_LONG_INT -- /* If 'long long' exists and is larger than 'long': */ -- if (flags >= 16 || (flags & 4)) -- type = TYPE_COUNT_LONGLONGINT_POINTER; -- else --#endif -- /* If 'long long' exists and is the same as 'long', we parse -- "lln" into TYPE_COUNT_LONGINT_POINTER. */ -- if (flags >= 8) -- type = TYPE_COUNT_LONGINT_POINTER; -- else if (flags & 2) -- type = TYPE_COUNT_SCHAR_POINTER; -- else if (flags & 1) -- type = TYPE_COUNT_SHORT_POINTER; -- else -- type = TYPE_COUNT_INT_POINTER; -- break; --#if ENABLE_UNISTDIO -- /* The unistdio extensions. */ -- case 'U': -- if (flags >= 16) -- type = TYPE_U32_STRING; -- else if (flags >= 8) -- type = TYPE_U16_STRING; -- else -- type = TYPE_U8_STRING; -- break; --#endif -- case '%': -- type = TYPE_NONE; -- break; -- default: -- /* Unknown conversion character. */ -- goto error; -- } -- } -- -- if (type != TYPE_NONE) -- { -- dp->arg_index = arg_index; -- if (dp->arg_index == ARG_NONE) -- { -- dp->arg_index = arg_posn++; -- if (dp->arg_index == ARG_NONE) -- /* arg_posn wrapped around. */ -- goto error; -- } -- REGISTER_ARG (dp->arg_index, type); -- } -- dp->conversion = c; -- dp->dir_end = cp; -- } -- -- d->count++; -- if (d->count >= d_allocated) -- { -- size_t memory_size; -- DIRECTIVE *memory; -- -- d_allocated = xtimes (d_allocated, 2); -- memory_size = xtimes (d_allocated, sizeof (DIRECTIVE)); -- if (size_overflow_p (memory_size)) -- /* Overflow, would lead to out of memory. */ -- goto out_of_memory; -- memory = (DIRECTIVE *) realloc (d->dir, memory_size); -- if (memory == NULL) -- /* Out of memory. */ -- goto out_of_memory; -- d->dir = memory; -- } -- } --#if CHAR_T_ONLY_ASCII -- else if (!c_isascii (c)) -- { -- /* Non-ASCII character. Not supported. */ -- goto error; -- } --#endif -- } -- d->dir[d->count].dir_start = cp; -- -- d->max_width_length = max_width_length; -- d->max_precision_length = max_precision_length; -- return 0; -- --error: -- if (a->arg) -- free (a->arg); -- if (d->dir) -- free (d->dir); -- errno = EINVAL; -- return -1; -- --out_of_memory: -- if (a->arg) -- free (a->arg); -- if (d->dir) -- free (d->dir); --out_of_memory_1: -- errno = ENOMEM; -- return -1; --} -- --#undef PRINTF_PARSE --#undef DIRECTIVES --#undef DIRECTIVE --#undef CHAR_T_ONLY_ASCII --#undef CHAR_T ---- a/intl/printf-parse.h -+++ /dev/null -@@ -1,75 +0,0 @@ --/* Parse printf format string. -- Copyright (C) 1999, 2002-2003 Free Software Foundation, Inc. -- -- This program is free software; you can redistribute it and/or modify it -- under the terms of the GNU Library General Public License as published -- by the Free Software Foundation; either version 2, or (at your option) -- any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Library General Public License for more details. -- -- You should have received a copy of the GNU Library General Public -- License along with this program; if not, write to the Free Software -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, -- USA. */ -- --#ifndef _PRINTF_PARSE_H --#define _PRINTF_PARSE_H -- --#include "printf-args.h" -- -- --/* Flags */ --#define FLAG_GROUP 1 /* ' flag */ --#define FLAG_LEFT 2 /* - flag */ --#define FLAG_SHOWSIGN 4 /* + flag */ --#define FLAG_SPACE 8 /* space flag */ --#define FLAG_ALT 16 /* # flag */ --#define FLAG_ZERO 32 -- --/* arg_index value indicating that no argument is consumed. */ --#define ARG_NONE (~(size_t)0) -- --/* A parsed directive. */ --typedef struct --{ -- const char* dir_start; -- const char* dir_end; -- int flags; -- const char* width_start; -- const char* width_end; -- size_t width_arg_index; -- const char* precision_start; -- const char* precision_end; -- size_t precision_arg_index; -- char conversion; /* d i o u x X f e E g G c s p n U % but not C S */ -- size_t arg_index; --} --char_directive; -- --/* A parsed format string. */ --typedef struct --{ -- size_t count; -- char_directive *dir; -- size_t max_width_length; -- size_t max_precision_length; --} --char_directives; -- -- --/* Parses the format string. Fills in the number N of directives, and fills -- in directives[0], ..., directives[N-1], and sets directives[N].dir_start -- to the end of the format string. Also fills in the arg_type fields of the -- arguments and the needed count of arguments. */ --#ifdef STATIC --STATIC --#else --extern --#endif --int printf_parse (const char *format, char_directives *d, arguments *a); -- --#endif /* _PRINTF_PARSE_H */ ---- a/intl/printf.c -+++ /dev/null -@@ -1,427 +0,0 @@ --/* Formatted output to strings, using POSIX/XSI format strings with positions. -- Copyright (C) 2003, 2006-2007 Free Software Foundation, Inc. -- Written by Bruno Haible <bruno@clisp.org>, 2003. -- -- This program is free software; you can redistribute it and/or modify it -- under the terms of the GNU Library General Public License as published -- by the Free Software Foundation; either version 2, or (at your option) -- any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Library General Public License for more details. -- -- You should have received a copy of the GNU Library General Public -- License along with this program; if not, write to the Free Software -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, -- USA. */ -- --#ifdef HAVE_CONFIG_H --# include <config.h> --#endif -- --#ifdef __GNUC__ --# define alloca __builtin_alloca --# define HAVE_ALLOCA 1 --#else --# ifdef _MSC_VER --# include <malloc.h> --# define alloca _alloca --# else --# if defined HAVE_ALLOCA_H || defined _LIBC --# include <alloca.h> --# else --# ifdef _AIX -- #pragma alloca --# else --# ifndef alloca --char *alloca (); --# endif --# endif --# endif --# endif --#endif -- --#include <stdio.h> -- --#if !HAVE_POSIX_PRINTF -- --#include <errno.h> --#include <limits.h> --#include <stdlib.h> --#include <string.h> -- --/* Some systems, like OSF/1 4.0 and Woe32, don't have EOVERFLOW. */ --#ifndef EOVERFLOW --# define EOVERFLOW E2BIG --#endif -- --/* When building a DLL, we must export some functions. Note that because -- the functions are only defined for binary backward compatibility, we -- don't need to use __declspec(dllimport) in any case. */ --#if defined _MSC_VER && BUILDING_DLL --# define DLL_EXPORTED __declspec(dllexport) --#else --# define DLL_EXPORTED --#endif -- --#define STATIC static -- --/* This needs to be consistent with libgnuintl.h.in. */ --#if defined __NetBSD__ || defined __BEOS__ || defined __CYGWIN__ || defined __MINGW32__ --/* Don't break __attribute__((format(printf,M,N))). -- This redefinition is only possible because the libc in NetBSD, Cygwin, -- mingw does not have a function __printf__. */ --# define libintl_printf __printf__ --#endif -- --/* Define auxiliary functions declared in "printf-args.h". */ --#include "printf-args.c" -- --/* Define auxiliary functions declared in "printf-parse.h". */ --#include "printf-parse.c" -- --/* Define functions declared in "vasnprintf.h". */ --#define vasnprintf libintl_vasnprintf --#include "vasnprintf.c" --#if 0 /* not needed */ --#define asnprintf libintl_asnprintf --#include "asnprintf.c" --#endif -- --DLL_EXPORTED --int --libintl_vfprintf (FILE *stream, const char *format, va_list args) --{ -- if (strchr (format, '$') == NULL) -- return vfprintf (stream, format, args); -- else -- { -- size_t length; -- char *result = libintl_vasnprintf (NULL, &length, format, args); -- int retval = -1; -- if (result != NULL) -- { -- size_t written = fwrite (result, 1, length, stream); -- free (result); -- if (written == length) -- { -- if (length > INT_MAX) -- errno = EOVERFLOW; -- else -- retval = length; -- } -- } -- return retval; -- } --} -- --DLL_EXPORTED --int --libintl_fprintf (FILE *stream, const char *format, ...) --{ -- va_list args; -- int retval; -- -- va_start (args, format); -- retval = libintl_vfprintf (stream, format, args); -- va_end (args); -- return retval; --} -- --DLL_EXPORTED --int --libintl_vprintf (const char *format, va_list args) --{ -- return libintl_vfprintf (stdout, format, args); --} -- --DLL_EXPORTED --int --libintl_printf (const char *format, ...) --{ -- va_list args; -- int retval; -- -- va_start (args, format); -- retval = libintl_vprintf (format, args); -- va_end (args); -- return retval; --} -- --DLL_EXPORTED --int --libintl_vsprintf (char *resultbuf, const char *format, va_list args) --{ -- if (strchr (format, '$') == NULL) -- return vsprintf (resultbuf, format, args); -- else -- { -- size_t length = (size_t) ~0 / (4 * sizeof (char)); -- char *result = libintl_vasnprintf (resultbuf, &length, format, args); -- if (result != resultbuf) -- { -- free (result); -- return -1; -- } -- if (length > INT_MAX) -- { -- errno = EOVERFLOW; -- return -1; -- } -- else -- return length; -- } --} -- --DLL_EXPORTED --int --libintl_sprintf (char *resultbuf, const char *format, ...) --{ -- va_list args; -- int retval; -- -- va_start (args, format); -- retval = libintl_vsprintf (resultbuf, format, args); -- va_end (args); -- return retval; --} -- --#if HAVE_SNPRINTF -- --# if HAVE_DECL__SNPRINTF -- /* Windows. */ --# define system_vsnprintf _vsnprintf --# else -- /* Unix. */ --# define system_vsnprintf vsnprintf --# endif -- --DLL_EXPORTED --int --libintl_vsnprintf (char *resultbuf, size_t length, const char *format, va_list args) --{ -- if (strchr (format, '$') == NULL) -- return system_vsnprintf (resultbuf, length, format, args); -- else -- { -- size_t maxlength = length; -- char *result = libintl_vasnprintf (resultbuf, &length, format, args); -- if (result != resultbuf) -- { -- if (maxlength > 0) -- { -- size_t pruned_length = -- (length < maxlength ? length : maxlength - 1); -- memcpy (resultbuf, result, pruned_length); -- resultbuf[pruned_length] = '\0'; -- } -- free (result); -- } -- if (length > INT_MAX) -- { -- errno = EOVERFLOW; -- return -1; -- } -- else -- return length; -- } --} -- --DLL_EXPORTED --int --libintl_snprintf (char *resultbuf, size_t length, const char *format, ...) --{ -- va_list args; -- int retval; -- -- va_start (args, format); -- retval = libintl_vsnprintf (resultbuf, length, format, args); -- va_end (args); -- return retval; --} -- --#endif -- --#if HAVE_ASPRINTF -- --DLL_EXPORTED --int --libintl_vasprintf (char **resultp, const char *format, va_list args) --{ -- size_t length; -- char *result = libintl_vasnprintf (NULL, &length, format, args); -- if (result == NULL) -- return -1; -- if (length > INT_MAX) -- { -- free (result); -- errno = EOVERFLOW; -- return -1; -- } -- *resultp = result; -- return length; --} -- --DLL_EXPORTED --int --libintl_asprintf (char **resultp, const char *format, ...) --{ -- va_list args; -- int retval; -- -- va_start (args, format); -- retval = libintl_vasprintf (resultp, format, args); -- va_end (args); -- return retval; --} -- --#endif -- --#if HAVE_FWPRINTF -- --#include <wchar.h> -- --#define WIDE_CHAR_VERSION 1 -- --#include "wprintf-parse.h" --/* Define auxiliary functions declared in "wprintf-parse.h". */ --#define CHAR_T wchar_t --#define DIRECTIVE wchar_t_directive --#define DIRECTIVES wchar_t_directives --#define PRINTF_PARSE wprintf_parse --#include "printf-parse.c" -- --/* Define functions declared in "vasnprintf.h". */ --#define vasnwprintf libintl_vasnwprintf --#include "vasnprintf.c" --#if 0 /* not needed */ --#define asnwprintf libintl_asnwprintf --#include "asnprintf.c" --#endif -- --# if HAVE_DECL__SNWPRINTF -- /* Windows. */ --# define system_vswprintf _vsnwprintf --# else -- /* Unix. */ --# define system_vswprintf vswprintf --# endif -- --DLL_EXPORTED --int --libintl_vfwprintf (FILE *stream, const wchar_t *format, va_list args) --{ -- if (wcschr (format, '$') == NULL) -- return vfwprintf (stream, format, args); -- else -- { -- size_t length; -- wchar_t *result = libintl_vasnwprintf (NULL, &length, format, args); -- int retval = -1; -- if (result != NULL) -- { -- size_t i; -- for (i = 0; i < length; i++) -- if (fputwc (result[i], stream) == WEOF) -- break; -- free (result); -- if (i == length) -- { -- if (length > INT_MAX) -- errno = EOVERFLOW; -- else -- retval = length; -- } -- } -- return retval; -- } --} -- --DLL_EXPORTED --int --libintl_fwprintf (FILE *stream, const wchar_t *format, ...) --{ -- va_list args; -- int retval; -- -- va_start (args, format); -- retval = libintl_vfwprintf (stream, format, args); -- va_end (args); -- return retval; --} -- --DLL_EXPORTED --int --libintl_vwprintf (const wchar_t *format, va_list args) --{ -- return libintl_vfwprintf (stdout, format, args); --} -- --DLL_EXPORTED --int --libintl_wprintf (const wchar_t *format, ...) --{ -- va_list args; -- int retval; -- -- va_start (args, format); -- retval = libintl_vwprintf (format, args); -- va_end (args); -- return retval; --} -- --DLL_EXPORTED --int --libintl_vswprintf (wchar_t *resultbuf, size_t length, const wchar_t *format, va_list args) --{ -- if (wcschr (format, '$') == NULL) -- return system_vswprintf (resultbuf, length, format, args); -- else -- { -- size_t maxlength = length; -- wchar_t *result = libintl_vasnwprintf (resultbuf, &length, format, args); -- if (result != resultbuf) -- { -- if (maxlength > 0) -- { -- size_t pruned_length = -- (length < maxlength ? length : maxlength - 1); -- memcpy (resultbuf, result, pruned_length * sizeof (wchar_t)); -- resultbuf[pruned_length] = 0; -- } -- free (result); -- /* Unlike vsnprintf, which has to return the number of character that -- would have been produced if the resultbuf had been sufficiently -- large, the vswprintf function has to return a negative value if -- the resultbuf was not sufficiently large. */ -- if (length >= maxlength) -- return -1; -- } -- if (length > INT_MAX) -- { -- errno = EOVERFLOW; -- return -1; -- } -- else -- return length; -- } --} -- --DLL_EXPORTED --int --libintl_swprintf (wchar_t *resultbuf, size_t length, const wchar_t *format, ...) --{ -- va_list args; -- int retval; -- -- va_start (args, format); -- retval = libintl_vswprintf (resultbuf, length, format, args); -- va_end (args); -- return retval; --} -- --#endif -- --#endif ---- a/intl/ref-add.sin -+++ /dev/null -@@ -1,31 +0,0 @@ --# Add this package to a list of references stored in a text file. --# --# Copyright (C) 2000 Free Software Foundation, Inc. --# --# This program is free software; you can redistribute it and/or modify it --# under the terms of the GNU Library General Public License as published --# by the Free Software Foundation; either version 2, or (at your option) --# any later version. --# --# This program is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU --# Library General Public License for more details. --# --# You should have received a copy of the GNU Library General Public --# License along with this program; if not, write to the Free Software --# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, --# USA. --# --# Written by Bruno Haible <haible@clisp.cons.org>. --# --/^# Packages using this file: / { -- s/# Packages using this file:// -- ta -- :a -- s/ @PACKAGE@ / @PACKAGE@ / -- tb -- s/ $/ @PACKAGE@ / -- :b -- s/^/# Packages using this file:/ --} ---- a/intl/ref-del.sin -+++ /dev/null -@@ -1,26 +0,0 @@ --# Remove this package from a list of references stored in a text file. --# --# Copyright (C) 2000 Free Software Foundation, Inc. --# --# This program is free software; you can redistribute it and/or modify it --# under the terms of the GNU Library General Public License as published --# by the Free Software Foundation; either version 2, or (at your option) --# any later version. --# --# This program is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU --# Library General Public License for more details. --# --# You should have received a copy of the GNU Library General Public --# License along with this program; if not, write to the Free Software --# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, --# USA. --# --# Written by Bruno Haible <haible@clisp.cons.org>. --# --/^# Packages using this file: / { -- s/# Packages using this file:// -- s/ @PACKAGE@ / / -- s/^/# Packages using this file:/ --} ---- a/intl/relocatable.c -+++ /dev/null -@@ -1,468 +0,0 @@ --/* Provide relocatable packages. -- Copyright (C) 2003-2006 Free Software Foundation, Inc. -- Written by Bruno Haible <bruno@clisp.org>, 2003. -- -- This program is free software; you can redistribute it and/or modify it -- under the terms of the GNU Library General Public License as published -- by the Free Software Foundation; either version 2, or (at your option) -- any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Library General Public License for more details. -- -- You should have received a copy of the GNU Library General Public -- License along with this program; if not, write to the Free Software -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, -- USA. */ -- -- --/* Tell glibc's <stdio.h> to provide a prototype for getline(). -- This must come before <config.h> because <config.h> may include -- <features.h>, and once <features.h> has been included, it's too late. */ --#ifndef _GNU_SOURCE --# define _GNU_SOURCE 1 --#endif -- --#include <config.h> -- --/* Specification. */ --#include "relocatable.h" -- --#if ENABLE_RELOCATABLE -- --#include <stddef.h> --#include <stdio.h> --#include <stdlib.h> --#include <string.h> -- --#ifdef NO_XMALLOC --# define xmalloc malloc --#else --# include "xalloc.h" --#endif -- --#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ --# define WIN32_LEAN_AND_MEAN --# include <windows.h> --#endif -- --#if DEPENDS_ON_LIBCHARSET --# include <libcharset.h> --#endif --#if DEPENDS_ON_LIBICONV && HAVE_ICONV --# include <iconv.h> --#endif --#if DEPENDS_ON_LIBINTL && ENABLE_NLS --# include <libintl.h> --#endif -- --/* Faked cheap 'bool'. */ --#undef bool --#undef false --#undef true --#define bool int --#define false 0 --#define true 1 -- --/* Pathname support. -- ISSLASH(C) tests whether C is a directory separator character. -- IS_PATH_WITH_DIR(P) tests whether P contains a directory specification. -- */ --#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__ -- /* Win32, Cygwin, OS/2, DOS */ --# define ISSLASH(C) ((C) == '/' || (C) == '\\') --# define HAS_DEVICE(P) \ -- ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \ -- && (P)[1] == ':') --# define IS_PATH_WITH_DIR(P) \ -- (strchr (P, '/') != NULL || strchr (P, '\\') != NULL || HAS_DEVICE (P)) --# define FILE_SYSTEM_PREFIX_LEN(P) (HAS_DEVICE (P) ? 2 : 0) --#else -- /* Unix */ --# define ISSLASH(C) ((C) == '/') --# define IS_PATH_WITH_DIR(P) (strchr (P, '/') != NULL) --# define FILE_SYSTEM_PREFIX_LEN(P) 0 --#endif -- --/* Original installation prefix. */ --static char *orig_prefix; --static size_t orig_prefix_len; --/* Current installation prefix. */ --static char *curr_prefix; --static size_t curr_prefix_len; --/* These prefixes do not end in a slash. Anything that will be concatenated -- to them must start with a slash. */ -- --/* Sets the original and the current installation prefix of this module. -- Relocation simply replaces a pathname starting with the original prefix -- by the corresponding pathname with the current prefix instead. Both -- prefixes should be directory names without trailing slash (i.e. use "" -- instead of "/"). */ --static void --set_this_relocation_prefix (const char *orig_prefix_arg, -- const char *curr_prefix_arg) --{ -- if (orig_prefix_arg != NULL && curr_prefix_arg != NULL -- /* Optimization: if orig_prefix and curr_prefix are equal, the -- relocation is a nop. */ -- && strcmp (orig_prefix_arg, curr_prefix_arg) != 0) -- { -- /* Duplicate the argument strings. */ -- char *memory; -- -- orig_prefix_len = strlen (orig_prefix_arg); -- curr_prefix_len = strlen (curr_prefix_arg); -- memory = (char *) xmalloc (orig_prefix_len + 1 + curr_prefix_len + 1); --#ifdef NO_XMALLOC -- if (memory != NULL) --#endif -- { -- memcpy (memory, orig_prefix_arg, orig_prefix_len + 1); -- orig_prefix = memory; -- memory += orig_prefix_len + 1; -- memcpy (memory, curr_prefix_arg, curr_prefix_len + 1); -- curr_prefix = memory; -- return; -- } -- } -- orig_prefix = NULL; -- curr_prefix = NULL; -- /* Don't worry about wasted memory here - this function is usually only -- called once. */ --} -- --/* Sets the original and the current installation prefix of the package. -- Relocation simply replaces a pathname starting with the original prefix -- by the corresponding pathname with the current prefix instead. Both -- prefixes should be directory names without trailing slash (i.e. use "" -- instead of "/"). */ --void --set_relocation_prefix (const char *orig_prefix_arg, const char *curr_prefix_arg) --{ -- set_this_relocation_prefix (orig_prefix_arg, curr_prefix_arg); -- -- /* Now notify all dependent libraries. */ --#if DEPENDS_ON_LIBCHARSET -- libcharset_set_relocation_prefix (orig_prefix_arg, curr_prefix_arg); --#endif --#if DEPENDS_ON_LIBICONV && HAVE_ICONV && _LIBICONV_VERSION >= 0x0109 -- libiconv_set_relocation_prefix (orig_prefix_arg, curr_prefix_arg); --#endif --#if DEPENDS_ON_LIBINTL && ENABLE_NLS && defined libintl_set_relocation_prefix -- libintl_set_relocation_prefix (orig_prefix_arg, curr_prefix_arg); --#endif --} -- --#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR) -- --/* Convenience function: -- Computes the current installation prefix, based on the original -- installation prefix, the original installation directory of a particular -- file, and the current pathname of this file. Returns NULL upon failure. */ --#ifdef IN_LIBRARY --#define compute_curr_prefix local_compute_curr_prefix --static --#endif --const char * --compute_curr_prefix (const char *orig_installprefix, -- const char *orig_installdir, -- const char *curr_pathname) --{ -- const char *curr_installdir; -- const char *rel_installdir; -- -- if (curr_pathname == NULL) -- return NULL; -- -- /* Determine the relative installation directory, relative to the prefix. -- This is simply the difference between orig_installprefix and -- orig_installdir. */ -- if (strncmp (orig_installprefix, orig_installdir, strlen (orig_installprefix)) -- != 0) -- /* Shouldn't happen - nothing should be installed outside $(prefix). */ -- return NULL; -- rel_installdir = orig_installdir + strlen (orig_installprefix); -- -- /* Determine the current installation directory. */ -- { -- const char *p_base = curr_pathname + FILE_SYSTEM_PREFIX_LEN (curr_pathname); -- const char *p = curr_pathname + strlen (curr_pathname); -- char *q; -- -- while (p > p_base) -- { -- p--; -- if (ISSLASH (*p)) -- break; -- } -- -- q = (char *) xmalloc (p - curr_pathname + 1); --#ifdef NO_XMALLOC -- if (q == NULL) -- return NULL; --#endif -- memcpy (q, curr_pathname, p - curr_pathname); -- q[p - curr_pathname] = '\0'; -- curr_installdir = q; -- } -- -- /* Compute the current installation prefix by removing the trailing -- rel_installdir from it. */ -- { -- const char *rp = rel_installdir + strlen (rel_installdir); -- const char *cp = curr_installdir + strlen (curr_installdir); -- const char *cp_base = -- curr_installdir + FILE_SYSTEM_PREFIX_LEN (curr_installdir); -- -- while (rp > rel_installdir && cp > cp_base) -- { -- bool same = false; -- const char *rpi = rp; -- const char *cpi = cp; -- -- while (rpi > rel_installdir && cpi > cp_base) -- { -- rpi--; -- cpi--; -- if (ISSLASH (*rpi) || ISSLASH (*cpi)) -- { -- if (ISSLASH (*rpi) && ISSLASH (*cpi)) -- same = true; -- break; -- } -- /* Do case-insensitive comparison if the filesystem is always or -- often case-insensitive. It's better to accept the comparison -- if the difference is only in case, rather than to fail. */ --#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__ -- /* Win32, Cygwin, OS/2, DOS - case insignificant filesystem */ -- if ((*rpi >= 'a' && *rpi <= 'z' ? *rpi - 'a' + 'A' : *rpi) -- != (*cpi >= 'a' && *cpi <= 'z' ? *cpi - 'a' + 'A' : *cpi)) -- break; --#else -- if (*rpi != *cpi) -- break; --#endif -- } -- if (!same) -- break; -- /* The last pathname component was the same. opi and cpi now point -- to the slash before it. */ -- rp = rpi; -- cp = cpi; -- } -- -- if (rp > rel_installdir) -- /* Unexpected: The curr_installdir does not end with rel_installdir. */ -- return NULL; -- -- { -- size_t curr_prefix_len = cp - curr_installdir; -- char *curr_prefix; -- -- curr_prefix = (char *) xmalloc (curr_prefix_len + 1); --#ifdef NO_XMALLOC -- if (curr_prefix == NULL) -- return NULL; --#endif -- memcpy (curr_prefix, curr_installdir, curr_prefix_len); -- curr_prefix[curr_prefix_len] = '\0'; -- -- return curr_prefix; -- } -- } --} -- --#endif /* !IN_LIBRARY || PIC */ -- --#if defined PIC && defined INSTALLDIR -- --/* Full pathname of shared library, or NULL. */ --static char *shared_library_fullname; -- --#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ -- --/* Determine the full pathname of the shared library when it is loaded. */ -- --BOOL WINAPI --DllMain (HINSTANCE module_handle, DWORD event, LPVOID reserved) --{ -- (void) reserved; -- -- if (event == DLL_PROCESS_ATTACH) -- { -- /* The DLL is being loaded into an application's address range. */ -- static char location[MAX_PATH]; -- -- if (!GetModuleFileName (module_handle, location, sizeof (location))) -- /* Shouldn't happen. */ -- return FALSE; -- -- if (!IS_PATH_WITH_DIR (location)) -- /* Shouldn't happen. */ -- return FALSE; -- -- { --#if defined __CYGWIN__ -- /* On Cygwin, we need to convert paths coming from Win32 system calls -- to the Unix-like slashified notation. */ -- static char location_as_posix_path[2 * MAX_PATH]; -- /* There's no error return defined for cygwin_conv_to_posix_path. -- See cygwin-api/func-cygwin-conv-to-posix-path.html. -- Does it overflow the buffer of expected size MAX_PATH or does it -- truncate the path? I don't know. Let's catch both. */ -- cygwin_conv_to_posix_path (location, location_as_posix_path); -- location_as_posix_path[MAX_PATH - 1] = '\0'; -- if (strlen (location_as_posix_path) >= MAX_PATH - 1) -- /* A sign of buffer overflow or path truncation. */ -- return FALSE; -- shared_library_fullname = strdup (location_as_posix_path); --#else -- shared_library_fullname = strdup (location); --#endif -- } -- } -- -- return TRUE; --} -- --#else /* Unix except Cygwin */ -- --static void --find_shared_library_fullname () --{ --#if defined __linux__ && __GLIBC__ >= 2 -- /* Linux has /proc/self/maps. glibc 2 has the getline() function. */ -- FILE *fp; -- -- /* Open the current process' maps file. It describes one VMA per line. */ -- fp = fopen ("/proc/self/maps", "r"); -- if (fp) -- { -- unsigned long address = (unsigned long) &find_shared_library_fullname; -- for (;;) -- { -- unsigned long start, end; -- int c; -- -- if (fscanf (fp, "%lx-%lx", &start, &end) != 2) -- break; -- if (address >= start && address <= end - 1) -- { -- /* Found it. Now see if this line contains a filename. */ -- while (c = getc (fp), c != EOF && c != '\n' && c != '/') -- continue; -- if (c == '/') -- { -- size_t size; -- int len; -- -- ungetc (c, fp); -- shared_library_fullname = NULL; size = 0; -- len = getline (&shared_library_fullname, &size, fp); -- if (len >= 0) -- { -- /* Success: filled shared_library_fullname. */ -- if (len > 0 && shared_library_fullname[len - 1] == '\n') -- shared_library_fullname[len - 1] = '\0'; -- } -- } -- break; -- } -- while (c = getc (fp), c != EOF && c != '\n') -- continue; -- } -- fclose (fp); -- } --#endif --} -- --#endif /* (WIN32 or Cygwin) / (Unix except Cygwin) */ -- --/* Return the full pathname of the current shared library. -- Return NULL if unknown. -- Guaranteed to work only on Linux, Cygwin and Woe32. */ --static char * --get_shared_library_fullname () --{ --#if !(defined _WIN32 || defined __WIN32__ || defined __CYGWIN__) -- static bool tried_find_shared_library_fullname; -- if (!tried_find_shared_library_fullname) -- { -- find_shared_library_fullname (); -- tried_find_shared_library_fullname = true; -- } --#endif -- return shared_library_fullname; --} -- --#endif /* PIC */ -- --/* Returns the pathname, relocated according to the current installation -- directory. */ --const char * --relocate (const char *pathname) --{ --#if defined PIC && defined INSTALLDIR -- static int initialized; -- -- /* Initialization code for a shared library. */ -- if (!initialized) -- { -- /* At this point, orig_prefix and curr_prefix likely have already been -- set through the main program's set_program_name_and_installdir -- function. This is sufficient in the case that the library has -- initially been installed in the same orig_prefix. But we can do -- better, to also cover the cases that 1. it has been installed -- in a different prefix before being moved to orig_prefix and (later) -- to curr_prefix, 2. unlike the program, it has not moved away from -- orig_prefix. */ -- const char *orig_installprefix = INSTALLPREFIX; -- const char *orig_installdir = INSTALLDIR; -- const char *curr_prefix_better; -- -- curr_prefix_better = -- compute_curr_prefix (orig_installprefix, orig_installdir, -- get_shared_library_fullname ()); -- if (curr_prefix_better == NULL) -- curr_prefix_better = curr_prefix; -- -- set_relocation_prefix (orig_installprefix, curr_prefix_better); -- -- initialized = 1; -- } --#endif -- -- /* Note: It is not necessary to perform case insensitive comparison here, -- even for DOS-like filesystems, because the pathname argument was -- typically created from the same Makefile variable as orig_prefix came -- from. */ -- if (orig_prefix != NULL && curr_prefix != NULL -- && strncmp (pathname, orig_prefix, orig_prefix_len) == 0) -- { -- if (pathname[orig_prefix_len] == '\0') -- /* pathname equals orig_prefix. */ -- return curr_prefix; -- if (ISSLASH (pathname[orig_prefix_len])) -- { -- /* pathname starts with orig_prefix. */ -- const char *pathname_tail = &pathname[orig_prefix_len]; -- char *result = -- (char *) xmalloc (curr_prefix_len + strlen (pathname_tail) + 1); -- --#ifdef NO_XMALLOC -- if (result != NULL) --#endif -- { -- memcpy (result, curr_prefix, curr_prefix_len); -- strcpy (result + curr_prefix_len, pathname_tail); -- return result; -- } -- } -- } -- /* Nothing to relocate. */ -- return pathname; --} -- --#endif ---- a/intl/relocatable.h -+++ /dev/null -@@ -1,79 +0,0 @@ --/* Provide relocatable packages. -- Copyright (C) 2003, 2005 Free Software Foundation, Inc. -- Written by Bruno Haible <bruno@clisp.org>, 2003. -- -- This program is free software; you can redistribute it and/or modify it -- under the terms of the GNU Library General Public License as published -- by the Free Software Foundation; either version 2, or (at your option) -- any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Library General Public License for more details. -- -- You should have received a copy of the GNU Library General Public -- License along with this program; if not, write to the Free Software -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, -- USA. */ -- --#ifndef _RELOCATABLE_H --#define _RELOCATABLE_H -- --#ifdef __cplusplus --extern "C" { --#endif -- -- --/* This can be enabled through the configure --enable-relocatable option. */ --#if ENABLE_RELOCATABLE -- --/* When building a DLL, we must export some functions. Note that because -- this is a private .h file, we don't need to use __declspec(dllimport) -- in any case. */ --#if HAVE_VISIBILITY && BUILDING_DLL --# define RELOCATABLE_DLL_EXPORTED __attribute__((__visibility__("default"))) --#elif defined _MSC_VER && BUILDING_DLL --# define RELOCATABLE_DLL_EXPORTED __declspec(dllexport) --#else --# define RELOCATABLE_DLL_EXPORTED --#endif -- --/* Sets the original and the current installation prefix of the package. -- Relocation simply replaces a pathname starting with the original prefix -- by the corresponding pathname with the current prefix instead. Both -- prefixes should be directory names without trailing slash (i.e. use "" -- instead of "/"). */ --extern RELOCATABLE_DLL_EXPORTED void -- set_relocation_prefix (const char *orig_prefix, -- const char *curr_prefix); -- --/* Returns the pathname, relocated according to the current installation -- directory. */ --extern const char * relocate (const char *pathname); -- --/* Memory management: relocate() leaks memory, because it has to construct -- a fresh pathname. If this is a problem because your program calls -- relocate() frequently, think about caching the result. */ -- --/* Convenience function: -- Computes the current installation prefix, based on the original -- installation prefix, the original installation directory of a particular -- file, and the current pathname of this file. Returns NULL upon failure. */ --extern const char * compute_curr_prefix (const char *orig_installprefix, -- const char *orig_installdir, -- const char *curr_pathname); -- --#else -- --/* By default, we use the hardwired pathnames. */ --#define relocate(pathname) (pathname) -- --#endif -- -- --#ifdef __cplusplus --} --#endif -- --#endif /* _RELOCATABLE_H */ ---- a/intl/textdomain.c -+++ /dev/null -@@ -1,127 +0,0 @@ --/* Implementation of the textdomain(3) function. -- Copyright (C) 1995-1998, 2000-2003, 2005-2006 Free Software Foundation, Inc. -- -- This program is free software; you can redistribute it and/or modify it -- under the terms of the GNU Library General Public License as published -- by the Free Software Foundation; either version 2, or (at your option) -- any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Library General Public License for more details. -- -- You should have received a copy of the GNU Library General Public -- License along with this program; if not, write to the Free Software -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, -- USA. */ -- --#ifdef HAVE_CONFIG_H --# include <config.h> --#endif -- --#include <stdlib.h> --#include <string.h> -- --#include "gettextP.h" --#ifdef _LIBC --# include <libintl.h> --#else --# include "libgnuintl.h" --#endif -- --/* Handle multi-threaded applications. */ --#ifdef _LIBC --# include <bits/libc-lock.h> --# define gl_rwlock_define __libc_rwlock_define --# define gl_rwlock_wrlock __libc_rwlock_wrlock --# define gl_rwlock_unlock __libc_rwlock_unlock --#else --# include "lock.h" --#endif -- --/* @@ end of prolog @@ */ -- -- --/* Names for the libintl functions are a problem. They must not clash -- with existing names and they should follow ANSI C. But this source -- code is also used in GNU C Library where the names have a __ -- prefix. So we have to make a difference here. */ --#ifdef _LIBC --# define TEXTDOMAIN __textdomain --# ifndef strdup --# define strdup(str) __strdup (str) --# endif --#else --# define TEXTDOMAIN libintl_textdomain --#endif -- --/* Lock variable to protect the global data in the gettext implementation. */ --gl_rwlock_define (extern, _nl_state_lock attribute_hidden) -- --/* Set the current default message catalog to DOMAINNAME. -- If DOMAINNAME is null, return the current default. -- If DOMAINNAME is "", reset to the default of "messages". */ --char * --TEXTDOMAIN (const char *domainname) --{ -- char *new_domain; -- char *old_domain; -- -- /* A NULL pointer requests the current setting. */ -- if (domainname == NULL) -- return (char *) _nl_current_default_domain; -- -- gl_rwlock_wrlock (_nl_state_lock); -- -- old_domain = (char *) _nl_current_default_domain; -- -- /* If domain name is the null string set to default domain "messages". */ -- if (domainname[0] == '\0' -- || strcmp (domainname, _nl_default_default_domain) == 0) -- { -- _nl_current_default_domain = _nl_default_default_domain; -- new_domain = (char *) _nl_current_default_domain; -- } -- else if (strcmp (domainname, old_domain) == 0) -- /* This can happen and people will use it to signal that some -- environment variable changed. */ -- new_domain = old_domain; -- else -- { -- /* If the following malloc fails `_nl_current_default_domain' -- will be NULL. This value will be returned and so signals we -- are out of core. */ --#if defined _LIBC || defined HAVE_STRDUP -- new_domain = strdup (domainname); --#else -- size_t len = strlen (domainname) + 1; -- new_domain = (char *) malloc (len); -- if (new_domain != NULL) -- memcpy (new_domain, domainname, len); --#endif -- -- if (new_domain != NULL) -- _nl_current_default_domain = new_domain; -- } -- -- /* We use this possibility to signal a change of the loaded catalogs -- since this is most likely the case and there is no other easy we -- to do it. Do it only when the call was successful. */ -- if (new_domain != NULL) -- { -- ++_nl_msg_cat_cntr; -- -- if (old_domain != new_domain && old_domain != _nl_default_default_domain) -- free (old_domain); -- } -- -- gl_rwlock_unlock (_nl_state_lock); -- -- return new_domain; --} -- --#ifdef _LIBC --/* Alias for function name in GNU C Library. */ --weak_alias (__textdomain, textdomain); --#endif ---- a/intl/tsearch.c -+++ /dev/null -@@ -1,684 +0,0 @@ --/* Copyright (C) 1995, 1996, 1997, 2000, 2006 Free Software Foundation, Inc. -- Contributed by Bernd Schmidt <crux@Pool.Informatik.RWTH-Aachen.DE>, 1997. -- -- NOTE: The canonical source of this file is maintained with the GNU C -- Library. Bugs can be reported to bug-glibc@gnu.org. -- -- This program is free software; you can redistribute it and/or modify it -- under the terms of the GNU Library General Public License as published -- by the Free Software Foundation; either version 2, or (at your option) -- any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Library General Public License for more details. -- -- You should have received a copy of the GNU Library General Public -- License along with this program; if not, write to the Free Software -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, -- USA. */ -- --/* Tree search for red/black trees. -- The algorithm for adding nodes is taken from one of the many "Algorithms" -- books by Robert Sedgewick, although the implementation differs. -- The algorithm for deleting nodes can probably be found in a book named -- "Introduction to Algorithms" by Cormen/Leiserson/Rivest. At least that's -- the book that my professor took most algorithms from during the "Data -- Structures" course... -- -- Totally public domain. */ -- --/* Red/black trees are binary trees in which the edges are colored either red -- or black. They have the following properties: -- 1. The number of black edges on every path from the root to a leaf is -- constant. -- 2. No two red edges are adjacent. -- Therefore there is an upper bound on the length of every path, it's -- O(log n) where n is the number of nodes in the tree. No path can be longer -- than 1+2*P where P is the length of the shortest path in the tree. -- Useful for the implementation: -- 3. If one of the children of a node is NULL, then the other one is red -- (if it exists). -- -- In the implementation, not the edges are colored, but the nodes. The color -- interpreted as the color of the edge leading to this node. The color is -- meaningless for the root node, but we color the root node black for -- convenience. All added nodes are red initially. -- -- Adding to a red/black tree is rather easy. The right place is searched -- with a usual binary tree search. Additionally, whenever a node N is -- reached that has two red successors, the successors are colored black and -- the node itself colored red. This moves red edges up the tree where they -- pose less of a problem once we get to really insert the new node. Changing -- N's color to red may violate rule 2, however, so rotations may become -- necessary to restore the invariants. Adding a new red leaf may violate -- the same rule, so afterwards an additional check is run and the tree -- possibly rotated. -- -- Deleting is hairy. There are mainly two nodes involved: the node to be -- deleted (n1), and another node that is to be unchained from the tree (n2). -- If n1 has a successor (the node with a smallest key that is larger than -- n1), then the successor becomes n2 and its contents are copied into n1, -- otherwise n1 becomes n2. -- Unchaining a node may violate rule 1: if n2 is black, one subtree is -- missing one black edge afterwards. The algorithm must try to move this -- error upwards towards the root, so that the subtree that does not have -- enough black edges becomes the whole tree. Once that happens, the error -- has disappeared. It may not be necessary to go all the way up, since it -- is possible that rotations and recoloring can fix the error before that. -- -- Although the deletion algorithm must walk upwards through the tree, we -- do not store parent pointers in the nodes. Instead, delete allocates a -- small array of parent pointers and fills it while descending the tree. -- Since we know that the length of a path is O(log n), where n is the number -- of nodes, this is likely to use less memory. */ -- --/* Tree rotations look like this: -- A C -- / \ / \ -- B C A G -- / \ / \ --> / \ -- D E F G B F -- / \ -- D E -- -- In this case, A has been rotated left. This preserves the ordering of the -- binary tree. */ -- --#include <config.h> -- --/* Specification. */ --#ifdef IN_LIBINTL --# include "tsearch.h" --#else --# include <search.h> --#endif -- --#include <stdlib.h> -- --typedef int (*__compar_fn_t) (const void *, const void *); --typedef void (*__action_fn_t) (const void *, VISIT, int); -- --#ifndef weak_alias --# define __tsearch tsearch --# define __tfind tfind --# define __tdelete tdelete --# define __twalk twalk --#endif -- --#ifndef internal_function --/* Inside GNU libc we mark some function in a special way. In other -- environments simply ignore the marking. */ --# define internal_function --#endif -- --typedef struct node_t --{ -- /* Callers expect this to be the first element in the structure - do not -- move! */ -- const void *key; -- struct node_t *left; -- struct node_t *right; -- unsigned int red:1; --} *node; --typedef const struct node_t *const_node; -- --#undef DEBUGGING -- --#ifdef DEBUGGING -- --/* Routines to check tree invariants. */ -- --#include <assert.h> -- --#define CHECK_TREE(a) check_tree(a) -- --static void --check_tree_recurse (node p, int d_sofar, int d_total) --{ -- if (p == NULL) -- { -- assert (d_sofar == d_total); -- return; -- } -- -- check_tree_recurse (p->left, d_sofar + (p->left && !p->left->red), d_total); -- check_tree_recurse (p->right, d_sofar + (p->right && !p->right->red), d_total); -- if (p->left) -- assert (!(p->left->red && p->red)); -- if (p->right) -- assert (!(p->right->red && p->red)); --} -- --static void --check_tree (node root) --{ -- int cnt = 0; -- node p; -- if (root == NULL) -- return; -- root->red = 0; -- for(p = root->left; p; p = p->left) -- cnt += !p->red; -- check_tree_recurse (root, 0, cnt); --} -- -- --#else -- --#define CHECK_TREE(a) -- --#endif -- --/* Possibly "split" a node with two red successors, and/or fix up two red -- edges in a row. ROOTP is a pointer to the lowest node we visited, PARENTP -- and GPARENTP pointers to its parent/grandparent. P_R and GP_R contain the -- comparison values that determined which way was taken in the tree to reach -- ROOTP. MODE is 1 if we need not do the split, but must check for two red -- edges between GPARENTP and ROOTP. */ --static void --maybe_split_for_insert (node *rootp, node *parentp, node *gparentp, -- int p_r, int gp_r, int mode) --{ -- node root = *rootp; -- node *rp, *lp; -- rp = &(*rootp)->right; -- lp = &(*rootp)->left; -- -- /* See if we have to split this node (both successors red). */ -- if (mode == 1 -- || ((*rp) != NULL && (*lp) != NULL && (*rp)->red && (*lp)->red)) -- { -- /* This node becomes red, its successors black. */ -- root->red = 1; -- if (*rp) -- (*rp)->red = 0; -- if (*lp) -- (*lp)->red = 0; -- -- /* If the parent of this node is also red, we have to do -- rotations. */ -- if (parentp != NULL && (*parentp)->red) -- { -- node gp = *gparentp; -- node p = *parentp; -- /* There are two main cases: -- 1. The edge types (left or right) of the two red edges differ. -- 2. Both red edges are of the same type. -- There exist two symmetries of each case, so there is a total of -- 4 cases. */ -- if ((p_r > 0) != (gp_r > 0)) -- { -- /* Put the child at the top of the tree, with its parent -- and grandparent as successors. */ -- p->red = 1; -- gp->red = 1; -- root->red = 0; -- if (p_r < 0) -- { -- /* Child is left of parent. */ -- p->left = *rp; -- *rp = p; -- gp->right = *lp; -- *lp = gp; -- } -- else -- { -- /* Child is right of parent. */ -- p->right = *lp; -- *lp = p; -- gp->left = *rp; -- *rp = gp; -- } -- *gparentp = root; -- } -- else -- { -- *gparentp = *parentp; -- /* Parent becomes the top of the tree, grandparent and -- child are its successors. */ -- p->red = 0; -- gp->red = 1; -- if (p_r < 0) -- { -- /* Left edges. */ -- gp->left = p->right; -- p->right = gp; -- } -- else -- { -- /* Right edges. */ -- gp->right = p->left; -- p->left = gp; -- } -- } -- } -- } --} -- --/* Find or insert datum into search tree. -- KEY is the key to be located, ROOTP is the address of tree root, -- COMPAR the ordering function. */ --void * --__tsearch (const void *key, void **vrootp, __compar_fn_t compar) --{ -- node q; -- node *parentp = NULL, *gparentp = NULL; -- node *rootp = (node *) vrootp; -- node *nextp; -- int r = 0, p_r = 0, gp_r = 0; /* No they might not, Mr Compiler. */ -- -- if (rootp == NULL) -- return NULL; -- -- /* This saves some additional tests below. */ -- if (*rootp != NULL) -- (*rootp)->red = 0; -- -- CHECK_TREE (*rootp); -- -- nextp = rootp; -- while (*nextp != NULL) -- { -- node root = *rootp; -- r = (*compar) (key, root->key); -- if (r == 0) -- return root; -- -- maybe_split_for_insert (rootp, parentp, gparentp, p_r, gp_r, 0); -- /* If that did any rotations, parentp and gparentp are now garbage. -- That doesn't matter, because the values they contain are never -- used again in that case. */ -- -- nextp = r < 0 ? &root->left : &root->right; -- if (*nextp == NULL) -- break; -- -- gparentp = parentp; -- parentp = rootp; -- rootp = nextp; -- -- gp_r = p_r; -- p_r = r; -- } -- -- q = (struct node_t *) malloc (sizeof (struct node_t)); -- if (q != NULL) -- { -- *nextp = q; /* link new node to old */ -- q->key = key; /* initialize new node */ -- q->red = 1; -- q->left = q->right = NULL; -- -- if (nextp != rootp) -- /* There may be two red edges in a row now, which we must avoid by -- rotating the tree. */ -- maybe_split_for_insert (nextp, rootp, parentp, r, p_r, 1); -- } -- -- return q; --} --#ifdef weak_alias --weak_alias (__tsearch, tsearch) --#endif -- -- --/* Find datum in search tree. -- KEY is the key to be located, ROOTP is the address of tree root, -- COMPAR the ordering function. */ --void * --__tfind (key, vrootp, compar) -- const void *key; -- void *const *vrootp; -- __compar_fn_t compar; --{ -- node *rootp = (node *) vrootp; -- -- if (rootp == NULL) -- return NULL; -- -- CHECK_TREE (*rootp); -- -- while (*rootp != NULL) -- { -- node root = *rootp; -- int r; -- -- r = (*compar) (key, root->key); -- if (r == 0) -- return root; -- -- rootp = r < 0 ? &root->left : &root->right; -- } -- return NULL; --} --#ifdef weak_alias --weak_alias (__tfind, tfind) --#endif -- -- --/* Delete node with given key. -- KEY is the key to be deleted, ROOTP is the address of the root of tree, -- COMPAR the comparison function. */ --void * --__tdelete (const void *key, void **vrootp, __compar_fn_t compar) --{ -- node p, q, r, retval; -- int cmp; -- node *rootp = (node *) vrootp; -- node root, unchained; -- /* Stack of nodes so we remember the parents without recursion. It's -- _very_ unlikely that there are paths longer than 40 nodes. The tree -- would need to have around 250.000 nodes. */ -- int stacksize = 100; -- int sp = 0; -- node *nodestack[100]; -- -- if (rootp == NULL) -- return NULL; -- p = *rootp; -- if (p == NULL) -- return NULL; -- -- CHECK_TREE (p); -- -- while ((cmp = (*compar) (key, (*rootp)->key)) != 0) -- { -- if (sp == stacksize) -- abort (); -- -- nodestack[sp++] = rootp; -- p = *rootp; -- rootp = ((cmp < 0) -- ? &(*rootp)->left -- : &(*rootp)->right); -- if (*rootp == NULL) -- return NULL; -- } -- -- /* This is bogus if the node to be deleted is the root... this routine -- really should return an integer with 0 for success, -1 for failure -- and errno = ESRCH or something. */ -- retval = p; -- -- /* We don't unchain the node we want to delete. Instead, we overwrite -- it with its successor and unchain the successor. If there is no -- successor, we really unchain the node to be deleted. */ -- -- root = *rootp; -- -- r = root->right; -- q = root->left; -- -- if (q == NULL || r == NULL) -- unchained = root; -- else -- { -- node *parent = rootp, *up = &root->right; -- for (;;) -- { -- if (sp == stacksize) -- abort (); -- nodestack[sp++] = parent; -- parent = up; -- if ((*up)->left == NULL) -- break; -- up = &(*up)->left; -- } -- unchained = *up; -- } -- -- /* We know that either the left or right successor of UNCHAINED is NULL. -- R becomes the other one, it is chained into the parent of UNCHAINED. */ -- r = unchained->left; -- if (r == NULL) -- r = unchained->right; -- if (sp == 0) -- *rootp = r; -- else -- { -- q = *nodestack[sp-1]; -- if (unchained == q->right) -- q->right = r; -- else -- q->left = r; -- } -- -- if (unchained != root) -- root->key = unchained->key; -- if (!unchained->red) -- { -- /* Now we lost a black edge, which means that the number of black -- edges on every path is no longer constant. We must balance the -- tree. */ -- /* NODESTACK now contains all parents of R. R is likely to be NULL -- in the first iteration. */ -- /* NULL nodes are considered black throughout - this is necessary for -- correctness. */ -- while (sp > 0 && (r == NULL || !r->red)) -- { -- node *pp = nodestack[sp - 1]; -- p = *pp; -- /* Two symmetric cases. */ -- if (r == p->left) -- { -- /* Q is R's brother, P is R's parent. The subtree with root -- R has one black edge less than the subtree with root Q. */ -- q = p->right; -- if (q->red) -- { -- /* If Q is red, we know that P is black. We rotate P left -- so that Q becomes the top node in the tree, with P below -- it. P is colored red, Q is colored black. -- This action does not change the black edge count for any -- leaf in the tree, but we will be able to recognize one -- of the following situations, which all require that Q -- is black. */ -- q->red = 0; -- p->red = 1; -- /* Left rotate p. */ -- p->right = q->left; -- q->left = p; -- *pp = q; -- /* Make sure pp is right if the case below tries to use -- it. */ -- nodestack[sp++] = pp = &q->left; -- q = p->right; -- } -- /* We know that Q can't be NULL here. We also know that Q is -- black. */ -- if ((q->left == NULL || !q->left->red) -- && (q->right == NULL || !q->right->red)) -- { -- /* Q has two black successors. We can simply color Q red. -- The whole subtree with root P is now missing one black -- edge. Note that this action can temporarily make the -- tree invalid (if P is red). But we will exit the loop -- in that case and set P black, which both makes the tree -- valid and also makes the black edge count come out -- right. If P is black, we are at least one step closer -- to the root and we'll try again the next iteration. */ -- q->red = 1; -- r = p; -- } -- else -- { -- /* Q is black, one of Q's successors is red. We can -- repair the tree with one operation and will exit the -- loop afterwards. */ -- if (q->right == NULL || !q->right->red) -- { -- /* The left one is red. We perform the same action as -- in maybe_split_for_insert where two red edges are -- adjacent but point in different directions: -- Q's left successor (let's call it Q2) becomes the -- top of the subtree we are looking at, its parent (Q) -- and grandparent (P) become its successors. The former -- successors of Q2 are placed below P and Q. -- P becomes black, and Q2 gets the color that P had. -- This changes the black edge count only for node R and -- its successors. */ -- node q2 = q->left; -- q2->red = p->red; -- p->right = q2->left; -- q->left = q2->right; -- q2->right = q; -- q2->left = p; -- *pp = q2; -- p->red = 0; -- } -- else -- { -- /* It's the right one. Rotate P left. P becomes black, -- and Q gets the color that P had. Q's right successor -- also becomes black. This changes the black edge -- count only for node R and its successors. */ -- q->red = p->red; -- p->red = 0; -- -- q->right->red = 0; -- -- /* left rotate p */ -- p->right = q->left; -- q->left = p; -- *pp = q; -- } -- -- /* We're done. */ -- sp = 1; -- r = NULL; -- } -- } -- else -- { -- /* Comments: see above. */ -- q = p->left; -- if (q->red) -- { -- q->red = 0; -- p->red = 1; -- p->left = q->right; -- q->right = p; -- *pp = q; -- nodestack[sp++] = pp = &q->right; -- q = p->left; -- } -- if ((q->right == NULL || !q->right->red) -- && (q->left == NULL || !q->left->red)) -- { -- q->red = 1; -- r = p; -- } -- else -- { -- if (q->left == NULL || !q->left->red) -- { -- node q2 = q->right; -- q2->red = p->red; -- p->left = q2->right; -- q->right = q2->left; -- q2->left = q; -- q2->right = p; -- *pp = q2; -- p->red = 0; -- } -- else -- { -- q->red = p->red; -- p->red = 0; -- q->left->red = 0; -- p->left = q->right; -- q->right = p; -- *pp = q; -- } -- sp = 1; -- r = NULL; -- } -- } -- --sp; -- } -- if (r != NULL) -- r->red = 0; -- } -- -- free (unchained); -- return retval; --} --#ifdef weak_alias --weak_alias (__tdelete, tdelete) --#endif -- -- --/* Walk the nodes of a tree. -- ROOT is the root of the tree to be walked, ACTION the function to be -- called at each node. LEVEL is the level of ROOT in the whole tree. */ --static void --internal_function --trecurse (const void *vroot, __action_fn_t action, int level) --{ -- const_node root = (const_node) vroot; -- -- if (root->left == NULL && root->right == NULL) -- (*action) (root, leaf, level); -- else -- { -- (*action) (root, preorder, level); -- if (root->left != NULL) -- trecurse (root->left, action, level + 1); -- (*action) (root, postorder, level); -- if (root->right != NULL) -- trecurse (root->right, action, level + 1); -- (*action) (root, endorder, level); -- } --} -- -- --/* Walk the nodes of a tree. -- ROOT is the root of the tree to be walked, ACTION the function to be -- called at each node. */ --void --__twalk (const void *vroot, __action_fn_t action) --{ -- const_node root = (const_node) vroot; -- -- CHECK_TREE (root); -- -- if (root != NULL && action != NULL) -- trecurse (root, action, 0); --} --#ifdef weak_alias --weak_alias (__twalk, twalk) --#endif -- -- --#ifdef _LIBC -- --/* The standardized functions miss an important functionality: the -- tree cannot be removed easily. We provide a function to do this. */ --static void --internal_function --tdestroy_recurse (node root, __free_fn_t freefct) --{ -- if (root->left != NULL) -- tdestroy_recurse (root->left, freefct); -- if (root->right != NULL) -- tdestroy_recurse (root->right, freefct); -- (*freefct) ((void *) root->key); -- /* Free the node itself. */ -- free (root); --} -- --void --__tdestroy (void *vroot, __free_fn_t freefct) --{ -- node root = (node) vroot; -- -- CHECK_TREE (root); -- -- if (root != NULL) -- tdestroy_recurse (root, freefct); --} --weak_alias (__tdestroy, tdestroy) -- --#endif /* _LIBC */ ---- a/intl/tsearch.h -+++ /dev/null -@@ -1,83 +0,0 @@ --/* Binary tree data structure. -- Copyright (C) 2006 Free Software Foundation, Inc. -- -- This program is free software; you can redistribute it and/or modify it -- under the terms of the GNU Library General Public License as published -- by the Free Software Foundation; either version 2, or (at your option) -- any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Library General Public License for more details. -- -- You should have received a copy of the GNU Library General Public -- License along with this program; if not, write to the Free Software -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, -- USA. */ -- --#ifndef _TSEARCH_H --#define _TSEARCH_H -- --#if HAVE_TSEARCH -- --/* Get tseach(), tfind(), tdelete(), twalk() declarations. */ --#include <search.h> -- --#else -- --#ifdef __cplusplus --extern "C" { --#endif -- --/* See <http://www.opengroup.org/susv3xbd/search.h.html>, -- <http://www.opengroup.org/susv3xsh/tsearch.html> -- for details. */ -- --typedef enum --{ -- preorder, -- postorder, -- endorder, -- leaf --} --VISIT; -- --/* Searches an element in the tree *VROOTP that compares equal to KEY. -- If one is found, it is returned. Otherwise, a new element equal to KEY -- is inserted in the tree and is returned. */ --extern void * tsearch (const void *key, void **vrootp, -- int (*compar) (const void *, const void *)); -- --/* Searches an element in the tree *VROOTP that compares equal to KEY. -- If one is found, it is returned. Otherwise, NULL is returned. */ --extern void * tfind (const void *key, void *const *vrootp, -- int (*compar) (const void *, const void *)); -- --/* Searches an element in the tree *VROOTP that compares equal to KEY. -- If one is found, it is removed from the tree, and its parent node is -- returned. Otherwise, NULL is returned. */ --extern void * tdelete (const void *key, void **vrootp, -- int (*compar) (const void *, const void *)); -- --/* Perform a depth-first, left-to-right traversal of the tree VROOT. -- The ACTION function is called: -- - for non-leaf nodes: 3 times, before the left subtree traversal, -- after the left subtree traversal but before the right subtree traversal, -- and after the right subtree traversal, -- - for leaf nodes: once. -- The arguments passed to ACTION are: -- 1. the node; it can be casted to a 'const void * const *', i.e. into a -- pointer to the key, -- 2. an indicator which visit of the node this is, -- 3. the level of the node in the tree (0 for the root). */ --extern void twalk (const void *vroot, -- void (*action) (const void *, VISIT, int)); -- --#ifdef __cplusplus --} --#endif -- --#endif -- --#endif /* _TSEARCH_H */ ---- a/intl/vasnprintf.c -+++ /dev/null -@@ -1,4677 +0,0 @@ --/* vsprintf with automatic memory allocation. -- Copyright (C) 1999, 2002-2007 Free Software Foundation, Inc. -- -- This program is free software; you can redistribute it and/or modify it -- under the terms of the GNU Library General Public License as published -- by the Free Software Foundation; either version 2, or (at your option) -- any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Library General Public License for more details. -- -- You should have received a copy of the GNU Library General Public -- License along with this program; if not, write to the Free Software -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, -- USA. */ -- --/* This file can be parametrized with the following macros: -- VASNPRINTF The name of the function being defined. -- FCHAR_T The element type of the format string. -- DCHAR_T The element type of the destination (result) string. -- FCHAR_T_ONLY_ASCII Set to 1 to enable verification that all characters -- in the format string are ASCII. MUST be set if -- FCHAR_T and DCHAR_T are not the same type. -- DIRECTIVE Structure denoting a format directive. -- Depends on FCHAR_T. -- DIRECTIVES Structure denoting the set of format directives of a -- format string. Depends on FCHAR_T. -- PRINTF_PARSE Function that parses a format string. -- Depends on FCHAR_T. -- DCHAR_CPY memcpy like function for DCHAR_T[] arrays. -- DCHAR_SET memset like function for DCHAR_T[] arrays. -- DCHAR_MBSNLEN mbsnlen like function for DCHAR_T[] arrays. -- SNPRINTF The system's snprintf (or similar) function. -- This may be either snprintf or swprintf. -- TCHAR_T The element type of the argument and result string -- of the said SNPRINTF function. This may be either -- char or wchar_t. The code exploits that -- sizeof (TCHAR_T) | sizeof (DCHAR_T) and -- alignof (TCHAR_T) <= alignof (DCHAR_T). -- DCHAR_IS_TCHAR Set to 1 if DCHAR_T and TCHAR_T are the same type. -- DCHAR_CONV_FROM_ENCODING A function to convert from char[] to DCHAR[]. -- DCHAR_IS_UINT8_T Set to 1 if DCHAR_T is uint8_t. -- DCHAR_IS_UINT16_T Set to 1 if DCHAR_T is uint16_t. -- DCHAR_IS_UINT32_T Set to 1 if DCHAR_T is uint32_t. */ -- --/* Tell glibc's <stdio.h> to provide a prototype for snprintf(). -- This must come before <config.h> because <config.h> may include -- <features.h>, and once <features.h> has been included, it's too late. */ --#ifndef _GNU_SOURCE --# define _GNU_SOURCE 1 --#endif -- --#ifndef VASNPRINTF --# include <config.h> --#endif --#ifndef IN_LIBINTL --# include <alloca.h> --#endif -- --/* Specification. */ --#ifndef VASNPRINTF --# if WIDE_CHAR_VERSION --# include "vasnwprintf.h" --# else --# include "vasnprintf.h" --# endif --#endif -- --#include <locale.h> /* localeconv() */ --#include <stdio.h> /* snprintf(), sprintf() */ --#include <stdlib.h> /* abort(), malloc(), realloc(), free() */ --#include <string.h> /* memcpy(), strlen() */ --#include <errno.h> /* errno */ --#include <limits.h> /* CHAR_BIT */ --#include <float.h> /* DBL_MAX_EXP, LDBL_MAX_EXP */ --#if HAVE_NL_LANGINFO --# include <langinfo.h> --#endif --#ifndef VASNPRINTF --# if WIDE_CHAR_VERSION --# include "wprintf-parse.h" --# else --# include "printf-parse.h" --# endif --#endif -- --/* Checked size_t computations. */ --#include "xsize.h" -- --#if (NEED_PRINTF_DOUBLE || NEED_PRINTF_LONG_DOUBLE) && !defined IN_LIBINTL --# include <math.h> --# include "float+.h" --#endif -- --#if (NEED_PRINTF_DOUBLE || NEED_PRINTF_INFINITE_DOUBLE) && !defined IN_LIBINTL --# include <math.h> --# include "isnan.h" --#endif -- --#if (NEED_PRINTF_LONG_DOUBLE || NEED_PRINTF_INFINITE_LONG_DOUBLE) && !defined IN_LIBINTL --# include <math.h> --# include "isnanl-nolibm.h" --# include "fpucw.h" --#endif -- --#if (NEED_PRINTF_DIRECTIVE_A || NEED_PRINTF_DOUBLE) && !defined IN_LIBINTL --# include <math.h> --# include "isnan.h" --# include "printf-frexp.h" --#endif -- --#if (NEED_PRINTF_DIRECTIVE_A || NEED_PRINTF_LONG_DOUBLE) && !defined IN_LIBINTL --# include <math.h> --# include "isnanl-nolibm.h" --# include "printf-frexpl.h" --# include "fpucw.h" --#endif -- --/* Some systems, like OSF/1 4.0 and Woe32, don't have EOVERFLOW. */ --#ifndef EOVERFLOW --# define EOVERFLOW E2BIG --#endif -- --#if HAVE_WCHAR_T --# if HAVE_WCSLEN --# define local_wcslen wcslen --# else -- /* Solaris 2.5.1 has wcslen() in a separate library libw.so. To avoid -- a dependency towards this library, here is a local substitute. -- Define this substitute only once, even if this file is included -- twice in the same compilation unit. */ --# ifndef local_wcslen_defined --# define local_wcslen_defined 1 --static size_t --local_wcslen (const wchar_t *s) --{ -- const wchar_t *ptr; -- -- for (ptr = s; *ptr != (wchar_t) 0; ptr++) -- ; -- return ptr - s; --} --# endif --# endif --#endif -- --/* Default parameters. */ --#ifndef VASNPRINTF --# if WIDE_CHAR_VERSION --# define VASNPRINTF vasnwprintf --# define FCHAR_T wchar_t --# define DCHAR_T wchar_t --# define TCHAR_T wchar_t --# define DCHAR_IS_TCHAR 1 --# define DIRECTIVE wchar_t_directive --# define DIRECTIVES wchar_t_directives --# define PRINTF_PARSE wprintf_parse --# define DCHAR_CPY wmemcpy --# else --# define VASNPRINTF vasnprintf --# define FCHAR_T char --# define DCHAR_T char --# define TCHAR_T char --# define DCHAR_IS_TCHAR 1 --# define DIRECTIVE char_directive --# define DIRECTIVES char_directives --# define PRINTF_PARSE printf_parse --# define DCHAR_CPY memcpy --# endif --#endif --#if WIDE_CHAR_VERSION -- /* TCHAR_T is wchar_t. */ --# define USE_SNPRINTF 1 --# if HAVE_DECL__SNWPRINTF -- /* On Windows, the function swprintf() has a different signature than -- on Unix; we use the _snwprintf() function instead. */ --# define SNPRINTF _snwprintf --# else -- /* Unix. */ --# define SNPRINTF swprintf --# endif --#else -- /* TCHAR_T is char. */ --# /* Use snprintf if it exists under the name 'snprintf' or '_snprintf'. -- But don't use it on BeOS, since BeOS snprintf produces no output if the -- size argument is >= 0x3000000. */ --# if (HAVE_DECL__SNPRINTF || HAVE_SNPRINTF) && !defined __BEOS__ --# define USE_SNPRINTF 1 --# else --# define USE_SNPRINTF 0 --# endif --# if HAVE_DECL__SNPRINTF -- /* Windows. */ --# define SNPRINTF _snprintf --# else -- /* Unix. */ --# define SNPRINTF snprintf -- /* Here we need to call the native snprintf, not rpl_snprintf. */ --# undef snprintf --# endif --#endif --/* Here we need to call the native sprintf, not rpl_sprintf. */ --#undef sprintf -- --#if (NEED_PRINTF_DIRECTIVE_A || NEED_PRINTF_LONG_DOUBLE || NEED_PRINTF_DOUBLE || NEED_PRINTF_INFINITE_DOUBLE) && !defined IN_LIBINTL --/* Determine the decimal-point character according to the current locale. */ --# ifndef decimal_point_char_defined --# define decimal_point_char_defined 1 --static char --decimal_point_char () --{ -- const char *point; -- /* Determine it in a multithread-safe way. We know nl_langinfo is -- multithread-safe on glibc systems, but is not required to be multithread- -- safe by POSIX. sprintf(), however, is multithread-safe. localeconv() -- is rarely multithread-safe. */ --# if HAVE_NL_LANGINFO && __GLIBC__ -- point = nl_langinfo (RADIXCHAR); --# elif 1 -- char pointbuf[5]; -- sprintf (pointbuf, "%#.0f", 1.0); -- point = &pointbuf[1]; --# else -- point = localeconv () -> decimal_point; --# endif -- /* The decimal point is always a single byte: either '.' or ','. */ -- return (point[0] != '\0' ? point[0] : '.'); --} --# endif --#endif -- --#if NEED_PRINTF_INFINITE_DOUBLE && !NEED_PRINTF_DOUBLE && !defined IN_LIBINTL -- --/* Equivalent to !isfinite(x) || x == 0, but does not require libm. */ --static int --is_infinite_or_zero (double x) --{ -- return isnan (x) || x + x == x; --} -- --#endif -- --#if NEED_PRINTF_INFINITE_LONG_DOUBLE && !NEED_PRINTF_LONG_DOUBLE && !defined IN_LIBINTL -- --/* Equivalent to !isfinite(x), but does not require libm. */ --static int --is_infinitel (long double x) --{ -- return isnanl (x) || (x + x == x && x != 0.0L); --} -- --#endif -- --#if (NEED_PRINTF_LONG_DOUBLE || NEED_PRINTF_DOUBLE) && !defined IN_LIBINTL -- --/* Converting 'long double' to decimal without rare rounding bugs requires -- real bignums. We use the naming conventions of GNU gmp, but vastly simpler -- (and slower) algorithms. */ -- --typedef unsigned int mp_limb_t; --# define GMP_LIMB_BITS 32 --typedef int mp_limb_verify[2 * (sizeof (mp_limb_t) * CHAR_BIT == GMP_LIMB_BITS) - 1]; -- --typedef unsigned long long mp_twolimb_t; --# define GMP_TWOLIMB_BITS 64 --typedef int mp_twolimb_verify[2 * (sizeof (mp_twolimb_t) * CHAR_BIT == GMP_TWOLIMB_BITS) - 1]; -- --/* Representation of a bignum >= 0. */ --typedef struct --{ -- size_t nlimbs; -- mp_limb_t *limbs; /* Bits in little-endian order, allocated with malloc(). */ --} mpn_t; -- --/* Compute the product of two bignums >= 0. -- Return the allocated memory in case of success, NULL in case of memory -- allocation failure. */ --static void * --multiply (mpn_t src1, mpn_t src2, mpn_t *dest) --{ -- const mp_limb_t *p1; -- const mp_limb_t *p2; -- size_t len1; -- size_t len2; -- -- if (src1.nlimbs <= src2.nlimbs) -- { -- len1 = src1.nlimbs; -- p1 = src1.limbs; -- len2 = src2.nlimbs; -- p2 = src2.limbs; -- } -- else -- { -- len1 = src2.nlimbs; -- p1 = src2.limbs; -- len2 = src1.nlimbs; -- p2 = src1.limbs; -- } -- /* Now 0 <= len1 <= len2. */ -- if (len1 == 0) -- { -- /* src1 or src2 is zero. */ -- dest->nlimbs = 0; -- dest->limbs = (mp_limb_t *) malloc (1); -- } -- else -- { -- /* Here 1 <= len1 <= len2. */ -- size_t dlen; -- mp_limb_t *dp; -- size_t k, i, j; -- -- dlen = len1 + len2; -- dp = (mp_limb_t *) malloc (dlen * sizeof (mp_limb_t)); -- if (dp == NULL) -- return NULL; -- for (k = len2; k > 0; ) -- dp[--k] = 0; -- for (i = 0; i < len1; i++) -- { -- mp_limb_t digit1 = p1[i]; -- mp_twolimb_t carry = 0; -- for (j = 0; j < len2; j++) -- { -- mp_limb_t digit2 = p2[j]; -- carry += (mp_twolimb_t) digit1 * (mp_twolimb_t) digit2; -- carry += dp[i + j]; -- dp[i + j] = (mp_limb_t) carry; -- carry = carry >> GMP_LIMB_BITS; -- } -- dp[i + len2] = (mp_limb_t) carry; -- } -- /* Normalise. */ -- while (dlen > 0 && dp[dlen - 1] == 0) -- dlen--; -- dest->nlimbs = dlen; -- dest->limbs = dp; -- } -- return dest->limbs; --} -- --/* Compute the quotient of a bignum a >= 0 and a bignum b > 0. -- a is written as a = q * b + r with 0 <= r < b. q is the quotient, r -- the remainder. -- Finally, round-to-even is performed: If r > b/2 or if r = b/2 and q is odd, -- q is incremented. -- Return the allocated memory in case of success, NULL in case of memory -- allocation failure. */ --static void * --divide (mpn_t a, mpn_t b, mpn_t *q) --{ -- /* Algorithm: -- First normalise a and b: a=[a[m-1],...,a[0]], b=[b[n-1],...,b[0]] -- with m>=0 and n>0 (in base beta = 2^GMP_LIMB_BITS). -- If m<n, then q:=0 and r:=a. -- If m>=n=1, perform a single-precision division: -- r:=0, j:=m, -- while j>0 do -- {Here (q[m-1]*beta^(m-1)+...+q[j]*beta^j) * b[0] + r*beta^j = -- = a[m-1]*beta^(m-1)+...+a[j]*beta^j und 0<=r<b[0]<beta} -- j:=j-1, r:=r*beta+a[j], q[j]:=floor(r/b[0]), r:=r-b[0]*q[j]. -- Normalise [q[m-1],...,q[0]], yields q. -- If m>=n>1, perform a multiple-precision division: -- We have a/b < beta^(m-n+1). -- s:=intDsize-1-(hightest bit in b[n-1]), 0<=s<intDsize. -- Shift a and b left by s bits, copying them. r:=a. -- r=[r[m],...,r[0]], b=[b[n-1],...,b[0]] with b[n-1]>=beta/2. -- For j=m-n,...,0: {Here 0 <= r < b*beta^(j+1).} -- Compute q* : -- q* := floor((r[j+n]*beta+r[j+n-1])/b[n-1]). -- In case of overflow (q* >= beta) set q* := beta-1. -- Compute c2 := ((r[j+n]*beta+r[j+n-1]) - q* * b[n-1])*beta + r[j+n-2] -- and c3 := b[n-2] * q*. -- {We have 0 <= c2 < 2*beta^2, even 0 <= c2 < beta^2 if no overflow -- occurred. Furthermore 0 <= c3 < beta^2. -- If there was overflow and -- r[j+n]*beta+r[j+n-1] - q* * b[n-1] >= beta, i.e. c2 >= beta^2, -- the next test can be skipped.} -- While c3 > c2, {Here 0 <= c2 < c3 < beta^2} -- Put q* := q* - 1, c2 := c2 + b[n-1]*beta, c3 := c3 - b[n-2]. -- If q* > 0: -- Put r := r - b * q* * beta^j. In detail: -- [r[n+j],...,r[j]] := [r[n+j],...,r[j]] - q* * [b[n-1],...,b[0]]. -- hence: u:=0, for i:=0 to n-1 do -- u := u + q* * b[i], -- r[j+i]:=r[j+i]-(u mod beta) (+ beta, if carry), -- u:=u div beta (+ 1, if carry in subtraction) -- r[n+j]:=r[n+j]-u. -- {Since always u = (q* * [b[i-1],...,b[0]] div beta^i) + 1 -- < q* + 1 <= beta, -- the carry u does not overflow.} -- If a negative carry occurs, put q* := q* - 1 -- and [r[n+j],...,r[j]] := [r[n+j],...,r[j]] + [0,b[n-1],...,b[0]]. -- Set q[j] := q*. -- Normalise [q[m-n],..,q[0]]; this yields the quotient q. -- Shift [r[n-1],...,r[0]] right by s bits and normalise; this yields the -- rest r. -- The room for q[j] can be allocated at the memory location of r[n+j]. -- Finally, round-to-even: -- Shift r left by 1 bit. -- If r > b or if r = b and q[0] is odd, q := q+1. -- */ -- const mp_limb_t *a_ptr = a.limbs; -- size_t a_len = a.nlimbs; -- const mp_limb_t *b_ptr = b.limbs; -- size_t b_len = b.nlimbs; -- mp_limb_t *roomptr; -- mp_limb_t *tmp_roomptr = NULL; -- mp_limb_t *q_ptr; -- size_t q_len; -- mp_limb_t *r_ptr; -- size_t r_len; -- -- /* Allocate room for a_len+2 digits. -- (Need a_len+1 digits for the real division and 1 more digit for the -- final rounding of q.) */ -- roomptr = (mp_limb_t *) malloc ((a_len + 2) * sizeof (mp_limb_t)); -- if (roomptr == NULL) -- return NULL; -- -- /* Normalise a. */ -- while (a_len > 0 && a_ptr[a_len - 1] == 0) -- a_len--; -- -- /* Normalise b. */ -- for (;;) -- { -- if (b_len == 0) -- /* Division by zero. */ -- abort (); -- if (b_ptr[b_len - 1] == 0) -- b_len--; -- else -- break; -- } -- -- /* Here m = a_len >= 0 and n = b_len > 0. */ -- -- if (a_len < b_len) -- { -- /* m<n: trivial case. q=0, r := copy of a. */ -- r_ptr = roomptr; -- r_len = a_len; -- memcpy (r_ptr, a_ptr, a_len * sizeof (mp_limb_t)); -- q_ptr = roomptr + a_len; -- q_len = 0; -- } -- else if (b_len == 1) -- { -- /* n=1: single precision division. -- beta^(m-1) <= a < beta^m ==> beta^(m-2) <= a/b < beta^m */ -- r_ptr = roomptr; -- q_ptr = roomptr + 1; -- { -- mp_limb_t den = b_ptr[0]; -- mp_limb_t remainder = 0; -- const mp_limb_t *sourceptr = a_ptr + a_len; -- mp_limb_t *destptr = q_ptr + a_len; -- size_t count; -- for (count = a_len; count > 0; count--) -- { -- mp_twolimb_t num = -- ((mp_twolimb_t) remainder << GMP_LIMB_BITS) | *--sourceptr; -- *--destptr = num / den; -- remainder = num % den; -- } -- /* Normalise and store r. */ -- if (remainder > 0) -- { -- r_ptr[0] = remainder; -- r_len = 1; -- } -- else -- r_len = 0; -- /* Normalise q. */ -- q_len = a_len; -- if (q_ptr[q_len - 1] == 0) -- q_len--; -- } -- } -- else -- { -- /* n>1: multiple precision division. -- beta^(m-1) <= a < beta^m, beta^(n-1) <= b < beta^n ==> -- beta^(m-n-1) <= a/b < beta^(m-n+1). */ -- /* Determine s. */ -- size_t s; -- { -- mp_limb_t msd = b_ptr[b_len - 1]; /* = b[n-1], > 0 */ -- s = 31; -- if (msd >= 0x10000) -- { -- msd = msd >> 16; -- s -= 16; -- } -- if (msd >= 0x100) -- { -- msd = msd >> 8; -- s -= 8; -- } -- if (msd >= 0x10) -- { -- msd = msd >> 4; -- s -= 4; -- } -- if (msd >= 0x4) -- { -- msd = msd >> 2; -- s -= 2; -- } -- if (msd >= 0x2) -- { -- msd = msd >> 1; -- s -= 1; -- } -- } -- /* 0 <= s < GMP_LIMB_BITS. -- Copy b, shifting it left by s bits. */ -- if (s > 0) -- { -- tmp_roomptr = (mp_limb_t *) malloc (b_len * sizeof (mp_limb_t)); -- if (tmp_roomptr == NULL) -- { -- free (roomptr); -- return NULL; -- } -- { -- const mp_limb_t *sourceptr = b_ptr; -- mp_limb_t *destptr = tmp_roomptr; -- mp_twolimb_t accu = 0; -- size_t count; -- for (count = b_len; count > 0; count--) -- { -- accu += (mp_twolimb_t) *sourceptr++ << s; -- *destptr++ = (mp_limb_t) accu; -- accu = accu >> GMP_LIMB_BITS; -- } -- /* accu must be zero, since that was how s was determined. */ -- if (accu != 0) -- abort (); -- } -- b_ptr = tmp_roomptr; -- } -- /* Copy a, shifting it left by s bits, yields r. -- Memory layout: -- At the beginning: r = roomptr[0..a_len], -- at the end: r = roomptr[0..b_len-1], q = roomptr[b_len..a_len] */ -- r_ptr = roomptr; -- if (s == 0) -- { -- memcpy (r_ptr, a_ptr, a_len * sizeof (mp_limb_t)); -- r_ptr[a_len] = 0; -- } -- else -- { -- const mp_limb_t *sourceptr = a_ptr; -- mp_limb_t *destptr = r_ptr; -- mp_twolimb_t accu = 0; -- size_t count; -- for (count = a_len; count > 0; count--) -- { -- accu += (mp_twolimb_t) *sourceptr++ << s; -- *destptr++ = (mp_limb_t) accu; -- accu = accu >> GMP_LIMB_BITS; -- } -- *destptr++ = (mp_limb_t) accu; -- } -- q_ptr = roomptr + b_len; -- q_len = a_len - b_len + 1; /* q will have m-n+1 limbs */ -- { -- size_t j = a_len - b_len; /* m-n */ -- mp_limb_t b_msd = b_ptr[b_len - 1]; /* b[n-1] */ -- mp_limb_t b_2msd = b_ptr[b_len - 2]; /* b[n-2] */ -- mp_twolimb_t b_msdd = /* b[n-1]*beta+b[n-2] */ -- ((mp_twolimb_t) b_msd << GMP_LIMB_BITS) | b_2msd; -- /* Division loop, traversed m-n+1 times. -- j counts down, b is unchanged, beta/2 <= b[n-1] < beta. */ -- for (;;) -- { -- mp_limb_t q_star; -- mp_limb_t c1; -- if (r_ptr[j + b_len] < b_msd) /* r[j+n] < b[n-1] ? */ -- { -- /* Divide r[j+n]*beta+r[j+n-1] by b[n-1], no overflow. */ -- mp_twolimb_t num = -- ((mp_twolimb_t) r_ptr[j + b_len] << GMP_LIMB_BITS) -- | r_ptr[j + b_len - 1]; -- q_star = num / b_msd; -- c1 = num % b_msd; -- } -- else -- { -- /* Overflow, hence r[j+n]*beta+r[j+n-1] >= beta*b[n-1]. */ -- q_star = (mp_limb_t)~(mp_limb_t)0; /* q* = beta-1 */ -- /* Test whether r[j+n]*beta+r[j+n-1] - (beta-1)*b[n-1] >= beta -- <==> r[j+n]*beta+r[j+n-1] + b[n-1] >= beta*b[n-1]+beta -- <==> b[n-1] < floor((r[j+n]*beta+r[j+n-1]+b[n-1])/beta) -- {<= beta !}. -- If yes, jump directly to the subtraction loop. -- (Otherwise, r[j+n]*beta+r[j+n-1] - (beta-1)*b[n-1] < beta -- <==> floor((r[j+n]*beta+r[j+n-1]+b[n-1])/beta) = b[n-1] ) */ -- if (r_ptr[j + b_len] > b_msd -- || (c1 = r_ptr[j + b_len - 1] + b_msd) < b_msd) -- /* r[j+n] >= b[n-1]+1 or -- r[j+n] = b[n-1] and the addition r[j+n-1]+b[n-1] gives a -- carry. */ -- goto subtract; -- } -- /* q_star = q*, -- c1 = (r[j+n]*beta+r[j+n-1]) - q* * b[n-1] (>=0, <beta). */ -- { -- mp_twolimb_t c2 = /* c1*beta+r[j+n-2] */ -- ((mp_twolimb_t) c1 << GMP_LIMB_BITS) | r_ptr[j + b_len - 2]; -- mp_twolimb_t c3 = /* b[n-2] * q* */ -- (mp_twolimb_t) b_2msd * (mp_twolimb_t) q_star; -- /* While c2 < c3, increase c2 and decrease c3. -- Consider c3-c2. While it is > 0, decrease it by -- b[n-1]*beta+b[n-2]. Because of b[n-1]*beta+b[n-2] >= beta^2/2 -- this can happen only twice. */ -- if (c3 > c2) -- { -- q_star = q_star - 1; /* q* := q* - 1 */ -- if (c3 - c2 > b_msdd) -- q_star = q_star - 1; /* q* := q* - 1 */ -- } -- } -- if (q_star > 0) -- subtract: -- { -- /* Subtract r := r - b * q* * beta^j. */ -- mp_limb_t cr; -- { -- const mp_limb_t *sourceptr = b_ptr; -- mp_limb_t *destptr = r_ptr + j; -- mp_twolimb_t carry = 0; -- size_t count; -- for (count = b_len; count > 0; count--) -- { -- /* Here 0 <= carry <= q*. */ -- carry = -- carry -- + (mp_twolimb_t) q_star * (mp_twolimb_t) *sourceptr++ -- + (mp_limb_t) ~(*destptr); -- /* Here 0 <= carry <= beta*q* + beta-1. */ -- *destptr++ = ~(mp_limb_t) carry; -- carry = carry >> GMP_LIMB_BITS; /* <= q* */ -- } -- cr = (mp_limb_t) carry; -- } -- /* Subtract cr from r_ptr[j + b_len], then forget about -- r_ptr[j + b_len]. */ -- if (cr > r_ptr[j + b_len]) -- { -- /* Subtraction gave a carry. */ -- q_star = q_star - 1; /* q* := q* - 1 */ -- /* Add b back. */ -- { -- const mp_limb_t *sourceptr = b_ptr; -- mp_limb_t *destptr = r_ptr + j; -- mp_limb_t carry = 0; -- size_t count; -- for (count = b_len; count > 0; count--) -- { -- mp_limb_t source1 = *sourceptr++; -- mp_limb_t source2 = *destptr; -- *destptr++ = source1 + source2 + carry; -- carry = -- (carry -- ? source1 >= (mp_limb_t) ~source2 -- : source1 > (mp_limb_t) ~source2); -- } -- } -- /* Forget about the carry and about r[j+n]. */ -- } -- } -- /* q* is determined. Store it as q[j]. */ -- q_ptr[j] = q_star; -- if (j == 0) -- break; -- j--; -- } -- } -- r_len = b_len; -- /* Normalise q. */ -- if (q_ptr[q_len - 1] == 0) -- q_len--; --# if 0 /* Not needed here, since we need r only to compare it with b/2, and -- b is shifted left by s bits. */ -- /* Shift r right by s bits. */ -- if (s > 0) -- { -- mp_limb_t ptr = r_ptr + r_len; -- mp_twolimb_t accu = 0; -- size_t count; -- for (count = r_len; count > 0; count--) -- { -- accu = (mp_twolimb_t) (mp_limb_t) accu << GMP_LIMB_BITS; -- accu += (mp_twolimb_t) *--ptr << (GMP_LIMB_BITS - s); -- *ptr = (mp_limb_t) (accu >> GMP_LIMB_BITS); -- } -- } --# endif -- /* Normalise r. */ -- while (r_len > 0 && r_ptr[r_len - 1] == 0) -- r_len--; -- } -- /* Compare r << 1 with b. */ -- if (r_len > b_len) -- goto increment_q; -- { -- size_t i; -- for (i = b_len;;) -- { -- mp_limb_t r_i = -- (i <= r_len && i > 0 ? r_ptr[i - 1] >> (GMP_LIMB_BITS - 1) : 0) -- | (i < r_len ? r_ptr[i] << 1 : 0); -- mp_limb_t b_i = (i < b_len ? b_ptr[i] : 0); -- if (r_i > b_i) -- goto increment_q; -- if (r_i < b_i) -- goto keep_q; -- if (i == 0) -- break; -- i--; -- } -- } -- if (q_len > 0 && ((q_ptr[0] & 1) != 0)) -- /* q is odd. */ -- increment_q: -- { -- size_t i; -- for (i = 0; i < q_len; i++) -- if (++(q_ptr[i]) != 0) -- goto keep_q; -- q_ptr[q_len++] = 1; -- } -- keep_q: -- if (tmp_roomptr != NULL) -- free (tmp_roomptr); -- q->limbs = q_ptr; -- q->nlimbs = q_len; -- return roomptr; --} -- --/* Convert a bignum a >= 0, multiplied with 10^extra_zeroes, to decimal -- representation. -- Destroys the contents of a. -- Return the allocated memory - containing the decimal digits in low-to-high -- order, terminated with a NUL character - in case of success, NULL in case -- of memory allocation failure. */ --static char * --convert_to_decimal (mpn_t a, size_t extra_zeroes) --{ -- mp_limb_t *a_ptr = a.limbs; -- size_t a_len = a.nlimbs; -- /* 0.03345 is slightly larger than log(2)/(9*log(10)). */ -- size_t c_len = 9 * ((size_t)(a_len * (GMP_LIMB_BITS * 0.03345f)) + 1); -- char *c_ptr = (char *) malloc (xsum (c_len, extra_zeroes)); -- if (c_ptr != NULL) -- { -- char *d_ptr = c_ptr; -- for (; extra_zeroes > 0; extra_zeroes--) -- *d_ptr++ = '0'; -- while (a_len > 0) -- { -- /* Divide a by 10^9, in-place. */ -- mp_limb_t remainder = 0; -- mp_limb_t *ptr = a_ptr + a_len; -- size_t count; -- for (count = a_len; count > 0; count--) -- { -- mp_twolimb_t num = -- ((mp_twolimb_t) remainder << GMP_LIMB_BITS) | *--ptr; -- *ptr = num / 1000000000; -- remainder = num % 1000000000; -- } -- /* Store the remainder as 9 decimal digits. */ -- for (count = 9; count > 0; count--) -- { -- *d_ptr++ = '0' + (remainder % 10); -- remainder = remainder / 10; -- } -- /* Normalize a. */ -- if (a_ptr[a_len - 1] == 0) -- a_len--; -- } -- /* Remove leading zeroes. */ -- while (d_ptr > c_ptr && d_ptr[-1] == '0') -- d_ptr--; -- /* But keep at least one zero. */ -- if (d_ptr == c_ptr) -- *d_ptr++ = '0'; -- /* Terminate the string. */ -- *d_ptr = '\0'; -- } -- return c_ptr; --} -- --# if NEED_PRINTF_LONG_DOUBLE -- --/* Assuming x is finite and >= 0: -- write x as x = 2^e * m, where m is a bignum. -- Return the allocated memory in case of success, NULL in case of memory -- allocation failure. */ --static void * --decode_long_double (long double x, int *ep, mpn_t *mp) --{ -- mpn_t m; -- int exp; -- long double y; -- size_t i; -- -- /* Allocate memory for result. */ -- m.nlimbs = (LDBL_MANT_BIT + GMP_LIMB_BITS - 1) / GMP_LIMB_BITS; -- m.limbs = (mp_limb_t *) malloc (m.nlimbs * sizeof (mp_limb_t)); -- if (m.limbs == NULL) -- return NULL; -- /* Split into exponential part and mantissa. */ -- y = frexpl (x, &exp); -- if (!(y >= 0.0L && y < 1.0L)) -- abort (); -- /* x = 2^exp * y = 2^(exp - LDBL_MANT_BIT) * (y * LDBL_MANT_BIT), and the -- latter is an integer. */ -- /* Convert the mantissa (y * LDBL_MANT_BIT) to a sequence of limbs. -- I'm not sure whether it's safe to cast a 'long double' value between -- 2^31 and 2^32 to 'unsigned int', therefore play safe and cast only -- 'long double' values between 0 and 2^16 (to 'unsigned int' or 'int', -- doesn't matter). */ --# if (LDBL_MANT_BIT % GMP_LIMB_BITS) != 0 --# if (LDBL_MANT_BIT % GMP_LIMB_BITS) > GMP_LIMB_BITS / 2 -- { -- mp_limb_t hi, lo; -- y *= (mp_limb_t) 1 << (LDBL_MANT_BIT % (GMP_LIMB_BITS / 2)); -- hi = (int) y; -- y -= hi; -- if (!(y >= 0.0L && y < 1.0L)) -- abort (); -- y *= (mp_limb_t) 1 << (GMP_LIMB_BITS / 2); -- lo = (int) y; -- y -= lo; -- if (!(y >= 0.0L && y < 1.0L)) -- abort (); -- m.limbs[LDBL_MANT_BIT / GMP_LIMB_BITS] = (hi << (GMP_LIMB_BITS / 2)) | lo; -- } --# else -- { -- mp_limb_t d; -- y *= (mp_limb_t) 1 << (LDBL_MANT_BIT % GMP_LIMB_BITS); -- d = (int) y; -- y -= d; -- if (!(y >= 0.0L && y < 1.0L)) -- abort (); -- m.limbs[LDBL_MANT_BIT / GMP_LIMB_BITS] = d; -- } --# endif --# endif -- for (i = LDBL_MANT_BIT / GMP_LIMB_BITS; i > 0; ) -- { -- mp_limb_t hi, lo; -- y *= (mp_limb_t) 1 << (GMP_LIMB_BITS / 2); -- hi = (int) y; -- y -= hi; -- if (!(y >= 0.0L && y < 1.0L)) -- abort (); -- y *= (mp_limb_t) 1 << (GMP_LIMB_BITS / 2); -- lo = (int) y; -- y -= lo; -- if (!(y >= 0.0L && y < 1.0L)) -- abort (); -- m.limbs[--i] = (hi << (GMP_LIMB_BITS / 2)) | lo; -- } -- if (!(y == 0.0L)) -- abort (); -- /* Normalise. */ -- while (m.nlimbs > 0 && m.limbs[m.nlimbs - 1] == 0) -- m.nlimbs--; -- *mp = m; -- *ep = exp - LDBL_MANT_BIT; -- return m.limbs; --} -- --# endif -- --# if NEED_PRINTF_DOUBLE -- --/* Assuming x is finite and >= 0: -- write x as x = 2^e * m, where m is a bignum. -- Return the allocated memory in case of success, NULL in case of memory -- allocation failure. */ --static void * --decode_double (double x, int *ep, mpn_t *mp) --{ -- mpn_t m; -- int exp; -- double y; -- size_t i; -- -- /* Allocate memory for result. */ -- m.nlimbs = (DBL_MANT_BIT + GMP_LIMB_BITS - 1) / GMP_LIMB_BITS; -- m.limbs = (mp_limb_t *) malloc (m.nlimbs * sizeof (mp_limb_t)); -- if (m.limbs == NULL) -- return NULL; -- /* Split into exponential part and mantissa. */ -- y = frexp (x, &exp); -- if (!(y >= 0.0 && y < 1.0)) -- abort (); -- /* x = 2^exp * y = 2^(exp - DBL_MANT_BIT) * (y * DBL_MANT_BIT), and the -- latter is an integer. */ -- /* Convert the mantissa (y * DBL_MANT_BIT) to a sequence of limbs. -- I'm not sure whether it's safe to cast a 'double' value between -- 2^31 and 2^32 to 'unsigned int', therefore play safe and cast only -- 'double' values between 0 and 2^16 (to 'unsigned int' or 'int', -- doesn't matter). */ --# if (DBL_MANT_BIT % GMP_LIMB_BITS) != 0 --# if (DBL_MANT_BIT % GMP_LIMB_BITS) > GMP_LIMB_BITS / 2 -- { -- mp_limb_t hi, lo; -- y *= (mp_limb_t) 1 << (DBL_MANT_BIT % (GMP_LIMB_BITS / 2)); -- hi = (int) y; -- y -= hi; -- if (!(y >= 0.0 && y < 1.0)) -- abort (); -- y *= (mp_limb_t) 1 << (GMP_LIMB_BITS / 2); -- lo = (int) y; -- y -= lo; -- if (!(y >= 0.0 && y < 1.0)) -- abort (); -- m.limbs[DBL_MANT_BIT / GMP_LIMB_BITS] = (hi << (GMP_LIMB_BITS / 2)) | lo; -- } --# else -- { -- mp_limb_t d; -- y *= (mp_limb_t) 1 << (DBL_MANT_BIT % GMP_LIMB_BITS); -- d = (int) y; -- y -= d; -- if (!(y >= 0.0 && y < 1.0)) -- abort (); -- m.limbs[DBL_MANT_BIT / GMP_LIMB_BITS] = d; -- } --# endif --# endif -- for (i = DBL_MANT_BIT / GMP_LIMB_BITS; i > 0; ) -- { -- mp_limb_t hi, lo; -- y *= (mp_limb_t) 1 << (GMP_LIMB_BITS / 2); -- hi = (int) y; -- y -= hi; -- if (!(y >= 0.0 && y < 1.0)) -- abort (); -- y *= (mp_limb_t) 1 << (GMP_LIMB_BITS / 2); -- lo = (int) y; -- y -= lo; -- if (!(y >= 0.0 && y < 1.0)) -- abort (); -- m.limbs[--i] = (hi << (GMP_LIMB_BITS / 2)) | lo; -- } -- if (!(y == 0.0)) -- abort (); -- /* Normalise. */ -- while (m.nlimbs > 0 && m.limbs[m.nlimbs - 1] == 0) -- m.nlimbs--; -- *mp = m; -- *ep = exp - DBL_MANT_BIT; -- return m.limbs; --} -- --# endif -- --/* Assuming x = 2^e * m is finite and >= 0, and n is an integer: -- Returns the decimal representation of round (x * 10^n). -- Return the allocated memory - containing the decimal digits in low-to-high -- order, terminated with a NUL character - in case of success, NULL in case -- of memory allocation failure. */ --static char * --scale10_round_decimal_decoded (int e, mpn_t m, void *memory, int n) --{ -- int s; -- size_t extra_zeroes; -- unsigned int abs_n; -- unsigned int abs_s; -- mp_limb_t *pow5_ptr; -- size_t pow5_len; -- unsigned int s_limbs; -- unsigned int s_bits; -- mpn_t pow5; -- mpn_t z; -- void *z_memory; -- char *digits; -- -- if (memory == NULL) -- return NULL; -- /* x = 2^e * m, hence -- y = round (2^e * 10^n * m) = round (2^(e+n) * 5^n * m) -- = round (2^s * 5^n * m). */ -- s = e + n; -- extra_zeroes = 0; -- /* Factor out a common power of 10 if possible. */ -- if (s > 0 && n > 0) -- { -- extra_zeroes = (s < n ? s : n); -- s -= extra_zeroes; -- n -= extra_zeroes; -- } -- /* Here y = round (2^s * 5^n * m) * 10^extra_zeroes. -- Before converting to decimal, we need to compute -- z = round (2^s * 5^n * m). */ -- /* Compute 5^|n|, possibly shifted by |s| bits if n and s have the same -- sign. 2.322 is slightly larger than log(5)/log(2). */ -- abs_n = (n >= 0 ? n : -n); -- abs_s = (s >= 0 ? s : -s); -- pow5_ptr = (mp_limb_t *) malloc (((int)(abs_n * (2.322f / GMP_LIMB_BITS)) + 1 -- + abs_s / GMP_LIMB_BITS + 1) -- * sizeof (mp_limb_t)); -- if (pow5_ptr == NULL) -- { -- free (memory); -- return NULL; -- } -- /* Initialize with 1. */ -- pow5_ptr[0] = 1; -- pow5_len = 1; -- /* Multiply with 5^|n|. */ -- if (abs_n > 0) -- { -- static mp_limb_t const small_pow5[13 + 1] = -- { -- 1, 5, 25, 125, 625, 3125, 15625, 78125, 390625, 1953125, 9765625, -- 48828125, 244140625, 1220703125 -- }; -- unsigned int n13; -- for (n13 = 0; n13 <= abs_n; n13 += 13) -- { -- mp_limb_t digit1 = small_pow5[n13 + 13 <= abs_n ? 13 : abs_n - n13]; -- size_t j; -- mp_twolimb_t carry = 0; -- for (j = 0; j < pow5_len; j++) -- { -- mp_limb_t digit2 = pow5_ptr[j]; -- carry += (mp_twolimb_t) digit1 * (mp_twolimb_t) digit2; -- pow5_ptr[j] = (mp_limb_t) carry; -- carry = carry >> GMP_LIMB_BITS; -- } -- if (carry > 0) -- pow5_ptr[pow5_len++] = (mp_limb_t) carry; -- } -- } -- s_limbs = abs_s / GMP_LIMB_BITS; -- s_bits = abs_s % GMP_LIMB_BITS; -- if (n >= 0 ? s >= 0 : s <= 0) -- { -- /* Multiply with 2^|s|. */ -- if (s_bits > 0) -- { -- mp_limb_t *ptr = pow5_ptr; -- mp_twolimb_t accu = 0; -- size_t count; -- for (count = pow5_len; count > 0; count--) -- { -- accu += (mp_twolimb_t) *ptr << s_bits; -- *ptr++ = (mp_limb_t) accu; -- accu = accu >> GMP_LIMB_BITS; -- } -- if (accu > 0) -- { -- *ptr = (mp_limb_t) accu; -- pow5_len++; -- } -- } -- if (s_limbs > 0) -- { -- size_t count; -- for (count = pow5_len; count > 0;) -- { -- count--; -- pow5_ptr[s_limbs + count] = pow5_ptr[count]; -- } -- for (count = s_limbs; count > 0;) -- { -- count--; -- pow5_ptr[count] = 0; -- } -- pow5_len += s_limbs; -- } -- pow5.limbs = pow5_ptr; -- pow5.nlimbs = pow5_len; -- if (n >= 0) -- { -- /* Multiply m with pow5. No division needed. */ -- z_memory = multiply (m, pow5, &z); -- } -- else -- { -- /* Divide m by pow5 and round. */ -- z_memory = divide (m, pow5, &z); -- } -- } -- else -- { -- pow5.limbs = pow5_ptr; -- pow5.nlimbs = pow5_len; -- if (n >= 0) -- { -- /* n >= 0, s < 0. -- Multiply m with pow5, then divide by 2^|s|. */ -- mpn_t numerator; -- mpn_t denominator; -- void *tmp_memory; -- tmp_memory = multiply (m, pow5, &numerator); -- if (tmp_memory == NULL) -- { -- free (pow5_ptr); -- free (memory); -- return NULL; -- } -- /* Construct 2^|s|. */ -- { -- mp_limb_t *ptr = pow5_ptr + pow5_len; -- size_t i; -- for (i = 0; i < s_limbs; i++) -- ptr[i] = 0; -- ptr[s_limbs] = (mp_limb_t) 1 << s_bits; -- denominator.limbs = ptr; -- denominator.nlimbs = s_limbs + 1; -- } -- z_memory = divide (numerator, denominator, &z); -- free (tmp_memory); -- } -- else -- { -- /* n < 0, s > 0. -- Multiply m with 2^s, then divide by pow5. */ -- mpn_t numerator; -- mp_limb_t *num_ptr; -- num_ptr = (mp_limb_t *) malloc ((m.nlimbs + s_limbs + 1) -- * sizeof (mp_limb_t)); -- if (num_ptr == NULL) -- { -- free (pow5_ptr); -- free (memory); -- return NULL; -- } -- { -- mp_limb_t *destptr = num_ptr; -- { -- size_t i; -- for (i = 0; i < s_limbs; i++) -- *destptr++ = 0; -- } -- if (s_bits > 0) -- { -- const mp_limb_t *sourceptr = m.limbs; -- mp_twolimb_t accu = 0; -- size_t count; -- for (count = m.nlimbs; count > 0; count--) -- { -- accu += (mp_twolimb_t) *sourceptr++ << s_bits; -- *destptr++ = (mp_limb_t) accu; -- accu = accu >> GMP_LIMB_BITS; -- } -- if (accu > 0) -- *destptr++ = (mp_limb_t) accu; -- } -- else -- { -- const mp_limb_t *sourceptr = m.limbs; -- size_t count; -- for (count = m.nlimbs; count > 0; count--) -- *destptr++ = *sourceptr++; -- } -- numerator.limbs = num_ptr; -- numerator.nlimbs = destptr - num_ptr; -- } -- z_memory = divide (numerator, pow5, &z); -- free (num_ptr); -- } -- } -- free (pow5_ptr); -- free (memory); -- -- /* Here y = round (x * 10^n) = z * 10^extra_zeroes. */ -- -- if (z_memory == NULL) -- return NULL; -- digits = convert_to_decimal (z, extra_zeroes); -- free (z_memory); -- return digits; --} -- --# if NEED_PRINTF_LONG_DOUBLE -- --/* Assuming x is finite and >= 0, and n is an integer: -- Returns the decimal representation of round (x * 10^n). -- Return the allocated memory - containing the decimal digits in low-to-high -- order, terminated with a NUL character - in case of success, NULL in case -- of memory allocation failure. */ --static char * --scale10_round_decimal_long_double (long double x, int n) --{ -- int e; -- mpn_t m; -- void *memory = decode_long_double (x, &e, &m); -- return scale10_round_decimal_decoded (e, m, memory, n); --} -- --# endif -- --# if NEED_PRINTF_DOUBLE -- --/* Assuming x is finite and >= 0, and n is an integer: -- Returns the decimal representation of round (x * 10^n). -- Return the allocated memory - containing the decimal digits in low-to-high -- order, terminated with a NUL character - in case of success, NULL in case -- of memory allocation failure. */ --static char * --scale10_round_decimal_double (double x, int n) --{ -- int e; -- mpn_t m; -- void *memory = decode_double (x, &e, &m); -- return scale10_round_decimal_decoded (e, m, memory, n); --} -- --# endif -- --# if NEED_PRINTF_LONG_DOUBLE -- --/* Assuming x is finite and > 0: -- Return an approximation for n with 10^n <= x < 10^(n+1). -- The approximation is usually the right n, but may be off by 1 sometimes. */ --static int --floorlog10l (long double x) --{ -- int exp; -- long double y; -- double z; -- double l; -- -- /* Split into exponential part and mantissa. */ -- y = frexpl (x, &exp); -- if (!(y >= 0.0L && y < 1.0L)) -- abort (); -- if (y == 0.0L) -- return INT_MIN; -- if (y < 0.5L) -- { -- while (y < (1.0L / (1 << (GMP_LIMB_BITS / 2)) / (1 << (GMP_LIMB_BITS / 2)))) -- { -- y *= 1.0L * (1 << (GMP_LIMB_BITS / 2)) * (1 << (GMP_LIMB_BITS / 2)); -- exp -= GMP_LIMB_BITS; -- } -- if (y < (1.0L / (1 << 16))) -- { -- y *= 1.0L * (1 << 16); -- exp -= 16; -- } -- if (y < (1.0L / (1 << 8))) -- { -- y *= 1.0L * (1 << 8); -- exp -= 8; -- } -- if (y < (1.0L / (1 << 4))) -- { -- y *= 1.0L * (1 << 4); -- exp -= 4; -- } -- if (y < (1.0L / (1 << 2))) -- { -- y *= 1.0L * (1 << 2); -- exp -= 2; -- } -- if (y < (1.0L / (1 << 1))) -- { -- y *= 1.0L * (1 << 1); -- exp -= 1; -- } -- } -- if (!(y >= 0.5L && y < 1.0L)) -- abort (); -- /* Compute an approximation for l = log2(x) = exp + log2(y). */ -- l = exp; -- z = y; -- if (z < 0.70710678118654752444) -- { -- z *= 1.4142135623730950488; -- l -= 0.5; -- } -- if (z < 0.8408964152537145431) -- { -- z *= 1.1892071150027210667; -- l -= 0.25; -- } -- if (z < 0.91700404320467123175) -- { -- z *= 1.0905077326652576592; -- l -= 0.125; -- } -- if (z < 0.9576032806985736469) -- { -- z *= 1.0442737824274138403; -- l -= 0.0625; -- } -- /* Now 0.95 <= z <= 1.01. */ -- z = 1 - z; -- /* log(1-z) = - z - z^2/2 - z^3/3 - z^4/4 - ... -- Four terms are enough to get an approximation with error < 10^-7. */ -- l -= z * (1.0 + z * (0.5 + z * ((1.0 / 3) + z * 0.25))); -- /* Finally multiply with log(2)/log(10), yields an approximation for -- log10(x). */ -- l *= 0.30102999566398119523; -- /* Round down to the next integer. */ -- return (int) l + (l < 0 ? -1 : 0); --} -- --# endif -- --# if NEED_PRINTF_DOUBLE -- --/* Assuming x is finite and > 0: -- Return an approximation for n with 10^n <= x < 10^(n+1). -- The approximation is usually the right n, but may be off by 1 sometimes. */ --static int --floorlog10 (double x) --{ -- int exp; -- double y; -- double z; -- double l; -- -- /* Split into exponential part and mantissa. */ -- y = frexp (x, &exp); -- if (!(y >= 0.0 && y < 1.0)) -- abort (); -- if (y == 0.0) -- return INT_MIN; -- if (y < 0.5) -- { -- while (y < (1.0 / (1 << (GMP_LIMB_BITS / 2)) / (1 << (GMP_LIMB_BITS / 2)))) -- { -- y *= 1.0 * (1 << (GMP_LIMB_BITS / 2)) * (1 << (GMP_LIMB_BITS / 2)); -- exp -= GMP_LIMB_BITS; -- } -- if (y < (1.0 / (1 << 16))) -- { -- y *= 1.0 * (1 << 16); -- exp -= 16; -- } -- if (y < (1.0 / (1 << 8))) -- { -- y *= 1.0 * (1 << 8); -- exp -= 8; -- } -- if (y < (1.0 / (1 << 4))) -- { -- y *= 1.0 * (1 << 4); -- exp -= 4; -- } -- if (y < (1.0 / (1 << 2))) -- { -- y *= 1.0 * (1 << 2); -- exp -= 2; -- } -- if (y < (1.0 / (1 << 1))) -- { -- y *= 1.0 * (1 << 1); -- exp -= 1; -- } -- } -- if (!(y >= 0.5 && y < 1.0)) -- abort (); -- /* Compute an approximation for l = log2(x) = exp + log2(y). */ -- l = exp; -- z = y; -- if (z < 0.70710678118654752444) -- { -- z *= 1.4142135623730950488; -- l -= 0.5; -- } -- if (z < 0.8408964152537145431) -- { -- z *= 1.1892071150027210667; -- l -= 0.25; -- } -- if (z < 0.91700404320467123175) -- { -- z *= 1.0905077326652576592; -- l -= 0.125; -- } -- if (z < 0.9576032806985736469) -- { -- z *= 1.0442737824274138403; -- l -= 0.0625; -- } -- /* Now 0.95 <= z <= 1.01. */ -- z = 1 - z; -- /* log(1-z) = - z - z^2/2 - z^3/3 - z^4/4 - ... -- Four terms are enough to get an approximation with error < 10^-7. */ -- l -= z * (1.0 + z * (0.5 + z * ((1.0 / 3) + z * 0.25))); -- /* Finally multiply with log(2)/log(10), yields an approximation for -- log10(x). */ -- l *= 0.30102999566398119523; -- /* Round down to the next integer. */ -- return (int) l + (l < 0 ? -1 : 0); --} -- --# endif -- --#endif -- --DCHAR_T * --VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, -- const FCHAR_T *format, va_list args) --{ -- DIRECTIVES d; -- arguments a; -- -- if (PRINTF_PARSE (format, &d, &a) < 0) -- /* errno is already set. */ -- return NULL; -- --#define CLEANUP() \ -- free (d.dir); \ -- if (a.arg) \ -- free (a.arg); -- -- if (PRINTF_FETCHARGS (args, &a) < 0) -- { -- CLEANUP (); -- errno = EINVAL; -- return NULL; -- } -- -- { -- size_t buf_neededlength; -- TCHAR_T *buf; -- TCHAR_T *buf_malloced; -- const FCHAR_T *cp; -- size_t i; -- DIRECTIVE *dp; -- /* Output string accumulator. */ -- DCHAR_T *result; -- size_t allocated; -- size_t length; -- -- /* Allocate a small buffer that will hold a directive passed to -- sprintf or snprintf. */ -- buf_neededlength = -- xsum4 (7, d.max_width_length, d.max_precision_length, 6); --#if HAVE_ALLOCA -- if (buf_neededlength < 4000 / sizeof (TCHAR_T)) -- { -- buf = (TCHAR_T *) alloca (buf_neededlength * sizeof (TCHAR_T)); -- buf_malloced = NULL; -- } -- else --#endif -- { -- size_t buf_memsize = xtimes (buf_neededlength, sizeof (TCHAR_T)); -- if (size_overflow_p (buf_memsize)) -- goto out_of_memory_1; -- buf = (TCHAR_T *) malloc (buf_memsize); -- if (buf == NULL) -- goto out_of_memory_1; -- buf_malloced = buf; -- } -- -- if (resultbuf != NULL) -- { -- result = resultbuf; -- allocated = *lengthp; -- } -- else -- { -- result = NULL; -- allocated = 0; -- } -- length = 0; -- /* Invariants: -- result is either == resultbuf or == NULL or malloc-allocated. -- If length > 0, then result != NULL. */ -- -- /* Ensures that allocated >= needed. Aborts through a jump to -- out_of_memory if needed is SIZE_MAX or otherwise too big. */ --#define ENSURE_ALLOCATION(needed) \ -- if ((needed) > allocated) \ -- { \ -- size_t memory_size; \ -- DCHAR_T *memory; \ -- \ -- allocated = (allocated > 0 ? xtimes (allocated, 2) : 12); \ -- if ((needed) > allocated) \ -- allocated = (needed); \ -- memory_size = xtimes (allocated, sizeof (DCHAR_T)); \ -- if (size_overflow_p (memory_size)) \ -- goto out_of_memory; \ -- if (result == resultbuf || result == NULL) \ -- memory = (DCHAR_T *) malloc (memory_size); \ -- else \ -- memory = (DCHAR_T *) realloc (result, memory_size); \ -- if (memory == NULL) \ -- goto out_of_memory; \ -- if (result == resultbuf && length > 0) \ -- DCHAR_CPY (memory, result, length); \ -- result = memory; \ -- } -- -- for (cp = format, i = 0, dp = &d.dir[0]; ; cp = dp->dir_end, i++, dp++) -- { -- if (cp != dp->dir_start) -- { -- size_t n = dp->dir_start - cp; -- size_t augmented_length = xsum (length, n); -- -- ENSURE_ALLOCATION (augmented_length); -- /* This copies a piece of FCHAR_T[] into a DCHAR_T[]. Here we -- need that the format string contains only ASCII characters -- if FCHAR_T and DCHAR_T are not the same type. */ -- if (sizeof (FCHAR_T) == sizeof (DCHAR_T)) -- { -- DCHAR_CPY (result + length, (const DCHAR_T *) cp, n); -- length = augmented_length; -- } -- else -- { -- do -- result[length++] = (unsigned char) *cp++; -- while (--n > 0); -- } -- } -- if (i == d.count) -- break; -- -- /* Execute a single directive. */ -- if (dp->conversion == '%') -- { -- size_t augmented_length; -- -- if (!(dp->arg_index == ARG_NONE)) -- abort (); -- augmented_length = xsum (length, 1); -- ENSURE_ALLOCATION (augmented_length); -- result[length] = '%'; -- length = augmented_length; -- } -- else -- { -- if (!(dp->arg_index != ARG_NONE)) -- abort (); -- -- if (dp->conversion == 'n') -- { -- switch (a.arg[dp->arg_index].type) -- { -- case TYPE_COUNT_SCHAR_POINTER: -- *a.arg[dp->arg_index].a.a_count_schar_pointer = length; -- break; -- case TYPE_COUNT_SHORT_POINTER: -- *a.arg[dp->arg_index].a.a_count_short_pointer = length; -- break; -- case TYPE_COUNT_INT_POINTER: -- *a.arg[dp->arg_index].a.a_count_int_pointer = length; -- break; -- case TYPE_COUNT_LONGINT_POINTER: -- *a.arg[dp->arg_index].a.a_count_longint_pointer = length; -- break; --#if HAVE_LONG_LONG_INT -- case TYPE_COUNT_LONGLONGINT_POINTER: -- *a.arg[dp->arg_index].a.a_count_longlongint_pointer = length; -- break; --#endif -- default: -- abort (); -- } -- } --#if ENABLE_UNISTDIO -- /* The unistdio extensions. */ -- else if (dp->conversion == 'U') -- { -- arg_type type = a.arg[dp->arg_index].type; -- int flags = dp->flags; -- int has_width; -- size_t width; -- int has_precision; -- size_t precision; -- -- has_width = 0; -- width = 0; -- if (dp->width_start != dp->width_end) -- { -- if (dp->width_arg_index != ARG_NONE) -- { -- int arg; -- -- if (!(a.arg[dp->width_arg_index].type == TYPE_INT)) -- abort (); -- arg = a.arg[dp->width_arg_index].a.a_int; -- if (arg < 0) -- { -- /* "A negative field width is taken as a '-' flag -- followed by a positive field width." */ -- flags |= FLAG_LEFT; -- width = (unsigned int) (-arg); -- } -- else -- width = arg; -- } -- else -- { -- const FCHAR_T *digitp = dp->width_start; -- -- do -- width = xsum (xtimes (width, 10), *digitp++ - '0'); -- while (digitp != dp->width_end); -- } -- has_width = 1; -- } -- -- has_precision = 0; -- precision = 0; -- if (dp->precision_start != dp->precision_end) -- { -- if (dp->precision_arg_index != ARG_NONE) -- { -- int arg; -- -- if (!(a.arg[dp->precision_arg_index].type == TYPE_INT)) -- abort (); -- arg = a.arg[dp->precision_arg_index].a.a_int; -- /* "A negative precision is taken as if the precision -- were omitted." */ -- if (arg >= 0) -- { -- precision = arg; -- has_precision = 1; -- } -- } -- else -- { -- const FCHAR_T *digitp = dp->precision_start + 1; -- -- precision = 0; -- while (digitp != dp->precision_end) -- precision = xsum (xtimes (precision, 10), *digitp++ - '0'); -- has_precision = 1; -- } -- } -- -- switch (type) -- { -- case TYPE_U8_STRING: -- { -- const uint8_t *arg = a.arg[dp->arg_index].a.a_u8_string; -- const uint8_t *arg_end; -- size_t characters; -- -- if (has_precision) -- { -- /* Use only PRECISION characters, from the left. */ -- arg_end = arg; -- characters = 0; -- for (; precision > 0; precision--) -- { -- int count = u8_strmblen (arg_end); -- if (count == 0) -- break; -- if (count < 0) -- { -- if (!(result == resultbuf || result == NULL)) -- free (result); -- if (buf_malloced != NULL) -- free (buf_malloced); -- CLEANUP (); -- errno = EILSEQ; -- return NULL; -- } -- arg_end += count; -- characters++; -- } -- } -- else if (has_width) -- { -- /* Use the entire string, and count the number of -- characters. */ -- arg_end = arg; -- characters = 0; -- for (;;) -- { -- int count = u8_strmblen (arg_end); -- if (count == 0) -- break; -- if (count < 0) -- { -- if (!(result == resultbuf || result == NULL)) -- free (result); -- if (buf_malloced != NULL) -- free (buf_malloced); -- CLEANUP (); -- errno = EILSEQ; -- return NULL; -- } -- arg_end += count; -- characters++; -- } -- } -- else -- { -- /* Use the entire string. */ -- arg_end = arg + u8_strlen (arg); -- /* The number of characters doesn't matter. */ -- characters = 0; -- } -- -- if (has_width && width > characters -- && !(dp->flags & FLAG_LEFT)) -- { -- size_t n = width - characters; -- ENSURE_ALLOCATION (xsum (length, n)); -- DCHAR_SET (result + length, ' ', n); -- length += n; -- } -- --# if DCHAR_IS_UINT8_T -- { -- size_t n = arg_end - arg; -- ENSURE_ALLOCATION (xsum (length, n)); -- DCHAR_CPY (result + length, arg, n); -- length += n; -- } --# else -- { /* Convert. */ -- DCHAR_T *converted = result + length; -- size_t converted_len = allocated - length; --# if DCHAR_IS_TCHAR -- /* Convert from UTF-8 to locale encoding. */ -- if (u8_conv_to_encoding (locale_charset (), -- iconveh_question_mark, -- arg, arg_end - arg, NULL, -- &converted, &converted_len) -- < 0) --# else -- /* Convert from UTF-8 to UTF-16/UTF-32. */ -- converted = -- U8_TO_DCHAR (arg, arg_end - arg, -- converted, &converted_len); -- if (converted == NULL) --# endif -- { -- int saved_errno = errno; -- if (!(result == resultbuf || result == NULL)) -- free (result); -- if (buf_malloced != NULL) -- free (buf_malloced); -- CLEANUP (); -- errno = saved_errno; -- return NULL; -- } -- if (converted != result + length) -- { -- ENSURE_ALLOCATION (xsum (length, converted_len)); -- DCHAR_CPY (result + length, converted, converted_len); -- free (converted); -- } -- length += converted_len; -- } --# endif -- -- if (has_width && width > characters -- && (dp->flags & FLAG_LEFT)) -- { -- size_t n = width - characters; -- ENSURE_ALLOCATION (xsum (length, n)); -- DCHAR_SET (result + length, ' ', n); -- length += n; -- } -- } -- break; -- -- case TYPE_U16_STRING: -- { -- const uint16_t *arg = a.arg[dp->arg_index].a.a_u16_string; -- const uint16_t *arg_end; -- size_t characters; -- -- if (has_precision) -- { -- /* Use only PRECISION characters, from the left. */ -- arg_end = arg; -- characters = 0; -- for (; precision > 0; precision--) -- { -- int count = u16_strmblen (arg_end); -- if (count == 0) -- break; -- if (count < 0) -- { -- if (!(result == resultbuf || result == NULL)) -- free (result); -- if (buf_malloced != NULL) -- free (buf_malloced); -- CLEANUP (); -- errno = EILSEQ; -- return NULL; -- } -- arg_end += count; -- characters++; -- } -- } -- else if (has_width) -- { -- /* Use the entire string, and count the number of -- characters. */ -- arg_end = arg; -- characters = 0; -- for (;;) -- { -- int count = u16_strmblen (arg_end); -- if (count == 0) -- break; -- if (count < 0) -- { -- if (!(result == resultbuf || result == NULL)) -- free (result); -- if (buf_malloced != NULL) -- free (buf_malloced); -- CLEANUP (); -- errno = EILSEQ; -- return NULL; -- } -- arg_end += count; -- characters++; -- } -- } -- else -- { -- /* Use the entire string. */ -- arg_end = arg + u16_strlen (arg); -- /* The number of characters doesn't matter. */ -- characters = 0; -- } -- -- if (has_width && width > characters -- && !(dp->flags & FLAG_LEFT)) -- { -- size_t n = width - characters; -- ENSURE_ALLOCATION (xsum (length, n)); -- DCHAR_SET (result + length, ' ', n); -- length += n; -- } -- --# if DCHAR_IS_UINT16_T -- { -- size_t n = arg_end - arg; -- ENSURE_ALLOCATION (xsum (length, n)); -- DCHAR_CPY (result + length, arg, n); -- length += n; -- } --# else -- { /* Convert. */ -- DCHAR_T *converted = result + length; -- size_t converted_len = allocated - length; --# if DCHAR_IS_TCHAR -- /* Convert from UTF-16 to locale encoding. */ -- if (u16_conv_to_encoding (locale_charset (), -- iconveh_question_mark, -- arg, arg_end - arg, NULL, -- &converted, &converted_len) -- < 0) --# else -- /* Convert from UTF-16 to UTF-8/UTF-32. */ -- converted = -- U16_TO_DCHAR (arg, arg_end - arg, -- converted, &converted_len); -- if (converted == NULL) --# endif -- { -- int saved_errno = errno; -- if (!(result == resultbuf || result == NULL)) -- free (result); -- if (buf_malloced != NULL) -- free (buf_malloced); -- CLEANUP (); -- errno = saved_errno; -- return NULL; -- } -- if (converted != result + length) -- { -- ENSURE_ALLOCATION (xsum (length, converted_len)); -- DCHAR_CPY (result + length, converted, converted_len); -- free (converted); -- } -- length += converted_len; -- } --# endif -- -- if (has_width && width > characters -- && (dp->flags & FLAG_LEFT)) -- { -- size_t n = width - characters; -- ENSURE_ALLOCATION (xsum (length, n)); -- DCHAR_SET (result + length, ' ', n); -- length += n; -- } -- } -- break; -- -- case TYPE_U32_STRING: -- { -- const uint32_t *arg = a.arg[dp->arg_index].a.a_u32_string; -- const uint32_t *arg_end; -- size_t characters; -- -- if (has_precision) -- { -- /* Use only PRECISION characters, from the left. */ -- arg_end = arg; -- characters = 0; -- for (; precision > 0; precision--) -- { -- int count = u32_strmblen (arg_end); -- if (count == 0) -- break; -- if (count < 0) -- { -- if (!(result == resultbuf || result == NULL)) -- free (result); -- if (buf_malloced != NULL) -- free (buf_malloced); -- CLEANUP (); -- errno = EILSEQ; -- return NULL; -- } -- arg_end += count; -- characters++; -- } -- } -- else if (has_width) -- { -- /* Use the entire string, and count the number of -- characters. */ -- arg_end = arg; -- characters = 0; -- for (;;) -- { -- int count = u32_strmblen (arg_end); -- if (count == 0) -- break; -- if (count < 0) -- { -- if (!(result == resultbuf || result == NULL)) -- free (result); -- if (buf_malloced != NULL) -- free (buf_malloced); -- CLEANUP (); -- errno = EILSEQ; -- return NULL; -- } -- arg_end += count; -- characters++; -- } -- } -- else -- { -- /* Use the entire string. */ -- arg_end = arg + u32_strlen (arg); -- /* The number of characters doesn't matter. */ -- characters = 0; -- } -- -- if (has_width && width > characters -- && !(dp->flags & FLAG_LEFT)) -- { -- size_t n = width - characters; -- ENSURE_ALLOCATION (xsum (length, n)); -- DCHAR_SET (result + length, ' ', n); -- length += n; -- } -- --# if DCHAR_IS_UINT32_T -- { -- size_t n = arg_end - arg; -- ENSURE_ALLOCATION (xsum (length, n)); -- DCHAR_CPY (result + length, arg, n); -- length += n; -- } --# else -- { /* Convert. */ -- DCHAR_T *converted = result + length; -- size_t converted_len = allocated - length; --# if DCHAR_IS_TCHAR -- /* Convert from UTF-32 to locale encoding. */ -- if (u32_conv_to_encoding (locale_charset (), -- iconveh_question_mark, -- arg, arg_end - arg, NULL, -- &converted, &converted_len) -- < 0) --# else -- /* Convert from UTF-32 to UTF-8/UTF-16. */ -- converted = -- U32_TO_DCHAR (arg, arg_end - arg, -- converted, &converted_len); -- if (converted == NULL) --# endif -- { -- int saved_errno = errno; -- if (!(result == resultbuf || result == NULL)) -- free (result); -- if (buf_malloced != NULL) -- free (buf_malloced); -- CLEANUP (); -- errno = saved_errno; -- return NULL; -- } -- if (converted != result + length) -- { -- ENSURE_ALLOCATION (xsum (length, converted_len)); -- DCHAR_CPY (result + length, converted, converted_len); -- free (converted); -- } -- length += converted_len; -- } --# endif -- -- if (has_width && width > characters -- && (dp->flags & FLAG_LEFT)) -- { -- size_t n = width - characters; -- ENSURE_ALLOCATION (xsum (length, n)); -- DCHAR_SET (result + length, ' ', n); -- length += n; -- } -- } -- break; -- -- default: -- abort (); -- } -- } --#endif --#if (NEED_PRINTF_DIRECTIVE_A || NEED_PRINTF_LONG_DOUBLE || NEED_PRINTF_DOUBLE) && !defined IN_LIBINTL -- else if ((dp->conversion == 'a' || dp->conversion == 'A') --# if !(NEED_PRINTF_DIRECTIVE_A || (NEED_PRINTF_LONG_DOUBLE && NEED_PRINTF_DOUBLE)) -- && (0 --# if NEED_PRINTF_DOUBLE -- || a.arg[dp->arg_index].type == TYPE_DOUBLE --# endif --# if NEED_PRINTF_LONG_DOUBLE -- || a.arg[dp->arg_index].type == TYPE_LONGDOUBLE --# endif -- ) --# endif -- ) -- { -- arg_type type = a.arg[dp->arg_index].type; -- int flags = dp->flags; -- int has_width; -- size_t width; -- int has_precision; -- size_t precision; -- size_t tmp_length; -- DCHAR_T tmpbuf[700]; -- DCHAR_T *tmp; -- DCHAR_T *pad_ptr; -- DCHAR_T *p; -- -- has_width = 0; -- width = 0; -- if (dp->width_start != dp->width_end) -- { -- if (dp->width_arg_index != ARG_NONE) -- { -- int arg; -- -- if (!(a.arg[dp->width_arg_index].type == TYPE_INT)) -- abort (); -- arg = a.arg[dp->width_arg_index].a.a_int; -- if (arg < 0) -- { -- /* "A negative field width is taken as a '-' flag -- followed by a positive field width." */ -- flags |= FLAG_LEFT; -- width = (unsigned int) (-arg); -- } -- else -- width = arg; -- } -- else -- { -- const FCHAR_T *digitp = dp->width_start; -- -- do -- width = xsum (xtimes (width, 10), *digitp++ - '0'); -- while (digitp != dp->width_end); -- } -- has_width = 1; -- } -- -- has_precision = 0; -- precision = 0; -- if (dp->precision_start != dp->precision_end) -- { -- if (dp->precision_arg_index != ARG_NONE) -- { -- int arg; -- -- if (!(a.arg[dp->precision_arg_index].type == TYPE_INT)) -- abort (); -- arg = a.arg[dp->precision_arg_index].a.a_int; -- /* "A negative precision is taken as if the precision -- were omitted." */ -- if (arg >= 0) -- { -- precision = arg; -- has_precision = 1; -- } -- } -- else -- { -- const FCHAR_T *digitp = dp->precision_start + 1; -- -- precision = 0; -- while (digitp != dp->precision_end) -- precision = xsum (xtimes (precision, 10), *digitp++ - '0'); -- has_precision = 1; -- } -- } -- -- /* Allocate a temporary buffer of sufficient size. */ -- if (type == TYPE_LONGDOUBLE) -- tmp_length = -- (unsigned int) ((LDBL_DIG + 1) -- * 0.831 /* decimal -> hexadecimal */ -- ) -- + 1; /* turn floor into ceil */ -- else -- tmp_length = -- (unsigned int) ((DBL_DIG + 1) -- * 0.831 /* decimal -> hexadecimal */ -- ) -- + 1; /* turn floor into ceil */ -- if (tmp_length < precision) -- tmp_length = precision; -- /* Account for sign, decimal point etc. */ -- tmp_length = xsum (tmp_length, 12); -- -- if (tmp_length < width) -- tmp_length = width; -- -- tmp_length = xsum (tmp_length, 1); /* account for trailing NUL */ -- -- if (tmp_length <= sizeof (tmpbuf) / sizeof (DCHAR_T)) -- tmp = tmpbuf; -- else -- { -- size_t tmp_memsize = xtimes (tmp_length, sizeof (DCHAR_T)); -- -- if (size_overflow_p (tmp_memsize)) -- /* Overflow, would lead to out of memory. */ -- goto out_of_memory; -- tmp = (DCHAR_T *) malloc (tmp_memsize); -- if (tmp == NULL) -- /* Out of memory. */ -- goto out_of_memory; -- } -- -- pad_ptr = NULL; -- p = tmp; -- if (type == TYPE_LONGDOUBLE) -- { --# if NEED_PRINTF_DIRECTIVE_A || NEED_PRINTF_LONG_DOUBLE -- long double arg = a.arg[dp->arg_index].a.a_longdouble; -- -- if (isnanl (arg)) -- { -- if (dp->conversion == 'A') -- { -- *p++ = 'N'; *p++ = 'A'; *p++ = 'N'; -- } -- else -- { -- *p++ = 'n'; *p++ = 'a'; *p++ = 'n'; -- } -- } -- else -- { -- int sign = 0; -- DECL_LONG_DOUBLE_ROUNDING -- -- BEGIN_LONG_DOUBLE_ROUNDING (); -- -- if (signbit (arg)) /* arg < 0.0L or negative zero */ -- { -- sign = -1; -- arg = -arg; -- } -- -- if (sign < 0) -- *p++ = '-'; -- else if (flags & FLAG_SHOWSIGN) -- *p++ = '+'; -- else if (flags & FLAG_SPACE) -- *p++ = ' '; -- -- if (arg > 0.0L && arg + arg == arg) -- { -- if (dp->conversion == 'A') -- { -- *p++ = 'I'; *p++ = 'N'; *p++ = 'F'; -- } -- else -- { -- *p++ = 'i'; *p++ = 'n'; *p++ = 'f'; -- } -- } -- else -- { -- int exponent; -- long double mantissa; -- -- if (arg > 0.0L) -- mantissa = printf_frexpl (arg, &exponent); -- else -- { -- exponent = 0; -- mantissa = 0.0L; -- } -- -- if (has_precision -- && precision < (unsigned int) ((LDBL_DIG + 1) * 0.831) + 1) -- { -- /* Round the mantissa. */ -- long double tail = mantissa; -- size_t q; -- -- for (q = precision; ; q--) -- { -- int digit = (int) tail; -- tail -= digit; -- if (q == 0) -- { -- if (digit & 1 ? tail >= 0.5L : tail > 0.5L) -- tail = 1 - tail; -- else -- tail = - tail; -- break; -- } -- tail *= 16.0L; -- } -- if (tail != 0.0L) -- for (q = precision; q > 0; q--) -- tail *= 0.0625L; -- mantissa += tail; -- } -- -- *p++ = '0'; -- *p++ = dp->conversion - 'A' + 'X'; -- pad_ptr = p; -- { -- int digit; -- -- digit = (int) mantissa; -- mantissa -= digit; -- *p++ = '0' + digit; -- if ((flags & FLAG_ALT) -- || mantissa > 0.0L || precision > 0) -- { -- *p++ = decimal_point_char (); -- /* This loop terminates because we assume -- that FLT_RADIX is a power of 2. */ -- while (mantissa > 0.0L) -- { -- mantissa *= 16.0L; -- digit = (int) mantissa; -- mantissa -= digit; -- *p++ = digit -- + (digit < 10 -- ? '0' -- : dp->conversion - 10); -- if (precision > 0) -- precision--; -- } -- while (precision > 0) -- { -- *p++ = '0'; -- precision--; -- } -- } -- } -- *p++ = dp->conversion - 'A' + 'P'; --# if WIDE_CHAR_VERSION -- { -- static const wchar_t decimal_format[] = -- { '%', '+', 'd', '\0' }; -- SNPRINTF (p, 6 + 1, decimal_format, exponent); -- } -- while (*p != '\0') -- p++; --# else -- if (sizeof (DCHAR_T) == 1) -- { -- sprintf ((char *) p, "%+d", exponent); -- while (*p != '\0') -- p++; -- } -- else -- { -- char expbuf[6 + 1]; -- const char *ep; -- sprintf (expbuf, "%+d", exponent); -- for (ep = expbuf; (*p = *ep) != '\0'; ep++) -- p++; -- } --# endif -- } -- -- END_LONG_DOUBLE_ROUNDING (); -- } --# else -- abort (); --# endif -- } -- else -- { --# if NEED_PRINTF_DIRECTIVE_A || NEED_PRINTF_DOUBLE -- double arg = a.arg[dp->arg_index].a.a_double; -- -- if (isnan (arg)) -- { -- if (dp->conversion == 'A') -- { -- *p++ = 'N'; *p++ = 'A'; *p++ = 'N'; -- } -- else -- { -- *p++ = 'n'; *p++ = 'a'; *p++ = 'n'; -- } -- } -- else -- { -- int sign = 0; -- -- if (signbit (arg)) /* arg < 0.0 or negative zero */ -- { -- sign = -1; -- arg = -arg; -- } -- -- if (sign < 0) -- *p++ = '-'; -- else if (flags & FLAG_SHOWSIGN) -- *p++ = '+'; -- else if (flags & FLAG_SPACE) -- *p++ = ' '; -- -- if (arg > 0.0 && arg + arg == arg) -- { -- if (dp->conversion == 'A') -- { -- *p++ = 'I'; *p++ = 'N'; *p++ = 'F'; -- } -- else -- { -- *p++ = 'i'; *p++ = 'n'; *p++ = 'f'; -- } -- } -- else -- { -- int exponent; -- double mantissa; -- -- if (arg > 0.0) -- mantissa = printf_frexp (arg, &exponent); -- else -- { -- exponent = 0; -- mantissa = 0.0; -- } -- -- if (has_precision -- && precision < (unsigned int) ((DBL_DIG + 1) * 0.831) + 1) -- { -- /* Round the mantissa. */ -- double tail = mantissa; -- size_t q; -- -- for (q = precision; ; q--) -- { -- int digit = (int) tail; -- tail -= digit; -- if (q == 0) -- { -- if (digit & 1 ? tail >= 0.5 : tail > 0.5) -- tail = 1 - tail; -- else -- tail = - tail; -- break; -- } -- tail *= 16.0; -- } -- if (tail != 0.0) -- for (q = precision; q > 0; q--) -- tail *= 0.0625; -- mantissa += tail; -- } -- -- *p++ = '0'; -- *p++ = dp->conversion - 'A' + 'X'; -- pad_ptr = p; -- { -- int digit; -- -- digit = (int) mantissa; -- mantissa -= digit; -- *p++ = '0' + digit; -- if ((flags & FLAG_ALT) -- || mantissa > 0.0 || precision > 0) -- { -- *p++ = decimal_point_char (); -- /* This loop terminates because we assume -- that FLT_RADIX is a power of 2. */ -- while (mantissa > 0.0) -- { -- mantissa *= 16.0; -- digit = (int) mantissa; -- mantissa -= digit; -- *p++ = digit -- + (digit < 10 -- ? '0' -- : dp->conversion - 10); -- if (precision > 0) -- precision--; -- } -- while (precision > 0) -- { -- *p++ = '0'; -- precision--; -- } -- } -- } -- *p++ = dp->conversion - 'A' + 'P'; --# if WIDE_CHAR_VERSION -- { -- static const wchar_t decimal_format[] = -- { '%', '+', 'd', '\0' }; -- SNPRINTF (p, 6 + 1, decimal_format, exponent); -- } -- while (*p != '\0') -- p++; --# else -- if (sizeof (DCHAR_T) == 1) -- { -- sprintf ((char *) p, "%+d", exponent); -- while (*p != '\0') -- p++; -- } -- else -- { -- char expbuf[6 + 1]; -- const char *ep; -- sprintf (expbuf, "%+d", exponent); -- for (ep = expbuf; (*p = *ep) != '\0'; ep++) -- p++; -- } --# endif -- } -- } --# else -- abort (); --# endif -- } -- /* The generated string now extends from tmp to p, with the -- zero padding insertion point being at pad_ptr. */ -- if (has_width && p - tmp < width) -- { -- size_t pad = width - (p - tmp); -- DCHAR_T *end = p + pad; -- -- if (flags & FLAG_LEFT) -- { -- /* Pad with spaces on the right. */ -- for (; pad > 0; pad--) -- *p++ = ' '; -- } -- else if ((flags & FLAG_ZERO) && pad_ptr != NULL) -- { -- /* Pad with zeroes. */ -- DCHAR_T *q = end; -- -- while (p > pad_ptr) -- *--q = *--p; -- for (; pad > 0; pad--) -- *p++ = '0'; -- } -- else -- { -- /* Pad with spaces on the left. */ -- DCHAR_T *q = end; -- -- while (p > tmp) -- *--q = *--p; -- for (; pad > 0; pad--) -- *p++ = ' '; -- } -- -- p = end; -- } -- -- { -- size_t count = p - tmp; -- -- if (count >= tmp_length) -- /* tmp_length was incorrectly calculated - fix the -- code above! */ -- abort (); -- -- /* Make room for the result. */ -- if (count >= allocated - length) -- { -- size_t n = xsum (length, count); -- -- ENSURE_ALLOCATION (n); -- } -- -- /* Append the result. */ -- memcpy (result + length, tmp, count * sizeof (DCHAR_T)); -- if (tmp != tmpbuf) -- free (tmp); -- length += count; -- } -- } --#endif --#if (NEED_PRINTF_INFINITE_DOUBLE || NEED_PRINTF_DOUBLE || NEED_PRINTF_INFINITE_LONG_DOUBLE || NEED_PRINTF_LONG_DOUBLE) && !defined IN_LIBINTL -- else if ((dp->conversion == 'f' || dp->conversion == 'F' -- || dp->conversion == 'e' || dp->conversion == 'E' -- || dp->conversion == 'g' || dp->conversion == 'G' -- || dp->conversion == 'a' || dp->conversion == 'A') -- && (0 --# if NEED_PRINTF_DOUBLE -- || a.arg[dp->arg_index].type == TYPE_DOUBLE --# elif NEED_PRINTF_INFINITE_DOUBLE -- || (a.arg[dp->arg_index].type == TYPE_DOUBLE -- /* The systems (mingw) which produce wrong output -- for Inf, -Inf, and NaN also do so for -0.0. -- Therefore we treat this case here as well. */ -- && is_infinite_or_zero (a.arg[dp->arg_index].a.a_double)) --# endif --# if NEED_PRINTF_LONG_DOUBLE -- || a.arg[dp->arg_index].type == TYPE_LONGDOUBLE --# elif NEED_PRINTF_INFINITE_LONG_DOUBLE -- || (a.arg[dp->arg_index].type == TYPE_LONGDOUBLE -- /* Some systems produce wrong output for Inf, -- -Inf, and NaN. */ -- && is_infinitel (a.arg[dp->arg_index].a.a_longdouble)) --# endif -- )) -- { --# if (NEED_PRINTF_DOUBLE || NEED_PRINTF_INFINITE_DOUBLE) && (NEED_PRINTF_LONG_DOUBLE || NEED_PRINTF_INFINITE_LONG_DOUBLE) -- arg_type type = a.arg[dp->arg_index].type; --# endif -- int flags = dp->flags; -- int has_width; -- size_t width; -- int has_precision; -- size_t precision; -- size_t tmp_length; -- DCHAR_T tmpbuf[700]; -- DCHAR_T *tmp; -- DCHAR_T *pad_ptr; -- DCHAR_T *p; -- -- has_width = 0; -- width = 0; -- if (dp->width_start != dp->width_end) -- { -- if (dp->width_arg_index != ARG_NONE) -- { -- int arg; -- -- if (!(a.arg[dp->width_arg_index].type == TYPE_INT)) -- abort (); -- arg = a.arg[dp->width_arg_index].a.a_int; -- if (arg < 0) -- { -- /* "A negative field width is taken as a '-' flag -- followed by a positive field width." */ -- flags |= FLAG_LEFT; -- width = (unsigned int) (-arg); -- } -- else -- width = arg; -- } -- else -- { -- const FCHAR_T *digitp = dp->width_start; -- -- do -- width = xsum (xtimes (width, 10), *digitp++ - '0'); -- while (digitp != dp->width_end); -- } -- has_width = 1; -- } -- -- has_precision = 0; -- precision = 0; -- if (dp->precision_start != dp->precision_end) -- { -- if (dp->precision_arg_index != ARG_NONE) -- { -- int arg; -- -- if (!(a.arg[dp->precision_arg_index].type == TYPE_INT)) -- abort (); -- arg = a.arg[dp->precision_arg_index].a.a_int; -- /* "A negative precision is taken as if the precision -- were omitted." */ -- if (arg >= 0) -- { -- precision = arg; -- has_precision = 1; -- } -- } -- else -- { -- const FCHAR_T *digitp = dp->precision_start + 1; -- -- precision = 0; -- while (digitp != dp->precision_end) -- precision = xsum (xtimes (precision, 10), *digitp++ - '0'); -- has_precision = 1; -- } -- } -- -- /* POSIX specifies the default precision to be 6 for %f, %F, -- %e, %E, but not for %g, %G. Implementations appear to use -- the same default precision also for %g, %G. */ -- if (!has_precision) -- precision = 6; -- -- /* Allocate a temporary buffer of sufficient size. */ --# if NEED_PRINTF_DOUBLE && NEED_PRINTF_LONG_DOUBLE -- tmp_length = (type == TYPE_LONGDOUBLE ? LDBL_DIG + 1 : DBL_DIG + 1); --# elif NEED_PRINTF_INFINITE_DOUBLE && NEED_PRINTF_LONG_DOUBLE -- tmp_length = (type == TYPE_LONGDOUBLE ? LDBL_DIG + 1 : 0); --# elif NEED_PRINTF_LONG_DOUBLE -- tmp_length = LDBL_DIG + 1; --# elif NEED_PRINTF_DOUBLE -- tmp_length = DBL_DIG + 1; --# else -- tmp_length = 0; --# endif -- if (tmp_length < precision) -- tmp_length = precision; --# if NEED_PRINTF_LONG_DOUBLE --# if NEED_PRINTF_DOUBLE || NEED_PRINTF_INFINITE_DOUBLE -- if (type == TYPE_LONGDOUBLE) --# endif -- if (dp->conversion == 'f' || dp->conversion == 'F') -- { -- long double arg = a.arg[dp->arg_index].a.a_longdouble; -- if (!(isnanl (arg) || arg + arg == arg)) -- { -- /* arg is finite and nonzero. */ -- int exponent = floorlog10l (arg < 0 ? -arg : arg); -- if (exponent >= 0 && tmp_length < exponent + precision) -- tmp_length = exponent + precision; -- } -- } --# endif --# if NEED_PRINTF_DOUBLE --# if NEED_PRINTF_LONG_DOUBLE || NEED_PRINTF_INFINITE_LONG_DOUBLE -- if (type == TYPE_DOUBLE) --# endif -- if (dp->conversion == 'f' || dp->conversion == 'F') -- { -- double arg = a.arg[dp->arg_index].a.a_double; -- if (!(isnan (arg) || arg + arg == arg)) -- { -- /* arg is finite and nonzero. */ -- int exponent = floorlog10 (arg < 0 ? -arg : arg); -- if (exponent >= 0 && tmp_length < exponent + precision) -- tmp_length = exponent + precision; -- } -- } --# endif -- /* Account for sign, decimal point etc. */ -- tmp_length = xsum (tmp_length, 12); -- -- if (tmp_length < width) -- tmp_length = width; -- -- tmp_length = xsum (tmp_length, 1); /* account for trailing NUL */ -- -- if (tmp_length <= sizeof (tmpbuf) / sizeof (DCHAR_T)) -- tmp = tmpbuf; -- else -- { -- size_t tmp_memsize = xtimes (tmp_length, sizeof (DCHAR_T)); -- -- if (size_overflow_p (tmp_memsize)) -- /* Overflow, would lead to out of memory. */ -- goto out_of_memory; -- tmp = (DCHAR_T *) malloc (tmp_memsize); -- if (tmp == NULL) -- /* Out of memory. */ -- goto out_of_memory; -- } -- -- pad_ptr = NULL; -- p = tmp; -- --# if NEED_PRINTF_LONG_DOUBLE || NEED_PRINTF_INFINITE_LONG_DOUBLE --# if NEED_PRINTF_DOUBLE || NEED_PRINTF_INFINITE_DOUBLE -- if (type == TYPE_LONGDOUBLE) --# endif -- { -- long double arg = a.arg[dp->arg_index].a.a_longdouble; -- -- if (isnanl (arg)) -- { -- if (dp->conversion >= 'A' && dp->conversion <= 'Z') -- { -- *p++ = 'N'; *p++ = 'A'; *p++ = 'N'; -- } -- else -- { -- *p++ = 'n'; *p++ = 'a'; *p++ = 'n'; -- } -- } -- else -- { -- int sign = 0; -- DECL_LONG_DOUBLE_ROUNDING -- -- BEGIN_LONG_DOUBLE_ROUNDING (); -- -- if (signbit (arg)) /* arg < 0.0L or negative zero */ -- { -- sign = -1; -- arg = -arg; -- } -- -- if (sign < 0) -- *p++ = '-'; -- else if (flags & FLAG_SHOWSIGN) -- *p++ = '+'; -- else if (flags & FLAG_SPACE) -- *p++ = ' '; -- -- if (arg > 0.0L && arg + arg == arg) -- { -- if (dp->conversion >= 'A' && dp->conversion <= 'Z') -- { -- *p++ = 'I'; *p++ = 'N'; *p++ = 'F'; -- } -- else -- { -- *p++ = 'i'; *p++ = 'n'; *p++ = 'f'; -- } -- } -- else -- { --# if NEED_PRINTF_LONG_DOUBLE -- pad_ptr = p; -- -- if (dp->conversion == 'f' || dp->conversion == 'F') -- { -- char *digits; -- size_t ndigits; -- -- digits = -- scale10_round_decimal_long_double (arg, precision); -- if (digits == NULL) -- { -- END_LONG_DOUBLE_ROUNDING (); -- goto out_of_memory; -- } -- ndigits = strlen (digits); -- -- if (ndigits > precision) -- do -- { -- --ndigits; -- *p++ = digits[ndigits]; -- } -- while (ndigits > precision); -- else -- *p++ = '0'; -- /* Here ndigits <= precision. */ -- if ((flags & FLAG_ALT) || precision > 0) -- { -- *p++ = decimal_point_char (); -- for (; precision > ndigits; precision--) -- *p++ = '0'; -- while (ndigits > 0) -- { -- --ndigits; -- *p++ = digits[ndigits]; -- } -- } -- -- free (digits); -- } -- else if (dp->conversion == 'e' || dp->conversion == 'E') -- { -- int exponent; -- -- if (arg == 0.0L) -- { -- exponent = 0; -- *p++ = '0'; -- if ((flags & FLAG_ALT) || precision > 0) -- { -- *p++ = decimal_point_char (); -- for (; precision > 0; precision--) -- *p++ = '0'; -- } -- } -- else -- { -- /* arg > 0.0L. */ -- int adjusted; -- char *digits; -- size_t ndigits; -- -- exponent = floorlog10l (arg); -- adjusted = 0; -- for (;;) -- { -- digits = -- scale10_round_decimal_long_double (arg, -- (int)precision - exponent); -- if (digits == NULL) -- { -- END_LONG_DOUBLE_ROUNDING (); -- goto out_of_memory; -- } -- ndigits = strlen (digits); -- -- if (ndigits == precision + 1) -- break; -- if (ndigits < precision -- || ndigits > precision + 2) -- /* The exponent was not guessed -- precisely enough. */ -- abort (); -- if (adjusted) -- /* None of two values of exponent is -- the right one. Prevent an endless -- loop. */ -- abort (); -- free (digits); -- if (ndigits == precision) -- exponent -= 1; -- else -- exponent += 1; -- adjusted = 1; -- } -- -- /* Here ndigits = precision+1. */ -- *p++ = digits[--ndigits]; -- if ((flags & FLAG_ALT) || precision > 0) -- { -- *p++ = decimal_point_char (); -- while (ndigits > 0) -- { -- --ndigits; -- *p++ = digits[ndigits]; -- } -- } -- -- free (digits); -- } -- -- *p++ = dp->conversion; /* 'e' or 'E' */ --# if WIDE_CHAR_VERSION -- { -- static const wchar_t decimal_format[] = -- { '%', '+', '.', '2', 'd', '\0' }; -- SNPRINTF (p, 6 + 1, decimal_format, exponent); -- } -- while (*p != '\0') -- p++; --# else -- if (sizeof (DCHAR_T) == 1) -- { -- sprintf ((char *) p, "%+.2d", exponent); -- while (*p != '\0') -- p++; -- } -- else -- { -- char expbuf[6 + 1]; -- const char *ep; -- sprintf (expbuf, "%+.2d", exponent); -- for (ep = expbuf; (*p = *ep) != '\0'; ep++) -- p++; -- } --# endif -- } -- else if (dp->conversion == 'g' || dp->conversion == 'G') -- { -- if (precision == 0) -- precision = 1; -- /* precision >= 1. */ -- -- if (arg == 0.0L) -- /* The exponent is 0, >= -4, < precision. -- Use fixed-point notation. */ -- { -- size_t ndigits = precision; -- /* Number of trailing zeroes that have to be -- dropped. */ -- size_t nzeroes = -- (flags & FLAG_ALT ? 0 : precision - 1); -- -- --ndigits; -- *p++ = '0'; -- if ((flags & FLAG_ALT) || ndigits > nzeroes) -- { -- *p++ = decimal_point_char (); -- while (ndigits > nzeroes) -- { -- --ndigits; -- *p++ = '0'; -- } -- } -- } -- else -- { -- /* arg > 0.0L. */ -- int exponent; -- int adjusted; -- char *digits; -- size_t ndigits; -- size_t nzeroes; -- -- exponent = floorlog10l (arg); -- adjusted = 0; -- for (;;) -- { -- digits = -- scale10_round_decimal_long_double (arg, -- (int)(precision - 1) - exponent); -- if (digits == NULL) -- { -- END_LONG_DOUBLE_ROUNDING (); -- goto out_of_memory; -- } -- ndigits = strlen (digits); -- -- if (ndigits == precision) -- break; -- if (ndigits < precision - 1 -- || ndigits > precision + 1) -- /* The exponent was not guessed -- precisely enough. */ -- abort (); -- if (adjusted) -- /* None of two values of exponent is -- the right one. Prevent an endless -- loop. */ -- abort (); -- free (digits); -- if (ndigits < precision) -- exponent -= 1; -- else -- exponent += 1; -- adjusted = 1; -- } -- /* Here ndigits = precision. */ -- -- /* Determine the number of trailing zeroes -- that have to be dropped. */ -- nzeroes = 0; -- if ((flags & FLAG_ALT) == 0) -- while (nzeroes < ndigits -- && digits[nzeroes] == '0') -- nzeroes++; -- -- /* The exponent is now determined. */ -- if (exponent >= -4 -- && exponent < (long)precision) -- { -- /* Fixed-point notation: -- max(exponent,0)+1 digits, then the -- decimal point, then the remaining -- digits without trailing zeroes. */ -- if (exponent >= 0) -- { -- size_t count = exponent + 1; -- /* Note: count <= precision = ndigits. */ -- for (; count > 0; count--) -- *p++ = digits[--ndigits]; -- if ((flags & FLAG_ALT) || ndigits > nzeroes) -- { -- *p++ = decimal_point_char (); -- while (ndigits > nzeroes) -- { -- --ndigits; -- *p++ = digits[ndigits]; -- } -- } -- } -- else -- { -- size_t count = -exponent - 1; -- *p++ = '0'; -- *p++ = decimal_point_char (); -- for (; count > 0; count--) -- *p++ = '0'; -- while (ndigits > nzeroes) -- { -- --ndigits; -- *p++ = digits[ndigits]; -- } -- } -- } -- else -- { -- /* Exponential notation. */ -- *p++ = digits[--ndigits]; -- if ((flags & FLAG_ALT) || ndigits > nzeroes) -- { -- *p++ = decimal_point_char (); -- while (ndigits > nzeroes) -- { -- --ndigits; -- *p++ = digits[ndigits]; -- } -- } -- *p++ = dp->conversion - 'G' + 'E'; /* 'e' or 'E' */ --# if WIDE_CHAR_VERSION -- { -- static const wchar_t decimal_format[] = -- { '%', '+', '.', '2', 'd', '\0' }; -- SNPRINTF (p, 6 + 1, decimal_format, exponent); -- } -- while (*p != '\0') -- p++; --# else -- if (sizeof (DCHAR_T) == 1) -- { -- sprintf ((char *) p, "%+.2d", exponent); -- while (*p != '\0') -- p++; -- } -- else -- { -- char expbuf[6 + 1]; -- const char *ep; -- sprintf (expbuf, "%+.2d", exponent); -- for (ep = expbuf; (*p = *ep) != '\0'; ep++) -- p++; -- } --# endif -- } -- -- free (digits); -- } -- } -- else -- abort (); --# else -- /* arg is finite. */ -- abort (); --# endif -- } -- -- END_LONG_DOUBLE_ROUNDING (); -- } -- } --# if NEED_PRINTF_DOUBLE || NEED_PRINTF_INFINITE_DOUBLE -- else --# endif --# endif --# if NEED_PRINTF_DOUBLE || NEED_PRINTF_INFINITE_DOUBLE -- { -- double arg = a.arg[dp->arg_index].a.a_double; -- -- if (isnan (arg)) -- { -- if (dp->conversion >= 'A' && dp->conversion <= 'Z') -- { -- *p++ = 'N'; *p++ = 'A'; *p++ = 'N'; -- } -- else -- { -- *p++ = 'n'; *p++ = 'a'; *p++ = 'n'; -- } -- } -- else -- { -- int sign = 0; -- -- if (signbit (arg)) /* arg < 0.0 or negative zero */ -- { -- sign = -1; -- arg = -arg; -- } -- -- if (sign < 0) -- *p++ = '-'; -- else if (flags & FLAG_SHOWSIGN) -- *p++ = '+'; -- else if (flags & FLAG_SPACE) -- *p++ = ' '; -- -- if (arg > 0.0 && arg + arg == arg) -- { -- if (dp->conversion >= 'A' && dp->conversion <= 'Z') -- { -- *p++ = 'I'; *p++ = 'N'; *p++ = 'F'; -- } -- else -- { -- *p++ = 'i'; *p++ = 'n'; *p++ = 'f'; -- } -- } -- else -- { --# if NEED_PRINTF_DOUBLE -- pad_ptr = p; -- -- if (dp->conversion == 'f' || dp->conversion == 'F') -- { -- char *digits; -- size_t ndigits; -- -- digits = -- scale10_round_decimal_double (arg, precision); -- if (digits == NULL) -- goto out_of_memory; -- ndigits = strlen (digits); -- -- if (ndigits > precision) -- do -- { -- --ndigits; -- *p++ = digits[ndigits]; -- } -- while (ndigits > precision); -- else -- *p++ = '0'; -- /* Here ndigits <= precision. */ -- if ((flags & FLAG_ALT) || precision > 0) -- { -- *p++ = decimal_point_char (); -- for (; precision > ndigits; precision--) -- *p++ = '0'; -- while (ndigits > 0) -- { -- --ndigits; -- *p++ = digits[ndigits]; -- } -- } -- -- free (digits); -- } -- else if (dp->conversion == 'e' || dp->conversion == 'E') -- { -- int exponent; -- -- if (arg == 0.0) -- { -- exponent = 0; -- *p++ = '0'; -- if ((flags & FLAG_ALT) || precision > 0) -- { -- *p++ = decimal_point_char (); -- for (; precision > 0; precision--) -- *p++ = '0'; -- } -- } -- else -- { -- /* arg > 0.0. */ -- int adjusted; -- char *digits; -- size_t ndigits; -- -- exponent = floorlog10 (arg); -- adjusted = 0; -- for (;;) -- { -- digits = -- scale10_round_decimal_double (arg, -- (int)precision - exponent); -- if (digits == NULL) -- goto out_of_memory; -- ndigits = strlen (digits); -- -- if (ndigits == precision + 1) -- break; -- if (ndigits < precision -- || ndigits > precision + 2) -- /* The exponent was not guessed -- precisely enough. */ -- abort (); -- if (adjusted) -- /* None of two values of exponent is -- the right one. Prevent an endless -- loop. */ -- abort (); -- free (digits); -- if (ndigits == precision) -- exponent -= 1; -- else -- exponent += 1; -- adjusted = 1; -- } -- -- /* Here ndigits = precision+1. */ -- *p++ = digits[--ndigits]; -- if ((flags & FLAG_ALT) || precision > 0) -- { -- *p++ = decimal_point_char (); -- while (ndigits > 0) -- { -- --ndigits; -- *p++ = digits[ndigits]; -- } -- } -- -- free (digits); -- } -- -- *p++ = dp->conversion; /* 'e' or 'E' */ --# if WIDE_CHAR_VERSION -- { -- static const wchar_t decimal_format[] = -- /* Produce the same number of exponent digits -- as the native printf implementation. */ --# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ -- { '%', '+', '.', '3', 'd', '\0' }; --# else -- { '%', '+', '.', '2', 'd', '\0' }; --# endif -- SNPRINTF (p, 6 + 1, decimal_format, exponent); -- } -- while (*p != '\0') -- p++; --# else -- { -- static const char decimal_format[] = -- /* Produce the same number of exponent digits -- as the native printf implementation. */ --# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ -- "%+.3d"; --# else -- "%+.2d"; --# endif -- if (sizeof (DCHAR_T) == 1) -- { -- sprintf ((char *) p, decimal_format, exponent); -- while (*p != '\0') -- p++; -- } -- else -- { -- char expbuf[6 + 1]; -- const char *ep; -- sprintf (expbuf, decimal_format, exponent); -- for (ep = expbuf; (*p = *ep) != '\0'; ep++) -- p++; -- } -- } --# endif -- } -- else if (dp->conversion == 'g' || dp->conversion == 'G') -- { -- if (precision == 0) -- precision = 1; -- /* precision >= 1. */ -- -- if (arg == 0.0) -- /* The exponent is 0, >= -4, < precision. -- Use fixed-point notation. */ -- { -- size_t ndigits = precision; -- /* Number of trailing zeroes that have to be -- dropped. */ -- size_t nzeroes = -- (flags & FLAG_ALT ? 0 : precision - 1); -- -- --ndigits; -- *p++ = '0'; -- if ((flags & FLAG_ALT) || ndigits > nzeroes) -- { -- *p++ = decimal_point_char (); -- while (ndigits > nzeroes) -- { -- --ndigits; -- *p++ = '0'; -- } -- } -- } -- else -- { -- /* arg > 0.0. */ -- int exponent; -- int adjusted; -- char *digits; -- size_t ndigits; -- size_t nzeroes; -- -- exponent = floorlog10 (arg); -- adjusted = 0; -- for (;;) -- { -- digits = -- scale10_round_decimal_double (arg, -- (int)(precision - 1) - exponent); -- if (digits == NULL) -- goto out_of_memory; -- ndigits = strlen (digits); -- -- if (ndigits == precision) -- break; -- if (ndigits < precision - 1 -- || ndigits > precision + 1) -- /* The exponent was not guessed -- precisely enough. */ -- abort (); -- if (adjusted) -- /* None of two values of exponent is -- the right one. Prevent an endless -- loop. */ -- abort (); -- free (digits); -- if (ndigits < precision) -- exponent -= 1; -- else -- exponent += 1; -- adjusted = 1; -- } -- /* Here ndigits = precision. */ -- -- /* Determine the number of trailing zeroes -- that have to be dropped. */ -- nzeroes = 0; -- if ((flags & FLAG_ALT) == 0) -- while (nzeroes < ndigits -- && digits[nzeroes] == '0') -- nzeroes++; -- -- /* The exponent is now determined. */ -- if (exponent >= -4 -- && exponent < (long)precision) -- { -- /* Fixed-point notation: -- max(exponent,0)+1 digits, then the -- decimal point, then the remaining -- digits without trailing zeroes. */ -- if (exponent >= 0) -- { -- size_t count = exponent + 1; -- /* Note: count <= precision = ndigits. */ -- for (; count > 0; count--) -- *p++ = digits[--ndigits]; -- if ((flags & FLAG_ALT) || ndigits > nzeroes) -- { -- *p++ = decimal_point_char (); -- while (ndigits > nzeroes) -- { -- --ndigits; -- *p++ = digits[ndigits]; -- } -- } -- } -- else -- { -- size_t count = -exponent - 1; -- *p++ = '0'; -- *p++ = decimal_point_char (); -- for (; count > 0; count--) -- *p++ = '0'; -- while (ndigits > nzeroes) -- { -- --ndigits; -- *p++ = digits[ndigits]; -- } -- } -- } -- else -- { -- /* Exponential notation. */ -- *p++ = digits[--ndigits]; -- if ((flags & FLAG_ALT) || ndigits > nzeroes) -- { -- *p++ = decimal_point_char (); -- while (ndigits > nzeroes) -- { -- --ndigits; -- *p++ = digits[ndigits]; -- } -- } -- *p++ = dp->conversion - 'G' + 'E'; /* 'e' or 'E' */ --# if WIDE_CHAR_VERSION -- { -- static const wchar_t decimal_format[] = -- /* Produce the same number of exponent digits -- as the native printf implementation. */ --# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ -- { '%', '+', '.', '3', 'd', '\0' }; --# else -- { '%', '+', '.', '2', 'd', '\0' }; --# endif -- SNPRINTF (p, 6 + 1, decimal_format, exponent); -- } -- while (*p != '\0') -- p++; --# else -- { -- static const char decimal_format[] = -- /* Produce the same number of exponent digits -- as the native printf implementation. */ --# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ -- "%+.3d"; --# else -- "%+.2d"; --# endif -- if (sizeof (DCHAR_T) == 1) -- { -- sprintf ((char *) p, decimal_format, exponent); -- while (*p != '\0') -- p++; -- } -- else -- { -- char expbuf[6 + 1]; -- const char *ep; -- sprintf (expbuf, decimal_format, exponent); -- for (ep = expbuf; (*p = *ep) != '\0'; ep++) -- p++; -- } -- } --# endif -- } -- -- free (digits); -- } -- } -- else -- abort (); --# else -- /* arg is finite. */ -- if (!(arg == 0.0)) -- abort (); -- -- pad_ptr = p; -- -- if (dp->conversion == 'f' || dp->conversion == 'F') -- { -- *p++ = '0'; -- if ((flags & FLAG_ALT) || precision > 0) -- { -- *p++ = decimal_point_char (); -- for (; precision > 0; precision--) -- *p++ = '0'; -- } -- } -- else if (dp->conversion == 'e' || dp->conversion == 'E') -- { -- *p++ = '0'; -- if ((flags & FLAG_ALT) || precision > 0) -- { -- *p++ = decimal_point_char (); -- for (; precision > 0; precision--) -- *p++ = '0'; -- } -- *p++ = dp->conversion; /* 'e' or 'E' */ -- *p++ = '+'; -- /* Produce the same number of exponent digits as -- the native printf implementation. */ --# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ -- *p++ = '0'; --# endif -- *p++ = '0'; -- *p++ = '0'; -- } -- else if (dp->conversion == 'g' || dp->conversion == 'G') -- { -- *p++ = '0'; -- if (flags & FLAG_ALT) -- { -- size_t ndigits = -- (precision > 0 ? precision - 1 : 0); -- *p++ = decimal_point_char (); -- for (; ndigits > 0; --ndigits) -- *p++ = '0'; -- } -- } -- else -- abort (); --# endif -- } -- } -- } --# endif -- -- /* The generated string now extends from tmp to p, with the -- zero padding insertion point being at pad_ptr. */ -- if (has_width && p - tmp < width) -- { -- size_t pad = width - (p - tmp); -- DCHAR_T *end = p + pad; -- -- if (flags & FLAG_LEFT) -- { -- /* Pad with spaces on the right. */ -- for (; pad > 0; pad--) -- *p++ = ' '; -- } -- else if ((flags & FLAG_ZERO) && pad_ptr != NULL) -- { -- /* Pad with zeroes. */ -- DCHAR_T *q = end; -- -- while (p > pad_ptr) -- *--q = *--p; -- for (; pad > 0; pad--) -- *p++ = '0'; -- } -- else -- { -- /* Pad with spaces on the left. */ -- DCHAR_T *q = end; -- -- while (p > tmp) -- *--q = *--p; -- for (; pad > 0; pad--) -- *p++ = ' '; -- } -- -- p = end; -- } -- -- { -- size_t count = p - tmp; -- -- if (count >= tmp_length) -- /* tmp_length was incorrectly calculated - fix the -- code above! */ -- abort (); -- -- /* Make room for the result. */ -- if (count >= allocated - length) -- { -- size_t n = xsum (length, count); -- -- ENSURE_ALLOCATION (n); -- } -- -- /* Append the result. */ -- memcpy (result + length, tmp, count * sizeof (DCHAR_T)); -- if (tmp != tmpbuf) -- free (tmp); -- length += count; -- } -- } --#endif -- else -- { -- arg_type type = a.arg[dp->arg_index].type; -- int flags = dp->flags; --#if !USE_SNPRINTF || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION -- int has_width; -- size_t width; --#endif --#if !USE_SNPRINTF || NEED_PRINTF_UNBOUNDED_PRECISION -- int has_precision; -- size_t precision; --#endif --#if NEED_PRINTF_UNBOUNDED_PRECISION -- int prec_ourselves; --#else --# define prec_ourselves 0 --#endif --#if !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION -- int pad_ourselves; --#else --# define pad_ourselves 0 --#endif -- TCHAR_T *fbp; -- unsigned int prefix_count; -- int prefixes[2]; --#if !USE_SNPRINTF -- size_t tmp_length; -- TCHAR_T tmpbuf[700]; -- TCHAR_T *tmp; --#endif -- --#if !USE_SNPRINTF || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION -- has_width = 0; -- width = 0; -- if (dp->width_start != dp->width_end) -- { -- if (dp->width_arg_index != ARG_NONE) -- { -- int arg; -- -- if (!(a.arg[dp->width_arg_index].type == TYPE_INT)) -- abort (); -- arg = a.arg[dp->width_arg_index].a.a_int; -- if (arg < 0) -- { -- /* "A negative field width is taken as a '-' flag -- followed by a positive field width." */ -- flags |= FLAG_LEFT; -- width = (unsigned int) (-arg); -- } -- else -- width = arg; -- } -- else -- { -- const FCHAR_T *digitp = dp->width_start; -- -- do -- width = xsum (xtimes (width, 10), *digitp++ - '0'); -- while (digitp != dp->width_end); -- } -- has_width = 1; -- } --#endif -- --#if !USE_SNPRINTF || NEED_PRINTF_UNBOUNDED_PRECISION -- has_precision = 0; -- precision = 6; -- if (dp->precision_start != dp->precision_end) -- { -- if (dp->precision_arg_index != ARG_NONE) -- { -- int arg; -- -- if (!(a.arg[dp->precision_arg_index].type == TYPE_INT)) -- abort (); -- arg = a.arg[dp->precision_arg_index].a.a_int; -- /* "A negative precision is taken as if the precision -- were omitted." */ -- if (arg >= 0) -- { -- precision = arg; -- has_precision = 1; -- } -- } -- else -- { -- const FCHAR_T *digitp = dp->precision_start + 1; -- -- precision = 0; -- while (digitp != dp->precision_end) -- precision = xsum (xtimes (precision, 10), *digitp++ - '0'); -- has_precision = 1; -- } -- } --#endif -- --#if !USE_SNPRINTF -- /* Allocate a temporary buffer of sufficient size for calling -- sprintf. */ -- { -- switch (dp->conversion) -- { -- -- case 'd': case 'i': case 'u': --# if HAVE_LONG_LONG_INT -- if (type == TYPE_LONGLONGINT || type == TYPE_ULONGLONGINT) -- tmp_length = -- (unsigned int) (sizeof (unsigned long long) * CHAR_BIT -- * 0.30103 /* binary -> decimal */ -- ) -- + 1; /* turn floor into ceil */ -- else --# endif -- if (type == TYPE_LONGINT || type == TYPE_ULONGINT) -- tmp_length = -- (unsigned int) (sizeof (unsigned long) * CHAR_BIT -- * 0.30103 /* binary -> decimal */ -- ) -- + 1; /* turn floor into ceil */ -- else -- tmp_length = -- (unsigned int) (sizeof (unsigned int) * CHAR_BIT -- * 0.30103 /* binary -> decimal */ -- ) -- + 1; /* turn floor into ceil */ -- if (tmp_length < precision) -- tmp_length = precision; -- /* Multiply by 2, as an estimate for FLAG_GROUP. */ -- tmp_length = xsum (tmp_length, tmp_length); -- /* Add 1, to account for a leading sign. */ -- tmp_length = xsum (tmp_length, 1); -- break; -- -- case 'o': --# if HAVE_LONG_LONG_INT -- if (type == TYPE_LONGLONGINT || type == TYPE_ULONGLONGINT) -- tmp_length = -- (unsigned int) (sizeof (unsigned long long) * CHAR_BIT -- * 0.333334 /* binary -> octal */ -- ) -- + 1; /* turn floor into ceil */ -- else --# endif -- if (type == TYPE_LONGINT || type == TYPE_ULONGINT) -- tmp_length = -- (unsigned int) (sizeof (unsigned long) * CHAR_BIT -- * 0.333334 /* binary -> octal */ -- ) -- + 1; /* turn floor into ceil */ -- else -- tmp_length = -- (unsigned int) (sizeof (unsigned int) * CHAR_BIT -- * 0.333334 /* binary -> octal */ -- ) -- + 1; /* turn floor into ceil */ -- if (tmp_length < precision) -- tmp_length = precision; -- /* Add 1, to account for a leading sign. */ -- tmp_length = xsum (tmp_length, 1); -- break; -- -- case 'x': case 'X': --# if HAVE_LONG_LONG_INT -- if (type == TYPE_LONGLONGINT || type == TYPE_ULONGLONGINT) -- tmp_length = -- (unsigned int) (sizeof (unsigned long long) * CHAR_BIT -- * 0.25 /* binary -> hexadecimal */ -- ) -- + 1; /* turn floor into ceil */ -- else --# endif -- if (type == TYPE_LONGINT || type == TYPE_ULONGINT) -- tmp_length = -- (unsigned int) (sizeof (unsigned long) * CHAR_BIT -- * 0.25 /* binary -> hexadecimal */ -- ) -- + 1; /* turn floor into ceil */ -- else -- tmp_length = -- (unsigned int) (sizeof (unsigned int) * CHAR_BIT -- * 0.25 /* binary -> hexadecimal */ -- ) -- + 1; /* turn floor into ceil */ -- if (tmp_length < precision) -- tmp_length = precision; -- /* Add 2, to account for a leading sign or alternate form. */ -- tmp_length = xsum (tmp_length, 2); -- break; -- -- case 'f': case 'F': -- if (type == TYPE_LONGDOUBLE) -- tmp_length = -- (unsigned int) (LDBL_MAX_EXP -- * 0.30103 /* binary -> decimal */ -- * 2 /* estimate for FLAG_GROUP */ -- ) -- + 1 /* turn floor into ceil */ -- + 10; /* sign, decimal point etc. */ -- else -- tmp_length = -- (unsigned int) (DBL_MAX_EXP -- * 0.30103 /* binary -> decimal */ -- * 2 /* estimate for FLAG_GROUP */ -- ) -- + 1 /* turn floor into ceil */ -- + 10; /* sign, decimal point etc. */ -- tmp_length = xsum (tmp_length, precision); -- break; -- -- case 'e': case 'E': case 'g': case 'G': -- tmp_length = -- 12; /* sign, decimal point, exponent etc. */ -- tmp_length = xsum (tmp_length, precision); -- break; -- -- case 'a': case 'A': -- if (type == TYPE_LONGDOUBLE) -- tmp_length = -- (unsigned int) (LDBL_DIG -- * 0.831 /* decimal -> hexadecimal */ -- ) -- + 1; /* turn floor into ceil */ -- else -- tmp_length = -- (unsigned int) (DBL_DIG -- * 0.831 /* decimal -> hexadecimal */ -- ) -- + 1; /* turn floor into ceil */ -- if (tmp_length < precision) -- tmp_length = precision; -- /* Account for sign, decimal point etc. */ -- tmp_length = xsum (tmp_length, 12); -- break; -- -- case 'c': --# if HAVE_WINT_T && !WIDE_CHAR_VERSION -- if (type == TYPE_WIDE_CHAR) -- tmp_length = MB_CUR_MAX; -- else --# endif -- tmp_length = 1; -- break; -- -- case 's': --# if HAVE_WCHAR_T -- if (type == TYPE_WIDE_STRING) -- { -- tmp_length = -- local_wcslen (a.arg[dp->arg_index].a.a_wide_string); -- --# if !WIDE_CHAR_VERSION -- tmp_length = xtimes (tmp_length, MB_CUR_MAX); --# endif -- } -- else --# endif -- tmp_length = strlen (a.arg[dp->arg_index].a.a_string); -- break; -- -- case 'p': -- tmp_length = -- (unsigned int) (sizeof (void *) * CHAR_BIT -- * 0.25 /* binary -> hexadecimal */ -- ) -- + 1 /* turn floor into ceil */ -- + 2; /* account for leading 0x */ -- break; -- -- default: -- abort (); -- } -- --# if ENABLE_UNISTDIO -- /* Padding considers the number of characters, therefore the -- number of elements after padding may be -- > max (tmp_length, width) -- but is certainly -- <= tmp_length + width. */ -- tmp_length = xsum (tmp_length, width); --# else -- /* Padding considers the number of elements, says POSIX. */ -- if (tmp_length < width) -- tmp_length = width; --# endif -- -- tmp_length = xsum (tmp_length, 1); /* account for trailing NUL */ -- } -- -- if (tmp_length <= sizeof (tmpbuf) / sizeof (TCHAR_T)) -- tmp = tmpbuf; -- else -- { -- size_t tmp_memsize = xtimes (tmp_length, sizeof (TCHAR_T)); -- -- if (size_overflow_p (tmp_memsize)) -- /* Overflow, would lead to out of memory. */ -- goto out_of_memory; -- tmp = (TCHAR_T *) malloc (tmp_memsize); -- if (tmp == NULL) -- /* Out of memory. */ -- goto out_of_memory; -- } --#endif -- -- /* Decide whether to handle the precision ourselves. */ --#if NEED_PRINTF_UNBOUNDED_PRECISION -- switch (dp->conversion) -- { -- case 'd': case 'i': case 'u': -- case 'o': -- case 'x': case 'X': case 'p': -- prec_ourselves = has_precision && (precision > 0); -- break; -- default: -- prec_ourselves = 0; -- break; -- } --#endif -- -- /* Decide whether to perform the padding ourselves. */ --#if !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION -- switch (dp->conversion) -- { --# if !DCHAR_IS_TCHAR || ENABLE_UNISTDIO -- /* If we need conversion from TCHAR_T[] to DCHAR_T[], we need -- to perform the padding after this conversion. Functions -- with unistdio extensions perform the padding based on -- character count rather than element count. */ -- case 'c': case 's': --# endif --# if NEED_PRINTF_FLAG_ZERO -- case 'f': case 'F': case 'e': case 'E': case 'g': case 'G': -- case 'a': case 'A': --# endif -- pad_ourselves = 1; -- break; -- default: -- pad_ourselves = prec_ourselves; -- break; -- } --#endif -- -- /* Construct the format string for calling snprintf or -- sprintf. */ -- fbp = buf; -- *fbp++ = '%'; --#if NEED_PRINTF_FLAG_GROUPING -- /* The underlying implementation doesn't support the ' flag. -- Produce no grouping characters in this case; this is -- acceptable because the grouping is locale dependent. */ --#else -- if (flags & FLAG_GROUP) -- *fbp++ = '\''; --#endif -- if (flags & FLAG_LEFT) -- *fbp++ = '-'; -- if (flags & FLAG_SHOWSIGN) -- *fbp++ = '+'; -- if (flags & FLAG_SPACE) -- *fbp++ = ' '; -- if (flags & FLAG_ALT) -- *fbp++ = '#'; -- if (!pad_ourselves) -- { -- if (flags & FLAG_ZERO) -- *fbp++ = '0'; -- if (dp->width_start != dp->width_end) -- { -- size_t n = dp->width_end - dp->width_start; -- /* The width specification is known to consist only -- of standard ASCII characters. */ -- if (sizeof (FCHAR_T) == sizeof (TCHAR_T)) -- { -- memcpy (fbp, dp->width_start, n * sizeof (TCHAR_T)); -- fbp += n; -- } -- else -- { -- const FCHAR_T *mp = dp->width_start; -- do -- *fbp++ = (unsigned char) *mp++; -- while (--n > 0); -- } -- } -- } -- if (!prec_ourselves) -- { -- if (dp->precision_start != dp->precision_end) -- { -- size_t n = dp->precision_end - dp->precision_start; -- /* The precision specification is known to consist only -- of standard ASCII characters. */ -- if (sizeof (FCHAR_T) == sizeof (TCHAR_T)) -- { -- memcpy (fbp, dp->precision_start, n * sizeof (TCHAR_T)); -- fbp += n; -- } -- else -- { -- const FCHAR_T *mp = dp->precision_start; -- do -- *fbp++ = (unsigned char) *mp++; -- while (--n > 0); -- } -- } -- } -- -- switch (type) -- { --#if HAVE_LONG_LONG_INT -- case TYPE_LONGLONGINT: -- case TYPE_ULONGLONGINT: --# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ -- *fbp++ = 'I'; -- *fbp++ = '6'; -- *fbp++ = '4'; -- break; --# else -- *fbp++ = 'l'; -- /*FALLTHROUGH*/ --# endif --#endif -- case TYPE_LONGINT: -- case TYPE_ULONGINT: --#if HAVE_WINT_T -- case TYPE_WIDE_CHAR: --#endif --#if HAVE_WCHAR_T -- case TYPE_WIDE_STRING: --#endif -- *fbp++ = 'l'; -- break; -- case TYPE_LONGDOUBLE: -- *fbp++ = 'L'; -- break; -- default: -- break; -- } --#if NEED_PRINTF_DIRECTIVE_F -- if (dp->conversion == 'F') -- *fbp = 'f'; -- else --#endif -- *fbp = dp->conversion; --#if USE_SNPRINTF --# if !(__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) -- fbp[1] = '%'; -- fbp[2] = 'n'; -- fbp[3] = '\0'; --# else -- /* On glibc2 systems from glibc >= 2.3 - probably also older -- ones - we know that snprintf's returns value conforms to -- ISO C 99: the gl_SNPRINTF_DIRECTIVE_N test passes. -- Therefore we can avoid using %n in this situation. -- On glibc2 systems from 2004-10-18 or newer, the use of %n -- in format strings in writable memory may crash the program -- (if compiled with _FORTIFY_SOURCE=2), so we should avoid it -- in this situation. */ -- fbp[1] = '\0'; --# endif --#else -- fbp[1] = '\0'; --#endif -- -- /* Construct the arguments for calling snprintf or sprintf. */ -- prefix_count = 0; -- if (!pad_ourselves && dp->width_arg_index != ARG_NONE) -- { -- if (!(a.arg[dp->width_arg_index].type == TYPE_INT)) -- abort (); -- prefixes[prefix_count++] = a.arg[dp->width_arg_index].a.a_int; -- } -- if (dp->precision_arg_index != ARG_NONE) -- { -- if (!(a.arg[dp->precision_arg_index].type == TYPE_INT)) -- abort (); -- prefixes[prefix_count++] = a.arg[dp->precision_arg_index].a.a_int; -- } -- --#if USE_SNPRINTF -- /* The SNPRINTF result is appended after result[0..length]. -- The latter is an array of DCHAR_T; SNPRINTF appends an -- array of TCHAR_T to it. This is possible because -- sizeof (TCHAR_T) divides sizeof (DCHAR_T) and -- alignof (TCHAR_T) <= alignof (DCHAR_T). */ --# define TCHARS_PER_DCHAR (sizeof (DCHAR_T) / sizeof (TCHAR_T)) -- /* Prepare checking whether snprintf returns the count -- via %n. */ -- ENSURE_ALLOCATION (xsum (length, 1)); -- *(TCHAR_T *) (result + length) = '\0'; --#endif -- -- for (;;) -- { -- int count = -1; -- --#if USE_SNPRINTF -- int retcount = 0; -- size_t maxlen = allocated - length; -- /* SNPRINTF can fail if its second argument is -- > INT_MAX. */ -- if (maxlen > INT_MAX / TCHARS_PER_DCHAR) -- maxlen = INT_MAX / TCHARS_PER_DCHAR; -- maxlen = maxlen * TCHARS_PER_DCHAR; --# define SNPRINTF_BUF(arg) \ -- switch (prefix_count) \ -- { \ -- case 0: \ -- retcount = SNPRINTF ((TCHAR_T *) (result + length), \ -- maxlen, buf, \ -- arg, &count); \ -- break; \ -- case 1: \ -- retcount = SNPRINTF ((TCHAR_T *) (result + length), \ -- maxlen, buf, \ -- prefixes[0], arg, &count); \ -- break; \ -- case 2: \ -- retcount = SNPRINTF ((TCHAR_T *) (result + length), \ -- maxlen, buf, \ -- prefixes[0], prefixes[1], arg, \ -- &count); \ -- break; \ -- default: \ -- abort (); \ -- } --#else --# define SNPRINTF_BUF(arg) \ -- switch (prefix_count) \ -- { \ -- case 0: \ -- count = sprintf (tmp, buf, arg); \ -- break; \ -- case 1: \ -- count = sprintf (tmp, buf, prefixes[0], arg); \ -- break; \ -- case 2: \ -- count = sprintf (tmp, buf, prefixes[0], prefixes[1],\ -- arg); \ -- break; \ -- default: \ -- abort (); \ -- } --#endif -- -- switch (type) -- { -- case TYPE_SCHAR: -- { -- int arg = a.arg[dp->arg_index].a.a_schar; -- SNPRINTF_BUF (arg); -- } -- break; -- case TYPE_UCHAR: -- { -- unsigned int arg = a.arg[dp->arg_index].a.a_uchar; -- SNPRINTF_BUF (arg); -- } -- break; -- case TYPE_SHORT: -- { -- int arg = a.arg[dp->arg_index].a.a_short; -- SNPRINTF_BUF (arg); -- } -- break; -- case TYPE_USHORT: -- { -- unsigned int arg = a.arg[dp->arg_index].a.a_ushort; -- SNPRINTF_BUF (arg); -- } -- break; -- case TYPE_INT: -- { -- int arg = a.arg[dp->arg_index].a.a_int; -- SNPRINTF_BUF (arg); -- } -- break; -- case TYPE_UINT: -- { -- unsigned int arg = a.arg[dp->arg_index].a.a_uint; -- SNPRINTF_BUF (arg); -- } -- break; -- case TYPE_LONGINT: -- { -- long int arg = a.arg[dp->arg_index].a.a_longint; -- SNPRINTF_BUF (arg); -- } -- break; -- case TYPE_ULONGINT: -- { -- unsigned long int arg = a.arg[dp->arg_index].a.a_ulongint; -- SNPRINTF_BUF (arg); -- } -- break; --#if HAVE_LONG_LONG_INT -- case TYPE_LONGLONGINT: -- { -- long long int arg = a.arg[dp->arg_index].a.a_longlongint; -- SNPRINTF_BUF (arg); -- } -- break; -- case TYPE_ULONGLONGINT: -- { -- unsigned long long int arg = a.arg[dp->arg_index].a.a_ulonglongint; -- SNPRINTF_BUF (arg); -- } -- break; --#endif -- case TYPE_DOUBLE: -- { -- double arg = a.arg[dp->arg_index].a.a_double; -- SNPRINTF_BUF (arg); -- } -- break; -- case TYPE_LONGDOUBLE: -- { -- long double arg = a.arg[dp->arg_index].a.a_longdouble; -- SNPRINTF_BUF (arg); -- } -- break; -- case TYPE_CHAR: -- { -- int arg = a.arg[dp->arg_index].a.a_char; -- SNPRINTF_BUF (arg); -- } -- break; --#if HAVE_WINT_T -- case TYPE_WIDE_CHAR: -- { -- wint_t arg = a.arg[dp->arg_index].a.a_wide_char; -- SNPRINTF_BUF (arg); -- } -- break; --#endif -- case TYPE_STRING: -- { -- const char *arg = a.arg[dp->arg_index].a.a_string; -- SNPRINTF_BUF (arg); -- } -- break; --#if HAVE_WCHAR_T -- case TYPE_WIDE_STRING: -- { -- const wchar_t *arg = a.arg[dp->arg_index].a.a_wide_string; -- SNPRINTF_BUF (arg); -- } -- break; --#endif -- case TYPE_POINTER: -- { -- void *arg = a.arg[dp->arg_index].a.a_pointer; -- SNPRINTF_BUF (arg); -- } -- break; -- default: -- abort (); -- } -- --#if USE_SNPRINTF -- /* Portability: Not all implementations of snprintf() -- are ISO C 99 compliant. Determine the number of -- bytes that snprintf() has produced or would have -- produced. */ -- if (count >= 0) -- { -- /* Verify that snprintf() has NUL-terminated its -- result. */ -- if (count < maxlen -- && ((TCHAR_T *) (result + length)) [count] != '\0') -- abort (); -- /* Portability hack. */ -- if (retcount > count) -- count = retcount; -- } -- else -- { -- /* snprintf() doesn't understand the '%n' -- directive. */ -- if (fbp[1] != '\0') -- { -- /* Don't use the '%n' directive; instead, look -- at the snprintf() return value. */ -- fbp[1] = '\0'; -- continue; -- } -- else -- { -- /* Look at the snprintf() return value. */ -- if (retcount < 0) -- { -- /* HP-UX 10.20 snprintf() is doubly deficient: -- It doesn't understand the '%n' directive, -- *and* it returns -1 (rather than the length -- that would have been required) when the -- buffer is too small. */ -- size_t bigger_need = -- xsum (xtimes (allocated, 2), 12); -- ENSURE_ALLOCATION (bigger_need); -- continue; -- } -- else -- count = retcount; -- } -- } --#endif -- -- /* Attempt to handle failure. */ -- if (count < 0) -- { -- if (!(result == resultbuf || result == NULL)) -- free (result); -- if (buf_malloced != NULL) -- free (buf_malloced); -- CLEANUP (); -- errno = EINVAL; -- return NULL; -- } -- --#if USE_SNPRINTF -- /* Handle overflow of the allocated buffer. -- If such an overflow occurs, a C99 compliant snprintf() -- returns a count >= maxlen. However, a non-compliant -- snprintf() function returns only count = maxlen - 1. To -- cover both cases, test whether count >= maxlen - 1. */ -- if ((unsigned int) count + 1 >= maxlen) -- { -- /* If maxlen already has attained its allowed maximum, -- allocating more memory will not increase maxlen. -- Instead of looping, bail out. */ -- if (maxlen == INT_MAX / TCHARS_PER_DCHAR) -- goto overflow; -- else -- { -- /* Need at least count * sizeof (TCHAR_T) bytes. -- But allocate proportionally, to avoid looping -- eternally if snprintf() reports a too small -- count. */ -- size_t n = -- xmax (xsum (length, -- (count + TCHARS_PER_DCHAR - 1) -- / TCHARS_PER_DCHAR), -- xtimes (allocated, 2)); -- -- ENSURE_ALLOCATION (n); -- continue; -- } -- } --#endif -- --#if NEED_PRINTF_UNBOUNDED_PRECISION -- if (prec_ourselves) -- { -- /* Handle the precision. */ -- TCHAR_T *prec_ptr = --# if USE_SNPRINTF -- (TCHAR_T *) (result + length); --# else -- tmp; --# endif -- size_t prefix_count; -- size_t move; -- -- prefix_count = 0; -- /* Put the additional zeroes after the sign. */ -- if (count >= 1 -- && (*prec_ptr == '-' || *prec_ptr == '+' -- || *prec_ptr == ' ')) -- prefix_count = 1; -- /* Put the additional zeroes after the 0x prefix if -- (flags & FLAG_ALT) || (dp->conversion == 'p'). */ -- else if (count >= 2 -- && prec_ptr[0] == '0' -- && (prec_ptr[1] == 'x' || prec_ptr[1] == 'X')) -- prefix_count = 2; -- -- move = count - prefix_count; -- if (precision > move) -- { -- /* Insert zeroes. */ -- size_t insert = precision - move; -- TCHAR_T *prec_end; -- --# if USE_SNPRINTF -- size_t n = -- xsum (length, -- (count + insert + TCHARS_PER_DCHAR - 1) -- / TCHARS_PER_DCHAR); -- length += (count + TCHARS_PER_DCHAR - 1) / TCHARS_PER_DCHAR; -- ENSURE_ALLOCATION (n); -- length -= (count + TCHARS_PER_DCHAR - 1) / TCHARS_PER_DCHAR; -- prec_ptr = (TCHAR_T *) (result + length); --# endif -- -- prec_end = prec_ptr + count; -- prec_ptr += prefix_count; -- -- while (prec_end > prec_ptr) -- { -- prec_end--; -- prec_end[insert] = prec_end[0]; -- } -- -- prec_end += insert; -- do -- *--prec_end = '0'; -- while (prec_end > prec_ptr); -- -- count += insert; -- } -- } --#endif -- --#if !DCHAR_IS_TCHAR --# if !USE_SNPRINTF -- if (count >= tmp_length) -- /* tmp_length was incorrectly calculated - fix the -- code above! */ -- abort (); --# endif -- -- /* Convert from TCHAR_T[] to DCHAR_T[]. */ -- if (dp->conversion == 'c' || dp->conversion == 's') -- { -- /* type = TYPE_CHAR or TYPE_WIDE_CHAR or TYPE_STRING -- TYPE_WIDE_STRING. -- The result string is not certainly ASCII. */ -- const TCHAR_T *tmpsrc; -- DCHAR_T *tmpdst; -- size_t tmpdst_len; -- /* This code assumes that TCHAR_T is 'char'. */ -- typedef int TCHAR_T_verify -- [2 * (sizeof (TCHAR_T) == 1) - 1]; --# if USE_SNPRINTF -- tmpsrc = (TCHAR_T *) (result + length); --# else -- tmpsrc = tmp; --# endif -- tmpdst = NULL; -- tmpdst_len = 0; -- if (DCHAR_CONV_FROM_ENCODING (locale_charset (), -- iconveh_question_mark, -- tmpsrc, count, -- NULL, -- &tmpdst, &tmpdst_len) -- < 0) -- { -- int saved_errno = errno; -- if (!(result == resultbuf || result == NULL)) -- free (result); -- if (buf_malloced != NULL) -- free (buf_malloced); -- CLEANUP (); -- errno = saved_errno; -- return NULL; -- } -- ENSURE_ALLOCATION (xsum (length, tmpdst_len)); -- DCHAR_CPY (result + length, tmpdst, tmpdst_len); -- free (tmpdst); -- count = tmpdst_len; -- } -- else -- { -- /* The result string is ASCII. -- Simple 1:1 conversion. */ --# if USE_SNPRINTF -- /* If sizeof (DCHAR_T) == sizeof (TCHAR_T), it's a -- no-op conversion, in-place on the array starting -- at (result + length). */ -- if (sizeof (DCHAR_T) != sizeof (TCHAR_T)) --# endif -- { -- const TCHAR_T *tmpsrc; -- DCHAR_T *tmpdst; -- size_t n; -- --# if USE_SNPRINTF -- if (result == resultbuf) -- { -- tmpsrc = (TCHAR_T *) (result + length); -- /* ENSURE_ALLOCATION will not move tmpsrc -- (because it's part of resultbuf). */ -- ENSURE_ALLOCATION (xsum (length, count)); -- } -- else -- { -- /* ENSURE_ALLOCATION will move the array -- (because it uses realloc(). */ -- ENSURE_ALLOCATION (xsum (length, count)); -- tmpsrc = (TCHAR_T *) (result + length); -- } --# else -- tmpsrc = tmp; -- ENSURE_ALLOCATION (xsum (length, count)); --# endif -- tmpdst = result + length; -- /* Copy backwards, because of overlapping. */ -- tmpsrc += count; -- tmpdst += count; -- for (n = count; n > 0; n--) -- *--tmpdst = (unsigned char) *--tmpsrc; -- } -- } --#endif -- --#if DCHAR_IS_TCHAR && !USE_SNPRINTF -- /* Make room for the result. */ -- if (count > allocated - length) -- { -- /* Need at least count elements. But allocate -- proportionally. */ -- size_t n = -- xmax (xsum (length, count), xtimes (allocated, 2)); -- -- ENSURE_ALLOCATION (n); -- } --#endif -- -- /* Here count <= allocated - length. */ -- -- /* Perform padding. */ --#if !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION -- if (pad_ourselves && has_width) -- { -- size_t w; --# if ENABLE_UNISTDIO -- /* Outside POSIX, it's preferrable to compare the width -- against the number of _characters_ of the converted -- value. */ -- w = DCHAR_MBSNLEN (result + length, count); --# else -- /* The width is compared against the number of _bytes_ -- of the converted value, says POSIX. */ -- w = count; --# endif -- if (w < width) -- { -- size_t pad = width - w; --# if USE_SNPRINTF -- /* Make room for the result. */ -- if (xsum (count, pad) > allocated - length) -- { -- /* Need at least count + pad elements. But -- allocate proportionally. */ -- size_t n = -- xmax (xsum3 (length, count, pad), -- xtimes (allocated, 2)); -- -- length += count; -- ENSURE_ALLOCATION (n); -- length -= count; -- } -- /* Here count + pad <= allocated - length. */ --# endif -- { --# if !DCHAR_IS_TCHAR || USE_SNPRINTF -- DCHAR_T * const rp = result + length; --# else -- DCHAR_T * const rp = tmp; --# endif -- DCHAR_T *p = rp + count; -- DCHAR_T *end = p + pad; --# if NEED_PRINTF_FLAG_ZERO -- DCHAR_T *pad_ptr; --# if !DCHAR_IS_TCHAR -- if (dp->conversion == 'c' -- || dp->conversion == 's') -- /* No zero-padding for string directives. */ -- pad_ptr = NULL; -- else --# endif -- { -- pad_ptr = (*rp == '-' ? rp + 1 : rp); -- /* No zero-padding of "inf" and "nan". */ -- if ((*pad_ptr >= 'A' && *pad_ptr <= 'Z') -- || (*pad_ptr >= 'a' && *pad_ptr <= 'z')) -- pad_ptr = NULL; -- } --# endif -- /* The generated string now extends from rp to p, -- with the zero padding insertion point being at -- pad_ptr. */ -- -- count = count + pad; /* = end - rp */ -- -- if (flags & FLAG_LEFT) -- { -- /* Pad with spaces on the right. */ -- for (; pad > 0; pad--) -- *p++ = ' '; -- } --# if NEED_PRINTF_FLAG_ZERO -- else if ((flags & FLAG_ZERO) && pad_ptr != NULL) -- { -- /* Pad with zeroes. */ -- DCHAR_T *q = end; -- -- while (p > pad_ptr) -- *--q = *--p; -- for (; pad > 0; pad--) -- *p++ = '0'; -- } --# endif -- else -- { -- /* Pad with spaces on the left. */ -- DCHAR_T *q = end; -- -- while (p > rp) -- *--q = *--p; -- for (; pad > 0; pad--) -- *p++ = ' '; -- } -- } -- } -- } --#endif -- --#if DCHAR_IS_TCHAR && !USE_SNPRINTF -- if (count >= tmp_length) -- /* tmp_length was incorrectly calculated - fix the -- code above! */ -- abort (); --#endif -- -- /* Here still count <= allocated - length. */ -- --#if !DCHAR_IS_TCHAR || USE_SNPRINTF -- /* The snprintf() result did fit. */ --#else -- /* Append the sprintf() result. */ -- memcpy (result + length, tmp, count * sizeof (DCHAR_T)); --#endif --#if !USE_SNPRINTF -- if (tmp != tmpbuf) -- free (tmp); --#endif -- --#if NEED_PRINTF_DIRECTIVE_F -- if (dp->conversion == 'F') -- { -- /* Convert the %f result to upper case for %F. */ -- DCHAR_T *rp = result + length; -- size_t rc; -- for (rc = count; rc > 0; rc--, rp++) -- if (*rp >= 'a' && *rp <= 'z') -- *rp = *rp - 'a' + 'A'; -- } --#endif -- -- length += count; -- break; -- } -- } -- } -- } -- -- /* Add the final NUL. */ -- ENSURE_ALLOCATION (xsum (length, 1)); -- result[length] = '\0'; -- -- if (result != resultbuf && length + 1 < allocated) -- { -- /* Shrink the allocated memory if possible. */ -- DCHAR_T *memory; -- -- memory = (DCHAR_T *) realloc (result, (length + 1) * sizeof (DCHAR_T)); -- if (memory != NULL) -- result = memory; -- } -- -- if (buf_malloced != NULL) -- free (buf_malloced); -- CLEANUP (); -- *lengthp = length; -- /* Note that we can produce a big string of a length > INT_MAX. POSIX -- says that snprintf() fails with errno = EOVERFLOW in this case, but -- that's only because snprintf() returns an 'int'. This function does -- not have this limitation. */ -- return result; -- -- overflow: -- if (!(result == resultbuf || result == NULL)) -- free (result); -- if (buf_malloced != NULL) -- free (buf_malloced); -- CLEANUP (); -- errno = EOVERFLOW; -- return NULL; -- -- out_of_memory: -- if (!(result == resultbuf || result == NULL)) -- free (result); -- if (buf_malloced != NULL) -- free (buf_malloced); -- out_of_memory_1: -- CLEANUP (); -- errno = ENOMEM; -- return NULL; -- } --} -- --#undef TCHARS_PER_DCHAR --#undef SNPRINTF --#undef USE_SNPRINTF --#undef DCHAR_CPY --#undef PRINTF_PARSE --#undef DIRECTIVES --#undef DIRECTIVE --#undef DCHAR_IS_TCHAR --#undef TCHAR_T --#undef DCHAR_T --#undef FCHAR_T --#undef VASNPRINTF ---- a/intl/vasnprintf.h -+++ /dev/null -@@ -1,78 +0,0 @@ --/* vsprintf with automatic memory allocation. -- Copyright (C) 2002-2004 Free Software Foundation, Inc. -- -- This program is free software; you can redistribute it and/or modify it -- under the terms of the GNU Library General Public License as published -- by the Free Software Foundation; either version 2, or (at your option) -- any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Library General Public License for more details. -- -- You should have received a copy of the GNU Library General Public -- License along with this program; if not, write to the Free Software -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, -- USA. */ -- --#ifndef _VASNPRINTF_H --#define _VASNPRINTF_H -- --/* Get va_list. */ --#include <stdarg.h> -- --/* Get size_t. */ --#include <stddef.h> -- --#ifndef __attribute__ --/* This feature is available in gcc versions 2.5 and later. */ --# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__ --# define __attribute__(Spec) /* empty */ --# endif --/* The __-protected variants of `format' and `printf' attributes -- are accepted by gcc versions 2.6.4 (effectively 2.7) and later. */ --# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7) --# define __format__ format --# define __printf__ printf --# endif --#endif -- --#ifdef __cplusplus --extern "C" { --#endif -- --/* Write formatted output to a string dynamically allocated with malloc(). -- You can pass a preallocated buffer for the result in RESULTBUF and its -- size in *LENGTHP; otherwise you pass RESULTBUF = NULL. -- If successful, return the address of the string (this may be = RESULTBUF -- if no dynamic memory allocation was necessary) and set *LENGTHP to the -- number of resulting bytes, excluding the trailing NUL. Upon error, set -- errno and return NULL. -- -- When dynamic memory allocation occurs, the preallocated buffer is left -- alone (with possibly modified contents). This makes it possible to use -- a statically allocated or stack-allocated buffer, like this: -- -- char buf[100]; -- size_t len = sizeof (buf); -- char *output = vasnprintf (buf, &len, format, args); -- if (output == NULL) -- ... error handling ...; -- else -- { -- ... use the output string ...; -- if (output != buf) -- free (output); -- } -- */ --extern char * asnprintf (char *resultbuf, size_t *lengthp, const char *format, ...) -- __attribute__ ((__format__ (__printf__, 3, 4))); --extern char * vasnprintf (char *resultbuf, size_t *lengthp, const char *format, va_list args) -- __attribute__ ((__format__ (__printf__, 3, 0))); -- --#ifdef __cplusplus --} --#endif -- --#endif /* _VASNPRINTF_H */ ---- a/intl/vasnwprintf.h -+++ /dev/null -@@ -1,46 +0,0 @@ --/* vswprintf with automatic memory allocation. -- Copyright (C) 2002-2003 Free Software Foundation, Inc. -- -- This program is free software; you can redistribute it and/or modify it -- under the terms of the GNU Library General Public License as published -- by the Free Software Foundation; either version 2, or (at your option) -- any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Library General Public License for more details. -- -- You should have received a copy of the GNU Library General Public -- License along with this program; if not, write to the Free Software -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, -- USA. */ -- --#ifndef _VASNWPRINTF_H --#define _VASNWPRINTF_H -- --/* Get va_list. */ --#include <stdarg.h> -- --/* Get wchar_t, size_t. */ --#include <stddef.h> -- --#ifdef __cplusplus --extern "C" { --#endif -- --/* Write formatted output to a string dynamically allocated with malloc(). -- You can pass a preallocated buffer for the result in RESULTBUF and its -- size in *LENGTHP; otherwise you pass RESULTBUF = NULL. -- If successful, return the address of the string (this may be = RESULTBUF -- if no dynamic memory allocation was necessary) and set *LENGTHP to the -- number of resulting bytes, excluding the trailing NUL. Upon error, set -- errno and return NULL. */ --extern wchar_t * asnwprintf (wchar_t *resultbuf, size_t *lengthp, const wchar_t *format, ...); --extern wchar_t * vasnwprintf (wchar_t *resultbuf, size_t *lengthp, const wchar_t *format, va_list args); -- --#ifdef __cplusplus --} --#endif -- --#endif /* _VASNWPRINTF_H */ ---- a/intl/version.c -+++ /dev/null -@@ -1,26 +0,0 @@ --/* libintl library version. -- Copyright (C) 2005 Free Software Foundation, Inc. -- -- This program is free software; you can redistribute it and/or modify it -- under the terms of the GNU Library General Public License as published -- by the Free Software Foundation; either version 2, or (at your option) -- any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Library General Public License for more details. -- -- You should have received a copy of the GNU Library General Public -- License along with this program; if not, write to the Free Software -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, -- USA. */ -- --#ifdef HAVE_CONFIG_H --# include <config.h> --#endif -- --#include "libgnuintl.h" -- --/* Version number: (major<<16) + (minor<<8) + subminor */ --int libintl_version = LIBINTL_VERSION; ---- a/intl/wprintf-parse.h -+++ /dev/null -@@ -1,75 +0,0 @@ --/* Parse printf format string. -- Copyright (C) 1999, 2002-2003 Free Software Foundation, Inc. -- -- This program is free software; you can redistribute it and/or modify it -- under the terms of the GNU Library General Public License as published -- by the Free Software Foundation; either version 2, or (at your option) -- any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Library General Public License for more details. -- -- You should have received a copy of the GNU Library General Public -- License along with this program; if not, write to the Free Software -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, -- USA. */ -- --#ifndef _WPRINTF_PARSE_H --#define _WPRINTF_PARSE_H -- --#include "printf-args.h" -- -- --/* Flags */ --#define FLAG_GROUP 1 /* ' flag */ --#define FLAG_LEFT 2 /* - flag */ --#define FLAG_SHOWSIGN 4 /* + flag */ --#define FLAG_SPACE 8 /* space flag */ --#define FLAG_ALT 16 /* # flag */ --#define FLAG_ZERO 32 -- --/* arg_index value indicating that no argument is consumed. */ --#define ARG_NONE (~(size_t)0) -- --/* A parsed directive. */ --typedef struct --{ -- const wchar_t* dir_start; -- const wchar_t* dir_end; -- int flags; -- const wchar_t* width_start; -- const wchar_t* width_end; -- size_t width_arg_index; -- const wchar_t* precision_start; -- const wchar_t* precision_end; -- size_t precision_arg_index; -- wchar_t conversion; /* d i o u x X f e E g G c s p n U % but not C S */ -- size_t arg_index; --} --wchar_t_directive; -- --/* A parsed format string. */ --typedef struct --{ -- size_t count; -- wchar_t_directive *dir; -- size_t max_width_length; -- size_t max_precision_length; --} --wchar_t_directives; -- -- --/* Parses the format string. Fills in the number N of directives, and fills -- in directives[0], ..., directives[N-1], and sets directives[N].dir_start -- to the end of the format string. Also fills in the arg_type fields of the -- arguments and the needed count of arguments. */ --#ifdef STATIC --STATIC --#else --extern --#endif --int wprintf_parse (const wchar_t *format, wchar_t_directives *d, arguments *a); -- --#endif /* _WPRINTF_PARSE_H */ ---- a/intl/xsize.h -+++ /dev/null -@@ -1,109 +0,0 @@ --/* xsize.h -- Checked size_t computations. -- -- Copyright (C) 2003 Free Software Foundation, Inc. -- -- This program is free software; you can redistribute it and/or modify it -- under the terms of the GNU Library General Public License as published -- by the Free Software Foundation; either version 2, or (at your option) -- any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Library General Public License for more details. -- -- You should have received a copy of the GNU Library General Public -- License along with this program; if not, write to the Free Software -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, -- USA. */ -- --#ifndef _XSIZE_H --#define _XSIZE_H -- --/* Get size_t. */ --#include <stddef.h> -- --/* Get SIZE_MAX. */ --#include <limits.h> --#if HAVE_STDINT_H --# include <stdint.h> --#endif -- --/* The size of memory objects is often computed through expressions of -- type size_t. Example: -- void* p = malloc (header_size + n * element_size). -- These computations can lead to overflow. When this happens, malloc() -- returns a piece of memory that is way too small, and the program then -- crashes while attempting to fill the memory. -- To avoid this, the functions and macros in this file check for overflow. -- The convention is that SIZE_MAX represents overflow. -- malloc (SIZE_MAX) is not guaranteed to fail -- think of a malloc -- implementation that uses mmap --, it's recommended to use size_overflow_p() -- or size_in_bounds_p() before invoking malloc(). -- The example thus becomes: -- size_t size = xsum (header_size, xtimes (n, element_size)); -- void *p = (size_in_bounds_p (size) ? malloc (size) : NULL); --*/ -- --/* Convert an arbitrary value >= 0 to type size_t. */ --#define xcast_size_t(N) \ -- ((N) <= SIZE_MAX ? (size_t) (N) : SIZE_MAX) -- --/* Sum of two sizes, with overflow check. */ --static inline size_t --#if __GNUC__ >= 3 --__attribute__ ((__pure__)) --#endif --xsum (size_t size1, size_t size2) --{ -- size_t sum = size1 + size2; -- return (sum >= size1 ? sum : SIZE_MAX); --} -- --/* Sum of three sizes, with overflow check. */ --static inline size_t --#if __GNUC__ >= 3 --__attribute__ ((__pure__)) --#endif --xsum3 (size_t size1, size_t size2, size_t size3) --{ -- return xsum (xsum (size1, size2), size3); --} -- --/* Sum of four sizes, with overflow check. */ --static inline size_t --#if __GNUC__ >= 3 --__attribute__ ((__pure__)) --#endif --xsum4 (size_t size1, size_t size2, size_t size3, size_t size4) --{ -- return xsum (xsum (xsum (size1, size2), size3), size4); --} -- --/* Maximum of two sizes, with overflow check. */ --static inline size_t --#if __GNUC__ >= 3 --__attribute__ ((__pure__)) --#endif --xmax (size_t size1, size_t size2) --{ -- /* No explicit check is needed here, because for any n: -- max (SIZE_MAX, n) == SIZE_MAX and max (n, SIZE_MAX) == SIZE_MAX. */ -- return (size1 >= size2 ? size1 : size2); --} -- --/* Multiplication of a count with an element size, with overflow check. -- The count must be >= 0 and the element size must be > 0. -- This is a macro, not an inline function, so that it works correctly even -- when N is of a wider tupe and N > SIZE_MAX. */ --#define xtimes(N, ELSIZE) \ -- ((N) <= SIZE_MAX / (ELSIZE) ? (size_t) (N) * (ELSIZE) : SIZE_MAX) -- --/* Check for overflow. */ --#define size_overflow_p(SIZE) \ -- ((SIZE) == SIZE_MAX) --/* Check against overflow. */ --#define size_in_bounds_p(SIZE) \ -- ((SIZE) != SIZE_MAX) -- --#endif /* _XSIZE_H */ ---- a/m4/intlmacosx.m4 -+++ b/m4/intlmacosx.m4 -@@ -1,50 +1,71 @@ --# intlmacosx.m4 serial 1 (gettext-0.17) --dnl Copyright (C) 2004-2007 Free Software Foundation, Inc. -+# intlmacosx.m4 serial 6 (gettext-0.20) -+dnl Copyright (C) 2004-2014, 2016, 2019 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. - dnl --dnl This file can can be used in projects which are not available under -+dnl This file can be used in projects which are not available under - dnl the GNU General Public License or the GNU Library General Public - dnl License but which still want to provide support for the GNU gettext - dnl functionality. - dnl Please note that the actual code of the GNU gettext library is covered - dnl by the GNU Library General Public License, and the rest of the GNU --dnl gettext package package is covered by the GNU General Public License. -+dnl gettext package is covered by the GNU General Public License. - dnl They are *not* in the public domain. - --dnl Checks for special options needed on MacOS X. -+dnl Checks for special options needed on Mac OS X. - dnl Defines INTL_MACOSX_LIBS. - AC_DEFUN([gt_INTL_MACOSX], - [ -- dnl Check for API introduced in MacOS X 10.2. -+ dnl Check for API introduced in Mac OS X 10.4. - AC_CACHE_CHECK([for CFPreferencesCopyAppValue], -- gt_cv_func_CFPreferencesCopyAppValue, -+ [gt_cv_func_CFPreferencesCopyAppValue], - [gt_save_LIBS="$LIBS" - LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" -- AC_TRY_LINK([#include <CoreFoundation/CFPreferences.h>], -- [CFPreferencesCopyAppValue(NULL, NULL)], -+ AC_LINK_IFELSE( -+ [AC_LANG_PROGRAM( -+ [[#include <CoreFoundation/CFPreferences.h>]], -+ [[CFPreferencesCopyAppValue(NULL, NULL)]])], - [gt_cv_func_CFPreferencesCopyAppValue=yes], - [gt_cv_func_CFPreferencesCopyAppValue=no]) - LIBS="$gt_save_LIBS"]) - if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then -- AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], 1, -- [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) -+ AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1], -+ [Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) - fi -- dnl Check for API introduced in MacOS X 10.3. -- AC_CACHE_CHECK([for CFLocaleCopyCurrent], gt_cv_func_CFLocaleCopyCurrent, -+ dnl Check for API introduced in Mac OS X 10.5. -+ AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent], - [gt_save_LIBS="$LIBS" - LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" -- AC_TRY_LINK([#include <CoreFoundation/CFLocale.h>], [CFLocaleCopyCurrent();], -+ AC_LINK_IFELSE( -+ [AC_LANG_PROGRAM( -+ [[#include <CoreFoundation/CFLocale.h>]], -+ [[CFLocaleCopyCurrent();]])], - [gt_cv_func_CFLocaleCopyCurrent=yes], - [gt_cv_func_CFLocaleCopyCurrent=no]) - LIBS="$gt_save_LIBS"]) - if test $gt_cv_func_CFLocaleCopyCurrent = yes; then -- AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], 1, -- [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.]) -+ AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1], -+ [Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the CoreFoundation framework.]) -+ fi -+ AC_CACHE_CHECK([for CFLocaleCopyPreferredLanguages], [gt_cv_func_CFLocaleCopyPreferredLanguages], -+ [gt_save_LIBS="$LIBS" -+ LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" -+ AC_LINK_IFELSE( -+ [AC_LANG_PROGRAM( -+ [[#include <CoreFoundation/CFLocale.h>]], -+ [[CFLocaleCopyPreferredLanguages();]])], -+ [gt_cv_func_CFLocaleCopyPreferredLanguages=yes], -+ [gt_cv_func_CFLocaleCopyPreferredLanguages=no]) -+ LIBS="$gt_save_LIBS"]) -+ if test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then -+ AC_DEFINE([HAVE_CFLOCALECOPYPREFERREDLANGUAGES], [1], -+ [Define to 1 if you have the Mac OS X function CFLocaleCopyPreferredLanguages in the CoreFoundation framework.]) - fi - INTL_MACOSX_LIBS= -- if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then -+ if test $gt_cv_func_CFPreferencesCopyAppValue = yes \ -+ || test $gt_cv_func_CFLocaleCopyCurrent = yes \ -+ || test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then - INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" - fi - AC_SUBST([INTL_MACOSX_LIBS]) ---- a/po/ChangeLog -+++ b/po/ChangeLog -@@ -1,3 +1,11 @@ -+2019-12-07 gettextize <bug-gnu-gettext@gnu.org> -+ -+ * en@boldquot.header: Upgrade to gettext-0.20.1. -+ * en@quot.header: Upgrade to gettext-0.20.1. -+ * insert-header.sin: Upgrade to gettext-0.20.1. -+ * remove-potcdate.sin: Upgrade to gettext-0.20.1. -+ * Rules-quot: Upgrade to gettext-0.20.1. -+ - 2009-08-11 Scott James Remnant <scott@netsplit.com> - - * libnih.pot: Distribute the pot file ---- a/po/Rules-quot -+++ b/po/Rules-quot -@@ -1,4 +1,9 @@ - # Special Makefile rules for English message catalogs with quotation marks. -+# -+# Copyright (C) 2001-2017 Free Software Foundation, Inc. -+# This file, Rules-quot, and its auxiliary files (listed under -+# DISTFILES.common.extra1) are free software; the Free Software Foundation -+# gives unlimited permission to use, copy, distribute, and modify them. - - DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.header insert-header.sin Rules-quot - -@@ -14,13 +19,23 @@ en@boldquot.po-update: en@boldquot.po-up - - .insert-header.po-update-en: - @lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \ -- if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \ -+ if test "$(PACKAGE)" = "gettext-tools" && test "$(CROSS_COMPILING)" != "yes"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \ - tmpdir=`pwd`; \ - echo "$$lang:"; \ - ll=`echo $$lang | sed -e 's/@.*//'`; \ - LC_ALL=C; export LC_ALL; \ - cd $(srcdir); \ -- if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$ll -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \ -+ if $(MSGINIT) $(MSGINIT_OPTIONS) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null \ -+ | $(SED) -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | \ -+ { case `$(MSGFILTER) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ -+ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-8] | 0.1[0-8].*) \ -+ $(MSGFILTER) $(SED) -f `echo $$lang | sed -e 's/.*@//'`.sed \ -+ ;; \ -+ *) \ -+ $(MSGFILTER) `echo $$lang | sed -e 's/.*@//'` \ -+ ;; \ -+ esac } 2>/dev/null > $$tmpdir/$$lang.new.po \ -+ ; then \ - if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ - rm -f $$tmpdir/$$lang.new.po; \ - else \ ---- a/po/en@boldquot.header -+++ b/po/en@boldquot.header -@@ -2,7 +2,7 @@ - # The msgids must be ASCII and therefore cannot contain real quotation - # characters, only substitutes like grave accent (0x60), apostrophe (0x27) - # and double quote (0x22). These substitutes look strange; see --# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html -+# https://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html - # - # This catalog translates grave accent (0x60) and apostrophe (0x27) to - # left single quotation mark (U+2018) and right single quotation mark (U+2019). ---- a/po/en@quot.header -+++ b/po/en@quot.header -@@ -2,7 +2,7 @@ - # The msgids must be ASCII and therefore cannot contain real quotation - # characters, only substitutes like grave accent (0x60), apostrophe (0x27) - # and double quote (0x22). These substitutes look strange; see --# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html -+# https://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html - # - # This catalog translates grave accent (0x60) and apostrophe (0x27) to - # left single quotation mark (U+2018) and right single quotation mark (U+2019). ---- a/po/insert-header.sin -+++ b/po/insert-header.sin -@@ -1,5 +1,10 @@ - # Sed script that inserts the file called HEADER before the header entry. - # -+# Copyright (C) 2001 Free Software Foundation, Inc. -+# Written by Bruno Haible <bruno@clisp.org>, 2001. -+# This file is free software; the Free Software Foundation gives -+# unlimited permission to use, copy, distribute, and modify it. -+# - # At each occurrence of a line starting with "msgid ", we execute the following - # commands. At the first occurrence, insert the file. At the following - # occurrences, do nothing. The distinction between the first and the following ---- a/po/remove-potcdate.sin -+++ b/po/remove-potcdate.sin -@@ -1,6 +1,12 @@ --# Sed script that remove the POT-Creation-Date line in the header entry -+# Sed script that removes the POT-Creation-Date line in the header entry - # from a POT file. - # -+# Copyright (C) 2002 Free Software Foundation, Inc. -+# Copying and distribution of this file, with or without modification, -+# are permitted in any medium without royalty provided the copyright -+# notice and this notice are preserved. This file is offered as-is, -+# without any warranty. -+# - # The distinction between the first and the following occurrences of the - # pattern is achieved by looking at the hold space. - /^"POT-Creation-Date: .*"$/{ diff --git a/meta-oe/recipes-support/libnih/libnih-1.0.3/0001-signal.c-SIGCLD-and-SIGCHILD-are-same-on-sytem-V-sys.patch b/meta-oe/recipes-support/libnih/libnih-1.0.3/0001-signal.c-SIGCLD-and-SIGCHILD-are-same-on-sytem-V-sys.patch deleted file mode 100644 index a43b4b176c..0000000000 --- a/meta-oe/recipes-support/libnih/libnih-1.0.3/0001-signal.c-SIGCLD-and-SIGCHILD-are-same-on-sytem-V-sys.patch +++ /dev/null @@ -1,28 +0,0 @@ -From f1b9992caf9910f9f7afae401045e42572cc84ff Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 1 Apr 2017 08:50:35 -0700 -Subject: [PATCH] signal.c: SIGCLD and SIGCHILD are same on sytem V systems - -Musl drops the SIGCLD legacy - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - nih/signal.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/nih/signal.c b/nih/signal.c -index a241df9..691c8e6 100644 ---- a/nih/signal.c -+++ b/nih/signal.c -@@ -87,7 +87,7 @@ static const SignalName signal_names[] = { - { SIGSTKFLT, "STKFLT" }, - #endif - { SIGCHLD, "CHLD" }, -- { SIGCLD, "CLD" }, -+ { SIGCHLD, "CLD" }, - { SIGCONT, "CONT" }, - { SIGSTOP, "STOP" }, - { SIGTSTP, "TSTP" }, --- -2.12.1 - diff --git a/meta-oe/recipes-support/libnih/libnih-1.0.3/libnih_1.0.3-4ubuntu16.patch b/meta-oe/recipes-support/libnih/libnih-1.0.3/libnih_1.0.3-4ubuntu16.patch deleted file mode 100644 index 5d125c8514..0000000000 --- a/meta-oe/recipes-support/libnih/libnih-1.0.3/libnih_1.0.3-4ubuntu16.patch +++ /dev/null @@ -1,3593 +0,0 @@ ---- libnih-1.0.3.orig/ChangeLog -+++ libnih-1.0.3/ChangeLog -@@ -1,3 +1,84 @@ -+2013-03-13 Steve Langasek <steve.langasek@ubuntu.com> -+ -+ * nih/watch.c (nih_watch_walk_filter): New NihFileFilter function -+ passed to nih_dir_walk_scan() to ensure the nih_watch_new() filter -+ function is passed the NihWatch data rather than the data passed to -+ the nih_dir_walk() NihFileVisitor function (LP: #776532). -+ -+ * nih/tests/test_watch.c (test_new): New test "with filter and data" -+ to ensure filter is passed correct value. -+ -+2013-02-28 James Hunt <james.hunt@ubuntu.com> -+ -+ * Removal of gcc 'malloc' function attribute resulting from -+ a clarification in its description which makes its use invalid. -+ (LP: #1123588). -+ -+2013-02-05 James Hunt <james.hunt@ubuntu.com> -+ -+ * nih/logging.c: nih_log_abort_message(): Remove erroneous check -+ left over from use of __abort_msg weak symbol. -+ * nih/tests/test_logging.c: Remove unecessary check on whether -+ __nih_abort_msg has an address. -+ -+2012-12-13 Stéphane Graber <stgraber@ubuntu.com> -+ -+ * nih-dbus-tool/type.c, nih-dbus-tool/marshal.c: Update dbus code -+ generator to allow for empty lists for type 'as'. This drops the -+ != NULL check for NULL terminated arrays and moves the iteration -+ loop inside an 'if' statement. -+ -+2012-12-11 Dmitrijs Ledkovs <dmitrijs.ledkovs@canonical.com> -+ -+ * nih/file.c (nih_dir_walk_scan): Fallback to lstat, if the -+ non-portable dirent.d_type is not available (LP: #672643) (Closes: -+ #695604). -+ -+2012-12-10 Petr Lautrbach <plautrba@redhat.com> -+ -+ * nih/tests/test_file.c: don't use dirent.d_type (not portable) -+ -+2012-10-25 James Hunt <james.hunt@ubuntu.com> -+ -+ * nih/logging.c: Use our own __nih_abort_msg rather than the -+ (e)glibc private symbol __abort_msg to avoid upgrade issues (LP: #997359). -+ * nih/tests/test_logging.c: Update tests for __nih_abort_msg. -+ -+2011-08-31 James Hunt <james.hunt@ubuntu.com> -+ -+ * nih-dbus-tool/tests/test_com.netsplit.Nih.Test_object.c -+ (test_unix_fd_to_str): Sanity check value before invoking strchr in -+ case it returns address of null (which would give a misleading test -+ pass). -+ * nih-dbus-tool/tests/test_com.netsplit.Nih.Test_proxy.c -+ (test_unix_fd_to_str, test_unix_fd_to_str_sync): Sanity check value -+ before invoking strchr in case it returns address of null (which would -+ give a misleading test pass). -+ * nih/config.c (): nih_config_block_end: Add check to ensure strchr() -+ doesn't return address of null since this would result in a misleading -+ return value of TRUE. -+ -+ * nih/string.c (nih_str_split): Fixes to avoid over-running -+ input string and also returning an empty string array entry -+ when repeat is true (LP: #834813). -+ * nih/tests/test_string.c (test_str_split): Added a lot of new -+ tests for nih_str_split(). -+ -+2011-08-26 James Hunt <james.hunt@ubuntu.com> -+ -+ * nih/io.c (nih_io_select_fds): Ensure number of fds being managed -+ is within limits. -+ -+ * nih/config.c, nih/error.h, nih/io.c, nih/test_files.h: Correct -+ typos in comments. -+ -+2011-06-20 James Hunt <james.hunt@ubuntu.com> -+ -+ * nih/watch.c (nih_watch_handle): Handle non-directory watches; -+ previously a file watch resulted in an invalid file path ending in -+ a single slash (LP:#777097). -+ * nih/tests/test_watch.c: Added explicit test for watch on a file. -+ - 2010-12-23 Scott James Remnant <scott@netsplit.com> - - * NEWS: Release 1.0.3 ---- libnih-1.0.3.orig/nih/watch.c -+++ libnih-1.0.3/nih/watch.c -@@ -2,8 +2,8 @@ - * - * watch.c - watching of files and directories with inotify - * -- * Copyright © 2009 Scott James Remnant <scott@netsplit.com>. -- * Copyright © 2009 Canonical Ltd. -+ * Copyright © 2011 Scott James Remnant <scott@netsplit.com>. -+ * Copyright © 2011 Canonical Ltd. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2, as -@@ -71,6 +71,9 @@ - uint32_t events, uint32_t cookie, - const char *name, - int *caught_free); -+static int nih_watch_walk_filter (void *data, const char *path, -+ int is_dir) -+ __attribute__ ((warn_unused_result)); - - - /** -@@ -91,7 +94,7 @@ - * sub-directories will be automatically watched. - * - * Additionally, the set of files and directories within @path can be -- * limited by passing a @filter function which will recieve the paths and -+ * limited by passing a @filter function which will receive the paths and - * may return TRUE to indicate that the path received should not be watched. - * - * When a file is created within @path, or moved from outside this location -@@ -104,7 +107,7 @@ - * files that exist under @path when the watch is first added. This only - * occurs if the watch can be added. - * -- * This is a very high level wrapped around the inotify API; lower levels -+ * This is a very high level wrapper around the inotify API; lower levels - * can be obtained using the inotify API itself and some of the helper - * functions used by this one. - * -@@ -185,6 +188,35 @@ - } - - -+ /** -+ * nih_watch_walk_filter: -+ * @data: NihWatch, -+ * @path: path to file, -+ * @is_dir: TRUE if @path is a directory. -+ * -+ * Callback function for nih_dir_walk(), used by nih_watch_add() to wrap -+ * the user-specified NihFileFilter (watch->filter) with a filter that can -+ * take watch itself as an argument. -+ * -+ * Returns: TRUE if the path should be ignored, FALSE otherwise. -+ **/ -+static int -+nih_watch_walk_filter (void *data, const char *path, int is_dir) -+{ -+ NihWatch *watch; -+ -+ watch = (NihWatch *)data; -+ -+ nih_assert (watch); -+ -+ /* No filter, so accept all files */ -+ if (! watch->filter) -+ return FALSE; -+ -+ return watch->filter (watch->data, path, is_dir); -+} -+ -+ - /** - * nih_watch_handle_by_wd: - * @watch: watch to search, -@@ -295,7 +327,7 @@ - * one; errors within the walk are warned automatically, so if this - * fails, it means we literally couldn't watch the top-level. - */ -- if (subdirs && (nih_dir_walk (path, watch->filter, -+ if (subdirs && (nih_dir_walk (path, nih_watch_walk_filter, - (NihFileVisitor)nih_watch_add_visitor, - NULL, watch) < 0)) { - NihError *err; -@@ -494,12 +526,21 @@ - return; - } - -+ /* Every other event must come with a name */ -+ if (name && *name) { - -- /* Every other event must come with a name. */ -- if ((! name) || strchr (name, '/')) -- return; -+ /* If name refers to a directory, there should be no associated -+ * path - just the name of the path element. -+ */ -+ if (strchr (name, '/')) -+ return; - -- path = NIH_MUST (nih_sprintf (NULL, "%s/%s", handle->path, name)); -+ /* Event occured for file within a watched directory */ -+ path = NIH_MUST (nih_sprintf (NULL, "%s/%s", handle->path, name)); -+ } else { -+ /* File event occured */ -+ path = NIH_MUST (nih_strdup (NULL, handle->path)); -+ } - - /* Check the filter */ - if (watch->filter && watch->filter (watch->data, path, ---- libnih-1.0.3.orig/nih/hash.h -+++ libnih-1.0.3/nih/hash.h -@@ -141,7 +141,7 @@ - * @hash: hash table to iterate, - * @iter: name of iterator variable. - * -- * Expans to nested for statements that iterate over each entry in each -+ * Expands to nested for statements that iterate over each entry in each - * bin of @hash, except for the bin head pointer, setting @iter to each - * entry for the block within the loop. A variable named _@iter_i is used - * to iterate the hash bins. -@@ -203,7 +203,7 @@ - NihKeyFunction key_function, - NihHashFunction hash_function, - NihCmpFunction cmp_function) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - NihList * nih_hash_add (NihHash *hash, NihList *entry); - NihList * nih_hash_add_unique (NihHash *hash, NihList *entry); ---- libnih-1.0.3.orig/nih/main.h -+++ libnih-1.0.3/nih/main.h -@@ -138,7 +138,7 @@ - - NihMainLoopFunc *nih_main_loop_add_func (const void *parent, - NihMainLoopCb callback, void *data) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - void nih_main_term_signal (void *data, NihSignal *signal); - ---- libnih-1.0.3.orig/nih/command.h -+++ libnih-1.0.3/nih/command.h -@@ -123,7 +123,7 @@ - - NihCommand *nih_command_join (const void *parent, - const NihCommand *a, const NihCommand *b) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - NIH_END_EXTERN - ---- libnih-1.0.3.orig/nih/config.h -+++ libnih-1.0.3/nih/config.h -@@ -140,10 +140,10 @@ - char * nih_config_next_token (const void *parent, const char *file, - size_t len, size_t *pos, size_t *lineno, - const char *delim, int dequote) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - char * nih_config_next_arg (const void *parent, const char *file, - size_t len, size_t *pos, size_t *lineno) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - void nih_config_next_line (const char *file, size_t len, - size_t *pos, size_t *lineno); - -@@ -155,15 +155,15 @@ - - char ** nih_config_parse_args (const void *parent, const char *file, - size_t len, size_t *pos, size_t *lineno) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - char * nih_config_parse_command (const void *parent, const char *file, - size_t len, size_t *pos, size_t *lineno) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - char * nih_config_parse_block (const void *parent, const char *file, - size_t len, size_t *pos, size_t *lineno, - const char *type) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - int nih_config_skip_block (const char *file, size_t len, - size_t *lineno, size_t *pos, - const char *type, size_t *endpos) ---- libnih-1.0.3.orig/nih/io.c -+++ libnih-1.0.3/nih/io.c -@@ -2,8 +2,8 @@ - * - * io.c - file and socket input/output handling - * -- * Copyright © 2009 Scott James Remnant <scott@netsplit.com>. -- * Copyright © 2009 Canonical Ltd. -+ * Copyright © 2011 Scott James Remnant <scott@netsplit.com>. -+ * Copyright © 2011 Canonical Ltd. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2, as -@@ -165,6 +165,7 @@ - nih_assert (readfds != NULL); - nih_assert (writefds != NULL); - nih_assert (exceptfds != NULL); -+ nih_assert (*nfds <= FD_SETSIZE); - - nih_io_init (); - -@@ -186,6 +187,9 @@ - *nfds = nih_max (*nfds, watch->fd + 1); - } - } -+ -+ /* Re-check in case we exceeded the limit in the loop */ -+ nih_assert (*nfds <= FD_SETSIZE); - } - - /** -@@ -901,7 +905,7 @@ - * read and placed into the receive buffer or queue, and the reader function - * is called if set. - * -- * Any data or messaages in the send buffer or queue are written out if the -+ * Any data or messages in the send buffer or queue are written out if the - * @events includes NIH_IO_WRITE. - * - * Errors are handled when data is read, and result in the error handled -@@ -1211,7 +1215,7 @@ - * This function is called when the local end of a file descriptor being - * managed by NihIo should be closed. Usually this is because the remote - * end has been closed (without error) but it can also be because no -- * error handler was given -+ * error handler was given. - * - * Normally this just calls the close handler, or if not available, it - * closes the file descriptor and frees the structure (which may be -@@ -1291,7 +1295,7 @@ - * @io: structure to be destroyed. - * - * Closes the file descriptor associated with an NihIo structure so that -- * the structure can be freed. IF an error is caught by closing the -+ * the structure can be freed. If an error is caught by closing the - * descriptor, the error handler is called instead of the error being raised; - * this allows you to group your error handling in one place rather than - * special-case close. ---- libnih-1.0.3.orig/nih/watch.h -+++ libnih-1.0.3/nih/watch.h -@@ -156,7 +156,7 @@ - NihCreateHandler create_handler, - NihModifyHandler modify_handler, - NihDeleteHandler delete_handler, void *data) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - int nih_watch_add (NihWatch *watch, const char *path, int subdirs) - __attribute__ ((warn_unused_result)); ---- libnih-1.0.3.orig/nih/tree.h -+++ libnih-1.0.3/nih/tree.h -@@ -344,9 +344,9 @@ - - void nih_tree_init (NihTree *tree); - NihTree * nih_tree_new (const void *parent) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - NihTreeEntry *nih_tree_entry_new (const void *parent) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - NihTree * nih_tree_add (NihTree *tree, NihTree *node, - NihTreeWhere where); ---- libnih-1.0.3.orig/nih/file.c -+++ libnih-1.0.3/nih/file.c -@@ -65,7 +65,7 @@ - /* Prototypes for static functions */ - static char **nih_dir_walk_scan (const char *path, NihFileFilter filter, - void *data) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - static int nih_dir_walk_visit (const char *dirname, NihList *dirs, - const char *path, NihFileFilter filter, - NihFileVisitor visitor, -@@ -619,6 +619,8 @@ - struct dirent *ent; - char **paths; - size_t npaths; -+ int isdir; -+ struct stat statbuf; - - nih_assert (path != NULL); - -@@ -640,7 +642,15 @@ - subpath = NIH_MUST (nih_sprintf (NULL, "%s/%s", - path, ent->d_name)); - -- if (filter && filter (data, subpath, ent->d_type == DT_DIR)) -+ if (ent->d_type == DT_UNKNOWN) { -+ if ( lstat (subpath, &statbuf)) -+ isdir = 0; -+ else -+ isdir = S_ISDIR(statbuf.st_mode); -+ } else -+ isdir = ent->d_type == DT_DIR; -+ -+ if (filter && filter (data, subpath, isdir)) - continue; - - NIH_MUST (nih_str_array_addp (&paths, NULL, &npaths, subpath)); ---- libnih-1.0.3.orig/nih/alloc.c -+++ libnih-1.0.3/nih/alloc.c -@@ -119,8 +119,7 @@ - static inline int nih_alloc_context_free (NihAllocCtx *ctx); - - static inline NihAllocRef *nih_alloc_ref_new (NihAllocCtx *parent, -- NihAllocCtx *child) -- __attribute__ ((malloc)); -+ NihAllocCtx *child); - static inline void nih_alloc_ref_free (NihAllocRef *ref); - static inline NihAllocRef *nih_alloc_ref_lookup (NihAllocCtx *parent, - NihAllocCtx *child); ---- libnih-1.0.3.orig/nih/timer.h -+++ libnih-1.0.3/nih/timer.h -@@ -59,7 +59,7 @@ - * @months: months (1-12), - * @wdays: days of week (0-7). - * -- * Indidcates when scheduled timers should be run, each member is a bit -+ * Indicates when scheduled timers should be run, each member is a bit - * field where the bit is 1 if the timer should be run for that value and - * 0 if not. - **/ -@@ -117,14 +117,14 @@ - - NihTimer *nih_timer_add_timeout (const void *parent, time_t timeout, - NihTimerCb callback, void *data) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - NihTimer *nih_timer_add_periodic (const void *parent, time_t period, - NihTimerCb callback, void *data) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - NihTimer *nih_timer_add_scheduled (const void *parent, - NihTimerSchedule *schedule, - NihTimerCb callback, void *data) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - NihTimer *nih_timer_next_due (void); - void nih_timer_poll (void); ---- libnih-1.0.3.orig/nih/config.c -+++ libnih-1.0.3/nih/config.c -@@ -2,8 +2,8 @@ - * - * config.c - configuration file parsing - * -- * Copyright © 2009 Scott James Remnant <scott@netsplit.com>. -- * Copyright © 2009 Canonical Ltd. -+ * Copyright © 2011 Scott James Remnant <scott@netsplit.com>. -+ * Copyright © 2011 Canonical Ltd. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2, as -@@ -657,7 +657,7 @@ - * of the returned string are freed, the returned string will also be - * freed. - * -- * Returns: the command found or NULL on raised error. -+ * Returns: the newly allocated command found or NULL on raised error. - **/ - char * - nih_config_parse_command (const void *parent, -@@ -714,7 +714,7 @@ - * @lineno: line number, - * @type: block identifier. - * -- * Extracts a block of text from @line, stopping when the pharse "end @type" -+ * Extracts a block of text from @line, stopping when the phrase "end @type" - * is encountered without any quotes or blackslash escaping within it. - * - * @file may be a memory mapped file, in which case @pos should be given -@@ -950,7 +950,7 @@ - return FALSE; - - /* Must be whitespace after */ -- if (! strchr (NIH_CONFIG_WS, file[p + 3])) -+ if (file[p + 3] && ! strchr (NIH_CONFIG_WS, file[p + 3])) - return FALSE; - - /* Find the second word */ ---- libnih-1.0.3.orig/nih/option.h -+++ libnih-1.0.3/nih/option.h -@@ -124,11 +124,11 @@ - char ** nih_option_parser (const void *parent, - int argc, char *argv[], - NihOption *options, int break_nonopt) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - NihOption *nih_option_join (const void *parent, - const NihOption *a, const NihOption *b) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - int nih_option_count (NihOption *option, const char *arg); - int nih_option_int (NihOption *option, const char *arg); ---- libnih-1.0.3.orig/nih/signal.h -+++ libnih-1.0.3/nih/signal.h -@@ -76,7 +76,7 @@ - - NihSignal * nih_signal_add_handler (const void *parent, int signum, - NihSignalHandler handler, void *data) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - void nih_signal_handler (int signum); - void nih_signal_poll (void); ---- libnih-1.0.3.orig/nih/list.h -+++ libnih-1.0.3/nih/list.h -@@ -37,7 +37,7 @@ - * after a known entry, and remove an entry from the list. - * - * List entries may be created in one of two ways. The most common is to -- * embed the NihList structure as the frist member of your own structure, -+ * embed the NihList structure as the first member of your own structure, - * and initialise it with nih_list_init() after allocating the structure. - * Alternatively you may create NihListEntry structures with - * nih_list_entry_new() and point at your own data from them. -@@ -196,10 +196,10 @@ - - void nih_list_init (NihList *entry); - NihList * nih_list_new (const void *parent) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - NihListEntry *nih_list_entry_new (const void *parent) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - - NihList * nih_list_add (NihList *list, NihList *entry); ---- libnih-1.0.3.orig/nih/logging.c -+++ libnih-1.0.3/nih/logging.c -@@ -39,11 +39,11 @@ - - - /** -- * __abort_msg: -+ * __nih_abort_msg: - * -- * A glibc variable that keeps the assertion message in the core dump. -+ * A variable that keeps the assertion message in the core dump. - **/ --extern char *__abort_msg __attribute__ ((weak)); -+char *__nih_abort_msg = NULL; - - /** - * logger: -@@ -114,19 +114,16 @@ - * nih_log_abort_message: - * @message: message to be logged. - * -- * Save @message in the glibc __abort_msg variable so it can be retrieved -+ * Save @message in the __nih_abort_msg variable so it can be retrieved - * by debuggers if we should crash at this point. - **/ - static void - nih_log_abort_message (const char *message) - { -- if (! &__abort_msg) -- return; -+ if (__nih_abort_msg) -+ nih_discard (__nih_abort_msg); - -- if (__abort_msg) -- nih_discard (__abort_msg); -- -- __abort_msg = NIH_MUST (nih_strdup (NULL, message)); -+ __nih_abort_msg = NIH_MUST (nih_strdup (NULL, message)); - } - - /** ---- libnih-1.0.3.orig/nih/test_files.h -+++ libnih-1.0.3/nih/test_files.h -@@ -1,7 +1,7 @@ - /* libnih - * -- * Copyright © 2009 Scott James Remnant <scott@netsplit.com>. -- * Copyright © 2009 Canonical Ltd. -+ * Copyright © 2011 Scott James Remnant <scott@netsplit.com>. -+ * Copyright © 2011 Canonical Ltd. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2, as -@@ -39,7 +39,7 @@ - * TEST_FILENAME: - * @_var: variable to store filename in. - * -- * Generate a filename that may be used for testing, it's unlinked it if -+ * Generate a filename that may be used for testing, it's unlinked if it - * exists and it's up to you to unlink it when done. @_var should be at - * least PATH_MAX long. - **/ ---- libnih-1.0.3.orig/nih/test_process.h -+++ libnih-1.0.3/nih/test_process.h -@@ -36,7 +36,7 @@ - * Spawn a child in which a test can be performed without affecting the - * main flow of the process. The pid of the child is stored in @_pid. - * -- * This macro ensures that the child has begun exectution before the -+ * This macro ensures that the child has begun execution before the - * parent is allowed to continue through the usual use of a pipe. - * - * A block of code should follow this macro, which is the code that will ---- libnih-1.0.3.orig/nih/child.h -+++ libnih-1.0.3/nih/child.h -@@ -98,7 +98,7 @@ - NihChildWatch *nih_child_add_watch (const void *parent, pid_t pid, - NihChildEvents events, - NihChildHandler handler, void *data) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - void nih_child_poll (void); - ---- libnih-1.0.3.orig/nih/alloc.h -+++ libnih-1.0.3/nih/alloc.h -@@ -299,7 +299,7 @@ - * It is permissible to take references to foo within its scope, or by - * functions called, in which case it will not be freed. Also it is - * generally nonsensical to allocate with a parent, since this too will -- * prevent it from beign freed. -+ * prevent it from being freed. - **/ - #define nih_local __attribute__ ((cleanup(_nih_discard_local))) - -@@ -307,11 +307,11 @@ - NIH_BEGIN_EXTERN - - void * nih_alloc (const void *parent, size_t size) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - void * nih_realloc (void *ptr, const void *parent, - size_t size) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - int nih_free (void *ptr); - int nih_discard (void *ptr); ---- libnih-1.0.3.orig/nih/io.h -+++ libnih-1.0.3/nih/io.h -@@ -269,7 +269,7 @@ - NihIoWatch * nih_io_add_watch (const void *parent, int fd, - NihIoEvents events, - NihIoWatcher watcher, void *data) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - void nih_io_select_fds (int *nfds, fd_set *readfds, - fd_set *writefds, fd_set *exceptfds); -@@ -278,12 +278,12 @@ - - - NihIoBuffer * nih_io_buffer_new (const void *parent) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - int nih_io_buffer_resize (NihIoBuffer *buffer, size_t grow); - char * nih_io_buffer_pop (const void *parent, - NihIoBuffer *buffer, size_t *len) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - void nih_io_buffer_shrink (NihIoBuffer *buffer, size_t len); - int nih_io_buffer_push (NihIoBuffer *buffer, - const char *str, size_t len) -@@ -291,7 +291,7 @@ - - - NihIoMessage *nih_io_message_new (const void *parent) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - int nih_io_message_add_control (NihIoMessage *message, int level, - int type, socklen_t len, -@@ -300,7 +300,7 @@ - - NihIoMessage *nih_io_message_recv (const void *parent, int fd, - size_t *len) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - ssize_t nih_io_message_send (NihIoMessage *message, int fd) - __attribute__ ((warn_unused_result)); - -@@ -310,7 +310,7 @@ - NihIoCloseHandler close_handler, - NihIoErrorHandler error_handler, - void *data) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - void nih_io_shutdown (NihIo *io); - int nih_io_destroy (NihIo *io); - -@@ -319,14 +319,14 @@ - - char * nih_io_read (const void *parent, NihIo *io, - size_t *len) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - int nih_io_write (NihIo *io, const char *str, - size_t len) - __attribute__ ((warn_unused_result)); - - char * nih_io_get (const void *parent, NihIo *io, - const char *delim) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - int nih_io_printf (NihIo *io, const char *format, ...) - __attribute__ ((warn_unused_result, format (printf, 2, 3))); ---- libnih-1.0.3.orig/nih/test_output.h -+++ libnih-1.0.3/nih/test_output.h -@@ -61,10 +61,10 @@ - - /** - * TEST_FEATURE: -- * @_feat: name of function feature being tested. -+ * @_feat: name of function or group feature being tested. - * -- * Output a message indicating that a sub-test of a function is being -- * performed, specifically the feature named _feat. -+ * Output a message indicating that a sub-test of a function or -+ * group is being performed, specifically the feature named _feat. - **/ - #define TEST_FEATURE(_feat) \ - printf ("...%s\n", _feat); ---- libnih-1.0.3.orig/nih/error.h -+++ libnih-1.0.3/nih/error.h -@@ -1,7 +1,7 @@ - /* libnih - * -- * Copyright © 2009 Scott James Remnant <scott@netsplit.com>. -- * Copyright © 2009 Canonical Ltd. -+ * Copyright © 2011 Scott James Remnant <scott@netsplit.com>. -+ * Copyright © 2011 Canonical Ltd. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2, as -@@ -111,7 +111,7 @@ - * @message: human-readable message. - * - * Raises an error with the given details in the current error context, -- * if an unhandled error already exists then an error message is emmitted -+ * if an unhandled error already exists then an error message is emitted - * through the logging system; you should try to avoid this. - * - * @message should be a static string, as it will not be freed when the -@@ -126,7 +126,7 @@ - * @format: format string for human-readable message. - * - * Raises an error with the given details in the current error context, -- * if an unhandled error already exists then an error message is emmitted -+ * if an unhandled error already exists then an error message is emitted - * through the logging system; you should try to avoid this. - * - * The human-readable message for the error is parsed according to @format, -@@ -140,7 +140,7 @@ - * nih_error_raise_system: - * - * Raises an error with details taken from the current value of errno, -- * if an unhandled error already exists then an error message is emmitted -+ * if an unhandled error already exists then an error message is emitted - * through the logging system; you should try to avoid this. - **/ - #define nih_error_raise_system() \ -@@ -162,7 +162,7 @@ - * @error: existing object to raise. - * - * Raises the existing error object in the current error context, -- * if an unhandled error already exists then an error message is emmitted -+ * if an unhandled error already exists then an error message is emitted - * through the logging system; you should try to avoid this. - * - * This is normally used to raise a taken error that has not been handled, -@@ -182,7 +182,7 @@ - * @message: human-readable message. - * - * Raises an error with the given details in the current error context, -- * if an unhandled error already exists then an error message is emmitted -+ * if an unhandled error already exists then an error message is emitted - * through the logging system; you should try to avoid this. - * - * Will return from the current function with @retval, which may be left -@@ -199,7 +199,7 @@ - * @retval: return value for function. - * - * Raises an error with details taken from the current value of errno, -- * if an unhandled error already exists then an error message is emmitted -+ * if an unhandled error already exists then an error message is emitted - * through the logging system; you should try to avoid this. - * - * Will return from the current function with @retval, which may be left ---- libnih-1.0.3.orig/nih/string.h -+++ libnih-1.0.3/nih/string.h -@@ -35,60 +35,60 @@ - NIH_BEGIN_EXTERN - - char * nih_sprintf (const void *parent, const char *format, ...) -- __attribute__ ((format (printf, 2, 3), warn_unused_result, malloc)); -+ __attribute__ ((format (printf, 2, 3), warn_unused_result)); - - char * nih_vsprintf (const void *parent, const char *format, - va_list args) -- __attribute__ ((format (printf, 2, 0), warn_unused_result, malloc)); -+ __attribute__ ((format (printf, 2, 0), warn_unused_result)); - - char * nih_strdup (const void *parent, const char *str) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - char * nih_strndup (const void *parent, const char *str, size_t len) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - char * nih_strcat (char **str, const void *parent, const char *src) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - char * nih_strncat (char **str, const void *parent, const char *src, - size_t len) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - char * nih_strcat_sprintf (char **str, const void *parent, - const char *format, ...) -- __attribute__ ((format (printf, 3, 4), warn_unused_result, malloc)); -+ __attribute__ ((format (printf, 3, 4), warn_unused_result)); - char * nih_strcat_vsprintf (char **str, const void *parent, - const char *format, va_list args) -- __attribute__ ((format (printf, 3, 0), warn_unused_result, malloc)); -+ __attribute__ ((format (printf, 3, 0), warn_unused_result)); - - char **nih_str_split (const void *parent, const char *str, - const char *delim, int repeat) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - char **nih_str_array_new (const void *parent) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - char **nih_str_array_add (char ***array, const void *parent, size_t *len, - const char *str) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - char **nih_str_array_addn (char ***array, const void *parent, size_t *len, - const char *str, size_t strlen) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - char **nih_str_array_addp (char ***array, const void *parent, size_t *len, - void *ptr) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - char **nih_str_array_copy (const void *parent, size_t *len, - char * const *array) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - char **nih_str_array_append (char ***array, const void *parent, size_t *len, - char * const *args) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - char * nih_str_wrap (const void *parent, const char *str, size_t len, - size_t first_indent, size_t indent) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - size_t nih_str_screen_width (void); - char * nih_str_screen_wrap (const void *parent, const char *str, - size_t first_indent, size_t indent) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - NIH_END_EXTERN - ---- libnih-1.0.3.orig/nih/string.c -+++ libnih-1.0.3/nih/string.c -@@ -405,7 +405,7 @@ - const char *ptr; - - /* Skip initial delimiters */ -- while (repeat && strchr (delim, *str)) -+ while (repeat && *str && strchr (delim, *str)) - str++; - - /* Find the end of the token */ -@@ -413,6 +413,13 @@ - while (*str && (! strchr (delim, *str))) - str++; - -+ /* Don't create an empty string array element in repeat -+ * mode if there is no token (as a result of a -+ * duplicated delimiter character). -+ */ -+ if (repeat && (str == ptr)) -+ continue; -+ - if (! nih_str_array_addn (&array, parent, &len, - ptr, str - ptr)) { - nih_free (array); ---- libnih-1.0.3.orig/nih/file.h -+++ libnih-1.0.3/nih/file.h -@@ -82,7 +82,7 @@ - - char *nih_file_read (const void *parent, const char *path, - size_t *length) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - void *nih_file_map (const char *path, int flags, size_t *length) - __attribute__ ((warn_unused_result)); ---- libnih-1.0.3.orig/nih/tests/test_option.c -+++ libnih-1.0.3/nih/tests/test_option.c -@@ -1574,7 +1574,7 @@ - output = tmpfile (); - TEST_CHILD (pid) { - TEST_DIVERT_STDOUT (output) { -- char **args; -+ char **args __attribute__((unused)); - - args = nih_option_parser (NULL, argc, argv, - options, FALSE); -@@ -1652,7 +1652,7 @@ - unsetenv ("COLUMNS"); - - TEST_DIVERT_STDOUT (output) { -- char **args; -+ char **args __attribute__((unused)); - - args = nih_option_parser (NULL, argc, argv, - options, FALSE); ---- libnih-1.0.3.orig/nih/tests/test_logging.c -+++ libnih-1.0.3/nih/tests/test_logging.c -@@ -31,7 +31,7 @@ - #include <nih/main.h> - - --extern char *__abort_msg __attribute__ ((weak)); -+extern char *__nih_abort_msg; - - static NihLogLevel last_priority = NIH_LOG_UNKNOWN; - static char * last_message = NULL; -@@ -156,68 +156,63 @@ - } - - -- /* Check that a fatal message is also stored in the glibc __abort_msg -+ /* Check that a fatal message is also stored in the __nih_abort_msg - * variable. - */ -- if (&__abort_msg) { -- TEST_FEATURE ("with fatal message"); -- TEST_ALLOC_FAIL { -- __abort_msg = NULL; -- last_priority = NIH_LOG_UNKNOWN; -- last_message = NULL; -- -- ret = nih_log_message (NIH_LOG_FATAL, -- "message with %s %d formatting", -- "some", 20); -- -- TEST_EQ (ret, 0); -- TEST_EQ (last_priority, NIH_LOG_FATAL); -- TEST_EQ_STR (last_message, "message with some 20 formatting"); -- -- TEST_NE_P (__abort_msg, NULL); -- TEST_ALLOC_PARENT (__abort_msg, NULL); -- TEST_EQ_STR (__abort_msg, "message with some 20 formatting"); -+ TEST_FEATURE ("with fatal message"); -+ TEST_ALLOC_FAIL { -+ __nih_abort_msg = NULL; -+ last_priority = NIH_LOG_UNKNOWN; -+ last_message = NULL; - -- free (last_message); -- } -+ ret = nih_log_message (NIH_LOG_FATAL, -+ "message with %s %d formatting", -+ "some", 20); - -+ TEST_EQ (ret, 0); -+ TEST_EQ (last_priority, NIH_LOG_FATAL); -+ TEST_EQ_STR (last_message, "message with some 20 formatting"); - -- /* Check that a fatal message can safely overwrite one already stored -- * in the glibc __abort_msg variable. -- */ -- TEST_FEATURE ("with second fatal message"); -- TEST_ALLOC_FAIL { -- TEST_ALLOC_SAFE { -- msg = nih_strdup (NULL, "test"); -- } -- -- __abort_msg = msg; -- TEST_FREE_TAG (msg); -- -- last_priority = NIH_LOG_UNKNOWN; -- last_message = NULL; -- -- ret = nih_log_message (NIH_LOG_FATAL, -- "message with %s %d formatting", -- "some", 20); -- -- TEST_EQ (ret, 0); -- TEST_EQ (last_priority, NIH_LOG_FATAL); -- TEST_EQ_STR (last_message, "message with some 20 formatting"); -- -- TEST_FREE (msg); -- -- TEST_NE_P (__abort_msg, NULL); -- TEST_ALLOC_PARENT (__abort_msg, NULL); -- TEST_EQ_STR (__abort_msg, "message with some 20 formatting"); -+ TEST_NE_P (__nih_abort_msg, NULL); -+ TEST_ALLOC_PARENT (__nih_abort_msg, NULL); -+ TEST_EQ_STR (__nih_abort_msg, "message with some 20 formatting"); - -- free (last_message); -- } -- } else { -- printf ("SKIP: __abort_msg not available\n"); -+ free (last_message); - } - - -+ /* Check that a fatal message can safely overwrite one already stored -+ * in the __nih_abort_msg variable. -+ */ -+ TEST_FEATURE ("with second fatal message"); -+ TEST_ALLOC_FAIL { -+ TEST_ALLOC_SAFE { -+ msg = nih_strdup (NULL, "test"); -+ } -+ -+ __nih_abort_msg = msg; -+ TEST_FREE_TAG (msg); -+ -+ last_priority = NIH_LOG_UNKNOWN; -+ last_message = NULL; -+ -+ ret = nih_log_message (NIH_LOG_FATAL, -+ "message with %s %d formatting", -+ "some", 20); -+ -+ TEST_EQ (ret, 0); -+ TEST_EQ (last_priority, NIH_LOG_FATAL); -+ TEST_EQ_STR (last_message, "message with some 20 formatting"); -+ -+ TEST_FREE (msg); -+ -+ TEST_NE_P (__nih_abort_msg, NULL); -+ TEST_ALLOC_PARENT (__nih_abort_msg, NULL); -+ TEST_EQ_STR (__nih_abort_msg, "message with some 20 formatting"); -+ -+ free (last_message); -+ } -+ - /* Check that the nih_debug macro wraps the call properly and - * includes the function in which the message occurred. - */ ---- libnih-1.0.3.orig/nih/tests/test_hash.c -+++ libnih-1.0.3/nih/tests/test_hash.c -@@ -470,7 +470,8 @@ - test_lookup (void) - { - NihHash *hash; -- NihList *entry1, *entry2, *entry3, *ptr; -+ NihList *entry1, *entry2, *ptr; -+ NihList *entry3 __attribute__((unused)); - - TEST_FUNCTION ("nih_hash_lookup"); - hash = nih_hash_string_new (NULL, 0); ---- libnih-1.0.3.orig/nih/tests/test_main.c -+++ libnih-1.0.3/nih/tests/test_main.c -@@ -457,7 +457,7 @@ - test_main_loop (void) - { - NihMainLoopFunc *func; -- NihTimer *timer; -+ NihTimer *timer __attribute__((unused)); - int ret; - - /* Check that we can run through the main loop, and that the ---- libnih-1.0.3.orig/nih/tests/test_watch.c -+++ libnih-1.0.3/nih/tests/test_watch.c -@@ -2,8 +2,8 @@ - * - * test_watch.c - test suite for nih/watch.c - * -- * Copyright © 2009 Scott James Remnant <scott@netsplit.com>. -- * Copyright © 2009 Canonical Ltd. -+ * Copyright © 2011 Scott James Remnant <scott@netsplit.com>. -+ * Copyright © 2011 Canonical Ltd. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2, as -@@ -39,6 +39,8 @@ - #include <nih/error.h> - #include <nih/logging.h> - -+/* Read "The Hitchhikers Guide to the Galaxy" */ -+#define FILTER_VALUE 42 - - static int - my_filter (void *data, -@@ -54,6 +56,26 @@ - return FALSE; - } - -+/* Set by my_filter2 () so it knows if it has already been called */ -+static int my_filter2_called = 0; -+ -+static int -+my_filter2 (int *value, -+ const char *path, -+ int is_dir) -+{ -+ /* we only want to toggle the value once */ -+ if (my_filter2_called) -+ return TRUE; -+ -+ my_filter2_called = 1; -+ -+ nih_assert (value && *value == FILTER_VALUE); -+ *value = 0; -+ -+ return FALSE; -+} -+ - static int create_called = 0; - static int modify_called = 0; - static int delete_called = 0; -@@ -553,6 +575,44 @@ - nih_free (watch); - } - -+ /* Ensure the file filter gets passed the correct data pointer. -+ */ -+ TEST_FEATURE ("with filter and data"); -+ -+ /* Ensure we have a new directory */ -+ TEST_FILENAME (dirname); -+ mkdir (dirname, 0755); -+ -+ /* Create a single file */ -+ strcpy (filename, dirname); -+ strcat (filename, "/foo"); -+ -+ fd = fopen (filename, "w"); -+ fprintf (fd, "test\n"); -+ fclose (fd); -+ -+ TEST_ALLOC_FAIL { -+ int watch_data = FILTER_VALUE; -+ -+ /* Reset required to appease TEST_ALLOC_FAIL */ -+ my_filter2_called = 0; -+ -+ watch = nih_watch_new (NULL, dirname, -+ TRUE, TRUE, -+ (NihFileFilter)my_filter2, -+ NULL, NULL, NULL, -+ &watch_data); -+ -+ TEST_NE_P (watch, NULL); -+ -+ /* Ensure the filter was called and changed the value */ -+ -+ TEST_NE (my_filter2_called, 0); -+ TEST_EQ (watch_data, 0); -+ -+ nih_free (watch); -+ } -+ - strcpy (filename, dirname); - strcat (filename, "/bar"); - chmod (filename, 0755); -@@ -946,13 +1006,82 @@ - nih_error_init (); - - TEST_FILENAME (dirname); -- mkdir (dirname, 0755); -+ TEST_EQ (mkdir (dirname, 0755), 0); - -- watch = nih_watch_new (NULL, dirname, TRUE, TRUE, my_filter, -- my_create_handler, my_modify_handler, -+ TEST_FEATURE ("with watched file"); -+ strcpy (filename, dirname); -+ strcat (filename, "/foo"); -+ -+ /* Create file first since we don't set a create handler on the -+ * watch. -+ */ -+ fd = fopen (filename, "w"); -+ fprintf (fd, "bar\n"); -+ fclose (fd); -+ -+ create_called = 0; -+ modify_called = 0; -+ delete_called = 0; -+ logger_called = 0; -+ last_path = NULL; -+ last_watch = NULL; -+ last_data = NULL; -+ -+ watch = nih_watch_new (NULL, filename, FALSE, FALSE, NULL, -+ NULL, my_modify_handler, - my_delete_handler, &watch); -+ TEST_NE_P (watch, NULL); -+ -+ /* Now, modify the existing file to trigger the modify handler. */ -+ fd = fopen (filename, "a+"); -+ fprintf (fd, "baz\n"); -+ fclose (fd); -+ -+ nfds = 0; -+ FD_ZERO (&readfds); -+ FD_ZERO (&writefds); -+ FD_ZERO (&exceptfds); -+ -+ nih_io_select_fds (&nfds, &readfds, &writefds, &exceptfds); -+ select (nfds, &readfds, &writefds, &exceptfds, NULL); -+ nih_io_handle_fds (&readfds, &writefds, &exceptfds); -+ -+ TEST_EQ_STR (watch->path, filename); -+ -+ /* Ensure no regression to old behaviour (LP:#777097) */ -+ TEST_NE (last_path[ strlen(last_path) - 1 ], '/'); -+ -+ TEST_EQ_STR (last_path, filename); -+ TEST_EQ (modify_called, 1); -+ -+ unlink (filename); -+ -+ nfds = 0; -+ FD_ZERO (&readfds); -+ FD_ZERO (&writefds); -+ FD_ZERO (&exceptfds); -+ -+ nih_io_select_fds (&nfds, &readfds, &writefds, &exceptfds); -+ select (nfds, &readfds, &writefds, &exceptfds, NULL); -+ nih_io_handle_fds (&readfds, &writefds, &exceptfds); - -+ TEST_EQ (delete_called, 1); - -+ rmdir (filename); -+ nih_free (last_path); -+ -+ create_called = 0; -+ modify_called = 0; -+ delete_called = 0; -+ logger_called = 0; -+ last_path = NULL; -+ last_watch = NULL; -+ last_data = NULL; -+ -+ -+ watch = nih_watch_new (NULL, dirname, TRUE, TRUE, my_filter, -+ my_create_handler, my_modify_handler, -+ my_delete_handler, &watch); - /* Check that creating a file within the directory being watched - * results in the create handler being called, and passed the full - * path of the created file to it. ---- libnih-1.0.3.orig/nih/tests/test_string.c -+++ libnih-1.0.3/nih/tests/test_string.c -@@ -619,6 +619,215 @@ - nih_free (array); - } - -+ TEST_FEATURE ("with no repeat and multiple identical delimiter " -+ "characters at string start"); -+ TEST_ALLOC_FAIL { -+ array = nih_str_split (NULL, "\t\tthis is a test", " \t", FALSE); -+ -+ if (test_alloc_failed) { -+ TEST_EQ_P (array, NULL); -+ continue; -+ } -+ -+ TEST_ALLOC_SIZE (array, sizeof (char *) * 7); -+ for (i = 0; i < 6; i++) -+ TEST_ALLOC_PARENT (array[i], array); -+ -+ TEST_EQ_STR (array[0], ""); -+ TEST_EQ_STR (array[1], ""); -+ TEST_EQ_STR (array[2], "this"); -+ TEST_EQ_STR (array[3], "is"); -+ TEST_EQ_STR (array[4], "a"); -+ TEST_EQ_STR (array[5], "test"); -+ TEST_EQ_P (array[6], NULL); -+ -+ nih_free (array); -+ } -+ -+ TEST_FEATURE ("with no repeat and multiple different delimiter " -+ "characters at string start"); -+ TEST_ALLOC_FAIL { -+ array = nih_str_split (NULL, " \tthis is a test", " \t", FALSE); -+ -+ if (test_alloc_failed) { -+ TEST_EQ_P (array, NULL); -+ continue; -+ } -+ -+ TEST_ALLOC_SIZE (array, sizeof (char *) * 7); -+ for (i = 0; i < 6; i++) -+ TEST_ALLOC_PARENT (array[i], array); -+ -+ TEST_EQ_STR (array[0], ""); -+ TEST_EQ_STR (array[1], ""); -+ TEST_EQ_STR (array[2], "this"); -+ TEST_EQ_STR (array[3], "is"); -+ TEST_EQ_STR (array[4], "a"); -+ TEST_EQ_STR (array[5], "test"); -+ TEST_EQ_P (array[6], NULL); -+ -+ nih_free (array); -+ } -+ -+ TEST_FEATURE ("with no repeat and multiple identical delimiter " -+ "characters within string"); -+ TEST_ALLOC_FAIL { -+ array = nih_str_split (NULL, "this is a\t\ttest", " \t", FALSE); -+ -+ if (test_alloc_failed) { -+ TEST_EQ_P (array, NULL); -+ continue; -+ } -+ -+ TEST_ALLOC_SIZE (array, sizeof (char *) * 8); -+ for (i = 0; i < 7; i++) -+ TEST_ALLOC_PARENT (array[i], array); -+ -+ TEST_EQ_STR (array[0], "this"); -+ TEST_EQ_STR (array[1], "is"); -+ TEST_EQ_STR (array[2], ""); -+ TEST_EQ_STR (array[3], ""); -+ TEST_EQ_STR (array[4], "a"); -+ TEST_EQ_STR (array[5], ""); -+ TEST_EQ_STR (array[6], "test"); -+ TEST_EQ_P (array[7], NULL); -+ -+ nih_free (array); -+ } -+ -+ TEST_FEATURE ("with no repeat and multiple different delimiter " -+ "characters within string"); -+ TEST_ALLOC_FAIL { -+ array = nih_str_split (NULL, "this is \n\ta\ttest", " \t\n", FALSE); -+ -+ if (test_alloc_failed) { -+ TEST_EQ_P (array, NULL); -+ continue; -+ } -+ -+ TEST_ALLOC_SIZE (array, sizeof (char *) * 7); -+ for (i = 0; i < 6; i++) -+ TEST_ALLOC_PARENT (array[i], array); -+ -+ TEST_EQ_STR (array[0], "this"); -+ TEST_EQ_STR (array[1], "is"); -+ TEST_EQ_STR (array[2], ""); -+ TEST_EQ_STR (array[3], ""); -+ TEST_EQ_STR (array[4], "a"); -+ TEST_EQ_STR (array[5], "test"); -+ TEST_EQ_P (array[6], NULL); -+ -+ nih_free (array); -+ } -+ -+ TEST_FEATURE ("with no repeat and multiple identical delimiter " -+ "characters at string end"); -+ TEST_ALLOC_FAIL { -+ array = nih_str_split (NULL, "this is a test ", " \t", FALSE); -+ -+ if (test_alloc_failed) { -+ TEST_EQ_P (array, NULL); -+ continue; -+ } -+ -+ TEST_ALLOC_SIZE (array, sizeof (char *) * 6); -+ for (i = 0; i < 5; i++) -+ TEST_ALLOC_PARENT (array[i], array); -+ -+ TEST_EQ_STR (array[0], "this"); -+ TEST_EQ_STR (array[1], "is"); -+ TEST_EQ_STR (array[2], "a"); -+ TEST_EQ_STR (array[3], "test"); -+ TEST_EQ_STR (array[4], ""); -+ TEST_EQ_P (array[5], NULL); -+ -+ nih_free (array); -+ } -+ -+ TEST_FEATURE ("with no repeat and multiple different delimiter " -+ "characters at string end"); -+ TEST_ALLOC_FAIL { -+ array = nih_str_split (NULL, "this is a test \t", " \t", FALSE); -+ -+ if (test_alloc_failed) { -+ TEST_EQ_P (array, NULL); -+ continue; -+ } -+ -+ TEST_ALLOC_SIZE (array, sizeof (char *) * 6); -+ for (i = 0; i < 5; i++) -+ TEST_ALLOC_PARENT (array[i], array); -+ -+ TEST_EQ_STR (array[0], "this"); -+ TEST_EQ_STR (array[1], "is"); -+ TEST_EQ_STR (array[2], "a"); -+ TEST_EQ_STR (array[3], "test"); -+ TEST_EQ_STR (array[4], ""); -+ TEST_EQ_P (array[5], NULL); -+ -+ nih_free (array); -+ } -+ -+ TEST_FEATURE ("with no repeat and multiple identical delimiter " -+ "characters at beginning, middle and end of string"); -+ TEST_ALLOC_FAIL { -+ array = nih_str_split (NULL, " this is\n\n\na test\t\t\t", " \t\n", FALSE); -+ -+ if (test_alloc_failed) { -+ TEST_EQ_P (array, NULL); -+ continue; -+ } -+ -+ TEST_ALLOC_SIZE (array, sizeof (char *) * 12); -+ for (i = 0; i < 11; i++) -+ TEST_ALLOC_PARENT (array[i], array); -+ -+ TEST_EQ_STR (array[0], ""); -+ TEST_EQ_STR (array[1], ""); -+ TEST_EQ_STR (array[2], ""); -+ TEST_EQ_STR (array[3], "this"); -+ TEST_EQ_STR (array[4], "is"); -+ TEST_EQ_STR (array[5], ""); -+ TEST_EQ_STR (array[6], ""); -+ TEST_EQ_STR (array[7], "a"); -+ TEST_EQ_STR (array[8], "test"); -+ TEST_EQ_STR (array[9], ""); -+ TEST_EQ_STR (array[10], ""); -+ TEST_EQ_P (array[11], NULL); -+ -+ nih_free (array); -+ } -+ -+ TEST_FEATURE ("with no repeat and multiple different delimiter " -+ "characters at beginning, middle and end of string"); -+ TEST_ALLOC_FAIL { -+ array = nih_str_split (NULL, ": \nthis is\t \n:a test:\n ", "\n :\t", FALSE); -+ -+ if (test_alloc_failed) { -+ TEST_EQ_P (array, NULL); -+ continue; -+ } -+ -+ TEST_ALLOC_SIZE (array, sizeof (char *) * 13); -+ for (i = 0; i < 12; i++) -+ TEST_ALLOC_PARENT (array[i], array); -+ -+ TEST_EQ_STR (array[0], ""); -+ TEST_EQ_STR (array[1], ""); -+ TEST_EQ_STR (array[2], ""); -+ TEST_EQ_STR (array[3], "this"); -+ TEST_EQ_STR (array[4], "is"); -+ TEST_EQ_STR (array[5], ""); -+ TEST_EQ_STR (array[6], ""); -+ TEST_EQ_STR (array[7], ""); -+ TEST_EQ_STR (array[8], "a"); -+ TEST_EQ_STR (array[9], "test"); -+ TEST_EQ_STR (array[10], ""); -+ TEST_EQ_STR (array[11], ""); -+ TEST_EQ_P (array[12], NULL); -+ -+ nih_free (array); -+ } - - /* Check that we can split a string treating multiple consecutive - * matching characters as a single separator to be skipped. -@@ -645,6 +854,177 @@ - nih_free (array); - } - -+ /* Check that we can split a string containing multiple -+ * occurences of one of the delimiter characters at the -+ * beginning of the string. -+ */ -+ TEST_FEATURE ("with repeat and multiple identical adjacent delimiter characters at string start"); -+ TEST_ALLOC_FAIL { -+ array = nih_str_split (NULL, "\n\nhello", " \t\r\n", TRUE); -+ -+ if (test_alloc_failed) { -+ TEST_EQ_P (array, NULL); -+ continue; -+ } -+ -+ TEST_ALLOC_SIZE (array, sizeof (char *) * 2); -+ for (i = 0; i < 1; i++) -+ TEST_ALLOC_PARENT (array[i], array); -+ -+ TEST_EQ_STR (array[0], "hello"); -+ TEST_EQ_P (array[1], NULL); -+ -+ nih_free (array); -+ } -+ -+ TEST_FEATURE ("with repeat and multiple different adjacent delimiter characters at string start"); -+ TEST_ALLOC_FAIL { -+ array = nih_str_split (NULL, "\n\r hello", " \t\r\n", TRUE); -+ -+ if (test_alloc_failed) { -+ TEST_EQ_P (array, NULL); -+ continue; -+ } -+ -+ TEST_ALLOC_SIZE (array, sizeof (char *) * 2); -+ for (i = 0; i < 1; i++) -+ TEST_ALLOC_PARENT (array[i], array); -+ -+ TEST_EQ_STR (array[0], "hello"); -+ TEST_EQ_P (array[1], NULL); -+ -+ nih_free (array); -+ } -+ -+ TEST_FEATURE ("with repeat and multiple identical adjacent delimiter " -+ "characters within string"); -+ TEST_ALLOC_FAIL { -+ array = nih_str_split (NULL, "hello\n\rworld", " \t\n\r", TRUE); -+ -+ if (test_alloc_failed) { -+ TEST_EQ_P (array, NULL); -+ continue; -+ } -+ -+ TEST_ALLOC_SIZE (array, sizeof (char *) * 3); -+ for (i = 0; i < 2; i++) -+ TEST_ALLOC_PARENT (array[i], array); -+ -+ TEST_EQ_STR (array[0], "hello"); -+ TEST_EQ_STR (array[1], "world"); -+ TEST_EQ_P (array[2], NULL); -+ -+ nih_free (array); -+ } -+ -+ TEST_FEATURE ("with repeat and multiple different adjacent delimiter " -+ "characters within string"); -+ TEST_ALLOC_FAIL { -+ array = nih_str_split (NULL, "hello\n\r\tworld", " \t\n\r", TRUE); -+ -+ if (test_alloc_failed) { -+ TEST_EQ_P (array, NULL); -+ continue; -+ } -+ -+ TEST_ALLOC_SIZE (array, sizeof (char *) * 3); -+ for (i = 0; i < 2; i++) -+ TEST_ALLOC_PARENT (array[i], array); -+ -+ TEST_EQ_STR (array[0], "hello"); -+ TEST_EQ_STR (array[1], "world"); -+ TEST_EQ_P (array[2], NULL); -+ -+ nih_free (array); -+ } -+ -+ TEST_FEATURE ("with repeat and multiple identical adjacent delimiter " -+ "characters at string end"); -+ TEST_ALLOC_FAIL { -+ array = nih_str_split (NULL, "hello\n\n\n\n\n\n\n", " \t\r\n", TRUE); -+ -+ if (test_alloc_failed) { -+ TEST_EQ_P (array, NULL); -+ continue; -+ } -+ -+ TEST_ALLOC_SIZE (array, sizeof (char *) * 2); -+ for (i = 0; i < 1; i++) -+ TEST_ALLOC_PARENT (array[i], array); -+ -+ TEST_EQ_STR (array[0], "hello"); -+ TEST_EQ_P (array[1], NULL); -+ -+ nih_free (array); -+ } -+ -+ TEST_FEATURE ("with repeat and multiple different adjacent delimiter " -+ "characters at string end"); -+ TEST_ALLOC_FAIL { -+ array = nih_str_split (NULL, "hello \r\t\r\t\n ", " \t\r\n", TRUE); -+ -+ if (test_alloc_failed) { -+ TEST_EQ_P (array, NULL); -+ continue; -+ } -+ -+ TEST_ALLOC_SIZE (array, sizeof (char *) * 2); -+ for (i = 0; i < 1; i++) -+ TEST_ALLOC_PARENT (array[i], array); -+ -+ TEST_EQ_STR (array[0], "hello"); -+ TEST_EQ_P (array[1], NULL); -+ -+ nih_free (array); -+ } -+ -+ TEST_FEATURE ("with repeat and multiple identical adjacent delimiter " -+ "characters at beginning, middle and end of string"); -+ TEST_ALLOC_FAIL { -+ array = nih_str_split (NULL, -+ " hello\n\n\n, world\n\n\n", -+ "\r\t\n ", TRUE); -+ -+ if (test_alloc_failed) { -+ TEST_EQ_P (array, NULL); -+ continue; -+ } -+ -+ TEST_ALLOC_SIZE (array, sizeof (char *) * 4); -+ for (i = 0; i < 3; i++) -+ TEST_ALLOC_PARENT (array[i], array); -+ -+ TEST_EQ_STR (array[0], "hello"); -+ TEST_EQ_STR (array[1], ","); -+ TEST_EQ_STR (array[2], "world"); -+ TEST_EQ_P (array[3], NULL); -+ -+ nih_free (array); -+ } -+ -+ TEST_FEATURE ("with repeat and multiple different adjacent delimiter " -+ "characters at beginning, middle and end of string"); -+ TEST_ALLOC_FAIL { -+ array = nih_str_split (NULL, -+ "\n \r\thello\n\n\r , \n\t\rworld\t \r\n \n", -+ " \t\n\r", TRUE); -+ -+ if (test_alloc_failed) { -+ TEST_EQ_P (array, NULL); -+ continue; -+ } -+ -+ TEST_ALLOC_SIZE (array, sizeof (char *) * 4); -+ for (i = 0; i < 3; i++) -+ TEST_ALLOC_PARENT (array[i], array); -+ -+ TEST_EQ_STR (array[0], "hello"); -+ TEST_EQ_STR (array[1], ","); -+ TEST_EQ_STR (array[2], "world"); -+ TEST_EQ_P (array[3], NULL); -+ -+ nih_free (array); -+ } - - /* Check that we can give an empty string, and end up with a - * one-element array that only contains a NULL pointer. ---- libnih-1.0.3.orig/nih/tests/test_file.c -+++ libnih-1.0.3/nih/tests/test_file.c -@@ -724,6 +724,25 @@ - return FALSE; - } - -+/* find only frodo files */ -+static int -+my_filter_frodo_file (void *data, -+ const char *path, -+ int is_dir) -+{ -+ char *slash; -+ -+ if (is_dir) -+ return FALSE; -+ -+ slash = strrchr (path, '/'); -+ if (strcmp (slash, "/frodo")) -+ return TRUE; -+ -+ return FALSE; -+} -+ -+ - static int logger_called = 0; - - static int -@@ -905,6 +924,48 @@ - TEST_EQ_STR (v->path, filename); - - nih_free (visited); -+ -+ /* Try also inverse filter */ -+ TEST_ALLOC_SAFE { -+ visitor_called = 0; -+ visited = nih_list_new (NULL); -+ } -+ -+ ret = nih_dir_walk (dirname, my_filter_frodo_file, -+ my_visitor, NULL, &ret); -+ -+ TEST_EQ (ret, 0); -+ TEST_EQ (visitor_called, 4); -+ -+ v = (Visited *)visited->next; -+ TEST_EQ (v->data, &ret); -+ TEST_EQ_STR (v->dirname, dirname); -+ strcpy (filename, dirname); -+ strcat (filename, "/bar"); -+ TEST_EQ_STR (v->path, filename); -+ -+ v = (Visited *)v->entry.next; -+ TEST_EQ (v->data, &ret); -+ TEST_EQ_STR (v->dirname, dirname); -+ strcpy (filename, dirname); -+ strcat (filename, "/bar/frodo"); -+ TEST_EQ_STR (v->path, filename); -+ -+ v = (Visited *)v->entry.next; -+ TEST_EQ (v->data, &ret); -+ TEST_EQ_STR (v->dirname, dirname); -+ strcpy (filename, dirname); -+ strcat (filename, "/baz"); -+ TEST_EQ_STR (v->path, filename); -+ -+ v = (Visited *)v->entry.next; -+ TEST_EQ (v->data, &ret); -+ TEST_EQ_STR (v->dirname, dirname); -+ strcpy (filename, dirname); -+ strcat (filename, "/frodo"); -+ TEST_EQ_STR (v->path, filename); -+ -+ nih_free (visited); - } - - ---- libnih-1.0.3.orig/debian/control -+++ libnih-1.0.3/debian/control -@@ -0,0 +1,81 @@ -+Source: libnih -+Section: libs -+Priority: required -+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> -+XSBC-Original-Maintainer: Scott James Remnant <scott@netsplit.com> -+Standards-Version: 3.9.4 -+Build-Depends: debhelper (>= 9), pkg-config (>= 0.22), libdbus-1-dev (>= 1.4), libexpat1-dev (>= 2.0.0), dbus (>= 1.4), libc6-dev (>= 2.15~) | libc6.1-dev (>= 2.15~), -+ dh-autoreconf, autopoint, dpkg-dev (>= 1.16.1~) -+# To cross build this package also needs: libdbus-1-dev:native (>= 1.4), libexpat1-dev:native (>= 2.0.0) -+# But :native build-deps are not supported yet, so instead one can do -+# $ apt-get build-dep libnih -+# $ apt-get build-dep libnih -aarmhf -+# instead to get all required build-deps -+Vcs-Bzr: lp:ubuntu/libnih -+XSC-Debian-Vcs-Git: git://git.debian.org/git/collab-maint/libnih.git -+XSC-Debian-Vcs-Browser: http://git.debian.org/?p=collab-maint/libnih.git;a=summary -+Homepage: https://launchpad.net/libnih -+ -+Package: libnih1 -+Architecture: any -+Pre-Depends: ${misc:Pre-Depends}, ${shlibs:Depends}, ${misc:Depends} -+Multi-Arch: same -+Description: NIH Utility Library -+ libnih is a light-weight "standard library" of C functions to ease the -+ development of other libraries and applications, especially those -+ normally found in /lib. -+ . -+ This package contains the shared library. -+ -+Package: libnih-dev -+Priority: optional -+Section: libdevel -+Architecture: any -+Multi-Arch: same -+Depends: libnih1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} -+Description: NIH Utility Library (development files) -+ libnih is a light-weight "standard library" of C functions to ease the -+ development of other libraries and applications, especially those -+ normally found in /lib. -+ . -+ This package contains the static library and C header files which are -+ needed for developing software using libnih. -+ -+Package: libnih-dbus1 -+Architecture: any -+Pre-Depends: ${misc:Pre-Depends} -+Depends: libnih1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} -+Multi-Arch: same -+Description: NIH D-Bus Bindings Library -+ libnih-dbus is a D-Bus bindings library that integrates with the main -+ loop provided by libnih. -+ . -+ This package contains the shared library. -+ -+Package: libnih-dbus-dev -+Priority: optional -+Section: libdevel -+Architecture: any -+Multi-Arch: same -+Depends: libnih-dbus1 (= ${binary:Version}), libnih-dev (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} -+Recommends: nih-dbus-tool (= ${binary:Version}) -+Description: NIH D-Bus Bindings Library (development files) -+ libnih-dbus is a D-Bus bindings library that integrates with the main -+ loop provided by libnih. -+ . -+ This package contains the static library and C header files which are -+ needed for developing software using libnih-dbus. -+ -+Package: nih-dbus-tool -+Section: devel -+Architecture: any -+Multi-Arch: foreign -+Depends: ${shlibs:Depends}, ${misc:Depends} -+Recommends: libnih-dbus-dev (= ${binary:Version}) -+Description: NIH D-Bus Binding Tool -+ nih-dbus-tool generates C source code from the D-Bus Introspection XML -+ data provided by most services; either to make implementing the -+ described objects in C programs or to make proxying to the described -+ remote objects easier. -+ . -+ The generated code requires libnih-dbus-dev to be compiled. ---- libnih-1.0.3.orig/debian/libnih-dev.install -+++ libnih-1.0.3/debian/libnih-dev.install -@@ -0,0 +1,6 @@ -+lib/*/libnih.a -+lib/*/libnih.so -+usr/include/libnih.h -+usr/include/nih -+usr/lib/*/pkgconfig/libnih.pc -+usr/share/aclocal/libnih.m4 ---- libnih-1.0.3.orig/debian/libnih1.docs -+++ libnih-1.0.3/debian/libnih1.docs -@@ -0,0 +1,3 @@ -+AUTHORS -+NEWS -+README ---- libnih-1.0.3.orig/debian/libnih-dbus1.install -+++ libnih-1.0.3/debian/libnih-dbus1.install -@@ -0,0 +1 @@ -+lib/*/libnih-dbus.so.* ---- libnih-1.0.3.orig/debian/libnih1.install -+++ libnih-1.0.3/debian/libnih1.install -@@ -0,0 +1 @@ -+lib/*/libnih.so.* ---- libnih-1.0.3.orig/debian/rules -+++ libnih-1.0.3/debian/rules -@@ -0,0 +1,54 @@ -+#!/usr/bin/make -f -+ -+include /usr/share/dpkg/architecture.mk -+ -+%: -+ dh $@ --with autoreconf -+ -+ -+CFLAGS := -Wall -fstack-protector -fPIE $(shell dpkg-buildflags --get CFLAGS) -+LDFLAGS := -Wl,--as-needed -Wl,-z,relro -Wl,-z,now -pie $(shell dpkg-buildflags --get LDFLAGS) -+ -+override_dh_auto_configure: -+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) -+ dh_auto_configure -- CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \ -+ --libdir=/lib/$(DEB_HOST_MULTIARCH) -+else -+ dh_auto_configure -B build-dbus-tool/ -- CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \ -+ --libdir=/lib/$(DEB_BUILD_MULTIARCH) \ -+ --host=$(DEB_BUILD_GNU_TYPE) -+ dh_auto_build -B build-dbus-tool/ --parallel -+ dh_auto_configure -- CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \ -+ NIH_DBUS_TOOL=$(CURDIR)/build-dbus-tool/nih-dbus-tool/nih-dbus-tool \ -+ --libdir=/lib/$(DEB_HOST_MULTIARCH) -+endif -+ -+override_dh_auto_build: -+ dh_auto_build --parallel -+ -+override_dh_auto_test: -+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) -+ dh_auto_test --parallel -+endif -+ -+override_dh_auto_install: -+ dh_auto_install -- pkgconfigdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)/pkgconfig -+ -+override_dh_makeshlibs: -+ dh_makeshlibs -plibnih1 -V 'libnih1 (>= 1.0.0)' -+ dh_makeshlibs -plibnih-dbus1 -V 'libnih-dbus1 (>= 1.0.0)' -+ dh_makeshlibs -Nlibnih1 -Nlibnih-dbus1 -+ -+override_dh_shlibdeps: -+ dh_shlibdeps -+ sed -i 's/2\.14/2.15/' debian/*.substvars -+ sed -i 's/>= 2.15)/>= 2.15~)/g' debian/*.substvars -+ -+ -+# Symlink /usr/share/doc directories together -+override_dh_installdocs: -+ dh_installdocs --link-doc=libnih1 -+ -+override_dh_clean: -+ rm -rf build-dbus-tool/ -+ dh_clean ---- libnih-1.0.3.orig/debian/compat -+++ libnih-1.0.3/debian/compat -@@ -0,0 +1 @@ -+9 ---- libnih-1.0.3.orig/debian/nih-dbus-tool.install -+++ libnih-1.0.3/debian/nih-dbus-tool.install -@@ -0,0 +1,2 @@ -+usr/bin/nih-dbus-tool -+usr/share/man/man1/nih-dbus-tool.1 ---- libnih-1.0.3.orig/debian/copyright -+++ libnih-1.0.3/debian/copyright -@@ -0,0 +1,18 @@ -+This is the Ubuntu package of libnih, the NIH Utility Library. -+ -+Copyright © 2009 Canonical Ltd. -+Copyright © 2009 Scott James Remnant <scott@netsplit.com> -+ -+Licence: -+ -+This program is free software; you can redistribute it and/or modify -+it under the terms of the GNU General Public License version 2, as -+published by the Free Software Foundation. -+ -+This program is distributed in the hope that it will be useful, but -+WITHOUT ANY WARRANTY; without even the implied warranty of -+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+General Public License for more details. -+ -+On Ubuntu systems, the complete text of the GNU General Public License -+can be found in ‘/usr/share/common-licenses/GPL-2’. ---- libnih-1.0.3.orig/debian/libnih-dbus1.postinst -+++ libnih-1.0.3/debian/libnih-dbus1.postinst -@@ -0,0 +1,53 @@ -+#!/bin/sh -+ -+set -e -+ -+if [ "$1" = configure ]; then -+ # A dependent library of Upstart has changed, so restart Upstart -+ # such that it can safely unmount the root filesystem (LP: #740390) -+ -+ # Query running version of Upstart, but only when we know -+ # that initctl will work. -+ # -+ # The calculated version string may be the null string if -+ # Upstart is not running (where for example an alternative -+ # init is running outside a chroot environment) or if the -+ # query failed for some reason. However, the version check -+ # below handles a null version string correctly. -+ UPSTART_VERSION_RUNNING=$(initctl version 2>/dev/null |\ -+ awk '{print $3}'|tr -d ')' || :) -+ -+ if ischroot; then -+ # Do not honour re-exec when requested from within a -+ # chroot since: -+ # -+ # (a) The version of Upstart outside might not support it. -+ # (b) An isolated environment such as a chroot should -+ # not be able to modify its containing environment. -+ # -+ # A sufficiently new Upstart will actually handle a re-exec -+ # request coming from telinit within a chroot correctly (by -+ # doing nothing) but it's simple enough to perform the check -+ # here and save Upstart the effort. -+ : -+ elif dpkg --compare-versions "$UPSTART_VERSION_RUNNING" ge 1.6.1; then -+ # We are not running inside a chroot and the running version -+ # of Upstart supports stateful re-exec, so we can -+ # restart immediately. -+ # -+ # XXX: Note that the check on the running version must -+ # remain *indefinitely* since it's the only safe way to -+ # know if stateful re-exec is supported: simply checking -+ # packaged version numbers is not sufficient since -+ # the package could be upgraded multiple times without a -+ # reboot. -+ telinit u || : -+ else -+ # Before we shutdown or reboot, we need to re-exec so that we -+ # can safely remount the root filesystem; we can't just do that -+ # here because we lose state. -+ touch /var/run/init.upgraded || : -+ fi -+fi -+ -+#DEBHELPER# ---- libnih-1.0.3.orig/debian/changelog.DEBIAN -+++ libnih-1.0.3/debian/changelog.DEBIAN -@@ -0,0 +1,118 @@ -+libnih (1.0.3-4) unstable; urgency=low -+ -+ * Rebuild for new libc to update versioned dependency; this comes from -+ the __abort_msg dependency, dpkg-shlibs needs overriding since this is -+ actually a weak link, but this rebuild fixes things for now. -+ Closes: #625257. -+ -+ -- Scott James Remnant <scott@netsplit.com> Mon, 02 May 2011 15:08:33 -0700 -+ -+libnih (1.0.3-3) unstable; urgency=low -+ -+ * New maintainer. Closes: #624442. -+ -+ -- Scott James Remnant <scott@netsplit.com> Thu, 28 Apr 2011 14:26:05 -0700 -+ -+libnih (1.0.3-2) unstable; urgency=low -+ -+ * Bump build dependency on libdbus-1-dev and dbus to (>= 1.4) for Unix file -+ descriptor passing support. -+ -+ -- Michael Biebl <biebl@debian.org> Thu, 10 Feb 2011 20:25:18 +0100 -+ -+libnih (1.0.3-1ubuntu1) natty; urgency=low -+ -+ * Rebuild with libc6-dev (>= 2.13~). -+ -+ -- Matthias Klose <doko@ubuntu.com> Fri, 18 Feb 2011 12:09:29 +0100 -+ -+libnih (1.0.3-1) unstable; urgency=low -+ -+ * New upstream release. -+ * Bump debhelper compatibility level to 8 and update build dependency -+ accordingly. -+ -+ -- Michael Biebl <biebl@debian.org> Mon, 07 Feb 2011 22:19:13 +0100 -+ -+libnih (1.0.2-2) unstable; urgency=low -+ -+ * Install library development files to /usr/lib and not /lib. -+ * Remove libtool *.la files as there are no reverse dependencies referencing -+ them. -+ * Bump Standards-Version to 3.9.1. No further changes. -+ -+ -- Michael Biebl <biebl@debian.org> Sun, 02 Jan 2011 21:09:40 +0100 -+ -+libnih (1.0.2-1ubuntu3) natty; urgency=low -+ -+ * Disable some tests on ppc64 to build an initial package. -+ -+ -- Matthias Klose <doko@ubuntu.com> Thu, 18 Nov 2010 10:59:38 +0100 -+ -+libnih (1.0.2-1ubuntu2) maverick; urgency=low -+ -+ * Re-add -fPIE to the testsuite on armel, removing all armel-specific tests; -+ current gcc-4.4 don't seem affected by the ICE anymore (see LP #398403). -+ -+ -- Loïc Minier <loic.minier@linaro.org> Mon, 23 Aug 2010 10:25:31 +0200 -+ -+libnih (1.0.2-1ubuntu1) maverick; urgency=low -+ -+ * Rebuild with libc6-dev (>= 2.12~), after checking that -+ __abort_msg is available with the same signature in eglibc 2.12. -+ * Don't build the testsuite with -fPIE on armel; LP: #398403. -+ -+ -- Matthias Klose <doko@ubuntu.com> Sun, 30 May 2010 02:54:56 +0200 -+ -+libnih (1.0.2-1) unstable; urgency=low -+ -+ * Initial upload to Debian. Closes: #585071 -+ * Based on the Ubuntu package for Lucid done by Scott James Remnant with the -+ following changes: -+ - Switch packages to priority optional. -+ - Use binary:Version instead of Source-Version. -+ - Bump Standards-Version to 3.8.4. -+ - Add Homepage and Vcs-* fields. -+ - Don't symlink /usr/share/doc directories. -+ - Refer to versioned /usr/share/common-licenses/GPL-2 file in -+ debian/copyright. -+ - List all symbols explicitly instead of using a wildcard and add symbols -+ introduced in 1.0.1. -+ - Use the symbols files to create the correct version info instead of -+ specifying it manually via shlibs. -+ - Switch to source format 3.0 (quilt). -+ - Add watch file to track new upstream releases. -+ -+ -- Michael Biebl <biebl@debian.org> Sun, 13 Jun 2010 23:36:52 +0200 -+ -+libnih (1.0.1-1) lucid; urgency=low -+ -+ * New upstream release: -+ - Add missing __nih_* symbols to linker version script so that we -+ can link Upstart's test suite. -+ - Glibc __abort_msg symbol now only linked as a weak symbol. -+ -+ -- Scott James Remnant <scott@ubuntu.com> Thu, 04 Feb 2010 14:53:26 -0800 -+ -+libnih (1.0.0-2build1) lucid; urgency=low -+ -+ * Rebuild to pick up relaxed dependency on libc6, after checking that -+ __abort_msg is available with the same signature in eglibc 2.11. -+ LP: #508702. -+ -+ -- Matthias Klose <doko@ubuntu.com> Mon, 18 Jan 2010 16:09:13 +0100 -+ -+libnih (1.0.0-2) lucid; urgency=low -+ -+ * debian/control: Add build-dependency on dbus so the test suite can -+ pass on the buildds. -+ -+ -- Scott James Remnant <scott@ubuntu.com> Sat, 28 Nov 2009 23:28:27 +0000 -+ -+libnih (1.0.0-1) lucid; urgency=low -+ -+ * First upstream release. Previously this code was included in the -+ upstart, mountall and ureadahead source packages. -+ -+ -- Scott James Remnant <scott@ubuntu.com> Sat, 28 Nov 2009 21:14:00 +0000 -+ ---- libnih-1.0.3.orig/debian/libnih1.symbols -+++ libnih-1.0.3/debian/libnih1.symbols -@@ -0,0 +1,2 @@ -+libnih.so.1 libnih1 #MINVER# -+ *@LIBNIH_1_0 1.0.0 ---- libnih-1.0.3.orig/debian/libnih-dbus-dev.install -+++ libnih-1.0.3/debian/libnih-dbus-dev.install -@@ -0,0 +1,5 @@ -+lib/*/libnih-dbus.a -+lib/*/libnih-dbus.so -+usr/include/libnih-dbus.h -+usr/include/nih-dbus -+usr/lib/*/pkgconfig/libnih-dbus.pc ---- libnih-1.0.3.orig/debian/libnih1.postinst -+++ libnih-1.0.3/debian/libnih1.postinst -@@ -0,0 +1,53 @@ -+#!/bin/sh -+ -+set -e -+ -+if [ "$1" = configure ]; then -+ # A dependent library of Upstart has changed, so restart Upstart -+ # such that it can safely unmount the root filesystem (LP: #740390) -+ -+ # Query running version of Upstart, but only when we know -+ # that initctl will work. -+ # -+ # The calculated version string may be the null string if -+ # Upstart is not running (where for example an alternative -+ # init is running outside a chroot environment) or if the -+ # query failed for some reason. However, the version check -+ # below handles a null version string correctly. -+ UPSTART_VERSION_RUNNING=$(initctl version 2>/dev/null |\ -+ awk '{print $3}'|tr -d ')' || :) -+ -+ if ischroot; then -+ # Do not honour re-exec when requested from within a -+ # chroot since: -+ # -+ # (a) The version of Upstart outside might not support it. -+ # (b) An isolated environment such as a chroot should -+ # not be able to modify its containing environment. -+ # -+ # A sufficiently new Upstart will actually handle a re-exec -+ # request coming from telinit within a chroot correctly (by -+ # doing nothing) but it's simple enough to perform the check -+ # here and save Upstart the effort. -+ : -+ elif dpkg --compare-versions "$UPSTART_VERSION_RUNNING" ge 1.6.1; then -+ # We are not running inside a chroot and the running version -+ # of Upstart supports stateful re-exec, so we can -+ # restart immediately. -+ # -+ # XXX: Note that the check on the running version must -+ # remain *indefinitely* since it's the only safe way to -+ # know if stateful re-exec is supported: simply checking -+ # packaged version numbers is not sufficient since -+ # the package could be upgraded multiple times without a -+ # reboot. -+ telinit u || : -+ else -+ # Before we shutdown or reboot, we need to re-exec so that we -+ # can safely remount the root filesystem; we can't just do that -+ # here because we lose state. -+ touch /var/run/init.upgraded || : -+ fi -+fi -+ -+#DEBHELPER# ---- libnih-1.0.3.orig/debian/libnih-dbus1.symbols -+++ libnih-1.0.3/debian/libnih-dbus1.symbols -@@ -0,0 +1,2 @@ -+libnih-dbus.so.1 libnih-dbus1 #MINVER# -+ *@LIBNIH_DBUS_1_0 1.0.0 ---- libnih-1.0.3.orig/debian/changelog -+++ libnih-1.0.3/debian/changelog -@@ -0,0 +1,213 @@ -+libnih (1.0.3-4ubuntu16) raring; urgency=low -+ -+ * debian/{libnih1.postinst,libnih-dbus1.postinst}: Force an upgrade to -+ restart Upstart (to pick up new package version) if the running -+ instance supports it. -+ * Merge of important fixes from lp:~upstart-devel/libnih/nih -+ (LP: #776532, LP: #777097, LP: #834813, LP: #1123588). -+ -+ -- James Hunt <james.hunt@ubuntu.com> Thu, 14 Mar 2013 09:14:22 +0000 -+ -+libnih (1.0.3-4ubuntu15) raring; urgency=low -+ -+ * Enable cross-building, sans adding :native build-dependencies. -+ See comments in debian/control. -+ * Lintian fixes. -+ -+ -- Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com> Tue, 08 Jan 2013 15:38:58 +0000 -+ -+libnih (1.0.3-4ubuntu14) raring; urgency=low -+ -+ * Update dbus code generator to allow for empty lists for type 'as'. -+ This drops the != NULL check for NULL terminated arrays and moves the -+ iteration loop inside an 'if' statement. -+ -+ -- Stéphane Graber <stgraber@ubuntu.com> Thu, 13 Dec 2012 10:00:27 -0500 -+ -+libnih (1.0.3-4ubuntu13) raring; urgency=low -+ -+ [ Petr Lautrbach <plautrba@redhat.com>, Dmitrijs Ledkovs ] -+ * Fallback to lstat, if dirent.d_type is not available (not portable) -+ (LP: #672643) (Closes: #695604) -+ -+ -- Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com> Tue, 11 Dec 2012 17:26:52 +0000 -+ -+libnih (1.0.3-4ubuntu12) raring; urgency=low -+ -+ * nih/logging.c: Use our own __nih_abort_msg rather than the (e)glibc -+ private symbol __abort_msg to avoid upgrade issues (LP: #997359). -+ * nih/tests/test_logging.c: Update tests for __nih_abort_msg. -+ -+ -- James Hunt <james.hunt@ubuntu.com> Thu, 25 Oct 2012 10:57:30 +0100 -+ -+libnih (1.0.3-4ubuntu11) quantal; urgency=low -+ -+ * Addition of debian/libnih-dbus1.postinst and -+ debian/libnih1.postinst to force Upstart re-exec on shutdown -+ to avoid unmounting disks uncleanly (LP: #740390). -+ -+ -- James Hunt <james.hunt@ubuntu.com> Wed, 03 Oct 2012 16:49:40 +0100 -+ -+libnih (1.0.3-4ubuntu10) quantal; urgency=low -+ -+ * Update config.guess,sub for aarch64 -+ -+ -- Wookey <wookey@wookware.org> Mon, 01 Oct 2012 12:57:05 +0100 -+ -+libnih (1.0.3-4ubuntu9) precise; urgency=low -+ -+ * Mark the nih-dbus-tool package Multi-Arch: foreign so it can be used as -+ a build-dependency of upstart when cross-building. -+ -+ -- Steve Langasek <steve.langasek@ubuntu.com> Wed, 15 Feb 2012 22:57:50 -0800 -+ -+libnih (1.0.3-4ubuntu8) precise; urgency=low -+ -+ * libnih1 needs a versioned Pre-Depend on libc6 instead of just a Depend, -+ because libc6 itself uses runlevel from the upstart package in its -+ preinst, which in turn uses libnih1, which needs to be loadable (i.e., -+ its symbol references resolve). We therefore need to ensure that -+ libnih1's dependencies are always unpacked before libnih1 itself is -+ unpacked. While having something further up the stack (such as upstart, -+ or something on top of upstart) being marked Essential: yes and with the -+ necessary pre-depends would let apt handle this for us with its -+ "immediate configuration" support, but for various reasons we don't want -+ to make upstart essential. LP: #508083. -+ -+ -- Steve Langasek <steve.langasek@ubuntu.com> Fri, 10 Feb 2012 12:13:25 -0800 -+ -+libnih (1.0.3-4ubuntu7) precise; urgency=low -+ -+ * Relax dependency on libc6. -+ -+ -- Matthias Klose <doko@ubuntu.com> Wed, 08 Feb 2012 23:43:21 +0100 -+ -+libnih (1.0.3-4ubuntu6) precise; urgency=low -+ -+ * Rebuild with libc6-dev (>= 2.15~). -+ -+ -- Matthias Klose <doko@ubuntu.com> Wed, 08 Feb 2012 21:48:57 +0100 -+ -+libnih (1.0.3-4ubuntu5) precise; urgency=low -+ -+ * Mark libnih-dev and libnih-dbus-dev Multi-Arch: same as well. -+ -+ -- Steve Langasek <steve.langasek@ubuntu.com> Sun, 06 Nov 2011 14:45:07 -0800 -+ -+libnih (1.0.3-4ubuntu4) precise; urgency=low -+ -+ * Make libnih1 and libnih-dbus1 installable using multi-arch. -+ -+ -- James Hunt <james.hunt@ubuntu.com> Tue, 01 Nov 2011 14:25:09 -0400 -+ -+libnih (1.0.3-4ubuntu3) precise; urgency=low -+ -+ * Build to install with eglibc-2.15. -+ -+ -- Matthias Klose <doko@ubuntu.com> Fri, 14 Oct 2011 14:05:03 +0200 -+ -+libnih (1.0.3-4ubuntu2) oneiric; urgency=low -+ -+ * Use dpkg-buildflags to get the build flags. -+ * Build with the default build flags, don't hard-code -Os. LP: #791315. -+ -+ -- Matthias Klose <doko@ubuntu.com> Wed, 15 Jun 2011 16:45:42 +0200 -+ -+libnih (1.0.3-4ubuntu1) oneiric; urgency=low -+ -+ * Merge from debian unstable. Retained Ubuntu Build-Depends and Priority. -+ -+ -- James Hunt <james.hunt@ubuntu.com> Mon, 23 May 2011 19:28:19 +0100 -+ -+libnih (1.0.3-1ubuntu1) natty; urgency=low -+ -+ * Rebuild with libc6-dev (>= 2.13~). -+ -+ -- Matthias Klose <doko@ubuntu.com> Fri, 18 Feb 2011 12:09:29 +0100 -+ -+libnih (1.0.3-1) natty; urgency=low -+ -+ * New upstream release: -+ - Added support for passing file descriptors over D-Bus to nih-dbus-tool -+ -+ -- Scott James Remnant <scott@ubuntu.com> Thu, 23 Dec 2010 22:28:24 +0000 -+ -+libnih (1.0.2-2) natty; urgency=low -+ -+ * Revert the previous upload. It is never acceptable to simply disable -+ tests, especially when it turns out that the test that was disabled -+ was failing because there was a serious bug that could cause kernel -+ panics for people on boot. -+ -+ Test suites are here for a reason. -+ -+ * Bumped libdbus Build-Dependency to the version with the bug fix that -+ caused the test suite to fail. -+ -+ -- Scott James Remnant <scott@ubuntu.com> Wed, 08 Dec 2010 19:40:15 +0000 -+ -+libnih (1.0.2-1ubuntu3) natty; urgency=low -+ -+ * Disable some tests on ppc64 to build an initial package. -+ -+ -- Matthias Klose <doko@ubuntu.com> Thu, 18 Nov 2010 10:59:38 +0100 -+ -+libnih (1.0.2-1ubuntu2) maverick; urgency=low -+ -+ * Re-add -fPIE to the testsuite on armel, removing all armel-specific tests; -+ current gcc-4.4 don't seem affected by the ICE anymore (see LP #398403). -+ -+ -- Loïc Minier <loic.minier@linaro.org> Mon, 23 Aug 2010 10:25:31 +0200 -+ -+libnih (1.0.2-1ubuntu1) maverick; urgency=low -+ -+ * Rebuild with libc6-dev (>= 2.12~), after checking that -+ __abort_msg is available with the same signature in eglibc 2.12. -+ * Don't build the testsuite with -fPIE on armel; LP: #398403. -+ -+ -- Matthias Klose <doko@ubuntu.com> Sun, 30 May 2010 02:54:56 +0200 -+ -+libnih (1.0.2-1) maverick; urgency=low -+ -+ * New upstream release: -+ - Rename AC_COPYRIGHT to NIH_COPYRIGHT to avoid conflict with other -+ packages. -+ - Add serial to libnih.m4 -+ - Add NIH_WITH_LOCAL_LIBNIH macro. -+ -+ * Fix use of ${Source-Version} to be ${binary:Version} -+ * Add debian/source/format with "1.0" to be future compatible. -+ * Bump standards version. -+ -+ -- Scott James Remnant <scott@ubuntu.com> Tue, 27 Apr 2010 10:49:55 -0700 -+ -+libnih (1.0.1-1) lucid; urgency=low -+ -+ * New upstream release: -+ - Add missing __nih_* symbols to linker version script so that we -+ can link Upstart's test suite. -+ - Glibc __abort_msg symbol now only linked as a weak symbol. -+ -+ -- Scott James Remnant <scott@ubuntu.com> Thu, 04 Feb 2010 14:53:26 -0800 -+ -+libnih (1.0.0-2build1) lucid; urgency=low -+ -+ * Rebuild to pick up relaxed dependency on libc6, after checking that -+ __abort_msg is available with the same signature in eglibc 2.11. -+ LP: #508702. -+ -+ -- Matthias Klose <doko@ubuntu.com> Mon, 18 Jan 2010 16:09:13 +0100 -+ -+libnih (1.0.0-2) lucid; urgency=low -+ -+ * debian/control: Add build-dependency on dbus so the test suite can -+ pass on the buildds. -+ -+ -- Scott James Remnant <scott@ubuntu.com> Sat, 28 Nov 2009 23:28:27 +0000 -+ -+libnih (1.0.0-1) lucid; urgency=low -+ -+ * First upstream release. Previously this code was included in the -+ upstart, mountall and ureadahead source packages. -+ -+ -- Scott James Remnant <scott@ubuntu.com> Sat, 28 Nov 2009 21:14:00 +0000 ---- libnih-1.0.3.orig/debian/source/format -+++ libnih-1.0.3/debian/source/format -@@ -0,0 +1 @@ -+1.0 ---- libnih-1.0.3.orig/nih-dbus/dbus_proxy.h -+++ libnih-1.0.3/nih-dbus/dbus_proxy.h -@@ -146,14 +146,14 @@ - const char *name, const char *path, - NihDBusLostHandler lost_handler, - void *data) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - NihDBusProxySignal *nih_dbus_proxy_connect (NihDBusProxy *proxy, - const NihDBusInterface *interface, - const char *name, - NihDBusSignalHandler handler, - void *data) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - NIH_END_EXTERN - ---- libnih-1.0.3.orig/nih-dbus/dbus_object.h -+++ libnih-1.0.3/nih-dbus/dbus_object.h -@@ -61,8 +61,7 @@ - DBusConnection *connection, - const char *path, - const NihDBusInterface **interfaces, -- void *data) -- __attribute__ ((malloc)); -+ void *data); - - NIH_END_EXTERN - ---- libnih-1.0.3.orig/nih-dbus/dbus_util.h -+++ libnih-1.0.3/nih-dbus/dbus_util.h -@@ -26,7 +26,7 @@ - NIH_BEGIN_EXTERN - - char *nih_dbus_path (const void *parent, const char *root, ...) -- __attribute__ ((sentinel, warn_unused_result, malloc)); -+ __attribute__ ((sentinel, warn_unused_result)); - - NIH_END_EXTERN - ---- libnih-1.0.3.orig/nih-dbus/dbus_pending_data.h -+++ libnih-1.0.3/nih-dbus/dbus_pending_data.h -@@ -104,7 +104,7 @@ - NihDBusReplyHandler handler, - NihDBusErrorHandler error_handler, - void *data) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - NIH_END_EXTERN - ---- libnih-1.0.3.orig/nih-dbus/dbus_proxy.c -+++ libnih-1.0.3/nih-dbus/dbus_proxy.c -@@ -46,11 +46,11 @@ - __attribute__ ((warn_unused_result)); - static char *nih_dbus_proxy_name_rule (const void *parent, - NihDBusProxy *proxy) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - static int nih_dbus_proxy_signal_destroy (NihDBusProxySignal *proxied); - static char *nih_dbus_proxy_signal_rule (const void *parent, - NihDBusProxySignal *proxied) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - /* Prototypes for handler functions */ - static DBusHandlerResult nih_dbus_proxy_name_owner_changed (DBusConnection *connection, ---- libnih-1.0.3.orig/nih-dbus-tool/symbol.c -+++ libnih-1.0.3/nih-dbus-tool/symbol.c -@@ -40,10 +40,10 @@ - /* Prototypes for static functions */ - static char *symbol_strcat_interface (char **str, const void *parent, - const char *format, ...) -- __attribute__ ((format (printf, 3, 4), warn_unused_result, malloc)); -+ __attribute__ ((format (printf, 3, 4), warn_unused_result)); - static char *symbol_strcat_title (char **str, const void *parent, - const char *format, ...) -- __attribute__ ((format (printf, 3, 4), warn_unused_result, malloc)); -+ __attribute__ ((format (printf, 3, 4), warn_unused_result)); - - - /** ---- libnih-1.0.3.orig/nih-dbus-tool/demarshal.h -+++ libnih-1.0.3/nih-dbus-tool/demarshal.h -@@ -37,7 +37,7 @@ - const char *prefix, const char *interface_symbol, - const char *member_symbol, const char *symbol, - NihList *structs) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - NIH_END_EXTERN - ---- libnih-1.0.3.orig/nih-dbus-tool/symbol.h -+++ libnih-1.0.3/nih-dbus-tool/symbol.h -@@ -28,22 +28,22 @@ - int symbol_valid (const char *symbol); - - char *symbol_from_name (const void *parent, const char *name) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - char *symbol_impl (const void *parent, const char *prefix, - const char *interface_name, const char *name, - const char *postfix) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - char *symbol_extern (const void *parent, const char *prefix, - const char *interface_symbol, const char *midfix, - const char *symbol, const char *postfix) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - char *symbol_typedef (const void *parent, const char *prefix, - const char *interface_symbol, const char *midfix, - const char *symbol, const char *postfix) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - NIH_END_EXTERN - ---- libnih-1.0.3.orig/nih-dbus-tool/output.h -+++ libnih-1.0.3/nih-dbus-tool/output.h -@@ -35,9 +35,9 @@ - __attribute__ ((warn_unused_result)); - - char *output_preamble (const void *parent, const char *path) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - char *output_sentinel (const void *parent, const char *path) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - NIH_END_EXTERN - ---- libnih-1.0.3.orig/nih-dbus-tool/parse.h -+++ libnih-1.0.3/nih-dbus-tool/parse.h -@@ -95,7 +95,7 @@ - - ParseStack *parse_stack_push (const void *parent, NihList *stack, - ParseStackType type, void *data) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - ParseStack *parse_stack_top (NihList *stack); - - void parse_start_tag (XML_Parser xmlp, const char *tag, -@@ -103,7 +103,7 @@ - void parse_end_tag (XML_Parser xmlp, const char *tag); - - Node * parse_xml (const void *parent, int fd, const char *filename) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - NIH_END_EXTERN - ---- libnih-1.0.3.orig/nih-dbus-tool/type.h -+++ libnih-1.0.3/nih-dbus-tool/type.h -@@ -94,43 +94,43 @@ - - char * type_of (const void * parent, - DBusSignatureIter *iter) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - TypeVar * type_var_new (const void *parent, const char *type, - const char *name) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - char * type_var_to_string (const void *parent, TypeVar *var) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - char * type_var_layout (const void *parent, NihList *vars) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - TypeFunc * type_func_new (const void *parent, const char *type, - const char *name) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - char * type_func_to_string (const void *parent, TypeFunc *func) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - char * type_func_to_typedef (const void *parent, TypeFunc *func) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - char * type_func_layout (const void *parent, NihList *funcs) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - TypeStruct *type_struct_new (const void *parent, const char *name) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - char * type_struct_to_string (const void *parent, TypeStruct *structure) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - char * type_to_const (char **type, const void *parent) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - char * type_to_pointer (char **type, const void *parent) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - char * type_to_static (char **type, const void *parent) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - char * type_to_extern (char **type, const void *parent) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - char * type_strcat_assert (char **block, const void *parent, - TypeVar *var, TypeVar *prev, TypeVar *next) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - NIH_END_EXTERN - ---- libnih-1.0.3.orig/nih-dbus-tool/argument.h -+++ libnih-1.0.3/nih-dbus-tool/argument.h -@@ -61,7 +61,7 @@ - - Argument *argument_new (const void *parent, const char *name, - const char *type, NihDBusArgDir direction) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - int argument_start_tag (XML_Parser xmlp, const char *tag, - char * const *attr) ---- libnih-1.0.3.orig/nih-dbus-tool/indent.h -+++ libnih-1.0.3/nih-dbus-tool/indent.h -@@ -26,9 +26,9 @@ - NIH_BEGIN_EXTERN - - char *indent (char **str, const void *parent, int level) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - char *comment (char **str, const void *parent) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - NIH_END_EXTERN - ---- libnih-1.0.3.orig/nih-dbus-tool/main.c -+++ libnih-1.0.3/nih-dbus-tool/main.c -@@ -52,10 +52,10 @@ - /* Prototypes for local functions */ - char *source_file_path (const void *parent, const char *output_path, - const char *filename) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - char *header_file_path (const void *parent, const char *output_path, - const char *filename) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - - /** ---- libnih-1.0.3.orig/nih-dbus-tool/signal.h -+++ libnih-1.0.3/nih-dbus-tool/signal.h -@@ -58,7 +58,7 @@ - int signal_name_valid (const char *name); - - Signal * signal_new (const void *parent, const char *name) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - int signal_start_tag (XML_Parser xmlp, const char *tag, - char * const *attr) -@@ -76,18 +76,18 @@ - char * signal_object_function (const void *parent, const char *prefix, - Interface *interface, Signal *signal, - NihList *prototypes, NihList *structs) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - char * signal_proxy_function (const void *parent, const char *prefix, - Interface *interface, Signal *signal, - NihList *prototypes, NihList *typedefs, - NihList *structs) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - char * signal_args_array (const void *parent, const char *prefix, - Interface *interface, Signal *signal, - NihList *prototypes) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - NIH_END_EXTERN - ---- libnih-1.0.3.orig/nih-dbus-tool/marshal.c -+++ libnih-1.0.3/nih-dbus-tool/marshal.c -@@ -49,7 +49,7 @@ - const char *prefix, const char *interface_symbol, - const char *member_symbol, const char *symbol, - NihList *structs) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - static char *marshal_array (const void *parent, - DBusSignatureIter *iter, - const char *iter_name, const char *name, -@@ -58,7 +58,7 @@ - const char *prefix, const char *interface_symbol, - const char *member_symbol, const char *symbol, - NihList *structs) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - static char *marshal_struct (const void *parent, - DBusSignatureIter *iter, - const char *iter_name, const char *name, -@@ -67,7 +67,7 @@ - const char *prefix, const char *interface_symbol, - const char *member_symbol, const char *symbol, - NihList *structs) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - - /** -@@ -364,6 +364,7 @@ - nih_local TypeVar *element_len_var = NULL; - nih_local char * block = NULL; - nih_local char * vars_block = NULL; -+ nih_local char * loop_block = NULL; - - nih_assert (iter != NULL); - nih_assert (iter_name != NULL); -@@ -448,7 +449,7 @@ - nih_list_add (locals, &array_iter_var->entry); - - if (dbus_type_is_fixed (element_type)) { -- if (! nih_strcat_sprintf (&code, parent, -+ if (! nih_strcat_sprintf (&loop_block, parent, - "for (size_t %s = 0; %s < %s; %s++) {\n", - loop_name, loop_name, len_name, loop_name)) { - nih_free (code); -@@ -456,6 +457,12 @@ - } - } else { - if (! nih_strcat_sprintf (&code, parent, -+ "if (%s) {\n", -+ name)) { -+ nih_free (code); -+ return NULL; -+ } -+ if (! nih_strcat_sprintf (&loop_block, parent, - "for (size_t %s = 0; %s[%s]; %s++) {\n", - loop_name, name, loop_name, loop_name)) { - nih_free (code); -@@ -576,7 +583,7 @@ - } - - -- if (! nih_strcat_sprintf (&code, parent, -+ if (! nih_strcat_sprintf (&loop_block, parent, - "%s" - "\n" - "%s" -@@ -590,9 +597,34 @@ - } - - /* Close the container again */ -+ if (! nih_strcat_sprintf (&loop_block, parent, -+ "}\n")) { -+ nih_free (code); -+ return NULL; -+ } -+ -+ if (dbus_type_is_fixed (element_type)) { -+ if (! nih_strcat_sprintf (&code, parent, -+ "%s\n", loop_block)) { -+ nih_free (code); -+ return NULL; -+ } -+ } -+ else { -+ if (! indent (&loop_block, NULL, 1)) { -+ nih_free (code); -+ return NULL; -+ } -+ -+ if (! nih_strcat_sprintf (&code, parent, -+ "%s" -+ "}\n\n", loop_block)) { -+ nih_free (code); -+ return NULL; -+ } -+ } -+ - if (! nih_strcat_sprintf (&code, parent, -- "}\n" -- "\n" - "if (! dbus_message_iter_close_container (&%s, &%s)) {\n" - "%s" - "}\n", ---- libnih-1.0.3.orig/nih-dbus-tool/demarshal.c -+++ libnih-1.0.3/nih-dbus-tool/demarshal.c -@@ -51,7 +51,7 @@ - const char *prefix, const char *interface_symbol, - const char *member_symbol, const char *symbol, - NihList *structs) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - static char *demarshal_array (const void *parent, - DBusSignatureIter *iter, - const char *parent_name, -@@ -62,7 +62,7 @@ - const char *prefix, const char *interface_symbol, - const char *member_symbol, const char *symbol, - NihList *structs) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - static char *demarshal_struct (const void *parent, - DBusSignatureIter *iter, - const char *parent_name, -@@ -73,7 +73,7 @@ - const char *prefix, const char *interface_symbol, - const char *member_symbol, const char *symbol, - NihList *structs) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - - /** ---- libnih-1.0.3.orig/nih-dbus-tool/interface.h -+++ libnih-1.0.3/nih-dbus-tool/interface.h -@@ -61,7 +61,7 @@ - - Interface *interface_new (const void *parent, - const char *name) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - int interface_start_tag (XML_Parser xmlp, - const char *tag, -@@ -81,26 +81,26 @@ - Interface *interface, - int with_handlers, - NihList *prototypes) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - char * interface_signals_array (const void *parent, - const char *prefix, - Interface *interface, - int with_filters, - NihList *prototypes) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - char * interface_properties_array (const void *parent, - const char *prefix, - Interface *interface, - int with_handlers, - NihList *prototypes) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - char * interface_struct (const void *parent, - const char *prefix, - Interface *interface, - int object, - NihList *prototypes) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - - char * interface_proxy_get_all_function (const void *parent, -@@ -108,7 +108,7 @@ - Interface *interface, - NihList *prototypes, - NihList *structs) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - char * interface_proxy_get_all_notify_function (const void *parent, - const char *prefix, -@@ -116,14 +116,14 @@ - NihList *prototypes, - NihList *typedefs, - NihList *structs) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - char * interface_proxy_get_all_sync_function (const void *parent, - const char *prefix, - Interface *interface, - NihList *prototypes, - NihList *structs) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - NIH_END_EXTERN - ---- libnih-1.0.3.orig/nih-dbus-tool/method.h -+++ libnih-1.0.3/nih-dbus-tool/method.h -@@ -62,7 +62,7 @@ - int method_name_valid (const char *name); - - Method * method_new (const void *parent, const char *name) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - int method_start_tag (XML_Parser xmlp, const char *tag, - char * const *attr) -@@ -82,33 +82,33 @@ - Interface *interface, Method *method, - NihList *prototypes, NihList *handlers, - NihList *structs) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - char * method_reply_function (const void *parent, const char *prefix, - Interface *interface, Method *method, - NihList *prototypes, NihList *structs) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - char * method_proxy_function (const void *parent, const char *prefix, - Interface *interface, Method *method, - NihList *prototypes, NihList *structs) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - char * method_proxy_notify_function (const void *parent, const char *prefix, - Interface *interface, Method *method, - NihList *prototypes, NihList *typedefs, - NihList *structs) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - char * method_proxy_sync_function (const void *parent, const char *prefix, - Interface *interface, Method *method, - NihList *prototypes, NihList *structs) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - char * method_args_array (const void *parent, const char *prefix, - Interface *interface, Method *method, - NihList *prototypes) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - NIH_END_EXTERN - ---- libnih-1.0.3.orig/nih-dbus-tool/node.h -+++ libnih-1.0.3/nih-dbus-tool/node.h -@@ -47,7 +47,7 @@ - int node_path_valid (const char *name); - - Node * node_new (const void *parent, const char *path) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - int node_start_tag (XML_Parser xmlp, const char *tag, - char * const *attr) -@@ -59,18 +59,18 @@ - - char * node_interfaces_array (const void *parent, const char *prefix, - Node *node, int object, NihList *prototypes) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - char * node_object_functions (const void *parent, const char *prefix, - Node *node, - NihList *prototypes, NihList *handlers, - NihList *structs, NihList *externs) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - char * node_proxy_functions (const void *parent, const char *prefix, - Node *node, - NihList *prototypes, NihList *structs, - NihList *typedefs, NihList *externs) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - NIH_END_EXTERN - ---- libnih-1.0.3.orig/nih-dbus-tool/marshal.h -+++ libnih-1.0.3/nih-dbus-tool/marshal.h -@@ -35,7 +35,7 @@ - const char *prefix, const char *interface_symbol, - const char *member_symbol, const char *symbol, - NihList *structs) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - NIH_END_EXTERN - ---- libnih-1.0.3.orig/nih-dbus-tool/type.c -+++ libnih-1.0.3/nih-dbus-tool/type.c -@@ -1101,7 +1101,7 @@ - nih_assert (block != NULL); - nih_assert (var != NULL); - -- if (! strchr (var->type, '*')) -+ if (! strchr (var->type, '*') || ! strcmp (var->type, "char * const *")) - return *block; - - if (next && (! strcmp (next->type, "size_t"))) { ---- libnih-1.0.3.orig/nih-dbus-tool/property.h -+++ libnih-1.0.3/nih-dbus-tool/property.h -@@ -65,7 +65,7 @@ - const char *name, - const char *type, - NihDBusAccess access) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - int property_start_tag (XML_Parser xmlp, const char *tag, - char * const *attr) -@@ -88,7 +88,7 @@ - NihList *prototypes, - NihList *handlers, - NihList *structs) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - char * property_object_set_function (const void *parent, - const char *prefix, - Interface *interface, -@@ -96,7 +96,7 @@ - NihList *prototypes, - NihList *handlers, - NihList *structs) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - char * property_proxy_get_function (const void *parent, - const char *prefix, -@@ -104,7 +104,7 @@ - Property *property, - NihList *prototypes, - NihList *structs) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - char * property_proxy_get_notify_function (const void *parent, - const char *prefix, - Interface *interface, -@@ -112,7 +112,7 @@ - NihList *prototypes, - NihList *typedefs, - NihList *structs) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - char * property_proxy_set_function (const void *parent, - const char *prefix, -@@ -120,7 +120,7 @@ - Property *property, - NihList *prototypes, - NihList *structs) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - char * property_proxy_set_notify_function (const void *parent, - const char *prefix, - Interface *interface, -@@ -128,7 +128,7 @@ - NihList *prototypes, - NihList *typedefs, - NihList *structs) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - char * property_proxy_get_sync_function (const void *parent, - const char *prefix, -@@ -136,14 +136,14 @@ - Property *property, - NihList *prototypes, - NihList *structs) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - char * property_proxy_set_sync_function (const void *parent, - const char *prefix, - Interface *interface, - Property *property, - NihList *prototypes, - NihList *structs) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - NIH_END_EXTERN - ---- libnih-1.0.3.orig/nih-dbus-tool/tests/test_main.c -+++ libnih-1.0.3/nih-dbus-tool/tests/test_main.c -@@ -100,10 +100,10 @@ - - extern char *source_file_path (const void *parent, const char *output_path, - const char *filename) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - extern char *header_file_path (const void *parent, const char *output_path, - const char *filename) -- __attribute__ ((warn_unused_result, malloc)); -+ __attribute__ ((warn_unused_result)); - - void - test_source_file_path (void) ---- libnih-1.0.3.orig/nih-dbus-tool/tests/test_com.netsplit.Nih.Test_object.c -+++ libnih-1.0.3/nih-dbus-tool/tests/test_com.netsplit.Nih.Test_object.c -@@ -12524,6 +12524,7 @@ - dbus_message_iter_init (reply, &iter); - - dbus_message_iter_get_basic (&iter, &str_value); -+ TEST_NE (str_value[0], '\0'); - TEST_TRUE (strchr ("0123456789", str_value[0])); - - dbus_message_unref (reply); ---- libnih-1.0.3.orig/nih-dbus-tool/tests/test_marshal.c -+++ libnih-1.0.3/nih-dbus-tool/tests/test_marshal.c -@@ -1479,39 +1479,41 @@ - "\treturn -1;\n" - "}\n" - "\n" -- "for (size_t value_i = 0; value[value_i]; value_i++) {\n" -- "\tDBusMessageIter value_element_iter;\n" -- "\tconst int16_t * value_element;\n" -- "\tsize_t value_element_len;\n" -+ "if (value) {\n" -+ "\tfor (size_t value_i = 0; value[value_i]; value_i++) {\n" -+ "\t\tDBusMessageIter value_element_iter;\n" -+ "\t\tconst int16_t * value_element;\n" -+ "\t\tsize_t value_element_len;\n" - "\n" -- "\tvalue_element = value[value_i];\n" -- "\tvalue_element_len = value_len[value_i];\n" -+ "\t\tvalue_element = value[value_i];\n" -+ "\t\tvalue_element_len = value_len[value_i];\n" - "\n" - -- "\t/* Marshal an array onto the message */\n" -- "\tif (! dbus_message_iter_open_container (&value_iter, DBUS_TYPE_ARRAY, \"n\", &value_element_iter)) {\n" -- "\t\tdbus_message_iter_abandon_container (&iter, &value_iter);\n" -- "\t\treturn -1;\n" -- "\t}\n" -+ "\t\t/* Marshal an array onto the message */\n" -+ "\t\tif (! dbus_message_iter_open_container (&value_iter, DBUS_TYPE_ARRAY, \"n\", &value_element_iter)) {\n" -+ "\t\t\tdbus_message_iter_abandon_container (&iter, &value_iter);\n" -+ "\t\t\treturn -1;\n" -+ "\t\t}\n" - "\n" -- "\tfor (size_t value_element_i = 0; value_element_i < value_element_len; value_element_i++) {\n" -- "\t\tint16_t value_element_element;\n" -+ "\t\tfor (size_t value_element_i = 0; value_element_i < value_element_len; value_element_i++) {\n" -+ "\t\t\tint16_t value_element_element;\n" - "\n" -- "\t\tvalue_element_element = value_element[value_element_i];\n" -+ "\t\t\tvalue_element_element = value_element[value_element_i];\n" - "\n" -- "\t\t/* Marshal a int16_t onto the message */\n" -- "\t\tif (! dbus_message_iter_append_basic (&value_element_iter, DBUS_TYPE_INT16, &value_element_element)) {\n" -- "\t\t\tdbus_message_iter_abandon_container (&value_iter, &value_element_iter);\n" -+ "\t\t\t/* Marshal a int16_t onto the message */\n" -+ "\t\t\tif (! dbus_message_iter_append_basic (&value_element_iter, DBUS_TYPE_INT16, &value_element_element)) {\n" -+ "\t\t\t\tdbus_message_iter_abandon_container (&value_iter, &value_element_iter);\n" -+ "\t\t\t\tdbus_message_iter_abandon_container (&iter, &value_iter);\n" -+ "\t\t\t\treturn -1;\n" -+ "\t\t\t}\n" -+ "\t\t}\n" -+ "\n" -+ "\t\tif (! dbus_message_iter_close_container (&value_iter, &value_element_iter)) {\n" - "\t\t\tdbus_message_iter_abandon_container (&iter, &value_iter);\n" - "\t\t\treturn -1;\n" - "\t\t}\n" -- "\t}\n" -- "\n" -- "\tif (! dbus_message_iter_close_container (&value_iter, &value_element_iter)) {\n" -- "\t\tdbus_message_iter_abandon_container (&iter, &value_iter);\n" -- "\t\treturn -1;\n" -- "\t}\n" - -+ "\t}\n" - "}\n" - "\n" - "if (! dbus_message_iter_close_container (&iter, &value_iter)) {\n" -@@ -1766,15 +1768,17 @@ - "\treturn -1;\n" - "}\n" - "\n" -- "for (size_t value_i = 0; value[value_i]; value_i++) {\n" -- "\tconst char *value_element;\n" -+ "if (value) {\n" -+ "\tfor (size_t value_i = 0; value[value_i]; value_i++) {\n" -+ "\t\tconst char *value_element;\n" - "\n" -- "\tvalue_element = value[value_i];\n" -+ "\t\tvalue_element = value[value_i];\n" - "\n" -- "\t/* Marshal a char * onto the message */\n" -- "\tif (! dbus_message_iter_append_basic (&value_iter, DBUS_TYPE_STRING, &value_element)) {\n" -- "\t\tdbus_message_iter_abandon_container (&iter, &value_iter);\n" -- "\t\treturn -1;\n" -+ "\t\t/* Marshal a char * onto the message */\n" -+ "\t\tif (! dbus_message_iter_append_basic (&value_iter, DBUS_TYPE_STRING, &value_element)) {\n" -+ "\t\t\tdbus_message_iter_abandon_container (&iter, &value_iter);\n" -+ "\t\t\treturn -1;\n" -+ "\t\t}\n" - "\t}\n" - "}\n" - "\n" -@@ -1933,35 +1937,39 @@ - "\treturn -1;\n" - "}\n" - "\n" -- "for (size_t value_i = 0; value[value_i]; value_i++) {\n" -- "\tDBusMessageIter value_element_iter;\n" -- "\tchar * const * value_element;\n" -+ "if (value) {\n" -+ "\tfor (size_t value_i = 0; value[value_i]; value_i++) {\n" -+ "\t\tDBusMessageIter value_element_iter;\n" -+ "\t\tchar * const * value_element;\n" - "\n" -- "\tvalue_element = value[value_i];\n" -+ "\t\tvalue_element = value[value_i];\n" - "\n" -- "\t/* Marshal an array onto the message */\n" -- "\tif (! dbus_message_iter_open_container (&value_iter, DBUS_TYPE_ARRAY, \"s\", &value_element_iter)) {\n" -- "\t\tdbus_message_iter_abandon_container (&iter, &value_iter);\n" -- "\t\treturn -1;\n" -- "\t}\n" -- "\n" -- "\tfor (size_t value_element_i = 0; value_element[value_element_i]; value_element_i++) {\n" -- "\t\tconst char *value_element_element;\n" -+ "\t\t/* Marshal an array onto the message */\n" -+ "\t\tif (! dbus_message_iter_open_container (&value_iter, DBUS_TYPE_ARRAY, \"s\", &value_element_iter)) {\n" -+ "\t\t\tdbus_message_iter_abandon_container (&iter, &value_iter);\n" -+ "\t\t\treturn -1;\n" -+ "\t\t}\n" - "\n" -- "\t\tvalue_element_element = value_element[value_element_i];\n" -+ "\t\tif (value_element) {\n" -+ "\t\t\tfor (size_t value_element_i = 0; value_element[value_element_i]; value_element_i++) {\n" -+ "\t\t\t\tconst char *value_element_element;\n" -+ "\n" -+ "\t\t\t\tvalue_element_element = value_element[value_element_i];\n" -+ "\n" -+ "\t\t\t\t/* Marshal a char * onto the message */\n" -+ "\t\t\t\tif (! dbus_message_iter_append_basic (&value_element_iter, DBUS_TYPE_STRING, &value_element_element)) {\n" -+ "\t\t\t\t\tdbus_message_iter_abandon_container (&value_iter, &value_element_iter);\n" -+ "\t\t\t\t\tdbus_message_iter_abandon_container (&iter, &value_iter);\n" -+ "\t\t\t\t\treturn -1;\n" -+ "\t\t\t\t}\n" -+ "\t\t\t}\n" -+ "\t\t}\n" - "\n" -- "\t\t/* Marshal a char * onto the message */\n" -- "\t\tif (! dbus_message_iter_append_basic (&value_element_iter, DBUS_TYPE_STRING, &value_element_element)) {\n" -- "\t\t\tdbus_message_iter_abandon_container (&value_iter, &value_element_iter);\n" -+ "\t\tif (! dbus_message_iter_close_container (&value_iter, &value_element_iter)) {\n" - "\t\t\tdbus_message_iter_abandon_container (&iter, &value_iter);\n" - "\t\t\treturn -1;\n" - "\t\t}\n" - "\t}\n" -- "\n" -- "\tif (! dbus_message_iter_close_container (&value_iter, &value_element_iter)) {\n" -- "\t\tdbus_message_iter_abandon_container (&iter, &value_iter);\n" -- "\t\treturn -1;\n" -- "\t}\n" - "}\n" - "\n" - "if (! dbus_message_iter_close_container (&iter, &value_iter)) {\n" -@@ -2194,16 +2202,18 @@ - "\treturn -1;\n" - "}\n" - "\n" -- "for (size_t value_item2_i = 0; value_item2[value_item2_i]; value_item2_i++) {\n" -- "\tconst char *value_item2_element;\n" -+ "if (value_item2) {\n" -+ "\tfor (size_t value_item2_i = 0; value_item2[value_item2_i]; value_item2_i++) {\n" -+ "\t\tconst char *value_item2_element;\n" - "\n" -- "\tvalue_item2_element = value_item2[value_item2_i];\n" -+ "\t\tvalue_item2_element = value_item2[value_item2_i];\n" - "\n" -- "\t/* Marshal a char * onto the message */\n" -- "\tif (! dbus_message_iter_append_basic (&value_item2_iter, DBUS_TYPE_STRING, &value_item2_element)) {\n" -- "\t\tdbus_message_iter_abandon_container (&value_iter, &value_item2_iter);\n" -- "\t\tdbus_message_iter_abandon_container (&iter, &value_iter);\n" -- "\t\treturn -1;\n" -+ "\t\t/* Marshal a char * onto the message */\n" -+ "\t\tif (! dbus_message_iter_append_basic (&value_item2_iter, DBUS_TYPE_STRING, &value_item2_element)) {\n" -+ "\t\t\tdbus_message_iter_abandon_container (&value_iter, &value_item2_iter);\n" -+ "\t\t\tdbus_message_iter_abandon_container (&iter, &value_iter);\n" -+ "\t\t\treturn -1;\n" -+ "\t\t}\n" - "\t}\n" - "}\n" - "\n" -@@ -2642,41 +2652,43 @@ - "\treturn -1;\n" - "}\n" - "\n" -- "for (size_t value_i = 0; value[value_i]; value_i++) {\n" -- "\tDBusMessageIter value_element_iter;\n" -- "\tconst char * value_element_item0;\n" -- "\tuint32_t value_element_item1;\n" -- "\tconst MyStructArrayValueElement *value_element;\n" -+ "if (value) {\n" -+ "\tfor (size_t value_i = 0; value[value_i]; value_i++) {\n" -+ "\t\tDBusMessageIter value_element_iter;\n" -+ "\t\tconst char * value_element_item0;\n" -+ "\t\tuint32_t value_element_item1;\n" -+ "\t\tconst MyStructArrayValueElement *value_element;\n" - "\n" -- "\tvalue_element = value[value_i];\n" -+ "\t\tvalue_element = value[value_i];\n" - "\n" -- "\t/* Marshal a structure onto the message */\n" -- "\tif (! dbus_message_iter_open_container (&value_iter, DBUS_TYPE_STRUCT, NULL, &value_element_iter)) {\n" -- "\t\tdbus_message_iter_abandon_container (&iter, &value_iter);\n" -- "\t\treturn -1;\n" -- "\t}\n" -+ "\t\t/* Marshal a structure onto the message */\n" -+ "\t\tif (! dbus_message_iter_open_container (&value_iter, DBUS_TYPE_STRUCT, NULL, &value_element_iter)) {\n" -+ "\t\t\tdbus_message_iter_abandon_container (&iter, &value_iter);\n" -+ "\t\t\treturn -1;\n" -+ "\t\t}\n" - "\n" -- "\tvalue_element_item0 = value_element->item0;\n" -+ "\t\tvalue_element_item0 = value_element->item0;\n" - "\n" -- "\t/* Marshal a char * onto the message */\n" -- "\tif (! dbus_message_iter_append_basic (&value_element_iter, DBUS_TYPE_STRING, &value_element_item0)) {\n" -- "\t\tdbus_message_iter_abandon_container (&value_iter, &value_element_iter);\n" -- "\t\tdbus_message_iter_abandon_container (&iter, &value_iter);\n" -- "\t\treturn -1;\n" -- "\t}\n" -+ "\t\t/* Marshal a char * onto the message */\n" -+ "\t\tif (! dbus_message_iter_append_basic (&value_element_iter, DBUS_TYPE_STRING, &value_element_item0)) {\n" -+ "\t\t\tdbus_message_iter_abandon_container (&value_iter, &value_element_iter);\n" -+ "\t\t\tdbus_message_iter_abandon_container (&iter, &value_iter);\n" -+ "\t\t\treturn -1;\n" -+ "\t\t}\n" - "\n" -- "\tvalue_element_item1 = value_element->item1;\n" -+ "\t\tvalue_element_item1 = value_element->item1;\n" - "\n" -- "\t/* Marshal a uint32_t onto the message */\n" -- "\tif (! dbus_message_iter_append_basic (&value_element_iter, DBUS_TYPE_UINT32, &value_element_item1)) {\n" -- "\t\tdbus_message_iter_abandon_container (&value_iter, &value_element_iter);\n" -- "\t\tdbus_message_iter_abandon_container (&iter, &value_iter);\n" -- "\t\treturn -1;\n" -- "\t}\n" -+ "\t\t/* Marshal a uint32_t onto the message */\n" -+ "\t\tif (! dbus_message_iter_append_basic (&value_element_iter, DBUS_TYPE_UINT32, &value_element_item1)) {\n" -+ "\t\t\tdbus_message_iter_abandon_container (&value_iter, &value_element_iter);\n" -+ "\t\t\tdbus_message_iter_abandon_container (&iter, &value_iter);\n" -+ "\t\t\treturn -1;\n" -+ "\t\t}\n" - "\n" -- "\tif (! dbus_message_iter_close_container (&value_iter, &value_element_iter)) {\n" -- "\t\tdbus_message_iter_abandon_container (&iter, &value_iter);\n" -- "\t\treturn -1;\n" -+ "\t\tif (! dbus_message_iter_close_container (&value_iter, &value_element_iter)) {\n" -+ "\t\t\tdbus_message_iter_abandon_container (&iter, &value_iter);\n" -+ "\t\t\treturn -1;\n" -+ "\t\t}\n" - "\t}\n" - "}\n" - "\n" -@@ -2912,41 +2924,43 @@ - "\treturn -1;\n" - "}\n" - "\n" -- "for (size_t value_i = 0; value[value_i]; value_i++) {\n" -- "\tDBusMessageIter value_element_iter;\n" -- "\tconst char * value_element_item0;\n" -- "\tuint32_t value_element_item1;\n" -- "\tconst MyDictEntryArrayValueElement *value_element;\n" -+ "if (value) {\n" -+ "\tfor (size_t value_i = 0; value[value_i]; value_i++) {\n" -+ "\t\tDBusMessageIter value_element_iter;\n" -+ "\t\tconst char * value_element_item0;\n" -+ "\t\tuint32_t value_element_item1;\n" -+ "\t\tconst MyDictEntryArrayValueElement *value_element;\n" - "\n" -- "\tvalue_element = value[value_i];\n" -+ "\t\tvalue_element = value[value_i];\n" - "\n" -- "\t/* Marshal a structure onto the message */\n" -- "\tif (! dbus_message_iter_open_container (&value_iter, DBUS_TYPE_DICT_ENTRY, NULL, &value_element_iter)) {\n" -- "\t\tdbus_message_iter_abandon_container (&iter, &value_iter);\n" -- "\t\treturn -1;\n" -- "\t}\n" -+ "\t\t/* Marshal a structure onto the message */\n" -+ "\t\tif (! dbus_message_iter_open_container (&value_iter, DBUS_TYPE_DICT_ENTRY, NULL, &value_element_iter)) {\n" -+ "\t\t\tdbus_message_iter_abandon_container (&iter, &value_iter);\n" -+ "\t\t\treturn -1;\n" -+ "\t\t}\n" - "\n" -- "\tvalue_element_item0 = value_element->item0;\n" -+ "\t\tvalue_element_item0 = value_element->item0;\n" - "\n" -- "\t/* Marshal a char * onto the message */\n" -- "\tif (! dbus_message_iter_append_basic (&value_element_iter, DBUS_TYPE_STRING, &value_element_item0)) {\n" -- "\t\tdbus_message_iter_abandon_container (&value_iter, &value_element_iter);\n" -- "\t\tdbus_message_iter_abandon_container (&iter, &value_iter);\n" -- "\t\treturn -1;\n" -- "\t}\n" -+ "\t\t/* Marshal a char * onto the message */\n" -+ "\t\tif (! dbus_message_iter_append_basic (&value_element_iter, DBUS_TYPE_STRING, &value_element_item0)) {\n" -+ "\t\t\tdbus_message_iter_abandon_container (&value_iter, &value_element_iter);\n" -+ "\t\t\tdbus_message_iter_abandon_container (&iter, &value_iter);\n" -+ "\t\t\treturn -1;\n" -+ "\t\t}\n" - "\n" -- "\tvalue_element_item1 = value_element->item1;\n" -+ "\t\tvalue_element_item1 = value_element->item1;\n" - "\n" -- "\t/* Marshal a uint32_t onto the message */\n" -- "\tif (! dbus_message_iter_append_basic (&value_element_iter, DBUS_TYPE_UINT32, &value_element_item1)) {\n" -- "\t\tdbus_message_iter_abandon_container (&value_iter, &value_element_iter);\n" -- "\t\tdbus_message_iter_abandon_container (&iter, &value_iter);\n" -- "\t\treturn -1;\n" -- "\t}\n" -+ "\t\t/* Marshal a uint32_t onto the message */\n" -+ "\t\tif (! dbus_message_iter_append_basic (&value_element_iter, DBUS_TYPE_UINT32, &value_element_item1)) {\n" -+ "\t\t\tdbus_message_iter_abandon_container (&value_iter, &value_element_iter);\n" -+ "\t\t\tdbus_message_iter_abandon_container (&iter, &value_iter);\n" -+ "\t\t\treturn -1;\n" -+ "\t\t}\n" - "\n" -- "\tif (! dbus_message_iter_close_container (&value_iter, &value_element_iter)) {\n" -- "\t\tdbus_message_iter_abandon_container (&iter, &value_iter);\n" -- "\t\treturn -1;\n" -+ "\t\tif (! dbus_message_iter_close_container (&value_iter, &value_element_iter)) {\n" -+ "\t\t\tdbus_message_iter_abandon_container (&iter, &value_iter);\n" -+ "\t\t\treturn -1;\n" -+ "\t\t}\n" - "\t}\n" - "}\n" - "\n" ---- libnih-1.0.3.orig/nih-dbus-tool/tests/test_com.netsplit.Nih.Test_proxy.c -+++ libnih-1.0.3/nih-dbus-tool/tests/test_com.netsplit.Nih.Test_proxy.c -@@ -27359,6 +27359,7 @@ - TEST_TRUE (unix_fd_to_str_replied); - - TEST_EQ_P (last_data, parent); -+ TEST_NE (last_str_value[0], '\0'); - TEST_TRUE (strchr ("0123456789", last_str_value[0])); - TEST_ALLOC_PARENT (last_str_value, parent); - -@@ -27673,6 +27674,7 @@ - - TEST_EQ (ret, 0); - -+ TEST_NE (str_value[0], '\0'); - TEST_TRUE (strchr ("0123456789", str_value[0])); - TEST_ALLOC_PARENT (str_value, parent); - ---- libnih-1.0.3.orig/nih-dbus-tool/tests/test_property.c -+++ libnih-1.0.3/nih-dbus-tool/tests/test_property.c -@@ -8733,7 +8733,7 @@ - TypeVar * var; - NihListEntry * attrib; - NihDBusProxy * proxy = NULL; -- void * parent = NULL; -+ void * parent __attribute__((unused)) = NULL; - pid_t pid = -1; - int status; - DBusMessage * method_call; ---- libnih-1.0.3.orig/nih-dbus-tool/tests/expected/test_method_object_function_standard.c -+++ libnih-1.0.3/nih-dbus-tool/tests/expected/test_method_object_function_standard.c -@@ -136,17 +136,19 @@ - goto enomem; - } - -- for (size_t output_i = 0; output[output_i]; output_i++) { -- const char *output_element; -+ if (output) { -+ for (size_t output_i = 0; output[output_i]; output_i++) { -+ const char *output_element; - -- output_element = output[output_i]; -+ output_element = output[output_i]; - -- /* Marshal a char * onto the message */ -- if (! dbus_message_iter_append_basic (&output_iter, DBUS_TYPE_STRING, &output_element)) { -- dbus_message_iter_abandon_container (&iter, &output_iter); -- dbus_message_unref (reply); -- reply = NULL; -- goto enomem; -+ /* Marshal a char * onto the message */ -+ if (! dbus_message_iter_append_basic (&output_iter, DBUS_TYPE_STRING, &output_element)) { -+ dbus_message_iter_abandon_container (&iter, &output_iter); -+ dbus_message_unref (reply); -+ reply = NULL; -+ goto enomem; -+ } - } - } - ---- libnih-1.0.3.orig/nih-dbus-tool/tests/expected/test_method_reply_function_standard.c -+++ libnih-1.0.3/nih-dbus-tool/tests/expected/test_method_reply_function_standard.c -@@ -7,7 +7,6 @@ - DBusMessageIter output_iter; - - nih_assert (message != NULL); -- nih_assert (output != NULL); - - /* If the sender doesn't care about a reply, don't bother wasting - * effort constructing and sending one. -@@ -28,16 +27,18 @@ - return -1; - } - -- for (size_t output_i = 0; output[output_i]; output_i++) { -- const char *output_element; -- -- output_element = output[output_i]; -- -- /* Marshal a char * onto the message */ -- if (! dbus_message_iter_append_basic (&output_iter, DBUS_TYPE_STRING, &output_element)) { -- dbus_message_iter_abandon_container (&iter, &output_iter); -- dbus_message_unref (reply); -- return -1; -+ if (output) { -+ for (size_t output_i = 0; output[output_i]; output_i++) { -+ const char *output_element; -+ -+ output_element = output[output_i]; -+ -+ /* Marshal a char * onto the message */ -+ if (! dbus_message_iter_append_basic (&output_iter, DBUS_TYPE_STRING, &output_element)) { -+ dbus_message_iter_abandon_container (&iter, &output_iter); -+ dbus_message_unref (reply); -+ return -1; -+ } - } - } - ---- libnih-1.0.3.orig/nih-dbus-tool/tests/expected/test_method_reply_function_deprecated.c -+++ libnih-1.0.3/nih-dbus-tool/tests/expected/test_method_reply_function_deprecated.c -@@ -7,7 +7,6 @@ - DBusMessageIter output_iter; - - nih_assert (message != NULL); -- nih_assert (output != NULL); - - /* If the sender doesn't care about a reply, don't bother wasting - * effort constructing and sending one. -@@ -28,16 +27,18 @@ - return -1; - } - -- for (size_t output_i = 0; output[output_i]; output_i++) { -- const char *output_element; -- -- output_element = output[output_i]; -- -- /* Marshal a char * onto the message */ -- if (! dbus_message_iter_append_basic (&output_iter, DBUS_TYPE_STRING, &output_element)) { -- dbus_message_iter_abandon_container (&iter, &output_iter); -- dbus_message_unref (reply); -- return -1; -+ if (output) { -+ for (size_t output_i = 0; output[output_i]; output_i++) { -+ const char *output_element; -+ -+ output_element = output[output_i]; -+ -+ /* Marshal a char * onto the message */ -+ if (! dbus_message_iter_append_basic (&output_iter, DBUS_TYPE_STRING, &output_element)) { -+ dbus_message_iter_abandon_container (&iter, &output_iter); -+ dbus_message_unref (reply); -+ return -1; -+ } - } - } - ---- libnih-1.0.3.orig/nih-dbus-tool/tests/expected/test_method_object_function_no_input.c -+++ libnih-1.0.3/nih-dbus-tool/tests/expected/test_method_object_function_no_input.c -@@ -88,17 +88,19 @@ - goto enomem; - } - -- for (size_t output_i = 0; output[output_i]; output_i++) { -- const char *output_element; -+ if (output) { -+ for (size_t output_i = 0; output[output_i]; output_i++) { -+ const char *output_element; - -- output_element = output[output_i]; -+ output_element = output[output_i]; - -- /* Marshal a char * onto the message */ -- if (! dbus_message_iter_append_basic (&output_iter, DBUS_TYPE_STRING, &output_element)) { -- dbus_message_iter_abandon_container (&iter, &output_iter); -- dbus_message_unref (reply); -- reply = NULL; -- goto enomem; -+ /* Marshal a char * onto the message */ -+ if (! dbus_message_iter_append_basic (&output_iter, DBUS_TYPE_STRING, &output_element)) { -+ dbus_message_iter_abandon_container (&iter, &output_iter); -+ dbus_message_unref (reply); -+ reply = NULL; -+ goto enomem; -+ } - } - } - diff --git a/meta-oe/recipes-support/libnih/libnih_1.0.3.bb b/meta-oe/recipes-support/libnih/libnih_1.0.3.bb deleted file mode 100644 index ff7a4ed105..0000000000 --- a/meta-oe/recipes-support/libnih/libnih_1.0.3.bb +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright (c) 2013 LG Electronics, Inc. - -SUMMARY = "libnih library" -HOMEPAGE = "https://launchpad.net/libnih" -DESCRIPTION = "libnih is a small library for C application development \ - containing functions that, despite its name, are not implemented \ - elsewhere in the standard library set. \ - \ - libnih is roughly equivalent to other C libraries such as glib, \ - except that its focus is on a small size and intended for \ - applications that sit very low in the software stack, especially \ - outside of /usr. \ - \ - It expressly does not reimplement functions that already exist in \ - libraries ordinarily shipped in /lib such libc6, and does not do \ - foolish things like invent arbitrary typedefs for perfectly good C types." - -SECTION = "libs" - -LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" - -DEPENDS = "dbus expat" -DEPENDS_append_class-target = " libnih-native" - -SRC_URI = "https://launchpad.net/${BPN}/1.0/${PV}/+download/${BP}.tar.gz \ - file://libnih_1.0.3-4ubuntu16.patch \ - file://0001-signal.c-SIGCLD-and-SIGCHILD-are-same-on-sytem-V-sys.patch \ - file://0001-Update-autotool-files-also-make-it-work-with-latest-.patch \ - " - -SRC_URI[md5sum] = "db7990ce55e01daffe19006524a1ccb0" -SRC_URI[sha256sum] = "897572df7565c0a90a81532671e23c63f99b4efde2eecbbf11e7857fbc61f405" - -inherit autotools gettext - -do_configure_append () { - sed -i -e 's,lib/pkgconfig,${baselib}/pkgconfig,g' ${S}/nih/Makefile.in ${S}/nih-dbus/Makefile.in -} - -FILES_${PN}-dev += "${libdir}/pkgconfig/* \ - ${includedir}/* \ - ${libdir}/*.so \ - ${datadir}/* \ - " - -# target libnih requires native nih-dbus-tool -BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/libnvme/libnvme_1.9.bb b/meta-oe/recipes-support/libnvme/libnvme_1.9.bb new file mode 100644 index 0000000000..1e03b4e7ad --- /dev/null +++ b/meta-oe/recipes-support/libnvme/libnvme_1.9.bb @@ -0,0 +1,22 @@ +SUMMARY = "libnvme development C library" +DESCRIPTION = "\ +libnvme provides type definitions for NVMe specification structures, \ +enumerations, and bit fields, helper functions to construct, dispatch, \ +and decode commands and payloads, and utilities to connect, scan, and \ +manage nvme devices on a Linux system." +HOMEPAGE = "https://github.com/linux-nvme/${BPN}" +SECTION = "libs" +LICENSE = "LGPL-2.1-only & CC0-1.0 & MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ + file://ccan/licenses/CC0;md5=c17af43b05840255a6fedc5eda9d56cc \ + file://ccan/licenses/BSD-MIT;md5=838c366f69b72c5df05c96dff79b35f2" +DEPENDS = "json-c" +SRCREV = "80c5cf2aa45f4afc7571dc48850fae3fd62828af" + +SRC_URI = "git://github.com/linux-nvme/libnvme;protocol=https;branch=master" + +S = "${WORKDIR}/git" + +inherit meson pkgconfig + +EXTRA_OEMESON += "-Dkeyutils=disabled -Dopenssl=disabled -Dpython=disabled" diff --git a/meta-oe/recipes-support/liboauth/liboauth/0001-Support-OpenSSL-1.1.0.patch b/meta-oe/recipes-support/liboauth/liboauth/0001-Support-OpenSSL-1.1.0.patch index 8691eae2b5..2631f4ae73 100644 --- a/meta-oe/recipes-support/liboauth/liboauth/0001-Support-OpenSSL-1.1.0.patch +++ b/meta-oe/recipes-support/liboauth/liboauth/0001-Support-OpenSSL-1.1.0.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Support OpenSSL 1.1.0 Taken from https://github.com/x42/liboauth/issues/9 -Upstream-Status: Submitted[https://github.com/x42/liboauth/issues/9] +Upstream-Status: Submitted [https://github.com/x42/liboauth/issues/9] Signed-off-by: Khem Raj <raj.khem@gmail.com> --- src/hash.c | 65 ++++++++++++++++++++++++++++++++++++------------------ diff --git a/meta-oe/recipes-support/liboauth/liboauth_1.0.3.bb b/meta-oe/recipes-support/liboauth/liboauth_1.0.3.bb index 498764ac83..d4b8170873 100644 --- a/meta-oe/recipes-support/liboauth/liboauth_1.0.3.bb +++ b/meta-oe/recipes-support/liboauth/liboauth_1.0.3.bb @@ -3,7 +3,7 @@ DESCRIPTION = "C library implementing OAuth Core RFC 5849" HOMEPAGE = "http://liboauth.sourceforge.net" -LICENSE = "MIT|GPL-2.0" +LICENSE = "MIT|GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING.MIT;md5=6266718a5241c045c8099d9be48817df \ file://COPYING.GPL;md5=0636e73ff0215e8d672dc4c32c317bb3" SECTION = "libs" diff --git a/meta-oe/recipes-support/libol/libol/configure.patch b/meta-oe/recipes-support/libol/libol/configure.patch deleted file mode 100644 index 87695fb06d..0000000000 --- a/meta-oe/recipes-support/libol/libol/configure.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: libol-0.3.18/configure.in -=================================================================== ---- libol-0.3.18.orig/configure.in 2006-03-27 14:44:52.000000000 +0000 -+++ libol-0.3.18/configure.in 2014-07-18 07:05:56.029481372 +0000 -@@ -1,7 +1,7 @@ - dnl Process this file with autoconf to produce a configure script. --AC_INIT(src/abstract_io.c) -+AC_INIT(libol, "0.3.18") - --AM_INIT_AUTOMAKE(libol, "0.3.18", 1) -+AM_INIT_AUTOMAKE([foreign]) - if test -n "$SNAPSHOT_VERSION"; then - VERSION=$VERSION+$SNAPSHOT_VERSION - fi diff --git a/meta-oe/recipes-support/libol/libol_0.3.18.bb b/meta-oe/recipes-support/libol/libol_0.3.18.bb deleted file mode 100644 index d7adb2b941..0000000000 --- a/meta-oe/recipes-support/libol/libol_0.3.18.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "A tiny C support library" -HOMEPAGE = "https://my.balabit.com/downloads/libol" -SECTION = "libs" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b" - -SRC_URI = "http://www.balabit.com/downloads/libol/0.3/${BP}.tar.gz \ - file://configure.patch" -SRC_URI[md5sum] = "cbadf4b7ea276dfa85acc38a1cc5ff17" -SRC_URI[sha256sum] = "9de3bf13297ff882e02a1e6e5f6bf760a544aff92a9d8a1cf4328a32005cefe7" - -inherit autotools binconfig - -do_compile_prepend() { - install ${S}/utils/make_class.in ${B}/utils -} - -do_install_append() { - rm -fr ${D}${bindir} -} diff --git a/meta-oe/recipes-support/liboop/liboop/tcl_dev.patch b/meta-oe/recipes-support/liboop/liboop/tcl_dev.patch index e00cf80141..0521aaeaff 100644 --- a/meta-oe/recipes-support/liboop/liboop/tcl_dev.patch +++ b/meta-oe/recipes-support/liboop/liboop/tcl_dev.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + --- a/configure.ac +++ b/configure.ac @@ -71,7 +71,7 @@ diff --git a/meta-oe/recipes-support/liboop/liboop_1.0.1.bb b/meta-oe/recipes-support/liboop/liboop_1.0.1.bb index 8ba3f72b76..7ad88b7402 100644 --- a/meta-oe/recipes-support/liboop/liboop_1.0.1.bb +++ b/meta-oe/recipes-support/liboop/liboop_1.0.1.bb @@ -1,9 +1,9 @@ DESCRIPTION = "Liboop is a low-level event loop management library for POSIX-based operating systems" HOMEPAGE = "http://www.lysator.liu.se/liboop/" -LICENSE = "GPL-2.0" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=8b54f38ccbd44feb80ab90e01af8b700" -SRC_URI = "http://ftp.debian.org/debian/pool/main/libo/liboop/liboop_${PV}.orig.tar.gz \ +SRC_URI = "http://ftp.lysator.liu.se/pub/liboop/liboop-${PV}.tar.gz \ file://tcl_dev.patch \ " diff --git a/meta-oe/recipes-support/libosinfo/libosinfo/0001-meson.build-allow-crosscompiling-gir.patch b/meta-oe/recipes-support/libosinfo/libosinfo/0001-meson.build-allow-crosscompiling-gir.patch new file mode 100644 index 0000000000..778a1f6e1e --- /dev/null +++ b/meta-oe/recipes-support/libosinfo/libosinfo/0001-meson.build-allow-crosscompiling-gir.patch @@ -0,0 +1,28 @@ +From 123b5a4c5e09f4262d4545a0bc5edb01a19b6b76 Mon Sep 17 00:00:00 2001 +From: Markus Volk <f_l_k@t-online.de> +Date: Mon, 21 Aug 2023 10:06:55 +0200 +Subject: [PATCH] meson.build: allow crosscompiling gir + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Markus Volk <f_l_k@t-online.de> +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 39b739e..46f2252 100644 +--- a/meson.build ++++ b/meson.build +@@ -29,7 +29,7 @@ libosinfo_pkgconfdir = join_paths(libosinfo_libdir, 'pkgconfig') + + # gobject introspection + gir = find_program('g-ir-scanner', required: get_option('enable-introspection')) +-enable_introspection = gir.found() and not meson.is_cross_build() ++enable_introspection = gir.found() + + # vala + vapi_opt = get_option('enable-vala') +-- +2.41.0 + diff --git a/meta-oe/recipes-support/libosinfo/libosinfo/0001-osinfo-Make-xmlError-struct-constant-in-propagate_li.patch b/meta-oe/recipes-support/libosinfo/libosinfo/0001-osinfo-Make-xmlError-struct-constant-in-propagate_li.patch new file mode 100644 index 0000000000..467c6b4baf --- /dev/null +++ b/meta-oe/recipes-support/libosinfo/libosinfo/0001-osinfo-Make-xmlError-struct-constant-in-propagate_li.patch @@ -0,0 +1,32 @@ +From 5bbdd06503456784c5ffa22409e8bab50470d673 Mon Sep 17 00:00:00 2001 +From: Michal Privoznik <mprivozn@redhat.com> +Date: Mon, 27 Nov 2023 15:11:45 +0100 +Subject: [PATCH] osinfo: Make xmlError struct constant in + propagate_libxml_error() + +In libxml2 commit v2.12.0~14 the API changed so that +xmlGetLastError() returns pointer to a constant xmlError struct. +Reflect this change in our code. + +Upstream-Status: Backport [https://gitlab.com/libosinfo/libosinfo/-/merge_requests/155] +Signed-off-by: Michal Privoznik <mprivozn@redhat.com> +--- + osinfo/osinfo_install_script.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/osinfo/osinfo_install_script.c b/osinfo/osinfo_install_script.c +index 5800f37..303245a 100644 +--- a/osinfo/osinfo_install_script.c ++++ b/osinfo/osinfo_install_script.c +@@ -769,7 +769,7 @@ static void propagate_libxml_error(GError **error, const char *format, ...) G_GN + + static void propagate_libxml_error(GError **error, const char *format, ...) + { +- xmlErrorPtr err = xmlGetLastError(); ++ const xmlError *err = xmlGetLastError(); + char *prefix; + va_list ap; + +-- +2.44.0 + diff --git a/meta-oe/recipes-support/libosinfo/libosinfo_1.11.0.bb b/meta-oe/recipes-support/libosinfo/libosinfo_1.11.0.bb new file mode 100644 index 0000000000..8ef7ac3df0 --- /dev/null +++ b/meta-oe/recipes-support/libosinfo/libosinfo_1.11.0.bb @@ -0,0 +1,35 @@ +SUMMARY = "API for managing information about operating systems, hypervisors and the (virtual) hardware devices." +HOMEPAGE = "https://libosinfo.org" + +LICENSE = "LGPL-2.1-only & GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=2b0e9926530c269f5ae95560370195af" +LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c" + +SRC_URI = " \ + git://gitlab.com/libosinfo/libosinfo.git;branch=main;protocol=https \ + file://0001-meson.build-allow-crosscompiling-gir.patch \ + file://0001-osinfo-Make-xmlError-struct-constant-in-propagate_li.patch \ +" + +SRCREV = "ca9dd5b810dc04ea38048ae9be491654c8596ef9" + +S = "${WORKDIR}/git" + +inherit meson pkgconfig gtk-doc gobject-introspection vala + +DEPENDS = "glib-2.0 libsoup libxslt" + +VALA_MESON_OPTION = 'enable-vala' +VALA_MESON_ENABLE_FLAG = 'enabled' +VALA_MESON_DISABLE_FLAG = 'disabled' +GIR_MESON_OPTION = "enable-introspection" +GIR_MESON_ENABLE_FLAG = 'enabled' +GIR_MESON_DISABLE_FLAG = 'disabled' +GTKDOC_MESON_OPTION = "enable-gtk-doc" + +EXTRA_OEMESON += " \ + -Dwith-pci-ids-path=${datadir}/hwdata/pci.ids \ + -Dwith-usb-ids-path=${datadir}/hwdata/usb.ids \ +" + +RDEPENDS:${PN} = "hwdata" diff --git a/meta-oe/recipes-support/libp11/libp11_0.4.10.bb b/meta-oe/recipes-support/libp11/libp11_0.4.12.bb index 655db49073..2237782009 100644 --- a/meta-oe/recipes-support/libp11/libp11_0.4.10.bb +++ b/meta-oe/recipes-support/libp11/libp11_0.4.12.bb @@ -5,12 +5,14 @@ make using PKCS" HOMEPAGE = "https://github.com/OpenSC/libp11" BUGTRACKER = "https://github.com/OpenSC/libp11/issues" SECTION = "Development/Libraries" -LICENSE = "LGPLv2+" +LICENSE = "LGPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=fad9b3332be894bab9bc501572864b29" DEPENDS = "libtool openssl" -SRC_URI = "git://github.com/OpenSC/libp11.git" -SRCREV = "973d31f3f58d5549ddd8b1f822ce8f72186f9d68" +SRC_URI = "git://github.com/OpenSC/libp11.git;branch=master;protocol=https" +SRCREV = "53d65dc48cf436694f7edcfc805414e608e8a2bf" + +UPSTREAM_CHECK_GITTAGREGEX = "libp11-(?P<pver>\d+(\.\d+)+)" S = "${WORKDIR}/git" @@ -18,11 +20,11 @@ inherit autotools pkgconfig EXTRA_OECONF = "--disable-static" -do_install_append () { +do_install:append () { rm -rf ${D}${docdir}/${BPN} } -FILES_${PN} += "${libdir}/engines*/pkcs11.so" -FILES_${PN}-dev += "${libdir}/engines*/libpkcs11${SOLIBSDEV}" +FILES:${PN} += "${libdir}/engines*/pkcs11.so" +FILES:${PN}-dev += "${libdir}/engines*/libpkcs11${SOLIBSDEV}" BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/libpaper/libpaper_2.1.2.bb b/meta-oe/recipes-support/libpaper/libpaper_2.1.2.bb new file mode 100644 index 0000000000..a45ffe1849 --- /dev/null +++ b/meta-oe/recipes-support/libpaper/libpaper_2.1.2.bb @@ -0,0 +1,9 @@ +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +SRC_URI = "https://github.com/rrthomas/libpaper/releases/download/v${PV}/libpaper-${PV}.tar.gz" +SRC_URI[sha256sum] = "1fda0cf64efa46b9684a4ccc17df4386c4cc83254805419222c064bf62ea001f" + +inherit perlnative autotools + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/libraw/libraw_0.21.2.bb b/meta-oe/recipes-support/libraw/libraw_0.21.2.bb new file mode 100644 index 0000000000..4d089f3b79 --- /dev/null +++ b/meta-oe/recipes-support/libraw/libraw_0.21.2.bb @@ -0,0 +1,11 @@ +SUMMARY = "raw image decoder" +LICENSE = "LGPL-2.1-only | CDDL-1.0" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=1501ae0aa3c8544e63f08d6f7bf88a6f" + +SRC_URI = "git://github.com/LibRaw/LibRaw.git;branch=0.21-stable;protocol=https" +SRCREV = "1ef70158d7fde1ced6aaddb0b9443c32a7121d3d" +S = "${WORKDIR}/git" + +inherit autotools pkgconfig + +DEPENDS = "jpeg jasper lcms" diff --git a/meta-oe/recipes-support/libraw1394/libraw1394_2.1.2.bb b/meta-oe/recipes-support/libraw1394/libraw1394_2.1.2.bb index 337780789d..15e1ee2438 100644 --- a/meta-oe/recipes-support/libraw1394/libraw1394_2.1.2.bb +++ b/meta-oe/recipes-support/libraw1394/libraw1394_2.1.2.bb @@ -1,7 +1,7 @@ SUMMARY = "base library for low-level IEEE 1394 accesses" HOMEPAGE = "https://ieee1394.wiki.kernel.org/index.php/Libraries#libraw1394" SECTION = "libs" -LICENSE = "LGPL-2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=d8045f3b8f929c1cb29a1e3fd737b499" SRC_URI = "https://www.kernel.org/pub/linux/libs/ieee1394/${BPN}-${PV}.tar.gz" diff --git a/meta-oe/recipes-support/librdkafka/librdkafka/0001-cmake-Use-CMAKE_INSTALL_LIBDIR.patch b/meta-oe/recipes-support/librdkafka/librdkafka/0001-cmake-Use-CMAKE_INSTALL_LIBDIR.patch new file mode 100644 index 0000000000..053a4cc2d8 --- /dev/null +++ b/meta-oe/recipes-support/librdkafka/librdkafka/0001-cmake-Use-CMAKE_INSTALL_LIBDIR.patch @@ -0,0 +1,30 @@ +From ed1dd35e0e23a98e57567718a0d474fd29cc348a Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 19 Mar 2022 21:36:41 -0700 +Subject: [PATCH] cmake: Use CMAKE_INSTALL_LIBDIR + +this ensures that it is portable across platforms e.g. ppc64/linux +uses lib64 not lib + +Upstream-Status: Submitted [https://github.com/edenhill/librdkafka/pull/3770] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d1129bce..774473fa 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -219,7 +219,7 @@ configure_file("packaging/cmake/config.h.in" "${GENERATED_DIR}/config.h") + + include(GNUInstallDirs) + +-set(config_install_dir "lib/cmake/${PROJECT_NAME}") ++set(config_install_dir "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") + + set(generated_dir "${CMAKE_CURRENT_BINARY_DIR}/generated") + +-- +2.35.1 + diff --git a/meta-oe/recipes-support/librdkafka/librdkafka_1.8.2.bb b/meta-oe/recipes-support/librdkafka/librdkafka_1.8.2.bb new file mode 100644 index 0000000000..6148e7cb08 --- /dev/null +++ b/meta-oe/recipes-support/librdkafka/librdkafka_1.8.2.bb @@ -0,0 +1,23 @@ +SUMMARY = "the Apache Kafka C/C++ client library" +DESCRIPTION = "librdkafka is a C library implementation of the Apache Kafka protocol, \ + providing Producer, Consumer and Admin clients." +HOMEPAGE = "https://github.com/edenhill/librdkafka" +SECTION = "libs" +LICENSE = "BSD-2-Clause" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=2be8675acbfdac48935e73897af5f646" + +SRC_URI = "git://github.com/edenhill/librdkafka;protocol=https;branch=master \ + file://0001-cmake-Use-CMAKE_INSTALL_LIBDIR.patch \ + " +SRCREV = "063a9ae7a65cebdf1cc128da9815c05f91a2a996" + +DEPENDS = "zlib openssl zstd" + +inherit cmake + +S = "${WORKDIR}/git" + +FILES:${PN} += "${datadir}" + +EXTRA_OECMAKE += "-DRDKAFKA_BUILD_EXAMPLES=OFF -DRDKAFKA_BUILD_TESTS=OFF" diff --git a/meta-oe/recipes-support/librsync/librsync_2.2.1.bb b/meta-oe/recipes-support/librsync/librsync_2.3.4.bb index c2f28fed25..3cad665389 100644 --- a/meta-oe/recipes-support/librsync/librsync_2.2.1.bb +++ b/meta-oe/recipes-support/librsync/librsync_2.3.4.bb @@ -1,11 +1,10 @@ SUMMARY = "Remote delta-compression library." -AUTHOR = "Martin Pool, Andrew Tridgell, Donovan Baarda, Adam Schubert" -LICENSE = "LGPLv2.1+" +LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499" -SRC_URI = "git://github.com/librsync/librsync.git" -SRCREV = "5917692418657dc78c9cbde3a8db4c85f25b9c8d" +SRC_URI = "git://github.com/librsync/librsync.git;branch=master;protocol=https" +SRCREV = "e364852674780e43d578e4239128ff7014190ed3" S = "${WORKDIR}/git" DEPENDS = "popt" @@ -13,6 +12,6 @@ DEPENDS = "popt" inherit cmake PACKAGES =+ "rdiff" -FILES_rdiff = "${bindir}/rdiff" +FILES:rdiff = "${bindir}/rdiff" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/libsmi/libsmi/0001-Define-createIdentifierRef-prototype-in-yang-complex.patch b/meta-oe/recipes-support/libsmi/libsmi/0001-Define-createIdentifierRef-prototype-in-yang-complex.patch new file mode 100644 index 0000000000..3374f8484e --- /dev/null +++ b/meta-oe/recipes-support/libsmi/libsmi/0001-Define-createIdentifierRef-prototype-in-yang-complex.patch @@ -0,0 +1,53 @@ +From 77b520a8ee193b6d9f12e049f505d8d98204c11c Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 31 Aug 2022 17:13:32 -0700 +Subject: [PATCH] Define createIdentifierRef prototype in yang-complex-types.c + +Provide needed prototype to make compiler happy + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + lib/parser-yang.y | 3 ++- + lib/yang-complex-types.c | 3 ++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +--- a/lib/parser-yang.y ++++ b/lib/parser-yang.y +@@ -41,7 +41,8 @@ + #include "yang-complex-types.h" + #include "util.h" + #include "error.h" +- ++#include "yang-check.h" ++ + #ifdef HAVE_DMALLOC_H + #include <dmalloc.h> + #endif +@@ -61,7 +62,8 @@ + #define debug + #endif + +- ++extern void createIdentifierRef(struct _YangNode *node, char* prefix, char* ident); ++extern void smiyyerror(char *msg, Parser *parserPtr); + /* + * NOTE: The argument lvalp ist not really a void pointer. Unfortunately, + * we don't know it better at this point. bison generated C code declares +--- a/lib/yang-complex-types.c ++++ b/lib/yang-complex-types.c +@@ -35,12 +35,13 @@ + #include "yang-data.h" + #include "yang-check.h" + #include "yang-complex-types.h" +- + /* + * Current parser defined in parser-yang. Workaround - can't include data.h + */ + extern Parser *currentParser; + ++extern void createIdentifierRef(struct _YangNode *node, char* prefix, char* ident); ++ + static const int parents_complex_type[] = { + YANG_DECL_MODULE, YANG_DECL_SUBMODULE, YANG_DECL_CONTAINER, + YANG_DECL_LIST, YANG_DECL_RPC, YANG_DECL_INPUT, diff --git a/meta-oe/recipes-support/libsmi/libsmi/0001-parser-yang-Define-_DEFAULT_SOURCE.patch b/meta-oe/recipes-support/libsmi/libsmi/0001-parser-yang-Define-_DEFAULT_SOURCE.patch new file mode 100644 index 0000000000..9354a889a0 --- /dev/null +++ b/meta-oe/recipes-support/libsmi/libsmi/0001-parser-yang-Define-_DEFAULT_SOURCE.patch @@ -0,0 +1,28 @@ +From 86b706f694b822d8028fd36320147767056d2ffa Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 6 Sep 2022 12:09:00 -0700 +Subject: [PATCH] parser-yang: Define _DEFAULT_SOURCE + +This is needed for timegm API + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + lib/parser-yang.y | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lib/parser-yang.y b/lib/parser-yang.y +index b111607..0ded9d2 100644 +--- a/lib/parser-yang.y ++++ b/lib/parser-yang.y +@@ -21,6 +21,7 @@ + #ifdef BACKEND_YANG + + #define _ISOC99_SOURCE ++#define _DEFAULT_SOURCE + #include <stdio.h> + #include <errno.h> + #include <stdlib.h> +-- +2.37.3 + diff --git a/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb b/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb index 98cc63eb3b..73aeb55393 100644 --- a/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb +++ b/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb @@ -1,32 +1,40 @@ SUMMARY = "A Library to Access SMI MIB Information" HOMEPAGE = "https://www.ibr.cs.tu-bs.de/projects/libsmi" -LICENSE = "BSD-3-Clause & tcl" +LICENSE = "BSD-3-Clause & TCL" LIC_FILES_CHKSUM = "file://COPYING;md5=3ad3076f9332343a21636cfd351f05b7" SRC_URI = "https://www.ibr.cs.tu-bs.de/projects/${BPN}/download/${BP}.tar.gz \ file://smi.conf \ file://libsmi-fix-the-test-dump-files.patch \ + file://0001-Define-createIdentifierRef-prototype-in-yang-complex.patch \ + file://0001-parser-yang-Define-_DEFAULT_SOURCE.patch \ " SRC_URI[md5sum] = "4bf47483c06c9f07d1b10fbc74eddf11" SRC_URI[sha256sum] = "f21accdadb1bb328ea3f8a13fc34d715baac6e2db66065898346322c725754d3" -RDEPENDS_${PN} += "wget" +DEPENDS += "bison-native flex-native wget-native gawk-native" -inherit autotools +inherit autotools-brokensep update-alternatives +ALTERNATIVE_PRIORITY = "50" +ALTERNATIVE:${PN}-yang = "ietf-interfaces " +ALTERNATIVE_LINK_NAME[ietf-interfaces] = "${datadir}/yang/ietf-interfaces.yang" -EXTRA_OECONF = "ac_cv_path_SH=${base_bindir}/sh ac_cv_path_WGET=${bindir}/wget" +EXTRA_OECONF:class-native = "ac_cv_path_SH=/bin/sh" +EXTRA_OECONF:class-target = "ac_cv_path_SH=/bin/sh ac_cv_path_WGET=${bindir}/wget ac_cv_path_AWK=${bindir}/awk" -do_install_append () { +do_install:append () { install -d ${D}${sysconfdir} - install -m 0644 ${WORKDIR}/smi.conf ${D}${sysconfdir}/smi.conf + install -m 0644 ${UNPACKDIR}/smi.conf ${D}${sysconfdir}/smi.conf } PACKAGES += "${PN}-mibs ${PN}-pibs ${PN}-yang" -FILES_${PN}-mibs += "${datadir}/mibs" -FILES_${PN}-pibs += "${datadir}/pibs" -FILES_${PN}-yang += "${datadir}/yang" +FILES:${PN}-mibs += "${datadir}/mibs" +FILES:${PN}-pibs += "${datadir}/pibs" +FILES:${PN}-yang += "${datadir}/yang" -RRECOMMENDS_${PN} = "${BPN}-mibs" +RRECOMMENDS:${PN} = "${BPN}-mibs" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/libsoc/libsoc_0.8.2.bb b/meta-oe/recipes-support/libsoc/libsoc_0.8.2.bb index 8b773aefa5..5969220a41 100644 --- a/meta-oe/recipes-support/libsoc/libsoc_0.8.2.bb +++ b/meta-oe/recipes-support/libsoc/libsoc_0.8.2.bb @@ -4,13 +4,13 @@ DESCRIPTION = "libsoc is a C library to interface with common peripherals (gpio, HOMEPAGE = "https://github.com/jackmitch/libsoc" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://LICENCE;md5=e0bfebea12a718922225ba987b2126a5" inherit autotools pkgconfig python3-dir SRCREV = "fd1ad6e7823fa76d8db0d3c5884faffa8ffddafb" -SRC_URI = "git://github.com/jackmitch/libsoc.git" +SRC_URI = "git://github.com/jackmitch/libsoc.git;branch=master;protocol=https" S = "${WORKDIR}/git" @@ -21,12 +21,12 @@ PACKAGECONFIG ?= "" PACKAGECONFIG[disabledebug] = "--disable-debug,," PACKAGECONFIG[allboardconfigs] = "--with-board-configs,," PACKAGECONFIG[enableboardconfig] = "--enable-board=${BOARD},," -PACKAGECONFIG[python] = "--enable-python=${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN},,${PYTHON_PN} ${PYTHON_PN}-native" +PACKAGECONFIG[python] = "--enable-python=${STAGING_BINDIR_NATIVE}/python3-native/python3,,python3 python3-native" PACKAGES =+ "${@bb.utils.contains('PACKAGECONFIG', 'python', \ - '${PYTHON_PN}-libsoc-staticdev ${PYTHON_PN}-libsoc', '', d)}" + 'python3-libsoc-staticdev python3-libsoc', '', d)}" -RDEPENDS_${PN} = "libgcc" +RDEPENDS:${PN} = "libgcc" -FILES_${PYTHON_PN}-libsoc-staticdev += "${PYTHON_SITEPACKAGES_DIR}/*/*.a" -FILES_${PYTHON_PN}-libsoc += "${PYTHON_SITEPACKAGES_DIR}" +FILES:python3-libsoc-staticdev += "${PYTHON_SITEPACKAGES_DIR}/*/*.a" +FILES:python3-libsoc += "${PYTHON_SITEPACKAGES_DIR}" diff --git a/meta-oe/recipes-support/libssh/libssh/0001-libgcrypt.c-Fix-prototype-of-des3_encrypt-des3_decry.patch b/meta-oe/recipes-support/libssh/libssh/0001-libgcrypt.c-Fix-prototype-of-des3_encrypt-des3_decry.patch new file mode 100644 index 0000000000..d2d1fb5955 --- /dev/null +++ b/meta-oe/recipes-support/libssh/libssh/0001-libgcrypt.c-Fix-prototype-of-des3_encrypt-des3_decry.patch @@ -0,0 +1,44 @@ +From 49a8ae4d6f77434ed9f7a601b9df488b921e4a22 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 20 Mar 2023 21:59:19 -0700 +Subject: [PATCH] libgcrypt.c: Fix prototype of des3_encrypt/des3_decrypt + +This is to match the prototype for callback functions which are now emitted as +errors by clang16 + +Fixes + +TOPDIR/build/tmp/work/cortexa15t2hf-neon-yoe-linux-gnueabi/libssh/0.10.4-r0/git/src/libgcrypt.c:903:20: error: incompatible function pointer types initializing 'void (*)(struct ssh_cipher_struct *, void *, void *, size_t)' (aka 'void (*)(struct ssh_cipher_struct *, void *, void *, unsigned int)') with an expression of type 'void (struct ssh_cipher_struct *, void *, void *, unsigned long)' [-Wincompatible-function-pointer-types] + .encrypt = des3_encrypt, + ^~~~~~~~~~~~ +TOPDIR/build/tmp/work/cortexa15t2hf-neon-yoe-linux-gnueabi/libssh/0.10.4-r0/git/src/libgcrypt.c:904:20: error: incompatible function pointer types initializing 'void (*)(struct ssh_cipher_struct *, void *, void *, size_t)' (aka 'void (*)(struct ssh_cipher_struct *, void *, void *, unsigned int)') with an expression of type 'void (struct ssh_cipher_struct *, void *, void *, unsigned long)' [-Wincompatible-function-pointer-types] + .decrypt = des3_decrypt + ^~~~~~~~~~~~ + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- + src/libgcrypt.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/libgcrypt.c b/src/libgcrypt.c +index f410d997..e3f66781 100644 +--- a/src/libgcrypt.c ++++ b/src/libgcrypt.c +@@ -416,12 +416,12 @@ static int des3_set_key(struct ssh_cipher_struct *cipher, void *key, void *IV) { + } + + static void des3_encrypt(struct ssh_cipher_struct *cipher, void *in, +- void *out, unsigned long len) { ++ void *out, size_t len) { + gcry_cipher_encrypt(cipher->key[0], out, len, in, len); + } + + static void des3_decrypt(struct ssh_cipher_struct *cipher, void *in, +- void *out, unsigned long len) { ++ void *out, size_t len) { + gcry_cipher_decrypt(cipher->key[0], out, len, in, len); + } + diff --git a/meta-oe/recipes-support/libssh/libssh/0001-tests-CMakeLists.txt-do-not-search-ssh-sshd-commands.patch b/meta-oe/recipes-support/libssh/libssh/0001-tests-CMakeLists.txt-do-not-search-ssh-sshd-commands.patch new file mode 100644 index 0000000000..d6bc75c3a6 --- /dev/null +++ b/meta-oe/recipes-support/libssh/libssh/0001-tests-CMakeLists.txt-do-not-search-ssh-sshd-commands.patch @@ -0,0 +1,36 @@ +From 69a89e8f015802f61637fed0d3791d20a594f298 Mon Sep 17 00:00:00 2001 +From: Yi Zhao <yi.zhao@windriver.com> +Date: Wed, 15 Mar 2023 16:51:58 +0800 +Subject: [PATCH] tests/CMakeLists.txt: do not search ssh/sshd commands on host + +It will search ssh/sshd commands on host when configure. Since they are +not required by unittests, we can skip the search. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> + +--- + tests/CMakeLists.txt | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index f5c30061..885c926a 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -86,6 +86,7 @@ set(TEST_TARGET_LIBRARIES + + add_subdirectory(unittests) + ++if (CLIENT_TESTING OR SERVER_TESTING) + # OpenSSH Capabilities are required for all unit tests + find_program(SSH_EXECUTABLE NAMES ssh) + if (SSH_EXECUTABLE) +@@ -302,6 +303,7 @@ if (CLIENT_TESTING OR SERVER_TESTING) + + message(STATUS "TORTURE_ENVIRONMENT=${TORTURE_ENVIRONMENT}") + endif () ++endif () + + configure_file(tests_config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/tests_config.h) + diff --git a/meta-oe/recipes-support/libssh/libssh/run-ptest b/meta-oe/recipes-support/libssh/libssh/run-ptest new file mode 100644 index 0000000000..6346b72d50 --- /dev/null +++ b/meta-oe/recipes-support/libssh/libssh/run-ptest @@ -0,0 +1,17 @@ +#!/bin/sh + +ptestdir=$(dirname "$(readlink -f "$0")") +cd "$ptestdir"/tests || exit + +tests=$(find * -type f -name 'torture_*') + +for f in $tests +do + if test -x ./"$f"; then + if ./"$f" > ./"$f".out 2> ./"$f".err; then + echo "PASS: $f" + else + echo "FAIL: $f" + fi + fi +done diff --git a/meta-oe/recipes-support/libssh/libssh_0.10.6.bb b/meta-oe/recipes-support/libssh/libssh_0.10.6.bb new file mode 100644 index 0000000000..31f29c1b7d --- /dev/null +++ b/meta-oe/recipes-support/libssh/libssh_0.10.6.bb @@ -0,0 +1,48 @@ +SUMMARY = "Multiplatform C library implementing the SSHv2 and SSHv1 protocol" +HOMEPAGE = "http://www.libssh.org" +SECTION = "libs" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=dabb4958b830e5df11d2b0ed8ea255a0" + +DEPENDS = "zlib openssl" + +SRC_URI = "git://git.libssh.org/projects/libssh.git;protocol=https;branch=stable-0.10 \ + file://0001-tests-CMakeLists.txt-do-not-search-ssh-sshd-commands.patch \ + file://0001-libgcrypt.c-Fix-prototype-of-des3_encrypt-des3_decry.patch \ + file://run-ptest \ + " +SRCREV = "10e09e273f69e149389b3e0e5d44b8c221c2e7f6" + +S = "${WORKDIR}/git" + +inherit cmake ptest + +PACKAGECONFIG ??= "gcrypt ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" +PACKAGECONFIG[gssapi] = "-DWITH_GSSAPI=1, -DWITH_GSSAPI=0, krb5, " +PACKAGECONFIG[gcrypt] = "-DWITH_GCRYPT=1, -DWITH_GCRYPT=0, libgcrypt, " +PACKAGECONFIG[tests] = "-DUNIT_TESTING=1, -DUNIT_TESTING=0, cmocka" + +ARM_INSTRUCTION_SET:armv5 = "arm" + +EXTRA_OECMAKE = " \ + -DWITH_PCAP=1 \ + -DWITH_SFTP=1 \ + -DWITH_ZLIB=1 \ + -DWITH_EXAMPLES=0 \ + " + +do_compile:prepend () { + if [ ${PTEST_ENABLED} = "1" ]; then + sed -i -e 's|${B}|${PTEST_PATH}|g' ${B}/config.h + sed -i -e 's|${S}|${PTEST_PATH}|g' ${B}/config.h + fi +} + +do_install_ptest () { + install -d ${D}${PTEST_PATH}/tests + cp -f ${B}/tests/unittests/torture_* ${D}${PTEST_PATH}/tests/ + install -d ${D}${PTEST_PATH}/tests/unittests + cp -f ${S}/tests/unittests/hello*.sh ${D}${PTEST_PATH}/tests/unittests/ +} + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/libssh/libssh_0.8.4.bb b/meta-oe/recipes-support/libssh/libssh_0.8.4.bb deleted file mode 100644 index 6040ec959e..0000000000 --- a/meta-oe/recipes-support/libssh/libssh_0.8.4.bb +++ /dev/null @@ -1,35 +0,0 @@ -SUMMARY = "Multiplatform C library implementing the SSHv2 and SSHv1 protocol" -HOMEPAGE = "http://www.libssh.org" -SECTION = "libs" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=388a4fb1dea8ceae0be78ba9b01fc139" - -DEPENDS = "zlib openssl libgcrypt" - -SRC_URI = "git://git.libssh.org/projects/libssh.git;branch=stable-0.8" -SRCREV = "789df0b7d0c7abd6b85db9fc5247e146e3d4ddba" - -S = "${WORKDIR}/git" - -inherit cmake - -PACKAGECONFIG ??="" -PACKAGECONFIG[gssapi] = "-DWITH_GSSAPI=1, -DWITH_GSSAPI=0, krb5, " - -ARM_INSTRUCTION_SET_armv5 = "arm" - -EXTRA_OECMAKE = " \ - -DWITH_GCRYPT=1 \ - -DWITH_PCAP=1 \ - -DWITH_SFTP=1 \ - -DWITH_ZLIB=1 \ - -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ - " - -do_configure_prepend () { - # Disable building of examples - sed -i -e '/add_subdirectory(examples)/s/^/#DONOTWANT/' ${S}/CMakeLists.txt \ - || bbfatal "Failed to disable examples" -} - -TOOLCHAIN = "gcc" diff --git a/meta-oe/recipes-support/libssh2/files/CVE-2019-17498.patch b/meta-oe/recipes-support/libssh2/files/CVE-2019-17498.patch deleted file mode 100644 index 001080072b..0000000000 --- a/meta-oe/recipes-support/libssh2/files/CVE-2019-17498.patch +++ /dev/null @@ -1,131 +0,0 @@ -From dedcbd106f8e52d5586b0205bc7677e4c9868f9c Mon Sep 17 00:00:00 2001 -From: Will Cosgrove <will@panic.com> -Date: Fri, 30 Aug 2019 09:57:38 -0700 -Subject: [PATCH] packet.c: improve message parsing (#402) - -* packet.c: improve parsing of packets - -file: packet.c - -notes: -Use _libssh2_get_string API in SSH_MSG_DEBUG/SSH_MSG_DISCONNECT. Additional uint32 bounds check in SSH_MSG_GLOBAL_REQUEST. - -Upstream-Status: Backport -CVE: CVE-2019-17498 -Signed-off-by: Li Zhou <li.zhou@windriver.com> ---- - src/packet.c | 68 ++++++++++++++++++++++------------------------------ - 1 file changed, 29 insertions(+), 39 deletions(-) - -diff --git a/src/packet.c b/src/packet.c -index 38ab629..2e01bfc 100644 ---- a/src/packet.c -+++ b/src/packet.c -@@ -419,8 +419,8 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, - size_t datalen, int macstate) - { - int rc = 0; -- char *message = NULL; -- char *language = NULL; -+ unsigned char *message = NULL; -+ unsigned char *language = NULL; - size_t message_len = 0; - size_t language_len = 0; - LIBSSH2_CHANNEL *channelp = NULL; -@@ -472,33 +472,23 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, - - case SSH_MSG_DISCONNECT: - if(datalen >= 5) { -- size_t reason = _libssh2_ntohu32(data + 1); -+ uint32_t reason = 0; -+ struct string_buf buf; -+ buf.data = (unsigned char *)data; -+ buf.dataptr = buf.data; -+ buf.len = datalen; -+ buf.dataptr++; /* advance past type */ - -- if(datalen >= 9) { -- message_len = _libssh2_ntohu32(data + 5); -+ _libssh2_get_u32(&buf, &reason); -+ _libssh2_get_string(&buf, &message, &message_len); -+ _libssh2_get_string(&buf, &language, &language_len); - -- if(message_len < datalen-13) { -- /* 9 = packet_type(1) + reason(4) + message_len(4) */ -- message = (char *) data + 9; -- -- language_len = -- _libssh2_ntohu32(data + 9 + message_len); -- language = (char *) data + 9 + message_len + 4; -- -- if(language_len > (datalen-13-message_len)) { -- /* bad input, clear info */ -- language = message = NULL; -- language_len = message_len = 0; -- } -- } -- else -- /* bad size, clear it */ -- message_len = 0; -- } - if(session->ssh_msg_disconnect) { -- LIBSSH2_DISCONNECT(session, reason, message, -- message_len, language, language_len); -+ LIBSSH2_DISCONNECT(session, reason, (const char *)message, -+ message_len, (const char *)language, -+ language_len); - } -+ - _libssh2_debug(session, LIBSSH2_TRACE_TRANS, - "Disconnect(%d): %s(%s)", reason, - message, language); -@@ -539,24 +529,24 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, - int always_display = data[1]; - - if(datalen >= 6) { -- message_len = _libssh2_ntohu32(data + 2); -- -- if(message_len <= (datalen - 10)) { -- /* 6 = packet_type(1) + display(1) + message_len(4) */ -- message = (char *) data + 6; -- language_len = _libssh2_ntohu32(data + 6 + -- message_len); -- -- if(language_len <= (datalen - 10 - message_len)) -- language = (char *) data + 10 + message_len; -- } -+ struct string_buf buf; -+ buf.data = (unsigned char *)data; -+ buf.dataptr = buf.data; -+ buf.len = datalen; -+ buf.dataptr += 2; /* advance past type & always display */ -+ -+ _libssh2_get_string(&buf, &message, &message_len); -+ _libssh2_get_string(&buf, &language, &language_len); - } - - if(session->ssh_msg_debug) { -- LIBSSH2_DEBUG(session, always_display, message, -- message_len, language, language_len); -+ LIBSSH2_DEBUG(session, always_display, -+ (const char *)message, -+ message_len, (const char *)language, -+ language_len); - } - } -+ - /* - * _libssh2_debug will actually truncate this for us so - * that it's not an inordinate about of data -@@ -579,7 +569,7 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, - uint32_t len = 0; - unsigned char want_reply = 0; - len = _libssh2_ntohu32(data + 1); -- if(datalen >= (6 + len)) { -+ if((len <= (UINT_MAX - 6)) && (datalen >= (6 + len))) { - want_reply = data[5 + len]; - _libssh2_debug(session, - LIBSSH2_TRACE_CONN, --- -2.17.1 - diff --git a/meta-oe/recipes-support/libssh2/libssh2_1.9.0.bb b/meta-oe/recipes-support/libssh2/libssh2_1.9.0.bb deleted file mode 100644 index c1f337a440..0000000000 --- a/meta-oe/recipes-support/libssh2/libssh2_1.9.0.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "A client-side C library implementing the SSH2 protocol" -HOMEPAGE = "http://www.libssh2.org/" -SECTION = "libs" - -DEPENDS = "zlib" - -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=c5cf34fc0acb44b082ef50ef5e4354ca" - -SRC_URI = "http://www.libssh2.org/download/${BP}.tar.gz \ - file://CVE-2019-17498.patch \ -" -SRC_URI[md5sum] = "1beefafe8963982adc84b408b2959927" -SRC_URI[sha256sum] = "d5fb8bd563305fd1074dda90bd053fb2d29fc4bce048d182f96eaa466dfadafd" - -inherit autotools pkgconfig - -EXTRA_OECONF += "\ - --with-libz \ - --with-libz-prefix=${STAGING_LIBDIR} \ - " - -# only one of openssl and gcrypt could be set -PACKAGECONFIG ??= "openssl" -PACKAGECONFIG[openssl] = "--with-crypto=openssl --with-libssl-prefix=${STAGING_LIBDIR}, , openssl" -PACKAGECONFIG[gcrypt] = "--with-crypto=libgcrypt --with-libgcrypt-prefix=${STAGING_EXECPREFIXDIR}, , libgcrypt" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/libstemmer/libstemmer/0001-Build-so-lib.patch b/meta-oe/recipes-support/libstemmer/libstemmer/0001-Build-so-lib.patch new file mode 100644 index 0000000000..2529d5d9d1 --- /dev/null +++ b/meta-oe/recipes-support/libstemmer/libstemmer/0001-Build-so-lib.patch @@ -0,0 +1,57 @@ +From eacc9e9c62a3857ce1e2e24b81fc22d8ae91f422 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Thu, 9 May 2019 22:06:48 +0200 +Subject: [PATCH] Build so-lib +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Stolen from [1] + +[1] https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/snowball/trunk/dynamiclib.diff + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + GNUmakefile | 7 +++++-- + libstemmer/symbol.map | 6 ++++++ + 2 files changed, 11 insertions(+), 2 deletions(-) + create mode 100644 libstemmer/symbol.map + +--- a/GNUmakefile ++++ b/GNUmakefile +@@ -170,12 +170,12 @@ C_OTHER_OBJECTS = $(C_OTHER_SOURCES:.c=. + JAVA_CLASSES = $(JAVA_SOURCES:.java=.class) + JAVA_RUNTIME_CLASSES=$(JAVARUNTIME_SOURCES:.java=.class) + +-CFLAGS=-O2 -W -Wall -Wmissing-prototypes -Wmissing-declarations ++CFLAGS=-O2 -fPIC -W -Wall -Wmissing-prototypes -Wmissing-declarations + CPPFLAGS= + + INCLUDES=-Iinclude + +-all: snowball$(EXEEXT) libstemmer.a stemwords$(EXEEXT) $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS) ++all: snowball$(EXEEXT) libstemmer.a libstemmer.so stemwords$(EXEEXT) $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS) + + algorithms.mk: libstemmer/mkalgorithms.pl libstemmer/modules.txt + libstemmer/mkalgorithms.pl algorithms.mk libstemmer/modules.txt +@@ -225,6 +225,9 @@ libstemmer/libstemmer.o: libstemmer/modu + libstemmer.a: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS) + $(AR) -cru $@ $^ + ++libstemmer.so: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS) ++ $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,libstemmer.so.0,-version-script,libstemmer/symbol.map -o $@.0.0.0 $^ ++ + examples/%.o: examples/%.c + $(CC) $(CFLAGS) $(INCLUDES) $(CPPFLAGS) -c -o $@ $< + +--- /dev/null ++++ b/libstemmer/symbol.map +@@ -0,0 +1,6 @@ ++SB_STEMMER_0 { ++ global: ++ sb_stemmer_*; ++ local: ++ *; ++}; diff --git a/meta-oe/recipes-support/libstemmer/libstemmer_2.2.0.bb b/meta-oe/recipes-support/libstemmer/libstemmer_2.2.0.bb new file mode 100644 index 0000000000..be2935a385 --- /dev/null +++ b/meta-oe/recipes-support/libstemmer/libstemmer_2.2.0.bb @@ -0,0 +1,37 @@ +SUMMARY = "Snowball compiler and stemming algorithms" +HOMEPAGE = "https://snowballstem.org/" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=19139aaf3c8c8fa1ca6edd59c072fb9f" + +DEPENDS:append:class-target = " ${BPN}-native" + +SRC_URI = "git://github.com/snowballstem/snowball.git;branch=master;protocol=https \ + file://0001-Build-so-lib.patch \ + " +SRCREV = "48a67a2831005f49c48ec29a5837640e23e54e6b" +S = "${WORKDIR}/git" + +LIBVER = "0.0.0" + +inherit lib_package + +do_compile:prepend:class-target() { + # use native tools + sed -i 's:./snowball :snowball :g' ${S}/GNUmakefile +} + +do_install() { + install -d ${D}${bindir} + install -m 755 ${S}/snowball ${D}${bindir} + install -m 755 ${S}/stemwords ${D}${bindir} + + install -d ${D}${libdir} + install -m 755 ${S}/libstemmer.so.${LIBVER} ${D}${libdir}/ + ln -s libstemmer.so.${LIBVER} ${D}${libdir}/libstemmer.so.0 + ln -s libstemmer.so.${LIBVER} ${D}${libdir}/libstemmer.so + + install -d ${D}${includedir} + install -m 644 ${S}/include/*.h ${D}${includedir} +} + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/libtar/files/0002-Do-not-strip-libtar.patch b/meta-oe/recipes-support/libtar/files/0002-Do-not-strip-libtar.patch index 31c0d29e93..4929eece06 100644 --- a/meta-oe/recipes-support/libtar/files/0002-Do-not-strip-libtar.patch +++ b/meta-oe/recipes-support/libtar/files/0002-Do-not-strip-libtar.patch @@ -4,6 +4,8 @@ Date: Wed, 2 Nov 2016 05:43:43 -0400 Subject: [PATCH] Do not strip libtar. --- +Upstream-Status: Pending + libtar/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/libtar/files/fix_libtool_sysroot.patch b/meta-oe/recipes-support/libtar/files/fix_libtool_sysroot.patch index 178a970299..efde754be7 100644 --- a/meta-oe/recipes-support/libtar/files/fix_libtool_sysroot.patch +++ b/meta-oe/recipes-support/libtar/files/fix_libtool_sysroot.patch @@ -1,4 +1,6 @@ --- +Upstream-Status: Pending + configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-support/libteam/libteam/0001-include-sys-select.h-for-fd_set-definition.patch b/meta-oe/recipes-support/libteam/libteam/0001-include-sys-select.h-for-fd_set-definition.patch deleted file mode 100644 index a4a17ed85b..0000000000 --- a/meta-oe/recipes-support/libteam/libteam/0001-include-sys-select.h-for-fd_set-definition.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 0ab69dc18a2057ff5bf41abcdf2b983b72d5a903 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 12 Jul 2017 15:34:49 -0700 -Subject: [PATCH 1/2] include sys/select.h for fd_set definition - -Fixes -teamnl.c:160:2: error: unknown type name 'fd_set'; did you mean 'fpos_t'? - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - utils/teamnl.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/utils/teamnl.c b/utils/teamnl.c -index e8de7e2..25129e8 100644 ---- a/utils/teamnl.c -+++ b/utils/teamnl.c -@@ -24,6 +24,7 @@ - #include <getopt.h> - #include <errno.h> - #include <sys/signalfd.h> -+#include <sys/select.h> - #include <signal.h> - #include <unistd.h> - #include <team.h> --- -2.13.2 - diff --git a/meta-oe/recipes-support/libteam/libteam/0001-team_basic_test.py-check-the-return-value.patch b/meta-oe/recipes-support/libteam/libteam/0001-team_basic_test.py-check-the-return-value.patch new file mode 100644 index 0000000000..96891c9ea7 --- /dev/null +++ b/meta-oe/recipes-support/libteam/libteam/0001-team_basic_test.py-check-the-return-value.patch @@ -0,0 +1,34 @@ +From e86a58271d7d0a3b9cd546251d2527e93898bdb8 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Tue, 21 Dec 2021 11:15:31 +0800 +Subject: [PATCH] team_basic_test.py: check the return value + +Not only print the traceback like before, also check the +return value. + +Upstream-Status: Submitted [https://github.com/jpirko/libteam/pull/63] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + scripts/team_basic_test.py | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/scripts/team_basic_test.py b/scripts/team_basic_test.py +index 0b64af2..17588c7 100755 +--- a/scripts/team_basic_test.py ++++ b/scripts/team_basic_test.py +@@ -203,4 +203,10 @@ def main(): + btest.run() + + if __name__ == "__main__": +- main() ++ try: ++ ret = main() ++ except Exception as esc: ++ ret = 1 ++ import traceback ++ traceback.print_exc() ++ sys.exit(ret) +-- +2.17.1 + diff --git a/meta-oe/recipes-support/libteam/libteam/0001-team_basic_test.py-switch-to-python3.patch b/meta-oe/recipes-support/libteam/libteam/0001-team_basic_test.py-switch-to-python3.patch new file mode 100644 index 0000000000..69276aba91 --- /dev/null +++ b/meta-oe/recipes-support/libteam/libteam/0001-team_basic_test.py-switch-to-python3.patch @@ -0,0 +1,101 @@ +From 06050e79655f0fa7d9daeda1fbd3a9a2c7736841 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Thu, 2 Dec 2021 15:08:25 +0800 +Subject: [PATCH] team_basic_test.py: switch to python3 + +Switch the script team_basic_test.py to python3 + +Upstream-Status: Submitted [https://github.com/jpirko/libteam/pull/63] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + scripts/team_basic_test.py | 28 ++++++++++++++-------------- + 1 file changed, 14 insertions(+), 14 deletions(-) + +diff --git a/scripts/team_basic_test.py b/scripts/team_basic_test.py +index faabd18..0b64af2 100755 +--- a/scripts/team_basic_test.py ++++ b/scripts/team_basic_test.py +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#! /usr/bin/env python3 + """ + Basic test. + +@@ -32,11 +32,11 @@ def usage(): + """ + Print usage of this app + """ +- print "Usage: team_basic_test.py [OPTION...]" +- print "" +- print " -h, --help print this message" +- print " -c, --loop-count=NUMBER number of loops (default 1)" +- print " -p, --port=NETDEV port device (can be defined multiple times)" ++ print("Usage: team_basic_test.py [OPTION...]") ++ print("") ++ print(" -h, --help print this message") ++ print(" -c, --loop-count=NUMBER number of loops (default 1)") ++ print(" -p, --port=NETDEV port device (can be defined multiple times)") + sys.exit() + + class CmdExecFailedException(Exception): +@@ -55,15 +55,15 @@ class CmdExecUnexpectedOutputException(Exception): + return "Command execution output unexpected: \"%s\" != \"%s\"" % (self.__output, self.__expected_output) + + def print_output(out_type, string): +- print("%s:\n" ++ print(("%s:\n" + "----------------------------\n" + "%s" +- "----------------------------" % (out_type, string)) ++ "----------------------------" % (out_type, string))) + + def cmd_exec(cmd, expected_output=None, cleaner=False): + cmd = cmd.rstrip(" ") + if not cleaner: +- print("# \"%s\"" % cmd) ++ print(("# \"%s\"" % cmd)) + subp = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + (data_stdout, data_stderr) = subp.communicate() +@@ -74,7 +74,7 @@ def cmd_exec(cmd, expected_output=None, cleaner=False): + if data_stderr: + print_output("Stderr", data_stderr) + raise CmdExecFailedException(subp.returncode) +- output = data_stdout.rstrip() ++ output = (data_stdout.rstrip()).decode() + if expected_output: + if output != expected_output: + raise CmdExecUnexpectedOutputException(output, expected_output) +@@ -166,7 +166,7 @@ TEAM_PORT_CONFIG='{"prio": 10}' + os.removedirs("/tmp/team_test/") + + def _run_one_loop(self, run_nr): +- print "RUN #%d" % (run_nr) ++ print("RUN #%d" % (run_nr)) + self._created_teams = [] + try: + for mode_name in self._team_modes: +@@ -176,7 +176,7 @@ TEAM_PORT_CONFIG='{"prio": 10}' + cmd_exec("modprobe -r team_mode_loadbalance team_mode_roundrobin team_mode_activebackup team_mode_broadcast team"); + + def run(self): +- for i in xrange(self._loop_count): ++ for i in range(self._loop_count): + self._run_one_loop(i + 1) + + def main(): +@@ -186,8 +186,8 @@ def main(): + "hc:p:", + ["help", "loop-count=", "port="] + ) +- except getopt.GetoptError, err: +- print str(err) ++ except getopt.GetoptError as err: ++ print(str(err)) + usage() + + btest = TeamBasicTest() +-- +2.17.1 + diff --git a/meta-oe/recipes-support/libteam/libteam/0001-teamd-Pass-correct-parameter-type-to-accept-API.patch b/meta-oe/recipes-support/libteam/libteam/0001-teamd-Pass-correct-parameter-type-to-accept-API.patch new file mode 100644 index 0000000000..0740601190 --- /dev/null +++ b/meta-oe/recipes-support/libteam/libteam/0001-teamd-Pass-correct-parameter-type-to-accept-API.patch @@ -0,0 +1,39 @@ +From e6ba4c16da808e47891241452a927b7f558a6420 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 11 May 2024 23:11:22 -0700 +Subject: [patch libteam] teamd: Pass correct parameter type to accept API + +accept() expects sockaddr as second parameter + +int accept (int, struct sockaddr *__restrict, socklen_t *__restrict); + +Fixes build with gcc-16 on musl systems +| ../../git/teamd/teamd_usock.c: In function 'callback_usock': +| ../../git/teamd/teamd_usock.c:280:40: error: passing argument 2 of 'accept' from incompatible pointer type [-Wincompatible-pointer-types] +| 280 | sock = accept(ctx->usock.sock, &addr, &alen); +| | ^~~~~ +| | | +| | struct sockaddr_un * + +Upstream-Status: Submitted [https://lists.fedorahosted.org/archives/list/libteam@lists.fedorahosted.org/2024/5/] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + teamd/teamd_usock.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/teamd/teamd_usock.c b/teamd/teamd_usock.c +index 1adfdf8..5895124 100644 +--- a/teamd/teamd_usock.c ++++ b/teamd/teamd_usock.c +@@ -277,7 +277,7 @@ static int callback_usock(struct teamd_context *ctx, int events, void *priv) + int err; + + alen = sizeof(addr); +- sock = accept(ctx->usock.sock, &addr, &alen); ++ sock = accept(ctx->usock.sock, (struct sockaddr *)&addr, &alen); + if (sock == -1) { + teamd_log_err("usock: Failed to accept connection."); + return -errno; +-- +2.45.0 + diff --git a/meta-oe/recipes-support/libteam/libteam/0002-teamd-Re-adjust-include-header-order.patch b/meta-oe/recipes-support/libteam/libteam/0002-teamd-Re-adjust-include-header-order.patch index beabf63ca3..030140ad46 100644 --- a/meta-oe/recipes-support/libteam/libteam/0002-teamd-Re-adjust-include-header-order.patch +++ b/meta-oe/recipes-support/libteam/libteam/0002-teamd-Re-adjust-include-header-order.patch @@ -12,22 +12,20 @@ tinet/if_ether.h:101:8: error: redefinition of 'struct ethhdr' Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + teamd/teamd_runner_lacp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/teamd/teamd_runner_lacp.c b/teamd/teamd_runner_lacp.c -index 9c77fae..8800854 100644 --- a/teamd/teamd_runner_lacp.c +++ b/teamd/teamd_runner_lacp.c -@@ -23,6 +23,7 @@ +@@ -23,12 +23,12 @@ #include <unistd.h> #include <limits.h> #include <sys/ioctl.h> +#include <net/ethernet.h> - #include <linux/if_ether.h> #include <sys/socket.h> - #include <linux/netdevice.h> -@@ -30,7 +31,6 @@ + #include <netinet/in.h> #include <errno.h> #include <team.h> #include <private/misc.h> @@ -35,6 +33,3 @@ index 9c77fae..8800854 100644 #include "teamd.h" #include "teamd_config.h" --- -2.13.2 - diff --git a/meta-oe/recipes-support/libteam/libteam/run-ptest b/meta-oe/recipes-support/libteam/libteam/run-ptest index 4ba5acf051..26f097d587 100644 --- a/meta-oe/recipes-support/libteam/libteam/run-ptest +++ b/meta-oe/recipes-support/libteam/libteam/run-ptest @@ -1,3 +1,8 @@ #!/bin/sh -python $(dirname $0)/team_basic_test.py +python3 $(dirname $0)/team_basic_test.py +if [ $? -eq 0 ] ; then + echo "PASS: libteam" +else + echo "FAIL: libteam" +fi diff --git a/meta-oe/recipes-support/libteam/libteam_1.29.bb b/meta-oe/recipes-support/libteam/libteam_1.29.bb deleted file mode 100644 index 821ca19380..0000000000 --- a/meta-oe/recipes-support/libteam/libteam_1.29.bb +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "Library for controlling team network device" -HOMEPAGE = "http://www.libteam.org/" -SECTION = "libs/network" - -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" - -DEPENDS = "libnl libdaemon jansson" - -SRC_URI = "git://github.com/jpirko/libteam \ - file://0001-include-sys-select.h-for-fd_set-definition.patch \ - file://0002-teamd-Re-adjust-include-header-order.patch \ - file://0001-team_basic_test.py-disable-RedHat-specific-test.patch \ - file://run-ptest \ - " -SRCREV = "e897f02bf2403d4859a99e090e34ea768b4c0540" - -S = "${WORKDIR}/git" - -inherit autotools pkgconfig ptest - -FILES_${PN} = "${libdir}/libteam${SOLIBS} \ -" - -PACKAGES += "${PN}-dctl ${PN}-utils" -FILES_${PN}-dctl = "${libdir}/libteamdctl${SOLIBS} \ -" -FILES_${PN}-utils = "${bindir}/bond2team \ - ${bindir}/teamd \ - ${bindir}/teamdctl \ - ${bindir}/teamnl \ -" - -RDEPENDS_${PN}-utils = "bash" -RDEPENDS_${PN}-ptest = "python" - -do_install_ptest() { - install ${S}/scripts/team_basic_test.py ${D}${PTEST_PATH}/ -} diff --git a/meta-oe/recipes-support/libteam/libteam_1.32.bb b/meta-oe/recipes-support/libteam/libteam_1.32.bb new file mode 100644 index 0000000000..508cbb13bb --- /dev/null +++ b/meta-oe/recipes-support/libteam/libteam_1.32.bb @@ -0,0 +1,47 @@ +SUMMARY = "Library for controlling team network device" +HOMEPAGE = "http://www.libteam.org/" +SECTION = "libs/network" + +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +DEPENDS = "libnl libdaemon jansson" + +SRC_URI = "git://github.com/jpirko/libteam;branch=master;protocol=https \ + file://0002-teamd-Re-adjust-include-header-order.patch \ + file://0001-team_basic_test.py-disable-RedHat-specific-test.patch \ + file://0001-team_basic_test.py-switch-to-python3.patch \ + file://0001-team_basic_test.py-check-the-return-value.patch \ + file://0001-teamd-Pass-correct-parameter-type-to-accept-API.patch \ + file://run-ptest \ + " +SRCREV = "8b843e93cee1dab61fb79b01791201cdad45e1d1" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig ptest + +FILES:${PN} = "${libdir}/libteam${SOLIBS} \ +" + +PACKAGES += "${PN}-dctl ${PN}-utils" +FILES:${PN}-dctl = "${libdir}/libteamdctl${SOLIBS} \ +" +FILES:${PN}-utils = "${bindir}/bond2team \ + ${bindir}/teamd \ + ${bindir}/teamdctl \ + ${bindir}/teamnl \ +" + +RDEPENDS:${PN}-utils = "bash" +RDEPENDS:${PN}-ptest = "python3-core libteam-utils" +# Ensure kernel has these mods enabled features/net/team/team.scc +RRECOMMENDS:${PN} += "kernel-module-team kernel-module-team-mode-activebackup \ + kernel-module-team-mode-broadcast \ + kernel-module-team-mode-loadbalance \ + kernel-module-team-mode-random \ + kernel-module-team-mode-roundrobin" + +do_install_ptest() { + install ${S}/scripts/team_basic_test.py ${D}${PTEST_PATH}/ +} diff --git a/meta-oe/recipes-support/libtinyxml/libtinyxml_2.6.2.bb b/meta-oe/recipes-support/libtinyxml/libtinyxml_2.6.2.bb index 138df9f300..6fbdd071e8 100644 --- a/meta-oe/recipes-support/libtinyxml/libtinyxml_2.6.2.bb +++ b/meta-oe/recipes-support/libtinyxml/libtinyxml_2.6.2.bb @@ -6,7 +6,6 @@ LICENSE = "Zlib" LIC_FILES_CHKSUM = "file://readme.txt;md5=f8f366f3370dda889f60faa7db162cf4" SECTION = "libs" -PR = "r5" SRC_URI = "${SOURCEFORGE_MIRROR}/tinyxml/tinyxml_${@'${PV}'.replace('.', '_')}.tar.gz \ file://enforce-use-stl.patch \ diff --git a/meta-oe/recipes-support/libtinyxml2/files/run-ptest b/meta-oe/recipes-support/libtinyxml2/files/run-ptest new file mode 100644 index 0000000000..870912672e --- /dev/null +++ b/meta-oe/recipes-support/libtinyxml2/files/run-ptest @@ -0,0 +1,10 @@ +#!/bin/sh + +for i in `ls xmltest`; do + ./$i + if [ $? -eq 0 ]; then + echo "PASS: $i" + else + echo "FAIL: $i" + fi +done diff --git a/meta-oe/recipes-support/libtinyxml2/libtinyxml2_10.0.0.bb b/meta-oe/recipes-support/libtinyxml2/libtinyxml2_10.0.0.bb new file mode 100644 index 0000000000..bcd309282b --- /dev/null +++ b/meta-oe/recipes-support/libtinyxml2/libtinyxml2_10.0.0.bb @@ -0,0 +1,30 @@ +SUMMARY = "TinyXML-2 is a simple, small, efficient, C++ XML parser that can be easily integrating into other programs" +HOMEPAGE = "https://leethomason.github.io/tinyxml2" +SECTION = "libs" +LICENSE = "Zlib" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=135624eef03e1f1101b9ba9ac9b5fffd" + +SRCREV = "321ea883b7190d4e85cae5512a12e5eaa8f8731f" +SRC_URI = "git://github.com/leethomason/tinyxml2.git;branch=master;protocol=https \ + file://run-ptest" + +S = "${WORKDIR}/git" + +inherit meson ptest + +EXTRA_OEMESON += " \ + ${@bb.utils.contains('PTEST_ENABLED', '1', '-Dtests=true', '', d)} \ + -Ddefault_library=both \ +" + +CXXFLAGS:append:libc-musl = " -D_LARGEFILE64_SOURCE" + +do_install_ptest() { + install -Dm 0755 ${B}/xmltest ${D}${PTEST_PATH}/xmltest + install -d ${D}${PTEST_PATH}/resources/out + for f in ${S}/resources/*.xml; do + install -m 0644 $f ${D}${PTEST_PATH}/resources/ + done +} + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/libtinyxml2/libtinyxml2_7.1.0.bb b/meta-oe/recipes-support/libtinyxml2/libtinyxml2_7.1.0.bb deleted file mode 100644 index 9e197a9180..0000000000 --- a/meta-oe/recipes-support/libtinyxml2/libtinyxml2_7.1.0.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "TinyXML-2 is a simple, small, efficient, C++ XML parser that can be easily integrating into other programs" -HOMEPAGE = "http://www.grinninglizard.com/tinyxml2/" -SECTION = "libs" -LICENSE = "Zlib" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=135624eef03e1f1101b9ba9ac9b5fffd" - -SRC_URI = "git://github.com/leethomason/tinyxml2.git" - -SRCREV = "9c740e8d2341bd46dbe8e87053cdb4d931971967" - -S = "${WORKDIR}/git" - -inherit cmake - -BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/libtommath/libtommath_1.3.0.bb b/meta-oe/recipes-support/libtommath/libtommath_1.3.0.bb new file mode 100644 index 0000000000..4d6c06240d --- /dev/null +++ b/meta-oe/recipes-support/libtommath/libtommath_1.3.0.bb @@ -0,0 +1,23 @@ +SUMMARY = "LibTomMath is a number theoretic multiple-precision integer library" +HOMEPAGE = "https://www.libtom.net/LibTomMath" +SECTION = "libs" +LICENSE = "Unlicense" +LIC_FILES_CHKSUM = "file://LICENSE;md5=23e7e0a32e53a2b1d35f5fd9ef053402" + +DEPENDS = "libtool-cross" + +SRC_URI = "git://github.com/libtom/libtommath.git;protocol=https;branch=master" + +SRCREV = "95d80fd8229d05dd6cb4ec88bc8d4f5377ff00ef" + +S = "${WORKDIR}/git" + +EXTRA_OEMAKE = "'PREFIX=${prefix}' 'DESTDIR=${D}' 'LIBPATH=${libdir}' 'CFLAGS=${CFLAGS}'" + +do_compile() { + oe_runmake -f makefile.shared +} + +do_install() { + oe_runmake -f makefile.shared install +} diff --git a/meta-oe/recipes-support/liburing/liburing_2.6.bb b/meta-oe/recipes-support/liburing/liburing_2.6.bb new file mode 100644 index 0000000000..fc3fe1cac1 --- /dev/null +++ b/meta-oe/recipes-support/liburing/liburing_2.6.bb @@ -0,0 +1,34 @@ +SUMMARY = "This is the io_uring library, liburing." +DESCRIPTION = "liburing provides helpers to setup and teardown io_uring \ +instances, and also a simplified interface for applications that don't need \ +(or want) to deal with the full kernel side implementation." +HOMEPAGE = "https://github.com/axboe/liburing" +BUGTRACKER = "https://github.com/axboe/liburing/issues" +SECTION = "libs" + +LICENSE = "LGPL-2.1-only | MIT" +LIC_FILES_CHKSUM = "file://README;beginline=41;endline=44;md5=2b0e9926530c269f5ae95560370195af" + +SRC_URI = "git://github.com/axboe/liburing.git;branch=master;protocol=https" +SRCREV = "f7dcc1ea60819475dffd3a45059e16f04381bee7" + +S = "${WORKDIR}/git" + +DEPENDS:append:libc-musl = " libucontext" +XCFLAGS = "-pthread" +XCFLAGS:append:libc-musl = " -lucontext" + +USELIBC = "" +# clang-18 on RV64 emits memset for arch/riscv64/syscall.h provided __do_syscall4 macro +# this does not happen for gcc or older clang, so link with libc since we need memset API +# -fno-builtin-memset does not help +USELIBC:riscv64:toolchain-clang = "--use-libc" +EXTRA_OEMAKE = "'CC=${CC}' 'RANLIB=${RANLIB}' 'AR=${AR}' 'CFLAGS=${CFLAGS} -I${S}/include -DWITHOUT_XATTR' 'LDFLAGS=${LDFLAGS}' 'XCFLAGS=${XCFLAGS}' 'BUILDDIR=${S}'" +do_configure() { + ${S}/configure --prefix=${prefix} --libdir=${libdir} --libdevdir=${libdir} --mandir=${mandir} --datadir=${datadir} --includedir=${includedir} ${USELIBC} +} +do_install () { + oe_runmake install DESTDIR=${D} +} + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/libusb/libusb-compat/0001-usb.h-Include-sys-types.h.patch b/meta-oe/recipes-support/libusb/libusb-compat/0001-usb.h-Include-sys-types.h.patch index b88440dec9..7df44737ad 100644 --- a/meta-oe/recipes-support/libusb/libusb-compat/0001-usb.h-Include-sys-types.h.patch +++ b/meta-oe/recipes-support/libusb/libusb-compat/0001-usb.h-Include-sys-types.h.patch @@ -1,4 +1,4 @@ -From 340f911f9e3f4ff6b01682c5341c959060782af2 Mon Sep 17 00:00:00 2001 +From 840795dcb48214b74cfde75e7ce5e8a1a6c64a46 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Thu, 2 Apr 2015 19:18:45 -0700 Subject: [PATCH] usb.h: Include sys/types.h @@ -13,18 +13,18 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 2 insertions(+) diff --git a/libusb/usb.h b/libusb/usb.h -index 84e730f..caffae2 100644 +index ea62543..18b610a 100644 --- a/libusb/usb.h +++ b/libusb/usb.h -@@ -31,6 +31,8 @@ - - #include <dirent.h> +@@ -46,6 +46,8 @@ typedef unsigned __int32 uint32_t; + #include <stdint.h> + #endif +#include <sys/types.h> + - /* - * USB spec information - * + /* On linux PATH_MAX is defined in linux/limits.h. */ + #if defined(__linux__) + #include <linux/limits.h> -- -2.1.4 +2.34.1 diff --git a/meta-oe/recipes-support/libusb/libusb-compat/0002-automake-make-example-programs-installable.patch b/meta-oe/recipes-support/libusb/libusb-compat/0002-automake-make-example-programs-installable.patch new file mode 100644 index 0000000000..faf532cad2 --- /dev/null +++ b/meta-oe/recipes-support/libusb/libusb-compat/0002-automake-make-example-programs-installable.patch @@ -0,0 +1,24 @@ +From 9dcdfa716e3c3831d9b70472b39dab2fd370f503 Mon Sep 17 00:00:00 2001 +From: Yoann Congal <yoann.congal@smile.fr> +Date: Sun, 26 Feb 2023 16:04:35 +0100 +Subject: [PATCH] automake: make example programs installable + +The example programs are used as tests for ptest, so we need a way to +install them on the rootfs. + +Upstream-Status: Inappropriate [oe-core specific] +--- + examples/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/examples/Makefile.am b/examples/Makefile.am +index 9bd3efc..f4324c2 100644 +--- a/examples/Makefile.am ++++ b/examples/Makefile.am +@@ -1,5 +1,5 @@ + AM_CPPFLAGS = -I$(top_srcdir)/libusb +-noinst_PROGRAMS = lsusb testlibusb ++bin_PROGRAMS = lsusb testlibusb + + lsusb_SOURCES = lsusb.c + lsusb_LDADD = ../libusb/libusb.la diff --git a/meta-oe/recipes-support/libusb/libusb-compat/run-ptest b/meta-oe/recipes-support/libusb/libusb-compat/run-ptest new file mode 100644 index 0000000000..901662d696 --- /dev/null +++ b/meta-oe/recipes-support/libusb/libusb-compat/run-ptest @@ -0,0 +1,14 @@ +#!/bin/sh + +rc=0 +for TEST in lsusb testlibusb; do + if ! ./$TEST ; then + echo "FAIL: $TEST" + rc=$((rc + 1)) + else + echo "PASS: $TEST" + fi +done + +# return number of failed tests +exit $rc diff --git a/meta-oe/recipes-support/libusb/libusb-compat_0.1.5.bb b/meta-oe/recipes-support/libusb/libusb-compat_0.1.5.bb deleted file mode 100644 index 1ddbe238fc..0000000000 --- a/meta-oe/recipes-support/libusb/libusb-compat_0.1.5.bb +++ /dev/null @@ -1,42 +0,0 @@ -SUMMARY = "libusb-0.1 compatibility layer for libusb1" -DESCRIPTION = "libusb-0.1 compatible layer for libusb1, a drop-in replacement \ -that aims to look, feel and behave exactly like libusb-0.1" -HOMEPAGE = "http://www.libusb.org/" -BUGTRACKER = "http://www.libusb.org/report" -SECTION = "libs" - -LICENSE = "LGPLv2.1+" -LIC_FILES_CHKSUM = "file://LICENSE;md5=f2ac5f3ac4835e8f91324a26a590a423" -DEPENDS = "libusb1" - -# Few packages are known not to work with libusb-compat (e.g. libmtp-1.0.0), -# so here libusb-0.1 is removed completely instead of adding virtual/libusb0. -# Besides, libusb-0.1 uses a per 1ms polling that hurts a lot to power -# consumption. -PROVIDES = "libusb virtual/libusb0" -BBCLASSEXTEND = "native nativesdk" - -PE = "1" - -SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-compat-${PV}.tar.bz2 \ - file://0001-usb.h-Include-sys-types.h.patch \ - " - -SRC_URI[md5sum] = "2780b6a758a1e2c2943bdbf7faf740e4" -SRC_URI[sha256sum] = "404ef4b6b324be79ac1bfb3d839eac860fbc929e6acb1ef88793a6ea328bc55a" - -UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/libusb/files/libusb-compat-0.1/" -UPSTREAM_CHECK_REGEX = "/libusb-compat-(?P<pver>(\d+[\.\-_]*)+)/$" - -BINCONFIG = "${bindir}/libusb-config" - -inherit autotools pkgconfig binconfig-disabled lib_package - -EXTRA_OECONF = "--libdir=${base_libdir}" - -do_install_append() { - install -d ${D}${libdir} - if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then - mv ${D}${base_libdir}/pkgconfig ${D}${libdir} - fi -} diff --git a/meta-oe/recipes-support/libusb/libusb-compat_0.1.8.bb b/meta-oe/recipes-support/libusb/libusb-compat_0.1.8.bb new file mode 100644 index 0000000000..57f1f54387 --- /dev/null +++ b/meta-oe/recipes-support/libusb/libusb-compat_0.1.8.bb @@ -0,0 +1,47 @@ +SUMMARY = "libusb-0.1 compatibility layer for libusb1" +DESCRIPTION = "libusb-0.1 compatible layer for libusb1, a drop-in replacement \ +that aims to look, feel and behave exactly like libusb-0.1" +HOMEPAGE = "http://www.libusb.org/" +BUGTRACKER = "http://www.libusb.org/report" +SECTION = "libs" + +LICENSE = "LGPL-2.1-or-later" +LIC_FILES_CHKSUM = "file://LICENSE;md5=f2ac5f3ac4835e8f91324a26a590a423" +DEPENDS = "libusb1" + +# libusb-compat dlopen() libusb1 so we need to explicitly RDEPENDS on it +RDEPENDS:${PN} += "libusb1" + +# Few packages are known not to work with libusb-compat (e.g. libmtp-1.0.0), +# so here libusb-0.1 is removed completely instead of adding virtual/libusb0. +# Besides, libusb-0.1 uses a per 1ms polling that hurts a lot to power +# consumption. +PROVIDES = "libusb virtual/libusb0" +BBCLASSEXTEND = "native nativesdk" + +PE = "1" + +SRC_URI = " \ + git://github.com/libusb/libusb-compat-0.1.git;protocol=https;branch=master \ + file://0001-usb.h-Include-sys-types.h.patch \ + file://0002-automake-make-example-programs-installable.patch \ + file://run-ptest \ +" +SRCREV = "c497eff1ae8c4cfd4fdff370f04c78fa0584f4f3" +S = "${WORKDIR}/git" + +UPSTREAM_CHECK_URI = "https://github.com/libusb/libusb-compat-0.1/releases" + +BINCONFIG = "${bindir}/libusb-config" + +inherit autotools pkgconfig binconfig-disabled lib_package ptest + +# examples are used as ptest so enable them at configuration if needed +EXTRA_OECONF += "${@bb.utils.contains('PTEST_ENABLED', '1', '--enable-examples-build', '', d)}" + +# Move test binaries out of bindir to avoid clashing with a "real" lsusb. +do_install_ptest() { + for bin in lsusb testlibusb; do + mv ${D}${bindir}/$bin ${D}${PTEST_PATH} + done +} diff --git a/meta-oe/recipes-support/libusbg/libusbg/0001-Fix-out-of-tree-builds.patch b/meta-oe/recipes-support/libusbg/libusbg/0001-Fix-out-of-tree-builds.patch index 6be49fbca4..16506999e2 100644 --- a/meta-oe/recipes-support/libusbg/libusbg/0001-Fix-out-of-tree-builds.patch +++ b/meta-oe/recipes-support/libusbg/libusbg/0001-Fix-out-of-tree-builds.patch @@ -7,7 +7,7 @@ The include flag should point to the source directory, not the build directory. Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> -Upstream-status: Submitted [https://github.com/libusbg/libusbg/pull/9] +Upstream-Status: Submitted [https://github.com/libusbg/libusbg/pull/9] --- examples/Makefile.am | 2 +- src/Makefile.am | 2 +- diff --git a/meta-oe/recipes-support/libusbg/libusbg_git.bb b/meta-oe/recipes-support/libusbg/libusbg_git.bb index 97d60a6a8a..716d9c4ce4 100644 --- a/meta-oe/recipes-support/libusbg/libusbg_git.bb +++ b/meta-oe/recipes-support/libusbg/libusbg_git.bb @@ -1,16 +1,19 @@ SUMMARY = "USB Gadget Configfs Library" -LICENSE = "GPLv2 & LGPLv2.1" +LICENSE = "GPL-2.0-only & LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c" -inherit autotools +inherit autotools update-alternatives PV = "0.1.0" SRCREV = "a826d136e0e8fa53815f1ba05893e6dd74208c15" -SRC_URI = "git://github.com/libusbg/libusbg.git \ +SRC_URI = "git://github.com/libusbg/libusbg.git;branch=master;protocol=https \ file://0001-Fix-out-of-tree-builds.patch \ " S = "${WORKDIR}/git" +ALTERNATIVE:${PN} = "gadget-acm-ecm show-gadgets" +ALTERNATIVE_LINK_NAME[gadget-acm-ecm] = "${bindir}/gadget-acm-ecm" +ALTERNATIVE_LINK_NAME[show-gadgets] = "${bindir}/show-gadgets" diff --git a/meta-oe/recipes-support/libusbgx/libusbgx-config.bb b/meta-oe/recipes-support/libusbgx/libusbgx-config.bb index b269e33c44..4e9e6bcdfd 100644 --- a/meta-oe/recipes-support/libusbgx/libusbgx-config.bb +++ b/meta-oe/recipes-support/libusbgx/libusbgx-config.bb @@ -8,5 +8,5 @@ do_configure[noexec] = "1" do_compile[noexec] = "1" do_install() { - install -Dm 0644 ${WORKDIR}/usbgx.default ${D}${sysconfdir}/default/usbgx + install -Dm 0644 ${UNPACKDIR}/usbgx.default ${D}${sysconfdir}/default/usbgx } diff --git a/meta-oe/recipes-support/libusbgx/libusbgx/0001-fix-stack-buffer-overflow-in-usbg_f_foo_attr_val-pro.patch b/meta-oe/recipes-support/libusbgx/libusbgx/0001-fix-stack-buffer-overflow-in-usbg_f_foo_attr_val-pro.patch new file mode 100644 index 0000000000..24a2760d11 --- /dev/null +++ b/meta-oe/recipes-support/libusbgx/libusbgx/0001-fix-stack-buffer-overflow-in-usbg_f_foo_attr_val-pro.patch @@ -0,0 +1,796 @@ +From 421b366cafdf954b7e1cd2bbb78b55e04d73c082 Mon Sep 17 00:00:00 2001 +From: Wlodzimierz Lipert <wlodzimierz.lipert@gmail.com> +Date: Mon, 28 Nov 2022 08:29:54 +0100 +Subject: [PATCH] fix: stack-buffer-overflow in usbg_f_foo_attr_val processing. + Changed ABI version from 2 to 3. + +Upstream-Status: Submitted [https://github.com/linux-usb-gadgets/libusbgx/pull/72] + +Signed-off-by: Wlodzimierz Lipert <wlodzimierz.lipert@gmail.com> +Signed-off-by: Ming Liu <liu.ming50@gmail.com> +--- + include/usbg/function/hid.h | 28 ++++++++++++---------------- + include/usbg/function/midi.h | 35 +++++++++++++---------------------- + include/usbg/function/ms.h | 30 +++++++++++------------------- + include/usbg/function/net.h | 34 ++++++++++++++-------------------- + include/usbg/function/uac2.h | 29 +++++++++++++---------------- + include/usbg/usbg_internal.h | 10 +++++----- + src/Makefile.am | 2 +- + src/function/ether.c | 10 +++++----- + src/function/hid.c | 12 ++++++------ + src/function/midi.c | 10 +++++----- + src/function/ms.c | 10 +++++----- + src/function/uac2.c | 10 +++++----- + src/function/uvc.c | 10 +++++----- + src/usbg_common.c | 2 +- + 14 files changed, 101 insertions(+), 131 deletions(-) + +diff --git a/include/usbg/function/hid.h b/include/usbg/function/hid.h +index 3463140..3b3907b 100644 +--- a/include/usbg/function/hid.h ++++ b/include/usbg/function/hid.h +@@ -56,11 +56,6 @@ union usbg_f_hid_attr_val { + unsigned int subclass; + }; + +-#define USBG_F_HID_UINT_TO_ATTR_VAL(WHAT) \ +- USBG_TO_UNION(usbg_f_hid_attr_val, protocol, WHAT) +- +-#define USBG_F_HID_RDESC_TO_ATTR_VAL(WHAT) \ +- USBG_TO_UNION(usbg_f_hid_attr_val, report_desc, WHAT) + /** + * @brief Cast from generic function to hid function + * @param[in] f function to be converted to hid funciton. +@@ -137,7 +132,7 @@ int usbg_f_hid_get_attr_val(usbg_f_hid *hf, enum usbg_f_hid_attr attr, + * @return 0 on success usbg_error if error occurred. + */ + int usbg_f_hid_set_attr_val(usbg_f_hid *hf, enum usbg_f_hid_attr attr, +- union usbg_f_hid_attr_val val); ++ const union usbg_f_hid_attr_val *val); + + /** + * @brief Get the minor and major of corresponding character device +@@ -173,8 +168,9 @@ static inline int usbg_f_hid_get_protocol(usbg_f_hid *hf, + static inline int usbg_f_hid_set_protocol(usbg_f_hid *hf, + unsigned int protocol) + { +- return usbg_f_hid_set_attr_val(hf, USBG_F_HID_PROTOCOL, +- USBG_F_HID_UINT_TO_ATTR_VAL(protocol)); ++ ++ union usbg_f_hid_attr_val val = {.protocol = protocol}; ++ return usbg_f_hid_set_attr_val(hf, USBG_F_HID_PROTOCOL, &val); + } + + /** +@@ -199,8 +195,8 @@ static inline int usbg_f_hid_get_report_desc(usbg_f_hid *hf, + static inline int usbg_f_hid_set_report_desc(usbg_f_hid *hf, + struct usbg_f_hid_report_desc report_desc) + { +- return usbg_f_hid_set_attr_val(hf, USBG_F_HID_REPORT_DESC, +- USBG_F_HID_RDESC_TO_ATTR_VAL(report_desc)); ++ union usbg_f_hid_attr_val val = {.report_desc = report_desc}; ++ return usbg_f_hid_set_attr_val(hf, USBG_F_HID_REPORT_DESC, &val); + } + + /** +@@ -242,8 +238,8 @@ static inline int usbg_f_hid_set_report_desc_raw(usbg_f_hid *hf, + .len = len, + }; + +- return usbg_f_hid_set_attr_val(hf, USBG_F_HID_REPORT_DESC, +- USBG_F_HID_RDESC_TO_ATTR_VAL(report_desc)); ++ union usbg_f_hid_attr_val val = {.report_desc = report_desc}; ++ return usbg_f_hid_set_attr_val(hf, USBG_F_HID_REPORT_DESC, &val); + } + + /** +@@ -268,8 +264,8 @@ static inline int usbg_f_hid_get_report_length(usbg_f_hid *hf, + static inline int usbg_f_hid_set_report_length(usbg_f_hid *hf, + unsigned int report_length) + { +- return usbg_f_hid_set_attr_val(hf, USBG_F_HID_REPORT_LENGTH, +- USBG_F_HID_UINT_TO_ATTR_VAL(report_length)); ++ union usbg_f_hid_attr_val val = {.report_length = report_length}; ++ return usbg_f_hid_set_attr_val(hf, USBG_F_HID_REPORT_LENGTH, &val); + } + + /** +@@ -294,8 +290,8 @@ static inline int usbg_f_hid_get_subclass(usbg_f_hid *hf, + static inline int usbg_f_hid_set_subclass(usbg_f_hid *hf, + unsigned int subclass) + { +- return usbg_f_hid_set_attr_val(hf, USBG_F_HID_SUBCLASS, +- USBG_F_HID_UINT_TO_ATTR_VAL(subclass)); ++ union usbg_f_hid_attr_val val = {.subclass = subclass}; ++ return usbg_f_hid_set_attr_val(hf, USBG_F_HID_SUBCLASS, &val); + } + + #ifdef __cplusplus +diff --git a/include/usbg/function/midi.h b/include/usbg/function/midi.h +index 39df047..b9d9d4f 100644 +--- a/include/usbg/function/midi.h ++++ b/include/usbg/function/midi.h +@@ -53,15 +53,6 @@ union usbg_f_midi_attr_val { + unsigned int qlen; + }; + +-#define USBG_F_MIDI_INT_TO_ATTR_VAL(WHAT) \ +- USBG_TO_UNION(usbg_f_midi_attr_val, index, WHAT) +- +-#define USBG_F_MIDI_UINT_TO_ATTR_VAL(WHAT) \ +- USBG_TO_UNION(usbg_f_midi_attr_val, qlen, WHAT) +- +-#define USBG_F_MIDI_CCHAR_PTR_TO_ATTR_VAL(WHAT) \ +- USBG_TO_UNION(usbg_f_midi_attr_val, id, WHAT) +- + /** + * @brief Cast from generic function to midi function + * @param[in] f function to be converted to midi funciton. +@@ -126,7 +117,7 @@ int usbg_f_midi_get_attr_val(usbg_f_midi *mf, enum usbg_f_midi_attr attr, + * @return 0 on success usbg_error if error occurred. + */ + int usbg_f_midi_set_attr_val(usbg_f_midi *mf, enum usbg_f_midi_attr attr, +- union usbg_f_midi_attr_val val); ++ const union usbg_f_midi_attr_val *val); + + /** + * @brief Get the index value of MIDI adapter +@@ -148,8 +139,8 @@ static inline int usbg_f_midi_get_index(usbg_f_midi *mf, int *index) + */ + static inline int usbg_f_midi_set_index(usbg_f_midi *mf, int index) + { +- return usbg_f_midi_set_attr_val(mf, USBG_F_MIDI_INDEX, +- USBG_F_MIDI_INT_TO_ATTR_VAL(index)); ++ union usbg_f_midi_attr_val val = {.index = index}; ++ return usbg_f_midi_set_attr_val(mf, USBG_F_MIDI_INDEX, &val); + } + + /** +@@ -188,8 +179,8 @@ int usbg_f_midi_get_id_s(usbg_f_midi *mf, char *buf, int len); + */ + static inline int usbg_f_midi_set_id(usbg_f_midi *mf, const char *id) + { +- return usbg_f_midi_set_attr_val(mf, USBG_F_MIDI_ID, +- USBG_F_MIDI_CCHAR_PTR_TO_ATTR_VAL(id)); ++ union usbg_f_midi_attr_val val = {.id = id}; ++ return usbg_f_midi_set_attr_val(mf, USBG_F_MIDI_ID, &val); + } + + /** +@@ -212,8 +203,8 @@ static inline int usbg_f_midi_get_in_ports(usbg_f_midi *mf, unsigned *in_ports) + */ + static inline int usbg_f_midi_set_in_ports(usbg_f_midi *mf, unsigned in_ports) + { +- return usbg_f_midi_set_attr_val(mf, USBG_F_MIDI_IN_PORTS, +- USBG_F_MIDI_UINT_TO_ATTR_VAL(in_ports)); ++ union usbg_f_midi_attr_val val = {.in_ports = in_ports}; ++ return usbg_f_midi_set_attr_val(mf, USBG_F_MIDI_IN_PORTS, &val); + } + + /** +@@ -236,8 +227,8 @@ static inline int usbg_f_midi_get_out_ports(usbg_f_midi *mf, unsigned *out_ports + */ + static inline int usbg_f_midi_set_out_ports(usbg_f_midi *mf, unsigned out_ports) + { +- return usbg_f_midi_set_attr_val(mf, USBG_F_MIDI_OUT_PORTS, +- USBG_F_MIDI_UINT_TO_ATTR_VAL(out_ports)); ++ union usbg_f_midi_attr_val val = {.out_ports = out_ports}; ++ return usbg_f_midi_set_attr_val(mf, USBG_F_MIDI_OUT_PORTS, &val); + } + + /** +@@ -264,8 +255,8 @@ static inline int usbg_f_midi_get_buflen(usbg_f_midi *mf, int *buflen) + */ + static inline int usbg_f_midi_set_buflen(usbg_f_midi *mf, unsigned buflen) + { +- return usbg_f_midi_set_attr_val(mf, USBG_F_MIDI_BUFLEN, +- USBG_F_MIDI_UINT_TO_ATTR_VAL(buflen)); ++ union usbg_f_midi_attr_val val = {.buflen = buflen}; ++ return usbg_f_midi_set_attr_val(mf, USBG_F_MIDI_BUFLEN, &val); + } + + /** +@@ -288,8 +279,8 @@ static inline int usbg_f_midi_get_qlen(usbg_f_midi *mf, unsigned *qlen) + */ + static inline int usbg_f_midi_set_qlen(usbg_f_midi *mf, unsigned qlen) + { +- return usbg_f_midi_set_attr_val(mf, USBG_F_MIDI_QLEN, +- USBG_F_MIDI_UINT_TO_ATTR_VAL(qlen)); ++ union usbg_f_midi_attr_val val = {.qlen = qlen}; ++ return usbg_f_midi_set_attr_val(mf, USBG_F_MIDI_QLEN, &val); + } + + #ifdef __cplusplus +diff --git a/include/usbg/function/ms.h b/include/usbg/function/ms.h +index 780464c..f52eb78 100644 +--- a/include/usbg/function/ms.h ++++ b/include/usbg/function/ms.h +@@ -56,14 +56,6 @@ union usbg_f_ms_lun_attr_val { + const char *file; + }; + +-#define USBG_F_MS_LUN_BOOL_TO_ATTR_VAL(WHAT) \ +- USBG_TO_UNION(usbg_f_ms_lun_attr_val, cdrom, WHAT) +- +-#define USBG_F_MS_LUN_CCHAR_PTR_TO_ATTR_VAL(WHAT) \ +- USBG_TO_UNION(usbg_f_ms_lun_attr_val, file, WHAT) +- +- +- + /** + * @brief Cast from generic function to mass storage function + * @param[in] f function to be converted to ms funciton. +@@ -157,7 +149,7 @@ int usbg_f_ms_get_lun_attr_val(usbg_f_ms *mf, int lun_id, + */ + int usbg_f_ms_set_lun_attr_val(usbg_f_ms *mf, int lun_id, + enum usbg_f_ms_lun_attr lattr, +- const union usbg_f_ms_lun_attr_val val); ++ const union usbg_f_ms_lun_attr_val *val); + + /** + * @brief Get the value which determines if lun is visible as a cdrom +@@ -183,8 +175,8 @@ static inline int usbg_f_ms_get_lun_cdrom(usbg_f_ms *mf, int lun_id, + static inline int usbg_f_ms_set_lun_cdrom(usbg_f_ms *mf, int lun_id, + bool cdrom) + { +- return usbg_f_ms_set_lun_attr_val(mf, lun_id, USBG_F_MS_LUN_CDROM, +- USBG_F_MS_LUN_BOOL_TO_ATTR_VAL(cdrom)); ++ union usbg_f_ms_lun_attr_val val = {.cdrom = cdrom}; ++ return usbg_f_ms_set_lun_attr_val(mf, lun_id, USBG_F_MS_LUN_CDROM, &val); + } + + /** +@@ -209,8 +201,8 @@ static inline int usbg_f_ms_get_lun_ro(usbg_f_ms *mf, int lun_id, bool *ro) + */ + static inline int usbg_f_ms_set_lun_ro(usbg_f_ms *mf, int lun_id, bool ro) + { +- return usbg_f_ms_set_lun_attr_val(mf, lun_id, USBG_F_MS_LUN_RO, +- USBG_F_MS_LUN_BOOL_TO_ATTR_VAL(ro)); ++ union usbg_f_ms_lun_attr_val val = {.ro = ro}; ++ return usbg_f_ms_set_lun_attr_val(mf, lun_id, USBG_F_MS_LUN_RO, &val); + } + + /** +@@ -239,8 +231,8 @@ static inline int usbg_f_ms_get_lun_nofua(usbg_f_ms *mf, int lun_id, + static inline int usbg_f_ms_set_lun_nofua(usbg_f_ms *mf, int lun_id, + bool nofua) + { +- return usbg_f_ms_set_lun_attr_val(mf, lun_id, USBG_F_MS_LUN_NOFUA, +- USBG_F_MS_LUN_BOOL_TO_ATTR_VAL(nofua)); ++ union usbg_f_ms_lun_attr_val val = {.nofua = nofua}; ++ return usbg_f_ms_set_lun_attr_val(mf, lun_id, USBG_F_MS_LUN_NOFUA, &val); + } + + /** +@@ -267,8 +259,8 @@ static inline int usbg_f_ms_get_lun_removable(usbg_f_ms *mf, int lun_id, + static inline int usbg_f_ms_set_lun_removable(usbg_f_ms *mf, int lun_id, + bool removable) + { +- return usbg_f_ms_set_lun_attr_val(mf, lun_id, USBG_F_MS_LUN_REMOVABLE, +- USBG_F_MS_LUN_BOOL_TO_ATTR_VAL(removable)); ++ union usbg_f_ms_lun_attr_val val = {.removable = removable}; ++ return usbg_f_ms_set_lun_attr_val(mf, lun_id, USBG_F_MS_LUN_REMOVABLE, &val); + } + + /** +@@ -313,8 +305,8 @@ int usbg_f_ms_get_lun_file_s(usbg_f_ms *mf, int lun_id, + static inline int usbg_f_ms_set_lun_file(usbg_f_ms *mf, int lun_id, + const char *file) + { +- return usbg_f_ms_set_lun_attr_val(mf, lun_id, USBG_F_MS_LUN_FILE, +- USBG_F_MS_LUN_CCHAR_PTR_TO_ATTR_VAL(file)); ++ union usbg_f_ms_lun_attr_val val = {.file = file}; ++ return usbg_f_ms_set_lun_attr_val(mf, lun_id, USBG_F_MS_LUN_FILE, &val); + } + + /** +diff --git a/include/usbg/function/net.h b/include/usbg/function/net.h +index b0409f1..06cee30 100644 +--- a/include/usbg/function/net.h ++++ b/include/usbg/function/net.h +@@ -56,12 +56,6 @@ union usbg_f_net_attr_val { + unsigned int protocol; + }; + +-#define USBG_F_NET_ETHER_ADDR_TO_ATTR_VAL(WHAT) \ +- USBG_TO_UNION(usbg_f_net_attr_val, dev_addr, WHAT) +- +-#define USBG_F_NET_INT_TO_ATTR_VAL(WHAT) \ +- USBG_TO_UNION(usbg_f_net_attr_val, qmult, WHAT) +- + /** + * @brief Cast from generic function to net function + * @param[in] f function to be converted to net funciton. +@@ -125,7 +119,7 @@ int usbg_f_net_get_attr_val(usbg_f_net *nf, enum usbg_f_net_attr attr, + * @return 0 on success usbg_error if error occurred. + */ + int usbg_f_net_set_attr_val(usbg_f_net *nf, enum usbg_f_net_attr attr, +- const union usbg_f_net_attr_val val); ++ const union usbg_f_net_attr_val *val); + + /** + * @brief Get the value of device side MAC address +@@ -136,7 +130,7 @@ int usbg_f_net_set_attr_val(usbg_f_net *nf, enum usbg_f_net_attr attr, + static inline int usbg_f_net_get_dev_addr(usbg_f_net *nf, + struct ether_addr *addr) + { +- union usbg_f_net_attr_val val = { .dev_addr = *addr, }; ++ union usbg_f_net_attr_val val = {.dev_addr = *addr}; + return usbg_f_net_get_attr_val(nf, USBG_F_NET_DEV_ADDR, &val); + } + +@@ -149,8 +143,8 @@ static inline int usbg_f_net_get_dev_addr(usbg_f_net *nf, + static inline int usbg_f_net_set_dev_addr(usbg_f_net *nf, + const struct ether_addr *addr) + { +- return usbg_f_net_set_attr_val(nf, USBG_F_NET_DEV_ADDR, +- USBG_F_NET_ETHER_ADDR_TO_ATTR_VAL(*addr)); ++ union usbg_f_net_attr_val val = {.dev_addr = *addr}; ++ return usbg_f_net_set_attr_val(nf, USBG_F_NET_DEV_ADDR, &val); + } + + /** +@@ -175,8 +169,8 @@ static inline int usbg_f_net_get_host_addr(usbg_f_net *nf, + static inline int usbg_f_net_set_host_addr(usbg_f_net *nf, + const struct ether_addr *addr) + { +- return usbg_f_net_set_attr_val(nf, USBG_F_NET_HOST_ADDR, +- USBG_F_NET_ETHER_ADDR_TO_ATTR_VAL(*addr)); ++ union usbg_f_net_attr_val val = {.host_addr = *addr}; ++ return usbg_f_net_set_attr_val(nf, USBG_F_NET_HOST_ADDR, &val); + } + + /** +@@ -226,8 +220,8 @@ static inline int usbg_f_net_get_qmult(usbg_f_net *nf, int *qmult) + */ + static inline int usbg_f_net_set_qmult(usbg_f_net *nf, int qmult) + { +- return usbg_f_net_set_attr_val(nf, USBG_F_NET_QMULT, +- USBG_F_NET_INT_TO_ATTR_VAL(qmult)); ++ union usbg_f_net_attr_val val = {.qmult = qmult}; ++ return usbg_f_net_set_attr_val(nf, USBG_F_NET_QMULT, &val); + } + + /** +@@ -250,8 +244,8 @@ static inline int usbg_f_net_get_class(usbg_f_net *nf, unsigned int *class_) + */ + static inline int usbg_f_net_set_class(usbg_f_net *nf, unsigned int class_) + { +- return usbg_f_net_set_attr_val(nf, USBG_F_NET_CLASS, +- USBG_F_NET_INT_TO_ATTR_VAL(class_)); ++ union usbg_f_net_attr_val val = {.class_ = class_}; ++ return usbg_f_net_set_attr_val(nf, USBG_F_NET_CLASS, &val); + } + + /** +@@ -274,8 +268,8 @@ static inline int usbg_f_net_get_subclass(usbg_f_net *nf, int *subclass) + */ + static inline int usbg_f_net_set_subclass(usbg_f_net *nf, unsigned int subclass) + { +- return usbg_f_net_set_attr_val(nf, USBG_F_NET_SUBCLASS, +- USBG_F_NET_INT_TO_ATTR_VAL(subclass)); ++ union usbg_f_net_attr_val val = {.subclass = subclass}; ++ return usbg_f_net_set_attr_val(nf, USBG_F_NET_SUBCLASS, &val); + } + + /** +@@ -298,8 +292,8 @@ static inline int usbg_f_net_get_protocol(usbg_f_net *nf, int *protocol) + */ + static inline int usbg_f_net_set_protocol(usbg_f_net *nf, unsigned int protocol) + { +- return usbg_f_net_set_attr_val(nf, USBG_F_NET_PROTOCOL, +- USBG_F_NET_INT_TO_ATTR_VAL(protocol)); ++ union usbg_f_net_attr_val val = {.protocol = protocol}; ++ return usbg_f_net_set_attr_val(nf, USBG_F_NET_PROTOCOL, &val); + } + + #ifdef __cplusplus +diff --git a/include/usbg/function/uac2.h b/include/usbg/function/uac2.h +index 6fc4d24..80918ef 100644 +--- a/include/usbg/function/uac2.h ++++ b/include/usbg/function/uac2.h +@@ -110,9 +110,6 @@ union usbg_f_uac2_attr_val { + const char * function_name; + }; + +-#define USBG_F_UAC2_INT_TO_ATTR_VAL(WHAT) \ +- USBG_TO_UNION(usbg_f_uac2_attr_val, c_chmask, WHAT) +- + /** + * @brief Cast from generic function to uac2 function + * @param[in] f function to be converted to uac2 funciton. +@@ -172,7 +169,7 @@ int usbg_f_uac2_get_attr_val(usbg_f_uac2 *af, enum usbg_f_uac2_attr attr, + * @return 0 on success usbg_error if error occurred. + */ + int usbg_f_uac2_set_attr_val(usbg_f_uac2 *af, enum usbg_f_uac2_attr attr, +- union usbg_f_uac2_attr_val val); ++ const union usbg_f_uac2_attr_val *val); + + /** + * @brief Get the capture channel mask of UAC2 adapter +@@ -194,8 +191,8 @@ static inline int usbg_f_uac2_get_c_chmask(usbg_f_uac2 *af, int *c_chmask) + */ + static inline int usbg_f_uac2_set_c_chmask(usbg_f_uac2 *af, int c_chmask) + { +- return usbg_f_uac2_set_attr_val(af, USBG_F_UAC2_C_CHMASK, +- USBG_F_UAC2_INT_TO_ATTR_VAL(c_chmask)); ++ union usbg_f_uac2_attr_val val = {.c_chmask = c_chmask}; ++ return usbg_f_uac2_set_attr_val(af, USBG_F_UAC2_C_CHMASK, &val); + } + + /** +@@ -218,8 +215,8 @@ static inline int usbg_f_uac2_get_c_srate(usbg_f_uac2 *af, int *c_srate) + */ + static inline int usbg_f_uac2_set_c_srate(usbg_f_uac2 *af, int c_srate) + { +- return usbg_f_uac2_set_attr_val(af, USBG_F_UAC2_C_SRATE, +- USBG_F_UAC2_INT_TO_ATTR_VAL(c_srate)); ++ union usbg_f_uac2_attr_val val = {.c_srate = c_srate}; ++ return usbg_f_uac2_set_attr_val(af, USBG_F_UAC2_C_SRATE, &val); + } + + /** +@@ -242,8 +239,8 @@ static inline int usbg_f_uac2_get_c_ssize(usbg_f_uac2 *af, int *c_ssize) + */ + static inline int usbg_f_uac2_set_c_ssize(usbg_f_uac2 *af, int c_ssize) + { +- return usbg_f_uac2_set_attr_val(af, USBG_F_UAC2_C_SSIZE, +- USBG_F_UAC2_INT_TO_ATTR_VAL(c_ssize)); ++ union usbg_f_uac2_attr_val val = {.c_ssize = c_ssize}; ++ return usbg_f_uac2_set_attr_val(af, USBG_F_UAC2_C_SSIZE, &val); + } + + /** +@@ -266,8 +263,8 @@ static inline int usbg_f_uac2_get_p_chmask(usbg_f_uac2 *af, int *p_chmask) + */ + static inline int usbg_f_uac2_set_p_chmask(usbg_f_uac2 *af, int p_chmask) + { +- return usbg_f_uac2_set_attr_val(af, USBG_F_UAC2_P_CHMASK, +- USBG_F_UAC2_INT_TO_ATTR_VAL(p_chmask)); ++ union usbg_f_uac2_attr_val val = {.p_chmask = p_chmask}; ++ return usbg_f_uac2_set_attr_val(af, USBG_F_UAC2_P_CHMASK, &val); + } + + /** +@@ -290,8 +287,8 @@ static inline int usbg_f_uac2_get_p_srate(usbg_f_uac2 *af, int *p_srate) + */ + static inline int usbg_f_uac2_set_p_srate(usbg_f_uac2 *af, int p_srate) + { +- return usbg_f_uac2_set_attr_val(af, USBG_F_UAC2_P_SRATE, +- USBG_F_UAC2_INT_TO_ATTR_VAL(p_srate)); ++ union usbg_f_uac2_attr_val val = {.p_srate = p_srate}; ++ return usbg_f_uac2_set_attr_val(af, USBG_F_UAC2_P_SRATE, &val); + } + + /** +@@ -314,8 +311,8 @@ static inline int usbg_f_uac2_get_p_ssize(usbg_f_uac2 *af, int *p_ssize) + */ + static inline int usbg_f_uac2_set_p_ssize(usbg_f_uac2 *af, int p_ssize) + { +- return usbg_f_uac2_set_attr_val(af, USBG_F_UAC2_P_SSIZE, +- USBG_F_UAC2_INT_TO_ATTR_VAL(p_ssize)); ++ union usbg_f_uac2_attr_val val = {.p_ssize = p_ssize}; ++ return usbg_f_uac2_set_attr_val(af, USBG_F_UAC2_P_SSIZE, &val); + } + + #ifdef __cplusplus +diff --git a/include/usbg/usbg_internal.h b/include/usbg/usbg_internal.h +index 1d8dfe2..d6a3e3a 100644 +--- a/include/usbg/usbg_internal.h ++++ b/include/usbg/usbg_internal.h +@@ -322,7 +322,7 @@ void usbg_cleanup_function(struct usbg_function *f); + } + + typedef int (*usbg_attr_get_func)(const char *, const char *, const char *, void *); +-typedef int (*usbg_attr_set_func)(const char *, const char *, const char *, void *); ++typedef int (*usbg_attr_set_func)(const char *, const char *, const char *, const void *); + + static inline int usbg_get_dec(const char *path, const char *name, + const char *attr, void *val) +@@ -331,7 +331,7 @@ static inline int usbg_get_dec(const char *path, const char *name, + } + + static inline int usbg_set_dec(const char *path, const char *name, +- const char *attr, void *val) ++ const char *attr, const void *val) + { + return usbg_write_dec(path, name, attr, *((int *)val)); + } +@@ -343,7 +343,7 @@ static inline int usbg_get_bool(const char *path, const char *name, + } + + static inline int usbg_set_bool(const char *path, const char *name, +- const char *attr, void *val) ++ const char *attr, const void *val) + { + return usbg_write_bool(path, name, attr, *((bool *)val)); + } +@@ -355,7 +355,7 @@ static inline int usbg_get_string(const char *path, const char *name, + } + + static inline int usbg_set_string(const char *path, const char *name, +- const char *attr, void *val) ++ const char *attr, const void *val) + { + return usbg_write_string(path, name, attr, *(char **)val); + } +@@ -364,7 +364,7 @@ int usbg_get_ether_addr(const char *path, const char *name, const char *attr, + void *val); + + int usbg_set_ether_addr(const char *path, const char *name, const char *attr, +- void *val); ++ const void *val); + + int usbg_get_dev(const char *path, const char *name, const char *attr, + void *val); +diff --git a/src/Makefile.am b/src/Makefile.am +index 634209f..ac97bc8 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -7,6 +7,6 @@ else + libusbgx_la_SOURCES += usbg_schemes_none.c + endif + libusbgx_la_LDFLAGS = $(LIBCONFIG_LIBS) +-libusbgx_la_LDFLAGS += -version-info 2:0:0 ++libusbgx_la_LDFLAGS += -version-info 3:0:0 + libusbgx_la_CFLAGS = $(LIBCONFIG_CFLAGS) + AM_CPPFLAGS=-I$(top_srcdir)/include/ -I$(top_builddir)/include/usbg +diff --git a/src/function/ether.c b/src/function/ether.c +index a9eaf33..a1d20f1 100644 +--- a/src/function/ether.c ++++ b/src/function/ether.c +@@ -124,7 +124,7 @@ static int ether_libconfig_import(struct usbg_function *f, + if (ret < 0) + break; + +- ret = usbg_f_net_set_attr_val(nf, i, val); ++ ret = usbg_f_net_set_attr_val(nf, i, &val); + if (ret) + break; + } +@@ -258,8 +258,8 @@ int usbg_f_net_set_attrs(usbg_f_net *nf, + continue; + + ret = usbg_f_net_set_attr_val(nf, i, +- *(union usbg_f_net_attr_val *) +- ((char *)attrs ++ (const union usbg_f_net_attr_val *) ++ ((const char *)attrs + + net_attr[i].offset)); + if (ret) + break; +@@ -277,12 +277,12 @@ int usbg_f_net_get_attr_val(usbg_f_net *nf, enum usbg_f_net_attr attr, + } + + int usbg_f_net_set_attr_val(usbg_f_net *nf, enum usbg_f_net_attr attr, +- union usbg_f_net_attr_val val) ++ const union usbg_f_net_attr_val *val) + { + return net_attr[attr].ro ? + USBG_ERROR_INVALID_PARAM : + net_attr[attr].set(nf->func.path, nf->func.name, +- net_attr[attr].name, &val); ++ net_attr[attr].name, val); + } + + int usbg_f_net_get_ifname_s(usbg_f_net *nf, char *buf, int len) +diff --git a/src/function/hid.c b/src/function/hid.c +index 4d075cf..895c2c6 100644 +--- a/src/function/hid.c ++++ b/src/function/hid.c +@@ -69,9 +69,9 @@ static int hid_get_report(const char *path, const char *name, const char *attr, + } + + static int hid_set_report(const char *path, const char *name, const char *attr, +- void *val) ++ const void *val) + { +- struct usbg_f_hid_report_desc *report_desc = val; ++ const struct usbg_f_hid_report_desc *report_desc = val; + char *buf = report_desc->desc; + int len = report_desc->len; + int ret; +@@ -239,7 +239,7 @@ static int hid_libconfig_import(struct usbg_function *f, + if (ret < 0) + break; + +- ret = usbg_f_hid_set_attr_val(hf, i, val); ++ ret = usbg_f_hid_set_attr_val(hf, i, &val); + if (ret) + break; + } +@@ -327,7 +327,7 @@ int usbg_f_hid_set_attrs(usbg_f_hid *hf, + continue; + + ret = usbg_f_hid_set_attr_val(hf, i, +- *(union usbg_f_hid_attr_val *) ++ (union usbg_f_hid_attr_val *) + ((char *)attrs + + hid_attr[i].offset)); + if (ret) +@@ -346,11 +346,11 @@ int usbg_f_hid_get_attr_val(usbg_f_hid *hf, enum usbg_f_hid_attr attr, + } + + int usbg_f_hid_set_attr_val(usbg_f_hid *hf, enum usbg_f_hid_attr attr, +- union usbg_f_hid_attr_val val) ++ const union usbg_f_hid_attr_val *val) + { + return hid_attr[attr].ro ? + USBG_ERROR_INVALID_PARAM : + hid_attr[attr].set(hf->func.path, hf->func.name, +- hid_attr[attr].name, &val); ++ hid_attr[attr].name, val); + } + +diff --git a/src/function/midi.c b/src/function/midi.c +index 1cedb97..2318b49 100644 +--- a/src/function/midi.c ++++ b/src/function/midi.c +@@ -100,7 +100,7 @@ static int midi_libconfig_import(struct usbg_function *f, + if (ret < 0) + break; + +- ret = usbg_f_midi_set_attr_val(mf, i, val); ++ ret = usbg_f_midi_set_attr_val(mf, i, &val); + if (ret) + break; + } +@@ -185,8 +185,8 @@ int usbg_f_midi_set_attrs(usbg_f_midi *mf, + + for (i = USBG_F_MIDI_ATTR_MIN; i < USBG_F_MIDI_ATTR_MAX; ++i) { + ret = usbg_f_midi_set_attr_val(mf, i, +- *(union usbg_f_midi_attr_val *) +- ((char *)attrs ++ (const union usbg_f_midi_attr_val *) ++ ((const char *)attrs + + midi_attr[i].offset)); + if (ret) + break; +@@ -204,10 +204,10 @@ int usbg_f_midi_get_attr_val(usbg_f_midi *mf, enum usbg_f_midi_attr attr, + } + + int usbg_f_midi_set_attr_val(usbg_f_midi *mf, enum usbg_f_midi_attr attr, +- union usbg_f_midi_attr_val val) ++ const union usbg_f_midi_attr_val *val) + { + return midi_attr[attr].set(mf->func.path, mf->func.name, +- midi_attr[attr].name, &val); ++ midi_attr[attr].name, val); + } + + int usbg_f_midi_get_id_s(usbg_f_midi *mf, char *buf, int len) +diff --git a/src/function/ms.c b/src/function/ms.c +index 519b012..5cdd814 100644 +--- a/src/function/ms.c ++++ b/src/function/ms.c +@@ -207,7 +207,7 @@ static int ms_import_lun_attrs(struct usbg_f_ms *mf, int lun_id, + if (ret < 0) + break; + +- ret = usbg_f_ms_set_lun_attr_val(mf, lun_id, i, val); ++ ret = usbg_f_ms_set_lun_attr_val(mf, lun_id, i, &val); + if (ret) + break; + } +@@ -605,8 +605,8 @@ int usbg_f_ms_set_lun_attrs(usbg_f_ms *mf, int lun_id, + + for (i = USBG_F_MS_LUN_ATTR_MIN; i < USBG_F_MS_LUN_ATTR_MAX; ++i) { + ret = usbg_f_ms_set_lun_attr_val(mf, lun_id, i, +- *(union usbg_f_ms_lun_attr_val *) +- ((char *)lattrs ++ (const union usbg_f_ms_lun_attr_val *) ++ ((const char *)lattrs + + ms_lun_attr[i].offset)); + if (ret) + break; +@@ -633,7 +633,7 @@ int usbg_f_ms_get_lun_attr_val(usbg_f_ms *mf, int lun_id, + + int usbg_f_ms_set_lun_attr_val(usbg_f_ms *mf, int lun_id, + enum usbg_f_ms_lun_attr lattr, +- union usbg_f_ms_lun_attr_val val) ++ const union usbg_f_ms_lun_attr_val *val) + { + char lpath[USBG_MAX_PATH_LENGTH]; + int ret; +@@ -644,7 +644,7 @@ int usbg_f_ms_set_lun_attr_val(usbg_f_ms *mf, int lun_id, + return USBG_ERROR_PATH_TOO_LONG; + + return ms_lun_attr[lattr].set(lpath, "", +- ms_lun_attr[lattr].name, &val); ++ ms_lun_attr[lattr].name, val); + } + + int usbg_f_ms_get_lun_file_s(usbg_f_ms *mf, int lun_id, +diff --git a/src/function/uac2.c b/src/function/uac2.c +index 9ca8b66..fc06c1d 100644 +--- a/src/function/uac2.c ++++ b/src/function/uac2.c +@@ -125,7 +125,7 @@ static int uac2_libconfig_import(struct usbg_function *f, + if (ret < 0) + break; + +- ret = usbg_f_uac2_set_attr_val(af, i, val); ++ ret = usbg_f_uac2_set_attr_val(af, i, &val); + if (ret) + break; + } +@@ -210,8 +210,8 @@ int usbg_f_uac2_set_attrs(usbg_f_uac2 *af, + + for (i = USBG_F_UAC2_ATTR_MIN; i < USBG_F_UAC2_ATTR_MAX; ++i) { + ret = usbg_f_uac2_set_attr_val(af, i, +- *(union usbg_f_uac2_attr_val *) +- ((char *)attrs ++ (const union usbg_f_uac2_attr_val *) ++ ((const char *)attrs + + uac2_attr[i].offset)); + if (ret) + break; +@@ -229,8 +229,8 @@ int usbg_f_uac2_get_attr_val(usbg_f_uac2 *af, enum usbg_f_uac2_attr attr, + } + + int usbg_f_uac2_set_attr_val(usbg_f_uac2 *af, enum usbg_f_uac2_attr attr, +- union usbg_f_uac2_attr_val val) ++ const union usbg_f_uac2_attr_val *val) + { + return uac2_attr[attr].set(af->func.path, af->func.name, +- uac2_attr[attr].name, &val); ++ uac2_attr[attr].name, val); + } +diff --git a/src/function/uvc.c b/src/function/uvc.c +index f39594b..947b94e 100644 +--- a/src/function/uvc.c ++++ b/src/function/uvc.c +@@ -303,7 +303,7 @@ int usbg_f_uvc_get_config_attr_val(usbg_f_uvc *uvcf, enum usbg_f_uvc_config_attr + } + + int usbg_f_uvc_set_config_attr_val(usbg_f_uvc *uvcf, enum usbg_f_uvc_config_attr iattr, +- union usbg_f_uvc_config_attr_val val) ++ const union usbg_f_uvc_config_attr_val *val) + { + char ipath[USBG_MAX_PATH_LENGTH]; + int nmb; +@@ -314,7 +314,7 @@ int usbg_f_uvc_set_config_attr_val(usbg_f_uvc *uvcf, enum usbg_f_uvc_config_attr + return USBG_ERROR_PATH_TOO_LONG; + + return uvc_config_attr[iattr].set(ipath, "", +- uvc_config_attr[iattr].name, &val); ++ uvc_config_attr[iattr].name, val); + } + + int usbg_f_uvc_get_config_attrs(usbg_f_uvc *uvcf, struct usbg_f_uvc_config_attrs *iattrs) +@@ -341,8 +341,8 @@ int usbg_f_uvc_set_config_attrs(usbg_f_uvc *uvcf, const struct usbg_f_uvc_config + + for (i = USBG_F_UVC_FRAME_ATTR_MIN; i < USBG_F_UVC_FRAME_ATTR_MAX; ++i) { + ret = usbg_f_uvc_set_config_attr_val(uvcf, i, +- *(union usbg_f_uvc_config_attr_val *) +- ((char *)iattrs ++ (const union usbg_f_uvc_config_attr_val *) ++ ((const char *)iattrs + + uvc_config_attr[i].offset)); + if (ret) + break; +@@ -774,7 +774,7 @@ static int uvc_import_config(struct usbg_f_uvc *uvcf, config_setting_t *root) + if (ret < 0) + break; + +- ret = usbg_f_uvc_set_config_attr_val(uvcf, i, val); ++ ret = usbg_f_uvc_set_config_attr_val(uvcf, i, &val); + if (ret) + break; + } +diff --git a/src/usbg_common.c b/src/usbg_common.c +index 5f7f4e5..7234649 100644 +--- a/src/usbg_common.c ++++ b/src/usbg_common.c +@@ -337,7 +337,7 @@ int usbg_get_ether_addr(const char *path, const char *name, + } + + int usbg_set_ether_addr(const char *path, const char *name, +- const char *attr, void *val) ++ const char *attr, const void *val) + { + char str_addr[USBG_MAX_STR_LENGTH]; + +-- +2.42.0 + diff --git a/meta-oe/recipes-support/libusbgx/libusbgx/0001-libusbgx-Add-interface-name-for-NCM-Feature-Descript.patch b/meta-oe/recipes-support/libusbgx/libusbgx/0001-libusbgx-Add-interface-name-for-NCM-Feature-Descript.patch new file mode 100644 index 0000000000..cc122c844c --- /dev/null +++ b/meta-oe/recipes-support/libusbgx/libusbgx/0001-libusbgx-Add-interface-name-for-NCM-Feature-Descript.patch @@ -0,0 +1,52 @@ +From 4f3f2ad08e6ca132bd1dd388e02b57223bf4219d Mon Sep 17 00:00:00 2001 +From: Ming Liu <liu.ming50@gmail.com> +Date: Sun, 11 Dec 2022 14:11:49 +0100 +Subject: [PATCH] libusbgx: Add interface name for NCM Feature Descriptors + +In commit: abf422bffca4a4767e7e242c44910dbf5ef7094f +[ +Author: Stefan Agner <stefan.agner@toradex.com> +Date: Tue Jan 24 14:22:25 2017 -0800 + + libusbgx: Add interface name for Feature Descriptors + + This adds interface name required for "Feature Descriptors". If + specified, we can assume that a Feature Descriptor with the + interface name of the specified string is understood by the + kernel (e.g. interface.rndis). +] + +it only added Feature Descriptors for RNDIS, NCM also needs that, or +else it could not be recognized by Windows systems. + +Add Feature Descriptors interface name for NCM. + +Upstream-Status: Submitted [https://github.com/linux-usb-gadgets/libusbgx/pull/73] + +Signed-off-by: Ming Liu <liu.ming50@gmail.com> +--- + src/function/ether.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/function/ether.c b/src/function/ether.c +index b1fe1d2..a9eaf33 100644 +--- a/src/function/ether.c ++++ b/src/function/ether.c +@@ -184,8 +184,14 @@ struct usbg_function_type usbg_f_type_subset = { + ETHER_FUNCTION_OPTS + }; + ++static char *ncm_os_desc_ifnames[] = { ++ "ncm", ++ NULL ++}; ++ + struct usbg_function_type usbg_f_type_ncm = { + .name = "ncm", ++ .os_desc_iname = ncm_os_desc_ifnames, + ETHER_FUNCTION_OPTS + }; + +-- +2.25.1 + diff --git a/meta-oe/recipes-support/libusbgx/libusbgx/gadget-start b/meta-oe/recipes-support/libusbgx/libusbgx/gadget-start index 1a106b7851..e80cb2c340 100644..100755 --- a/meta-oe/recipes-support/libusbgx/libusbgx/gadget-start +++ b/meta-oe/recipes-support/libusbgx/libusbgx/gadget-start @@ -6,6 +6,15 @@ for i in $IMPORT_SCHEMAS; do /usr/bin/gadget-import "$i" /etc/usbgx/"$i".schema done +for script in $(find -L /etc/usbgx.d -type f -exec test -e {} \; -print 2>/dev/null); do + $script +done + for i in $ENABLED_SCHEMAS; do - ls /sys/class/udc/ > /sys/kernel/config/usb_gadget/"$i"/UDC + configured_udc=$(eval 'echo ${UDC_FOR_SCHEMA_'"$i"'}') + if [ -n "${configured_udc}" ] && [ -e "/sys/class/udc/${configured_udc}" ]; then + echo ${configured_udc} > /sys/kernel/config/usb_gadget/"$i"/UDC + else + ls /sys/class/udc/ > /sys/kernel/config/usb_gadget/"$i"/UDC + fi done diff --git a/meta-oe/recipes-support/libusbgx/libusbgx/gadget-stop b/meta-oe/recipes-support/libusbgx/libusbgx/gadget-stop new file mode 100755 index 0000000000..24b7caed5e --- /dev/null +++ b/meta-oe/recipes-support/libusbgx/libusbgx/gadget-stop @@ -0,0 +1,13 @@ +#!/bin/sh + +[ -r /etc/default/usbgx ] && . /etc/default/usbgx + +for i in $IMPORT_SCHEMAS; do + if [ -e /sys/kernel/config/usb_gadget/"$i"/idVendor ]; then + if [ -e /sys/kernel/config/usb_gadget/"$i"/idProduct ]; then + idVendor=$(cat /sys/kernel/config/usb_gadget/"$i"/idVendor) + idProduct=$(cat /sys/kernel/config/usb_gadget/"$i"/idProduct) + /usr/bin/gadget-vid-pid-remove ${idVendor}:${idProduct} + fi + fi +done diff --git a/meta-oe/recipes-support/libusbgx/libusbgx/usbgx.service b/meta-oe/recipes-support/libusbgx/libusbgx/usbgx.service index 74541d3c2d..7210969d62 100644 --- a/meta-oe/recipes-support/libusbgx/libusbgx/usbgx.service +++ b/meta-oe/recipes-support/libusbgx/libusbgx/usbgx.service @@ -1,9 +1,13 @@ [Unit] Description=Load USB gadget schemas +Requires=sys-kernel-config.mount +After=sys-kernel-config.mount [Service] Type=oneshot +RemainAfterExit=yes ExecStart=/usr/bin/gadget-start +ExecStop=/usr/bin/gadget-stop [Install] -WantedBy=multi-user.target +WantedBy=usb-gadget.target diff --git a/meta-oe/recipes-support/libusbgx/libusbgx_git.bb b/meta-oe/recipes-support/libusbgx/libusbgx_git.bb index d73ca61060..bc40f029cd 100644 --- a/meta-oe/recipes-support/libusbgx/libusbgx_git.bb +++ b/meta-oe/recipes-support/libusbgx/libusbgx_git.bb @@ -1,40 +1,61 @@ SUMMARY = "USB Gadget neXt Configfs Library" -LICENSE = "GPLv2 & LGPLv2.1" +LICENSE = "GPL-2.0-only & LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c" -DEPENDS = "libconfig" +inherit autotools pkgconfig systemd update-rc.d update-alternatives -inherit autotools pkgconfig systemd update-rc.d - -PV = "0.2.0+git${SRCPV}" -SRCREV = "45c14ef4d5d7ced0fbf984208de44ced6d5ed898" +PV = "0.2.0+git" +SRCREV = "ec0b01c03fdc7893997b7b32ec1c12c6103f62f3" SRCBRANCH = "master" SRC_URI = " \ - git://github.com/libusbgx/libusbgx.git;branch=${SRCBRANCH} \ + git://github.com/libusbgx/libusbgx.git;branch=${SRCBRANCH};protocol=https \ + file://0001-libusbgx-Add-interface-name-for-NCM-Feature-Descript.patch \ + file://0001-fix-stack-buffer-overflow-in-usbg_f_foo_attr_val-pro.patch \ file://gadget-start \ + file://gadget-stop \ file://usbgx.initd \ file://usbgx.service \ " S = "${WORKDIR}/git" -SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "usbgx.service" +PACKAGECONFIG ??= "examples gadget-schemes libconfig" +PACKAGECONFIG[libconfig] = "--with-libconfig=yes,--without-libconfig,libconfig" +PACKAGECONFIG[examples] = "--enable-examples,--disable-examples" +PACKAGECONFIG[gadget-schemes] = "--enable-gadget-schemes,--disable-gadget-schemes" +PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,cmocka" + +PACKAGE_BEFORE_PN = "${@bb.utils.contains('PACKAGECONFIG', 'examples', '${PN}-examples', '', d)}" + +SYSTEMD_PACKAGES = "${PN}-examples" +SYSTEMD_SERVICE:${PN}-examples = "usbgx.service" +SYSTEMD_AUTO_ENABLE:${PN}-examples = "${@bb.utils.contains('PACKAGECONFIG', 'examples', 'enable', 'disable', d)}" +INITSCRIPT_PACKAGES = "${@bb.utils.contains('PACKAGECONFIG', 'examples', '${PN}-examples', '', d)}" INITSCRIPT_NAME = "usbgx" INITSCRIPT_PARAMS = "defaults" +INHIBIT_UPDATERCD_BBCLASS = "${@bb.utils.contains('PACKAGECONFIG', 'examples', '1', '0', d)}" -EXTRA_OECONF = "--includedir=${includedir}/usbgx" +do_install:append() { + install -Dm 0755 ${UNPACKDIR}/gadget-start ${D}${bindir}/gadget-start + sed -i -e 's,/usr/bin,${bindir},g' -e 's,/etc,${sysconfdir},g' ${D}${bindir}/gadget-start + install -m 0755 ${UNPACKDIR}/gadget-start ${D}${bindir}/gadget-stop + sed -i -e 's,/usr/bin,${bindir},g' -e 's,/etc,${sysconfdir},g' ${D}${bindir}/gadget-stop -do_install_append() { - install -Dm 0755 ${WORKDIR}/gadget-start ${D}/${bindir}/gadget-start if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -Dm 0644 ${WORKDIR}/usbgx.service ${D}${systemd_system_unitdir}/usbgx.service + install -Dm 0644 ${UNPACKDIR}/usbgx.service ${D}${systemd_system_unitdir}/usbgx.service fi + if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then - install -Dm 0755 ${WORKDIR}/usbgx.initd ${D}${sysconfdir}/init.d/usbgx - fi + install -Dm 0755 ${UNPACKDIR}/usbgx.initd ${D}${sysconfdir}/init.d/usbgx + fi } -RDEPENDS_${PN} += "libusbgx-config" +FILES:${PN}-examples = "${bindir}/* ${sysconfdir}/*" +RDEPENDS:${PN}-examples += "${@bb.utils.contains('PACKAGECONFIG', 'examples', 'libusbgx-config', '', d)}" + +ALTERNATIVE_PRIORITY = "90" +ALTERNATIVE:${PN}-examples = "${@bb.utils.contains('PACKAGECONFIG', 'examples', 'gadget-acm-ecm show-gadgets', '', d)}" +ALTERNATIVE_LINK_NAME[gadget-acm-ecm] = "${bindir}/gadget-acm-ecm" +ALTERNATIVE_LINK_NAME[show-gadgets] = "${bindir}/show-gadgets" diff --git a/meta-oe/recipes-support/libutempter/libutempter/0001-Fix-macro-error.patch b/meta-oe/recipes-support/libutempter/libutempter/0001-Fix-macro-error.patch index 8140ea3438..00119af11c 100644 --- a/meta-oe/recipes-support/libutempter/libutempter/0001-Fix-macro-error.patch +++ b/meta-oe/recipes-support/libutempter/libutempter/0001-Fix-macro-error.patch @@ -11,15 +11,13 @@ Signed-off-by: Qian Lei <qianl.fnst@cn.fujitsu.com> iface.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) -diff --git a/iface.c b/iface.c -index 5951d81..27793f0 100644 --- a/iface.c +++ b/iface.c @@ -43,7 +43,14 @@ __result; })) #endif --#define UTEMPTER_DEFAULT_PATHNAME LIBEXECDIR "/utempter/utempter" +-#define UTEMPTER_DEFAULT_PATHNAME LIBEXECDIR "/utempter/utempter" +#ifdef LIBEXECDIR +# define CAT_PATH(DIR1,DIR2) DIR1##DIR2 +# define RAW_UTEMPTER_PATH CAT_PATH(LIBEXECDIR,/utempter/utempter) @@ -31,6 +29,3 @@ index 5951d81..27793f0 100644 static const char *utempter_pathname; static int saved_fd = -1; --- -1.8.3.1 - diff --git a/meta-oe/recipes-support/libutempter/libutempter/0002-Proper-macro-path-generation.patch b/meta-oe/recipes-support/libutempter/libutempter/0002-Proper-macro-path-generation.patch index 2a866c0796..f43f54eaab 100644 --- a/meta-oe/recipes-support/libutempter/libutempter/0002-Proper-macro-path-generation.patch +++ b/meta-oe/recipes-support/libutempter/libutempter/0002-Proper-macro-path-generation.patch @@ -5,6 +5,8 @@ Subject: [PATCH] Proper macro path generation. Signed-off-by: iddinev <xidinev@gmail.com> --- +Upstream-Status: Pending + libutempter/iface.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/meta-oe/recipes-support/libutempter/libutempter/libutempter-remove-glibc-assumption.patch b/meta-oe/recipes-support/libutempter/libutempter/libutempter-remove-glibc-assumption.patch deleted file mode 100644 index 6ed93355bb..0000000000 --- a/meta-oe/recipes-support/libutempter/libutempter/libutempter-remove-glibc-assumption.patch +++ /dev/null @@ -1,81 +0,0 @@ -diff -Naur libutempter-1.1.6.orig/utempter.c libutempter-1.1.6/utempter.c ---- libutempter-1.1.6.orig/utempter.c 2010-11-04 13:14:53.000000000 -0400 -+++ libutempter-1.1.6/utempter.c 2014-06-20 16:37:09.762403323 -0400 -@@ -34,13 +34,7 @@ - #include <sys/stat.h> - #include <utmp.h> - --#ifdef __GLIBC__ - # include <pty.h> --#elif defined(__FreeBSD__) --# include <libutil.h> --#else --# error Unsupported platform --#endif /* __GLIBC__ || __FreeBSD__ */ - - #define DEV_PREFIX "/dev/" - #define DEV_PREFIX_LEN (sizeof(DEV_PREFIX)-1) -@@ -106,17 +100,12 @@ - - static int - write_uwtmp_record(const char *user, const char *term, const char *host, --#ifdef __GLIBC__ - pid_t pid, --#endif - int add) - { - struct utmp ut; - struct timeval tv; -- --#ifdef __GLIBC__ - size_t offset; --#endif - - memset(&ut, 0, sizeof(ut)); - -@@ -128,8 +117,6 @@ - if (host) - strncpy(ut.ut_host, host, sizeof(ut.ut_host)); - --#ifdef __GLIBC__ -- - offset = (strlen(term) <= sizeof(ut.ut_id)) ? 0 : - strlen(term) - sizeof(ut.ut_id); - strncpy(ut.ut_id, term + offset, sizeof(ut.ut_id)); -@@ -156,27 +143,6 @@ - - (void) updwtmp(_PATH_WTMP, &ut); - --#elif defined(__FreeBSD__) -- -- ut.ut_time = tv.tv_sec; -- -- if (add) -- { -- login(&ut); -- } else -- { -- if (logout(term) != 1) -- { --#ifdef UTEMPTER_DEBUG -- fprintf(stderr, "utempter: logout: %s\n", -- strerror(errno)); --#endif -- exit(EXIT_FAILURE); -- } -- } -- --#endif /* __GLIBC__ || __FreeBSD__ */ -- - #ifdef UTEMPTER_DEBUG - fprintf(stderr, - "utempter: DEBUG: utmp/wtmp record %s for terminal '%s'\n", -@@ -255,8 +221,6 @@ - validate_device(device); - - return write_uwtmp_record(pw->pw_name, device + DEV_PREFIX_LEN, host, --#ifdef __GLIBC__ - pid, --#endif - add); - } diff --git a/meta-oe/recipes-support/libutempter/libutempter.bb b/meta-oe/recipes-support/libutempter/libutempter_1.2.2-alt1.bb index b8a700b7b7..0d2cd135c6 100644 --- a/meta-oe/recipes-support/libutempter/libutempter.bb +++ b/meta-oe/recipes-support/libutempter/libutempter_1.2.2-alt1.bb @@ -4,17 +4,15 @@ This library provides interface for terminal emulators such as \ screen and xterm to record user sessions to utmp and wtmp files." HOMEPAGE = "ftp://ftp.altlinux.org/pub/people/ldv/utempter" SECTION = "System Environment/Libraries" -LICENSE = "GPLv2 & GPLv2+ & LGPLv2 & MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" +LICENSE = "GPL-2.0-only & GPL-2.0-or-later & LGPL-2.0-only & MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=2caced0b25dfefd4c601d92bd15116de" -SRCREV = "3ef74fff310f09e2601e241b9f042cd39d591018" -PV = "1.1.6-alt2+git${SRCPV}" +SRCREV = "63825e2244629d44dae21132b1065d7ecc0491c0" -SRC_URI = "git://git.altlinux.org/people/ldv/packages/libutempter.git \ +SRC_URI = "git://git.altlinux.org/people/ldv/packages/libutempter.git;branch=master \ file://0001-Fix-macro-error.patch \ file://0002-Proper-macro-path-generation.patch \ - file://libutempter-remove-glibc-assumption.patch \ - " + " S = "${WORKDIR}/git/${BPN}" @@ -37,6 +35,6 @@ do_install() { rm -f ${D}${libdir}/*.a } -FILES_${PN} = "${libdir}/*.so.*" -FILES_${PN} += "${libexecdir}/utempter/utempter" -FILES_${PN}-dbg += "${libexecdir}/utempter/.debug/utempter" +FILES:${PN} = "${libdir}/*.so.*" +FILES:${PN} += "${libexecdir}/utempter/utempter" +FILES:${PN}-dbg += "${libexecdir}/utempter/.debug/utempter" diff --git a/meta-oe/recipes-support/links/files/ac-prog-cxx.patch b/meta-oe/recipes-support/links/files/ac-prog-cxx.patch index 2dc57a5c83..0406b700d7 100644 --- a/meta-oe/recipes-support/links/files/ac-prog-cxx.patch +++ b/meta-oe/recipes-support/links/files/ac-prog-cxx.patch @@ -3,6 +3,8 @@ From: Martin Jansa <Martin.Jansa@gmail.com> Date: Mon, 30 Jul 2012 23:52:49 +0200 --- +Upstream-Status: Pending + configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/links/links-x11_2.20.2.bb b/meta-oe/recipes-support/links/links-x11_2.20.2.bb deleted file mode 100644 index 645fe3b264..0000000000 --- a/meta-oe/recipes-support/links/links-x11_2.20.2.bb +++ /dev/null @@ -1,53 +0,0 @@ -# FIXME: the LIC_FILES_CHKSUM values have been updated by 'devtool upgrade'. -# The following is the difference between the old and the new license text. -# Please update the LICENSE value if needed, and summarize the changes in -# the commit message via 'License-Update:' tag. -# (example: 'License-Update: copyright years updated.') -# -# The changes: -# -# --- COPYING -# +++ COPYING -# @@ -293,7 +293,7 @@ -# <one line to give the program's name and a brief idea of what it does.> -# Copyright (C) <year> <name of author> -# -# - on, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USAThis program is free software; you can redistribute it and/or modify -# + This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# - -require links.inc - -DEPENDS += "virtual/libx11" -RCONFLICTS_${PN} = "links" - -inherit 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] = "ee39e612249440d0497535d0dafc3c0e" -SRC_URI[sha256sum] = "4b4f07d0e6261118d1365a5a5bfa31e1eafdbd280cfae6f0e9eedfea51a2f424" -SRC_URI[icon.md5sum] = "477e8787927c634614bac01b44355a33" -SRC_URI[icon.sha256sum] = "eddcd8b8c8698aa621d1a453943892d77b72ed492e0d14e0dbac5c6a57e52f47" diff --git a/meta-oe/recipes-support/links/links-x11_2.26.bb b/meta-oe/recipes-support/links/links-x11_2.26.bb new file mode 100644 index 0000000000..713919bca1 --- /dev/null +++ b/meta-oe/recipes-support/links/links-x11_2.26.bb @@ -0,0 +1,29 @@ +require links.inc + +DEPENDS += "virtual/libx11" +RCONFLICTS:${PN} = "links" + +inherit 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" + +SRC_URI[sha256sum] = "f05b3577f25dbe63e491c424f0ecb31f7bfadce9b2bc2f111dfed049c004c9cb" +SRC_URI[icon.sha256sum] = "eddcd8b8c8698aa621d1a453943892d77b72ed492e0d14e0dbac5c6a57e52f47" + +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 ${UNPACKDIR}/links2.desktop ${D}/${datadir}/applications + install -d ${D}/${datadir}/pixmaps + install -m 0644 ${UNPACKDIR}/links2.png ${D}/${datadir}/pixmaps +} diff --git a/meta-oe/recipes-support/links/links.inc b/meta-oe/recipes-support/links/links.inc index d6aa2d2d4e..d772d54aff 100644 --- a/meta-oe/recipes-support/links/links.inc +++ b/meta-oe/recipes-support/links/links.inc @@ -2,7 +2,7 @@ DESCRIPTION = "Links is graphics and text mode WWW \ browser, similar to Lynx." HOMEPAGE = "http://links.twibright.com/" SECTION = "console/network" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b0c80473f97008e42e29a9f80fcc55ff" DEPENDS = "jpeg libpng flex openssl zlib" diff --git a/meta-oe/recipes-support/links/links_2.20.2.bb b/meta-oe/recipes-support/links/links_2.20.2.bb deleted file mode 100644 index 1a36291e55..0000000000 --- a/meta-oe/recipes-support/links/links_2.20.2.bb +++ /dev/null @@ -1,15 +0,0 @@ -require links.inc - -DEPENDS += "gpm" -RCONFLICTS_${PN} = "links-x11" - -EXTRA_OECONF = "--enable-graphics \ - --with-ssl=${STAGING_LIBDIR}/.. --with-libjpeg \ - --without-libtiff --without-svgalib --with-fb \ - --without-directfb --without-pmshell --without-atheos \ - --without-x" - -SRC_URI[md5sum] = "ee39e612249440d0497535d0dafc3c0e" -SRC_URI[sha256sum] = "4b4f07d0e6261118d1365a5a5bfa31e1eafdbd280cfae6f0e9eedfea51a2f424" -SRC_URI[icon.md5sum] = "477e8787927c634614bac01b44355a33" -SRC_URI[icon.sha256sum] = "eddcd8b8c8698aa621d1a453943892d77b72ed492e0d14e0dbac5c6a57e52f47" diff --git a/meta-oe/recipes-support/links/links_2.29.bb b/meta-oe/recipes-support/links/links_2.29.bb new file mode 100644 index 0000000000..e3a15d1819 --- /dev/null +++ b/meta-oe/recipes-support/links/links_2.29.bb @@ -0,0 +1,11 @@ +require links.inc + +DEPENDS += "gpm" +RCONFLICTS:${PN} = "links-x11" + +EXTRA_OECONF = "--enable-graphics \ + --with-ssl=${STAGING_LIBDIR}/.. --with-libjpeg \ + --without-libtiff --without-svgalib --with-fb \ + --without-directfb --without-pmshell --without-atheos \ + --without-x" +SRC_URI[sha256sum] = "22aa96c0b38e1a6f8f7ed9d7a4167a47fc37246097759ef6059ecf8f9ead7998" diff --git a/meta-oe/recipes-support/lio-utils/lio-utils/0001-Makefiles-Respect-environment-variables-and-add-LDFL.patch b/meta-oe/recipes-support/lio-utils/lio-utils/0001-Makefiles-Respect-environment-variables-and-add-LDFL.patch index 9608b7e753..86edcc2e42 100644 --- a/meta-oe/recipes-support/lio-utils/lio-utils/0001-Makefiles-Respect-environment-variables-and-add-LDFL.patch +++ b/meta-oe/recipes-support/lio-utils/lio-utils/0001-Makefiles-Respect-environment-variables-and-add-LDFL.patch @@ -8,6 +8,8 @@ Fixes QA errors about GNU_HASH Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + mib-modules/Makefile | 10 +++++----- tools/Makefile | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb b/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb index ea54e75523..844e5acf90 100644 --- a/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb +++ b/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb @@ -1,18 +1,18 @@ SUMMARY = "lio-utils" DESCRIPTION = "a simple low-level configuration tool set for the Target+iSCSI (LIO)" HOMEPAGE = "http://linux-iscsi.org/index.php/Lio-utils" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://debian/copyright;md5=c3ea231a32635cbb5debedf3e88aa3df" -PV = "4.1+git${SRCPV}" +PV = "4.1+git" -SRC_URI = "git://github.com/Datera/lio-utils.git \ +SRC_URI = "git://github.com/Datera/lio-utils.git;branch=master;protocol=https \ file://0001-Makefiles-Respect-environment-variables-and-add-LDFL.patch \ " SRCREV = "0ac9091c1ff7a52d5435a4f4449e82637142e06e" S = "${WORKDIR}/git" -inherit distutils +inherit ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "distutils", "", d)} EXTRA_OEMAKE += "DESTDIR=${D}" @@ -55,12 +55,21 @@ do_install() { install -m 755 ${S}/conf/lio_start.default ${D}/etc/target/lio_start.sh } -RDEPENDS_${PN} += "python-stringold python-subprocess python-shell \ +SKIP_RECIPE[lio-utils] ?= "${@bb.utils.contains('I_SWEAR_TO_MIGRATE_TO_PYTHON3', 'yes', '', 'python2 is out of support for long time, read https://www.python.org/doc/sunset-python-2/ https://python3statement.org/ and if you really have to temporarily use this, then set I_SWEAR_TO_MIGRATE_TO_PYTHON3 to "yes"', d)}" + +RDEPENDS:${PN} += "python-stringold python-subprocess python-shell \ python-datetime python-textutils python-crypt python-netclient python-email \ bash" -FILES_${PN} += "${sbindir}/* /etc/init.d/* /etc/target/*" +FILES:${PN} += "${sbindir}/* /etc/init.d/* /etc/target/*" # http://errors.yoctoproject.org/Errors/Details/184712/ # python-native/python: can't open file 'setup.py': [Errno 2] No such file or directory CLEANBROKEN = "1" + +python() { + if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split(): + raise bb.parse.SkipRecipe('Requires meta-python2 to be present.') +} + + diff --git a/meta-oe/recipes-support/lockdev/lockdev/0001-lockdev-Define-MAJOR-MINOR-for-non-glibc-case.patch b/meta-oe/recipes-support/lockdev/lockdev/0001-lockdev-Define-MAJOR-MINOR-for-non-glibc-case.patch new file mode 100644 index 0000000000..abcf1bc20f --- /dev/null +++ b/meta-oe/recipes-support/lockdev/lockdev/0001-lockdev-Define-MAJOR-MINOR-for-non-glibc-case.patch @@ -0,0 +1,28 @@ +From 11c78232aa589d5ed43eea3683e6e3de0362ffdc Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 26 Apr 2022 10:00:32 -0700 +Subject: [PATCH] lockdev: Define MAJOR/MINOR for non-glibc case + +gnu_dev_major and gnu_dev_minor are glibc extensions but we do have +major/minor macros on musl too, so use them to define MINOR/MAJOR here + +Upstream-Status: Inappropriate [No active upstream] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/lockdev.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/src/lockdev.c ++++ b/src/lockdev.c +@@ -125,8 +125,8 @@ + #include <sys/file.h> + #if defined (__GNU_LIBRARY__) + # include <sys/sysmacros.h> +-# define MAJOR(dev) gnu_dev_major (dev) +-# define MINOR(dev) gnu_dev_minor (dev) ++# define MAJOR(dev) major (dev) ++# define MINOR(dev) minor (dev) + #else + # error "put here a define for MAJOR and MINOR" + #endif diff --git a/meta-oe/recipes-support/lockdev/lockdev/build.patch b/meta-oe/recipes-support/lockdev/lockdev/build.patch index 6ec91d2316..36daea79af 100644 --- a/meta-oe/recipes-support/lockdev/lockdev/build.patch +++ b/meta-oe/recipes-support/lockdev/lockdev/build.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + commit 0dd47123655c52d68185f06b9da8fb0e1b925400 Author: Ludwig Nussel <ludwig.nussel@suse.de> Date: Tue Feb 9 14:56:23 2010 +0100 @@ -18,7 +20,7 @@ Date: Tue Feb 9 14:56:23 2010 +0100 soname = ${libname}.so.${MVER} # overwritten by caller (e.g.: debian/rules) -@@ -72,6 +72,7 @@ install_doc: docs/lockdev.3 +@@ -73,6 +73,7 @@ install_doc: docs/lockdev.3 install_run: ${shared} install -m755 -d ${libdir} install -m644 ${shared} ${libdir} diff --git a/meta-oe/recipes-support/lockdev/lockdev/cross_compile.patch b/meta-oe/recipes-support/lockdev/lockdev/cross_compile.patch index aa8f6a4d85..886af121b3 100644 --- a/meta-oe/recipes-support/lockdev/lockdev/cross_compile.patch +++ b/meta-oe/recipes-support/lockdev/lockdev/cross_compile.patch @@ -1,14 +1,18 @@ +Upstream-Status: Pending + --- a/Makefile +++ b/Makefile -@@ -15,17 +15,17 @@ shared = ${libname}.${VER}.so +@@ -15,17 +15,18 @@ shared = ${libname}.${VER}.so soname = ${libname}.so.${MVER} # overwritten by caller (e.g.: debian/rules) -basedir = /usr/local +basedir ?= /usr/local ++baselib ?= lib srcdir=. - libdir = ${basedir}/lib +-libdir = ${basedir}/lib ++libdir = ${basedir}/${baselib} incdir = ${basedir}/include mandir = ${basedir}/share/man @@ -17,7 +21,7 @@ -CFLAGS = -g -LDLIBS = -llockdev +CC ?= gcc -+LCFLAGS ?= -g -O2 -fPIC -Wall -pipe -D_REENTRANT ++LCFLAGS ?= -g -O2 -fPIC -Wall -pipe -D_REENTRANT +CFLAGS ?= -g +LDLIBS ?= -llockdev diff --git a/meta-oe/recipes-support/lockdev/lockdev_1.0.3.bb b/meta-oe/recipes-support/lockdev/lockdev_1.0.3.bb index 5b862bd1fe..a52ca25da4 100644 --- a/meta-oe/recipes-support/lockdev/lockdev_1.0.3.bb +++ b/meta-oe/recipes-support/lockdev/lockdev_1.0.3.bb @@ -1,29 +1,27 @@ SUMMARY = "Locking devices library" SECTION = "libs" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM="file://LICENSE;md5=d8045f3b8f929c1cb29a1e3fd737b499" PE = "1" SRC_URI = "http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/l/lockdev/lockdev_${PV}.orig.tar.gz \ - http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/l/lockdev/lockdev_${PV}-1.6.diff.gz;name=debianpatch \ file://cross_compile.patch \ file://build.patch \ + file://0001-lockdev-Define-MAJOR-MINOR-for-non-glibc-case.patch \ " -SRC_URI[md5sum] = "64b9c1b87b125fc348e892e24625524a" SRC_URI[sha256sum] = "ccae635d7ac3fdd50897eceb250872b3d9a191d298f213e7f0c836910d869f82" -SRC_URI[debianpatch.md5sum] = "5ef6267c42fca9145e0af006ccb6aff7" -SRC_URI[debianpatch.sha256sum] = "a5405c6ee5e97e45eeb1c81330a7e9f444a58bda5e6771fa30007516c115007e" inherit lib_package perlnative -export basedir="${D}${prefix}" - -CFLAGS += " -D__GNU_LIBRARY__" TARGET_CC_ARCH += "${LDFLAGS}" +CFLAGS:append:libc-musl = " -D__GNU_LIBRARY__" + +EXTRA_OEMAKE = "basedir=${D}${prefix} baselib=${baselib} LD='${CC}'" + do_compile() { - oe_runmake basedir=${D}${prefix} LD="${CC}" LD="${CC}" shared static + oe_runmake shared static } do_install() { - oe_runmake DESTDIR=${D} basedir=${D}${prefix} install + oe_runmake DESTDIR=${D} install } diff --git a/meta-oe/recipes-support/log4c/log4c/0001-Use-the-API-properly-in-the-example-format-security-.patch b/meta-oe/recipes-support/log4c/log4c/0001-Use-the-API-properly-in-the-example-format-security-.patch index 9ff9d70025..405104a0fc 100644 --- a/meta-oe/recipes-support/log4c/log4c/0001-Use-the-API-properly-in-the-example-format-security-.patch +++ b/meta-oe/recipes-support/log4c/log4c/0001-Use-the-API-properly-in-the-example-format-security-.patch @@ -5,6 +5,8 @@ Subject: [PATCH] Use the API properly in the example (format security error fixed). --- +Upstream-Status: Pending + examples/helloworld1/mylog.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/log4c/log4c/fix_configure_with-expat.patch b/meta-oe/recipes-support/log4c/log4c/fix_configure_with-expat.patch index 4872eb4f5e..dadefec33a 100644 --- a/meta-oe/recipes-support/log4c/log4c/fix_configure_with-expat.patch +++ b/meta-oe/recipes-support/log4c/log4c/fix_configure_with-expat.patch @@ -1,7 +1,7 @@ The original use of AC_ARG_WITH is buggy and causes expat support to be *disabled* if "--with-expat" is passed to configure. -Upstream status: pending +Upstream-Status: Pending Index: log4c-1.2.4/configure.in =================================================================== diff --git a/meta-oe/recipes-support/log4c/log4c_1.2.4.bb b/meta-oe/recipes-support/log4c/log4c_1.2.4.bb index ef7ad847a6..7d9b9d50f8 100644 --- a/meta-oe/recipes-support/log4c/log4c_1.2.4.bb +++ b/meta-oe/recipes-support/log4c/log4c_1.2.4.bb @@ -1,6 +1,6 @@ SUMMARY = "Log4c is a C library for flexible logging to files, syslog and other destinations" HOMEPAGE = "http://log4c.sourceforge.net" -LICENSE = "LGPLv2" +LICENSE = "LGPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz \ diff --git a/meta-oe/recipes-support/log4cpp/files/fix-pc.patch b/meta-oe/recipes-support/log4cpp/files/fix-pc.patch index b8fb42e5fd..b57b5a263c 100644 --- a/meta-oe/recipes-support/log4cpp/files/fix-pc.patch +++ b/meta-oe/recipes-support/log4cpp/files/fix-pc.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + diff -Nurd ./log4cpp.orig/configure.in ./log4cpp/configure.in --- ./log4cpp.orig/configure.in 2009-09-07 16:57:46.000000000 -0400 +++ ./log4cpp/configure.in 2016-02-23 12:57:11.567240018 -0500 diff --git a/meta-oe/recipes-support/log4cpp/log4cpp_1.1.2.bb b/meta-oe/recipes-support/log4cpp/log4cpp_1.1.4.bb index 19b94466bd..729857eb62 100644 --- a/meta-oe/recipes-support/log4cpp/log4cpp_1.1.2.bb +++ b/meta-oe/recipes-support/log4cpp/log4cpp_1.1.4.bb @@ -1,14 +1,12 @@ DESCRIPTION = "A library of C++ classes for flexible logging to files, syslog, IDSA and other destinations." HOMEPAGE = "http://sourceforge.net/projects/log4cpp/" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" -PRC = "rc5" -SRC_URI = "http://downloads.sourceforge.net/${BPN}/${BP}${PRC}.tar.gz \ +SRC_URI = "http://downloads.sourceforge.net/${BPN}/${BP}.tar.gz \ file://fix-pc.patch;striplevel=2 \ " -SRC_URI[md5sum] = "58b4591a2f3e7ef3d5e3e7cfb3a81a62" -SRC_URI[sha256sum] = "a611d99a20af6676c60219762771c0bfac90f4879bbde70038ece75338b588ec" +SRC_URI[sha256sum] = "696113659e426540625274a8b251052cc04306d8ee5c42a0c7639f39ca90c9d6" S = "${WORKDIR}/${BPN}" @@ -20,3 +18,5 @@ EXTRA_OECONF = "\ --enable-html-docs=no \ --enable-latex-docs=no \ " + +CXXFLAGS += "-std=c++14" diff --git a/meta-oe/recipes-support/logwarn/logwarn_1.0.14.bb b/meta-oe/recipes-support/logwarn/logwarn_1.0.14.bb index 5ae36bb67c..3549cb2153 100644 --- a/meta-oe/recipes-support/logwarn/logwarn_1.0.14.bb +++ b/meta-oe/recipes-support/logwarn/logwarn_1.0.14.bb @@ -31,7 +31,7 @@ CACHED_CONFIGUREVARS += " \ # Make sure some files exist for autoreconf. # -do_configure_prepend () { +do_configure:prepend () { touch ${S}/NEWS touch ${S}/ChangeLog touch ${S}/README @@ -39,7 +39,7 @@ do_configure_prepend () { # Create a directory for logfile state info, usually under /var/lib. # -do_install_append () { +do_install:append () { install -d ${D}${lcl_default_state_dir} } @@ -47,6 +47,6 @@ do_install_append () { # PACKAGES += "${PN}-nagios" -FILES_${PN}-nagios = "${nonarch_libdir}/nagios" +FILES:${PN}-nagios = "${nonarch_libdir}/nagios" -RDEPENDS_${PN}-nagios += "bash coreutils sed" +RDEPENDS:${PN}-nagios += "bash coreutils sed" diff --git a/meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch b/meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch index 3c4a3a151d..fb58793a17 100644 --- a/meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch +++ b/meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch @@ -1,7 +1,7 @@ -From ea66faf68c93735edb1f2691cd7364b8cab83fef Mon Sep 17 00:00:00 2001 +From 44695f332e206e1db43d50163e1bce0bedf75fb7 Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Date: Mon, 26 Nov 2018 14:53:09 +0800 -Subject: [PATCH 1/3] Avoid bashisms in init scripts +Subject: [PATCH] Avoid bashisms in init scripts Upstream-Status: Inappropriate @@ -19,7 +19,7 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/scripts/blk_availability_init_red_hat.in b/scripts/blk_availability_init_red_hat.in -index 347c395..b2e9cf9 100644 +index 347c39574..b2e9cf932 100644 --- a/scripts/blk_availability_init_red_hat.in +++ b/scripts/blk_availability_init_red_hat.in @@ -1,4 +1,4 @@ @@ -37,7 +37,7 @@ index 347c395..b2e9cf9 100644 ;; esac diff --git a/scripts/cmirrord_init_red_hat.in b/scripts/cmirrord_init_red_hat.in -index c82f8f5..a3a321d 100755 +index c82f8f547..a3a321d9c 100755 --- a/scripts/cmirrord_init_red_hat.in +++ b/scripts/cmirrord_init_red_hat.in @@ -1,4 +1,4 @@ @@ -56,7 +56,7 @@ index c82f8f5..a3a321d 100755 esac diff --git a/scripts/lvm2_lvmpolld_init_red_hat.in b/scripts/lvm2_lvmpolld_init_red_hat.in -index 176ff5d..825f6ad 100644 +index 176ff5dcb..825f6ad84 100644 --- a/scripts/lvm2_lvmpolld_init_red_hat.in +++ b/scripts/lvm2_lvmpolld_init_red_hat.in @@ -1,4 +1,4 @@ @@ -75,7 +75,7 @@ index 176ff5d..825f6ad 100644 esac diff --git a/scripts/lvm2_monitoring_init_red_hat.in b/scripts/lvm2_monitoring_init_red_hat.in -index 95e4125..dff89cd 100644 +index 95e4125a0..dff89cd38 100644 --- a/scripts/lvm2_monitoring_init_red_hat.in +++ b/scripts/lvm2_monitoring_init_red_hat.in @@ -1,4 +1,4 @@ @@ -94,7 +94,7 @@ index 95e4125..dff89cd 100644 esac diff --git a/scripts/lvm2_monitoring_init_rhel4 b/scripts/lvm2_monitoring_init_rhel4 -index 8eb06c5..2e8d0f7 100644 +index 8eb06c509..2e8d0f71e 100644 --- a/scripts/lvm2_monitoring_init_rhel4 +++ b/scripts/lvm2_monitoring_init_rhel4 @@ -1,4 +1,4 @@ @@ -112,6 +112,3 @@ index 8eb06c5..2e8d0f7 100644 ;; esac --- -2.7.4 - diff --git a/meta-oe/recipes-support/lvm2/files/0001-configure.ac-check-egrep.patch b/meta-oe/recipes-support/lvm2/files/0001-configure.ac-check-egrep.patch new file mode 100644 index 0000000000..f4b0f913d8 --- /dev/null +++ b/meta-oe/recipes-support/lvm2/files/0001-configure.ac-check-egrep.patch @@ -0,0 +1,33 @@ +From f261b2f1bc16c32a55a22e28bf1b2f15ac6c7a88 Mon Sep 17 00:00:00 2001 +From: Kai Kang <kai.kang@windriver.com> +Date: Wed, 6 Dec 2023 10:24:46 +0800 +Subject: [PATCH] configure.ac: check egrep + +The macro AC_HEADER_STDC which requires AC_PROG_EGREP has been removed +from configure.ac, then it fails to substitute '@EGREP@': + +| [GEN] command-lines-input.h +| /bin/bash: line 2: @EGREP@: command not found +| [GEN] command-count.h + +Call AC_PROG_EGREP to fix the error. + +Upstream-Status: Submitted [https://gitlab.com/lvmteam/lvm2/-/merge_requests/4] + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configure.ac b/configure.ac +index c2dbf3c9f..d9e7964c3 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -88,6 +88,7 @@ AC_PROG_EGREP + AC_PROG_MAKE_SET + AC_PROG_MKDIR_P + AC_PROG_RANLIB ++AC_PROG_EGREP + AC_CHECK_TOOL([READELF], [readelf]) + AC_CHECK_TOOL(AR, ar) + AC_PATH_TOOL(CFLOW_CMD, cflow) diff --git a/meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch b/meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch index bb582ed1ff..a064516e32 100644 --- a/meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch +++ b/meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch @@ -1,4 +1,4 @@ -From e3103459416616d3b8508e7176e897b0ae6c90f2 Mon Sep 17 00:00:00 2001 +From a86919ed5468f3c152114446c189b00f5f656d59 Mon Sep 17 00:00:00 2001 From: Dengke Du <dengke.du@windriver.com> Date: Tue, 25 Oct 2016 11:49:40 +0000 Subject: [PATCH] implement libc specific reopen_stream @@ -13,17 +13,16 @@ http://git.alpinelinux.org/cgit/aports/tree/main/lvm2/fix-stdio-usage.patch Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Dengke Du <dengke.du@windriver.com> - --- lib/log/log.c | 6 ++++++ tools/lvmcmdline.c | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) -Index: LVM2.2.02.177/lib/log/log.c -=================================================================== ---- LVM2.2.02.177.orig/lib/log/log.c -+++ LVM2.2.02.177/lib/log/log.c -@@ -161,6 +161,7 @@ static void _check_and_replace_standard_ +diff --git a/lib/log/log.c b/lib/log/log.c +index 7b88252f0..e1720098a 100644 +--- a/lib/log/log.c ++++ b/lib/log/log.c +@@ -165,6 +165,7 @@ static void _check_and_replace_standard_log_streams(FILE *old_stream, FILE *new_ * Close and reopen standard stream on file descriptor fd. */ int reopen_standard_stream(FILE **stream, const char *mode) @@ -31,7 +30,7 @@ Index: LVM2.2.02.177/lib/log/log.c { int fd, fd_copy, new_fd; const char *name; -@@ -207,6 +208,11 @@ int reopen_standard_stream(FILE **stream +@@ -211,6 +212,11 @@ int reopen_standard_stream(FILE **stream, const char *mode) *stream = new_stream; return 1; } @@ -43,11 +42,11 @@ Index: LVM2.2.02.177/lib/log/log.c void init_log_fn(lvm2_log_fn_t log_fn) { -Index: LVM2.2.02.177/tools/lvmcmdline.c -=================================================================== ---- LVM2.2.02.177.orig/tools/lvmcmdline.c -+++ LVM2.2.02.177/tools/lvmcmdline.c -@@ -3095,7 +3095,7 @@ static int _check_standard_fds(void) +diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c +index 3fd23a521..c2ee39905 100644 +--- a/tools/lvmcmdline.c ++++ b/tools/lvmcmdline.c +@@ -3380,7 +3380,7 @@ static int _check_standard_fds(void) int err = is_valid_fd(STDERR_FILENO); if (!is_valid_fd(STDIN_FILENO) && @@ -56,7 +55,7 @@ Index: LVM2.2.02.177/tools/lvmcmdline.c if (err) perror("stdin stream open"); else -@@ -3105,7 +3105,7 @@ static int _check_standard_fds(void) +@@ -3390,7 +3390,7 @@ static int _check_standard_fds(void) } if (!is_valid_fd(STDOUT_FILENO) && @@ -65,7 +64,7 @@ Index: LVM2.2.02.177/tools/lvmcmdline.c if (err) perror("stdout stream open"); /* else no stdout */ -@@ -3113,7 +3113,7 @@ static int _check_standard_fds(void) +@@ -3398,7 +3398,7 @@ static int _check_standard_fds(void) } if (!is_valid_fd(STDERR_FILENO) && diff --git a/meta-oe/recipes-support/lvm2/files/0001-include-libgen.h-for-basename.patch b/meta-oe/recipes-support/lvm2/files/0001-include-libgen.h-for-basename.patch new file mode 100644 index 0000000000..83a7f936b1 --- /dev/null +++ b/meta-oe/recipes-support/lvm2/files/0001-include-libgen.h-for-basename.patch @@ -0,0 +1,29 @@ +From 4e7f4ea0bf89726255612a2a382c064e5923fbcd Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 25 Mar 2024 13:07:28 -0700 +Subject: [PATCH] include libgen.h for basename + +basename prototype has been removed from string.h from latest musl [1] +compilers e.g. clang-18 flags the absense of prototype as error. therefore +include libgen.h for providing it. + +[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7 + +Upstream-Status: Submitted [ Sent to maintainer and lvm-devel@redhat.com ] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + lib/device/device_id.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lib/device/device_id.c b/lib/device/device_id.c +index 2b183810a..53467cbbb 100644 +--- a/lib/device/device_id.c ++++ b/lib/device/device_id.c +@@ -26,6 +26,7 @@ + #include "lib/datastruct/str_list.h" + #include "lib/metadata/metadata-exported.h" + ++#include <libgen.h> + #include <sys/stat.h> + #include <fcntl.h> + #include <unistd.h> diff --git a/meta-oe/recipes-support/lvm2/files/0002-Guard-use-of-mallinfo-with-__GLIBC__.patch b/meta-oe/recipes-support/lvm2/files/0002-Guard-use-of-mallinfo-with-__GLIBC__.patch deleted file mode 100644 index ce8a97ab6f..0000000000 --- a/meta-oe/recipes-support/lvm2/files/0002-Guard-use-of-mallinfo-with-__GLIBC__.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 3ae9c0b607ec33fb07f32a41e9d28cc9068dd39a Mon Sep 17 00:00:00 2001 -From: Dengke Du <dengke.du@windriver.com> -Date: Tue, 25 Oct 2016 11:52:44 +0000 -Subject: [PATCH] Guard use of mallinfo() with __GLIBC__ - -This API is glibc-only - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Signed-off-by: Dengke Du <dengke.du@windriver.com> - ---- - lib/mm/memlock.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: LVM2.2.02.177/lib/mm/memlock.c -=================================================================== ---- LVM2.2.02.177.orig/lib/mm/memlock.c -+++ LVM2.2.02.177/lib/mm/memlock.c -@@ -151,7 +151,7 @@ static void _touch_memory(void *mem, siz - - static void _allocate_memory(void) - { --#ifndef VALGRIND_POOL -+#if !defined(VALGRIND_POOL) && defined(__GLIBC__) - void *stack_mem; - struct rlimit limit; - int i, area = 0, missing = _size_malloc_tmp, max_areas = 32, hblks; diff --git a/meta-oe/recipes-support/lvm2/files/0004-tweak-MODPROBE_CMD-for-cross-compile.patch b/meta-oe/recipes-support/lvm2/files/0004-tweak-MODPROBE_CMD-for-cross-compile.patch index 517b9a5f28..6435c3fd92 100644 --- a/meta-oe/recipes-support/lvm2/files/0004-tweak-MODPROBE_CMD-for-cross-compile.patch +++ b/meta-oe/recipes-support/lvm2/files/0004-tweak-MODPROBE_CMD-for-cross-compile.patch @@ -1,7 +1,7 @@ -From 3bba45890985b877b823836e78a1c8ac3c878856 Mon Sep 17 00:00:00 2001 +From b30f842d5d200a8217a47465d6cdd99d3805ba76 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Tue, 31 Jul 2018 15:04:29 +0800 -Subject: [PATCH 4/4] tweak MODPROBE_CMD for cross compile +Subject: [PATCH] tweak MODPROBE_CMD for cross compile Lvm uses variable MODPROBE_CMD at runtime, so build time detection of modprobe is incorrect. @@ -21,18 +21,15 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 1 file changed, 2 deletions(-) diff --git a/configure.ac b/configure.ac -index e427708..aa374ea 100644 +index c8d81e16c..7c1c04627 100644 --- a/configure.ac +++ b/configure.ac -@@ -1791,8 +1791,6 @@ if test "$BUILD_DMFILEMAPD" = yes; then - fi +@@ -1689,8 +1689,6 @@ AS_IF([test "$BUILD_DMFILEMAPD" = "yes"], [ + ]) ################################################################################ -AC_PATH_TOOL(MODPROBE_CMD, modprobe, [], [$PATH_SBIN]) - - if test -n "$MODPROBE_CMD"; then + AS_IF([test -n "$MODPROBE_CMD"], [ AC_DEFINE_UNQUOTED([MODPROBE_CMD], ["$MODPROBE_CMD"], [The path to 'modprobe', if available.]) - fi --- -2.7.4 - + ]) diff --git a/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch b/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch index 7117d99a39..e7aaad4d0e 100644 --- a/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch +++ b/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch @@ -1,7 +1,7 @@ -From 103ac1c1200df8190372d973e004776cffe8e659 Mon Sep 17 00:00:00 2001 +From e0e06b77e067da6a01dd9b0d5582a0a1709c655d Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Mon, 26 Nov 2018 14:59:55 +0800 -Subject: [PATCH 2/3] do not build manual +Subject: [PATCH] do not build manual On some host (ubuntu 1404), build manual failed. ... @@ -15,25 +15,26 @@ Upstream-Status: Pending Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> - Update context for lvm2 2.03.02. - Signed-off-by: Kai Kang <kai.kang@windriver.com> + +Update context for lvm2 2.03.16. +Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> --- Makefile.in | 6 +++--- configure.ac | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile.in b/Makefile.in -index 6a1a990..80cba91 100644 +index 06c4b1823..90df7b09c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -18,7 +18,7 @@ top_builddir = @top_builddir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ --SUBDIRS = conf daemons include lib libdaemon libdm man scripts tools -+SUBDIRS = conf daemons include lib libdaemon libdm scripts tools +-SUBDIRS = libdm conf daemons include lib libdaemon man scripts tools ++SUBDIRS = libdm conf daemons include lib libdaemon scripts tools ifeq ("@UDEV_RULES@", "yes") SUBDIRS += udev @@ -46,20 +47,20 @@ index 6a1a990..80cba91 100644 libdaemon lib tools daemons libdm \ udev po tools.distclean: test.distclean -@@ -65,7 +65,7 @@ libdm.device-mapper: include.device-mapper +@@ -59,7 +59,7 @@ unit-test run-unit-test: test libdm + daemons.device-mapper: libdm.device-mapper tools.device-mapper: libdm.device-mapper - scripts.device-mapper: include.device-mapper -device-mapper: tools.device-mapper daemons.device-mapper man.device-mapper +device-mapper: tools.device-mapper daemons.device-mapper + device_mapper: device-mapper ifeq ("@INTL@", "yes") - lib.pofile: include.pofile diff --git a/configure.ac b/configure.ac -index 7fd0561..4154dc0 100644 +index 7c1c04627..5364dd68e 100644 --- a/configure.ac +++ b/configure.ac -@@ -1812,7 +1812,6 @@ libdaemon/server/Makefile +@@ -2022,7 +2022,6 @@ libdaemon/server/Makefile libdm/Makefile libdm/dm-tools/Makefile libdm/libdevmapper.pc @@ -67,6 +68,3 @@ index 7fd0561..4154dc0 100644 po/Makefile scripts/lvm2-pvscan.service scripts/blkdeactivate.sh --- -2.7.4 - diff --git a/meta-oe/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch b/meta-oe/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch index 9f9383ef48..2d49820057 100644 --- a/meta-oe/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch +++ b/meta-oe/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch @@ -1,4 +1,4 @@ -From e213ed33a28704f6f538df41a91b7ce95594a4f8 Mon Sep 17 00:00:00 2001 +From 20a110ade91c73f4cb3883a3a9676708a93ca786 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Tue, 15 Oct 2019 18:12:54 +0800 Subject: [PATCH] start lvm2-monitor.service after tmp.mount @@ -11,23 +11,23 @@ Upstream-Status: Inappropriate [oe specific] Rebase to v2_03_05 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> + +Rebase to v2_03_16 +Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> --- scripts/lvm2_monitoring_systemd_red_hat.service.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/lvm2_monitoring_systemd_red_hat.service.in b/scripts/lvm2_monitoring_systemd_red_hat.service.in -index 4bf744a..46766cb 100644 +index c0c96e316..2a99a379d 100644 --- a/scripts/lvm2_monitoring_systemd_red_hat.service.in +++ b/scripts/lvm2_monitoring_systemd_red_hat.service.in @@ -2,7 +2,7 @@ Description=Monitoring of LVM2 mirrors, snapshots etc. using dmeventd or progress polling Documentation=man:dmeventd(8) man:lvcreate(8) man:lvchange(8) man:vgchange(8) Requires=dm-event.socket --After=dm-event.socket dm-event.service lvm2-activation.service -+After=dm-event.socket dm-event.service lvm2-activation.service tmp.mount +-After=dm-event.socket dm-event.service ++After=dm-event.socket dm-event.service tmp.mount Before=local-fs-pre.target shutdown.target DefaultDependencies=no Conflicts=shutdown.target --- -2.7.4 - diff --git a/meta-oe/recipes-support/lvm2/files/reproducible-build.patch b/meta-oe/recipes-support/lvm2/files/reproducible-build.patch new file mode 100644 index 0000000000..ca632d213f --- /dev/null +++ b/meta-oe/recipes-support/lvm2/files/reproducible-build.patch @@ -0,0 +1,35 @@ +From f5c6fabbdf2e7bfa105658b9dfe45d2ab86f34bb Mon Sep 17 00:00:00 2001 +From: Joe Slater <joe.slater@windriver.com> +Date: Fri, 17 Jul 2020 13:59:56 -0700 +Subject: [PATCH] configure.ac: override CONFIGURE_LINE + +For reproducible binaries, we need to report a constant CONFIGURE_LINE. + +Upstream-Status: Pending + +Signed-off-by: Joe Slater <joe.slater@windriver.com> +--- + configure.ac | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 5364dd68e..c2dbf3c9f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -15,7 +15,15 @@ AC_PREREQ(2.69) + ################################################################################ + dnl -- Process this file with autoconf to produce a configure script. + AC_INIT +-CONFIGURE_LINE="$0 $@" ++ ++dnl per reproducible-builds.org check SOURCE_DATE_EPOCH ++dnl ++if test -z "${SOURCE_DATE_EPOCH+set}" ; then ++ CONFIGURE_LINE="$0 $@" ++else ++ CONFIGURE_LINE="configure options are not available for reproducible builds" ++fi ++ + AC_CONFIG_SRCDIR([lib/device/dev-cache.h]) + AC_CONFIG_HEADERS([include/configure.h]) + diff --git a/meta-oe/recipes-support/lvm2/libdevmapper_2.03.06.bb b/meta-oe/recipes-support/lvm2/libdevmapper.bb index be558ce1d2..be558ce1d2 100644 --- a/meta-oe/recipes-support/lvm2/libdevmapper_2.03.06.bb +++ b/meta-oe/recipes-support/lvm2/libdevmapper.bb diff --git a/meta-oe/recipes-support/lvm2/lvm2.bb b/meta-oe/recipes-support/lvm2/lvm2.bb new file mode 100644 index 0000000000..868f5a249e --- /dev/null +++ b/meta-oe/recipes-support/lvm2/lvm2.bb @@ -0,0 +1,109 @@ +require lvm2.inc + +SRC_URI += " \ + file://0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch \ + file://tweak-for-lvmdbusd.patch \ + " + +DEPENDS += "autoconf-archive-native" + +inherit multilib_script python3native + +MULTILIB_SCRIPTS = "${PN}:${sysconfdir}/lvm/lvm.conf" + +CACHED_CONFIGUREVARS += "MODPROBE_CMD=${base_sbindir}/modprobe" + +do_install:append() { + # Install machine specific configuration file + install -d ${D}${sysconfdir}/lvm + install -m 0644 ${UNPACKDIR}/lvm.conf ${D}${sysconfdir}/lvm/lvm.conf + sed -i -e 's:@libdir@:${libdir}:g' ${D}${sysconfdir}/lvm/lvm.conf + # We don't want init scripts/systemd units for native SDK utilities + if [ "${PN}" != "nativesdk-lvm2" ]; then + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + oe_runmake 'DESTDIR=${D}' install install_systemd_units + sed -i -e 's:/usr/bin/true:${base_bindir}/true:g' ${D}${systemd_system_unitdir}/blk-availability.service + else + oe_runmake 'DESTDIR=${D}' install install_initscripts + mv ${D}${sysconfdir}/rc.d/init.d ${D}${sysconfdir}/init.d + rm -rf ${D}${sysconfdir}/rc.d + fi + fi + + # following files only exist when package config `dbus` enabled + sed -i -e '1s,#!.*python.*,#!${USRBINPATH}/env python3,' \ + ${D}${sbindir}/lvmdbusd \ + ${D}${PYTHON_SITEPACKAGES_DIR}/lvmdbusd/lvmdb.py \ + ${D}${PYTHON_SITEPACKAGES_DIR}/lvmdbusd/lvm_shell_proxy.py \ + || true +} + +PACKAGE_BEFORE_PN = "${PN}-scripts ${PN}-udevrules" + +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE:${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'dmeventd', 'lvm2-monitor.service dm-event.socket dm-event.service', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'dbus', 'lvm2-lvmdbusd.service', '', d)} \ + blk-availability.service \ + " +SYSTEMD_AUTO_ENABLE = "disable" + +TARGET_CC_ARCH += "${LDFLAGS}" + +EXTRA_OECONF:append:class-nativesdk = " --with-confdir=${sysconfdir}" + +DEPENDS += "util-linux" +LVM2_PACKAGECONFIG:append:class-target = " \ + udev \ +" + +PACKAGECONFIG[dbus] = "--enable-dbus-service,--disable-dbus-service,,python3-dbus python3-pyudev" +PACKAGECONFIG[udev] = "--enable-udev_sync --enable-udev_rules --with-udevdir=${nonarch_base_libdir}/udev/rules.d,--disable-udev_sync --disable-udev_rules,udev,${PN}-udevrules" + +PACKAGES =+ "libdevmapper" +FILES:libdevmapper = " \ + ${libdir}/libdevmapper.so.* \ + ${sbindir}/dmsetup \ + ${sbindir}/dmstats \ +" + +FILES:${PN} += " \ + ${libdir}/device-mapper/*.so \ + ${systemd_system_unitdir}/lvm2-pvscan@.service \ + ${PYTHON_SITEPACKAGES_DIR}/lvmdbusd \ + ${datadir}/dbus-1/system-services/com.redhat.lvmdbus1.service \ +" + +FILES:${PN}-scripts = " \ + ${sbindir}/blkdeactivate \ + ${sbindir}/fsadm \ + ${sbindir}/lvmconf \ + ${sbindir}/lvmdump \ +" +# Specified explicitly for the udev rules, just in case that it does not get picked +# up automatically: +FILES:${PN}-udevrules = "${nonarch_base_libdir}/udev/rules.d" +RDEPENDS:${PN} = "bash" +RDEPENDS:${PN}-udevrules = "libdevmapper" +RDEPENDS:${PN}:append:class-target = " libdevmapper" +RDEPENDS:${PN}:append:class-nativesdk = " libdevmapper" + +RDEPENDS:${PN}-scripts = "${PN} (= ${EXTENDPKGV}) \ + bash \ + util-linux-lsblk \ + util-linux-findmnt \ + coreutils \ +" +RRECOMMENDS:${PN}:class-target = "${PN}-scripts (= ${EXTENDPKGV})" + +CONFFILES:${PN} += "${sysconfdir}/lvm/lvm.conf" + +SYSROOT_PREPROCESS_FUNCS:append = " remove_libdevmapper_sysroot_preprocess" +remove_libdevmapper_sysroot_preprocess() { + rm -f ${SYSROOT_DESTDIR}${libdir}/libdevmapper.so* \ + ${SYSROOT_DESTDIR}${sbindir}/dmsetup \ + ${SYSROOT_DESTDIR}${sbindir}/dmstats \ + ${SYSROOT_DESTDIR}${includedir}/libdevmapper.h \ + ${SYSROOT_DESTDIR}${libdir}/pkgconfig/devmapper.pc +} + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-oe/recipes-support/lvm2/lvm2.inc index 01c9df45c1..29cc7425ba 100644 --- a/meta-oe/recipes-support/lvm2/lvm2.inc +++ b/meta-oe/recipes-support/lvm2/lvm2.inc @@ -1,30 +1,35 @@ HOMEPAGE = "https://www.sourceware.org/lvm2/" SECTION = "utils" DESCRIPTION = "LVM2 is a set of utilities to manage logical volumes in Linux." -LICENSE = "GPLv2 & LGPLv2.1" +LICENSE = "GPL-2.0-only & LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=12713b4d9386533feeb07d6e4831765a \ file://COPYING.LIB;md5=fbc093901857fcd118f065f900982c24" DEPENDS += "libaio" -SRC_URI = "git://sourceware.org/git/lvm2.git \ +SRC_URI = "git://sourceware.org/git/lvm2.git;branch=main \ file://lvm.conf \ file://0001-implement-libc-specific-reopen_stream.patch \ - file://0002-Guard-use-of-mallinfo-with-__GLIBC__.patch \ file://0004-tweak-MODPROBE_CMD-for-cross-compile.patch \ file://0001-Avoid-bashisms-in-init-scripts.patch \ file://0005-do-not-build-manual.patch \ file://0006-start-lvm2-monitor.service-after-tmp.mount.patch \ + file://reproducible-build.patch \ + file://0001-configure.ac-check-egrep.patch \ + file://0001-include-libgen.h-for-basename.patch \ " -SRCREV = "b9391b1b9f0b73303fa21f8f92574d17ce4c2b02" + +SRCREV = "90ec2cd92f6367c431dd8dae55d0cbe7e196734f" S = "${WORKDIR}/git" +PV = "2.03.24" + +UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\_\d+)+)" -inherit autotools-brokensep pkgconfig systemd license +inherit autotools-brokensep pkgconfig systemd LVM2_PACKAGECONFIG = "dmeventd" -LVM2_PACKAGECONFIG_append_class-target = " \ +LVM2_PACKAGECONFIG:append:class-target = " \ ${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)} \ - ${@incompatible_license_contains('GPLv3', '', 'thin-provisioning-tools', d)} \ " # odirect is always enabled because there currently is a bug in @@ -37,6 +42,7 @@ PACKAGECONFIG[dmeventd] = "--enable-dmeventd,--disable-dmeventd" PACKAGECONFIG[odirect] = "--enable-o_direct,--disable-o_direct" PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline" PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" +# NOTE: Add thin-provisioning-tools only if your distro policy allows GPL-3.0 license PACKAGECONFIG[thin-provisioning-tools] = "--with-thin=internal,--with-thin=none,,thin-provisioning-tools" # Unset user/group to unbreak install. @@ -54,3 +60,6 @@ EXTRA_OECONF = "--with-user= \ --with-thin-restore=${sbindir}/thin_restore \ " +# gold doesn't like multiple dm_bitset_parse_list definitions in libdm/.exported_symbols.DM_1_02_138 and libdm/.exported_symbols.DM_1_02_129 +# after it was uncommented in the later in 2.03.12 with https://github.com/lvmteam/lvm2/commit/60eb608d66c2056a78e81f27db3da14139d9faab +LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', " -fuse-ld=bfd", '', d)}" diff --git a/meta-oe/recipes-support/lvm2/lvm2/0001-dev-hdc-open-failed-No-medium-found-will-print-out-i.patch b/meta-oe/recipes-support/lvm2/lvm2/0001-dev-hdc-open-failed-No-medium-found-will-print-out-i.patch deleted file mode 100644 index 24d5b1b486..0000000000 --- a/meta-oe/recipes-support/lvm2/lvm2/0001-dev-hdc-open-failed-No-medium-found-will-print-out-i.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 93c93e3b85492e58f9451841e6079d00c497efa4 Mon Sep 17 00:00:00 2001 -From: Jiping Ma <jiping.ma2@windriver.com> -Date: Mon, 25 Feb 2019 13:29:12 +0800 -Subject: [PATCH] "/dev/hdc: open failed: No medium found" will print out in - lvmdiskscan. - -commit [57bb46c5e7f8] introduce this issue. -"/dev/hdc: open failed: No medium found" will be print out -after run lvmdiskscan. change dev_open_readonly() -to dev_open_readonly_quiet() in fuction _dev_get_size_dev(). - -Signed-off-by: Jiping Ma <jiping.ma2@windriver.com> ---- - lib/device/dev-io.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/device/dev-io.c b/lib/device/dev-io.c -index dc95131..81a66b0 100644 ---- a/lib/device/dev-io.c -+++ b/lib/device/dev-io.c -@@ -338,7 +338,7 @@ static int _dev_get_size_dev(struct device *dev, uint64_t *size) - } - - if (fd <= 0) { -- if (!dev_open_readonly(dev)) -+ if (!dev_open_readonly_quiet(dev)) - return_0; - fd = dev_fd(dev); - do_close = 1; --- -1.9.1 - diff --git a/meta-oe/recipes-support/lvm2/lvm2/0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch b/meta-oe/recipes-support/lvm2/lvm2/0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch index 16de8c0a1f..96a3d64fdf 100644 --- a/meta-oe/recipes-support/lvm2/lvm2/0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch +++ b/meta-oe/recipes-support/lvm2/lvm2/0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch @@ -1,6 +1,6 @@ -From 27b56cb6b5dfc75ea8ddb395dc9ef41fb7a09c93 Mon Sep 17 00:00:00 2001 +From 2ff2a867db8d3e1c660d191a1805f9e355169c80 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Mon, 2 Sep 2019 23:04:50 -0400 +Date: Tue, 2 Mar 2021 01:33:05 -0800 Subject: [PATCH] fix command /bin/findmnt, /bin/lsblk, /bin/sort not found In oe-core (util-linux and coreutils), the commands locates in @@ -15,10 +15,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac -index d1431e2..54e5a7b 100644 +index d9e7964c3..9dfdcfe01 100644 --- a/configure.ac +++ b/configure.ac -@@ -1495,6 +1495,8 @@ fi +@@ -1704,6 +1704,8 @@ AS_IF([test -n "$MODPROBE_CMD"], [ SYSCONFDIR="$(eval echo $(eval echo $sysconfdir))" @@ -27,19 +27,19 @@ index d1431e2..54e5a7b 100644 SBINDIR="$(eval echo $(eval echo $sbindir))" LVM_PATH="$SBINDIR/lvm" AC_DEFINE_UNQUOTED(LVM_PATH, ["$LVM_PATH"], [Path to lvm binary.]) -@@ -1721,6 +1723,7 @@ AC_SUBST(SACKPT_CFLAGS) - AC_SUBST(SACKPT_LIBS) - AC_SUBST(SALCK_CFLAGS) - AC_SUBST(SALCK_LIBS) +@@ -1944,6 +1946,7 @@ AC_SUBST(PYTHON2DIR) + AC_SUBST(PYTHON3) + AC_SUBST(PYTHON3DIR) + AC_SUBST(RT_LIBS) +AC_SUBST(BINDIR) AC_SUBST(SBINDIR) AC_SUBST(SELINUX_LIBS) AC_SUBST(SELINUX_PC) diff --git a/scripts/blkdeactivate.sh.in b/scripts/blkdeactivate.sh.in -index a4b8a8f..3db4226 100644 +index 7c517b87b..7ef1bb766 100644 --- a/scripts/blkdeactivate.sh.in +++ b/scripts/blkdeactivate.sh.in -@@ -41,13 +41,14 @@ UMOUNT="/bin/umount" +@@ -42,13 +42,14 @@ VDO="/bin/vdo" sbindir="@SBINDIR@" DMSETUP="$sbindir/dmsetup" @@ -55,9 +55,9 @@ index a4b8a8f..3db4226 100644 FINDMNT_READ="read -r mnt" fi DMSETUP_OPTS="" -@@ -55,10 +56,10 @@ LVM_OPTS="" - MDADM_OPTS="" +@@ -57,10 +58,10 @@ MDADM_OPTS="" MPATHD_OPTS="" + VDO_OPTS="" -LSBLK="/bin/lsblk -r --noheadings -o TYPE,KNAME,NAME,MOUNTPOINT" +LSBLK="$bindir/lsblk -r --noheadings -o TYPE,KNAME,NAME,MOUNTPOINT" @@ -68,6 +68,3 @@ index a4b8a8f..3db4226 100644 # Do not show tool errors by default (only done/skipping summary # message provided by this script) and no verbose mode by default. --- -2.8.1 - diff --git a/meta-oe/recipes-support/lvm2/lvm2/tweak-for-lvmdbusd.patch b/meta-oe/recipes-support/lvm2/lvm2/tweak-for-lvmdbusd.patch new file mode 100644 index 0000000000..200f2f044a --- /dev/null +++ b/meta-oe/recipes-support/lvm2/lvm2/tweak-for-lvmdbusd.patch @@ -0,0 +1,60 @@ +From 34f5a21afae759d48fa11e77b622ca35a4feabaa Mon Sep 17 00:00:00 2001 +From: Kai Kang <kai.kang@windriver.com> +Date: Wed, 6 Dec 2023 10:24:46 +0800 +Subject: [PATCH] lvm2: 2.03.16 -> 2.03.22 + +Not check python modules pyudev and dbus during configure that they are runtime +dependencies. Deal with them in the package config setting in the recipe. + +Remove $(DESTDIR) from install destination that it is not suitable for oe. And +no generate python cache files too. + +Upstream-Status: Pending [oe specific] + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- + configure.ac | 4 ++-- + daemons/lvmdbusd/Makefile.in | 6 ++---- + 2 files changed, 4 insertions(+), 6 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 9dfdcfe01..fcf5c8b78 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1282,8 +1282,8 @@ AS_IF([test "$BUILD_LVMDBUSD" = "yes"], [ + AS_IF([test "$PYTHON3_BINDINGS" = "yes"], [PYTHON_BINDINGS="yes"]) + + # To get this macro, install autoconf-archive package then run autoreconf +- AX_PYTHON_MODULE([pyudev], [Required], python3) +- AX_PYTHON_MODULE([dbus], [Required], python3) ++ # AX_PYTHON_MODULE([pyudev], [Required], python3) ++ # AX_PYTHON_MODULE([dbus], [Required], python3) + ]) + + ################################################################################ +diff --git a/daemons/lvmdbusd/Makefile.in b/daemons/lvmdbusd/Makefile.in +index 08b061fb2..e2b1c3209 100644 +--- a/daemons/lvmdbusd/Makefile.in ++++ b/daemons/lvmdbusd/Makefile.in +@@ -16,7 +16,7 @@ top_srcdir = @top_srcdir@ + top_builddir = @top_builddir@ + + lvmdbuspydir = $(python3dir)/lvmdbusd +-lvmdbusdir = $(DESTDIR)$(lvmdbuspydir) ++lvmdbusdir = $(lvmdbuspydir) + + LVMDBUS_SRCDIR_FILES = \ + automatedproperties.py \ +@@ -55,11 +55,9 @@ install_lvmdbusd: $(LVMDBUSD) + $(SHOW) " [INSTALL] $<" + $(Q) $(INSTALL_DIR) $(sbindir) + $(Q) $(INSTALL_SCRIPT) $(LVMDBUSD) $(sbindir) +- $(Q) $(INSTALL_DIR) $(lvmdbusdir) $(lvmdbusdir)/__pycache__ ++ $(Q) $(INSTALL_DIR) $(lvmdbusdir) + $(Q) (cd $(srcdir); $(INSTALL_DATA) $(LVMDBUS_SRCDIR_FILES) $(lvmdbusdir)) + $(Q) $(INSTALL_DATA) $(LVMDBUS_BUILDDIR_FILES) $(lvmdbusdir) +- $(Q) PYTHON=$(PYTHON3) $(PYCOMPILE) --destdir "$(DESTDIR)" --basedir "$(lvmdbuspydir)" $(LVMDBUS_SRCDIR_FILES) $(LVMDBUS_BUILDDIR_FILES) +- $(Q) $(CHMOD) 444 $(lvmdbusdir)/__pycache__/*.py[co] + + install_lvm2: install_lvmdbusd + diff --git a/meta-oe/recipes-support/lvm2/lvm2_2.03.06.bb b/meta-oe/recipes-support/lvm2/lvm2_2.03.06.bb deleted file mode 100644 index e2b551bbc6..0000000000 --- a/meta-oe/recipes-support/lvm2/lvm2_2.03.06.bb +++ /dev/null @@ -1,88 +0,0 @@ -require lvm2.inc - -SRC_URI += " \ - file://0001-dev-hdc-open-failed-No-medium-found-will-print-out-i.patch \ - file://0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch \ - " - -DEPENDS += "autoconf-archive-native" - -inherit multilib_script - -MULTILIB_SCRIPTS = "${PN}:${sysconfdir}/lvm/lvm.conf" - -CACHED_CONFIGUREVARS += "MODPROBE_CMD=${base_sbindir}/modprobe" - -do_install_append() { - # Install machine specific configuration file - install -d ${D}${sysconfdir}/lvm - install -m 0644 ${WORKDIR}/lvm.conf ${D}${sysconfdir}/lvm/lvm.conf - sed -i -e 's:@libdir@:${libdir}:g' ${D}${sysconfdir}/lvm/lvm.conf - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - oe_runmake 'DESTDIR=${D}' install install_systemd_units - sed -i -e 's:/usr/bin/true:${base_bindir}/true:g' ${D}${systemd_system_unitdir}/blk-availability.service - else - oe_runmake 'DESTDIR=${D}' install install_initscripts - mv ${D}${sysconfdir}/rc.d/init.d ${D}${sysconfdir}/init.d - rm -rf ${D}${sysconfdir}/rc.d - fi -} - -PACKAGE_BEFORE_PN = "${PN}-scripts ${PN}-udevrules" - -SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'dmeventd', 'lvm2-monitor.service dm-event.socket dm-event.service', '', d)} \ - blk-availability.service lvm2-pvscan@.service" -SYSTEMD_AUTO_ENABLE = "disable" - -TARGET_CC_ARCH += "${LDFLAGS}" - -EXTRA_OECONF_append_class-nativesdk = " --with-confdir=${sysconfdir}" - -DEPENDS += "util-linux" -LVM2_PACKAGECONFIG_append_class-target = " \ - udev \ -" -PACKAGECONFIG[udev] = "--enable-udev_sync --enable-udev_rules --with-udevdir=${nonarch_base_libdir}/udev/rules.d,--disable-udev_sync --disable-udev_rules,udev,${PN}-udevrules" - -PACKAGES =+ "libdevmapper" -FILES_libdevmapper = " \ - ${libdir}/libdevmapper.so.* \ - ${sbindir}/dmsetup \ - ${sbindir}/dmstats \ -" - -FILES_${PN} += "${libdir}/device-mapper/*.so" -FILES_${PN}-scripts = " \ - ${sbindir}/blkdeactivate \ - ${sbindir}/fsadm \ - ${sbindir}/lvmconf \ - ${sbindir}/lvmdump \ -" -# Specified explicitly for the udev rules, just in case that it does not get picked -# up automatically: -FILES_${PN}-udevrules = "${nonarch_base_libdir}/udev/rules.d" -RDEPENDS_${PN}-udevrules = "libdevmapper" -RDEPENDS_${PN}_append_class-target = " libdevmapper" -RDEPENDS_${PN}_append_class-nativesdk = " libdevmapper" - -RDEPENDS_${PN}-scripts = "${PN} (= ${EXTENDPKGV}) \ - bash \ - util-linux-lsblk \ - util-linux-findmnt \ - coreutils \ -" -RRECOMMENDS_${PN}_class-target = "${PN}-scripts (= ${EXTENDPKGV})" - -CONFFILES_${PN} += "${sysconfdir}/lvm/lvm.conf" - -SYSROOT_PREPROCESS_FUNCS_append = " remove_libdevmapper_sysroot_preprocess" -remove_libdevmapper_sysroot_preprocess() { - rm -f ${SYSROOT_DESTDIR}${libdir}/libdevmapper.so* \ - ${SYSROOT_DESTDIR}${sbindir}/dmsetup \ - ${SYSROOT_DESTDIR}${sbindir}/dmstats \ - ${SYSROOT_DESTDIR}${includedir}/libdevmapper.h \ - ${SYSROOT_DESTDIR}${libdir}/pkgconfig/devmapper.pc -} - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/mailcap/mailcap_2.1.48.bb b/meta-oe/recipes-support/mailcap/mailcap_2.1.54.bb index 114ce4607c..8385b63543 100644 --- a/meta-oe/recipes-support/mailcap/mailcap_2.1.48.bb +++ b/meta-oe/recipes-support/mailcap/mailcap_2.1.54.bb @@ -14,13 +14,17 @@ by several applications e.g. to determine MIME types for filenames." SECTION = "System Environment/Base" LICENSE = "PD & MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=100fcfb84512ccc03ffc7d89ac391305" +LIC_FILES_CHKSUM = "file://COPYING;md5=8dce08227d135cfda1f19d4c0c6689de" SRC_URI = "https://releases.pagure.org/${BPN}/${BP}.tar.xz" -SRC_URI[md5sum] = "2c26e18e912a5cf00318fcf7f8f2d747" -SRC_URI[sha256sum] = "d7b023b237d6053bf05ff6786e0663c55c614efcc99cdf856120be13b5c29157" +SRC_URI[sha256sum] = "9a4032202fc0d2b0858f41b167389a9cfe52ac24ec282e6479b90765319de113" + +inherit update-alternatives do_install() { oe_runmake install DESTDIR=${D} sysconfdir=${sysconfdir} mandir=${mandir} } + +ALTERNATIVE:${PN} = "mime.types" +ALTERNATIVE_LINK_NAME[mime.types] = "${sysconfdir}/mime.types" diff --git a/meta-oe/recipes-support/mbuffer/mbuffer_20140310.bb b/meta-oe/recipes-support/mbuffer/mbuffer_20140310.bb index 3467d28988..ccc21f418c 100644 --- a/meta-oe/recipes-support/mbuffer/mbuffer_20140310.bb +++ b/meta-oe/recipes-support/mbuffer/mbuffer_20140310.bb @@ -1,6 +1,6 @@ DESCRIPTION = "mbuffer is a tool for buffering data streams with a large set of unique features." HOMEPAGE = "http://www.maier-komor.de/mbuffer.html" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504" SECTION = "console/network" diff --git a/meta-oe/recipes-support/mcelog/mce-inject_git.bb b/meta-oe/recipes-support/mcelog/mce-inject_git.bb index cc33cbaf28..a228c3cc06 100644 --- a/meta-oe/recipes-support/mcelog/mce-inject_git.bb +++ b/meta-oe/recipes-support/mcelog/mce-inject_git.bb @@ -4,7 +4,7 @@ software level into a running Linux kernel. This is intended for \ validation of the kernel machine check handler." SECTION = "System Environment/Base" -SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mce-inject.git" +SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mce-inject.git;branch=master" SRCREV = "4cbe46321b4a81365ff3aafafe63967264dbfec5" @@ -12,7 +12,7 @@ UPSTREAM_CHECK_COMMITS = "1" DEPENDS = "bison-native" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://README;beginline=30;md5=94c18755082a2da9c9cf97cba3ad47d6" S = "${WORKDIR}/git" @@ -21,4 +21,4 @@ COMPATIBLE_HOST = '(x86_64.*|i.86.*)-linux' inherit autotools-brokensep -EXTRA_OEMAKE = "destdir=${D}" +EXTRA_OEMAKE = "destdir=${D} CFLAGS='${CFLAGS}'" diff --git a/meta-oe/recipes-support/mcelog/mce-test/0001-gcov_merge.py-scov_merge.py-switch-to-python3.patch b/meta-oe/recipes-support/mcelog/mce-test/0001-gcov_merge.py-scov_merge.py-switch-to-python3.patch new file mode 100644 index 0000000000..969bfc17cf --- /dev/null +++ b/meta-oe/recipes-support/mcelog/mce-test/0001-gcov_merge.py-scov_merge.py-switch-to-python3.patch @@ -0,0 +1,110 @@ +From 430982376a544bbccaef5006fab94bbc2f1d1711 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Mon, 13 Apr 2020 07:12:44 +0000 +Subject: [PATCH] gcov_merge.py/scov_merge.py: switch to python3 + +Make gcov_merge.py and scov_merge.py port to python3. + +Upstream-Status: Pending + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + tools/scripts/gcov_merge.py | 12 ++++++------ + tools/scripts/scov_merge.py | 12 ++++++------ + 2 files changed, 12 insertions(+), 12 deletions(-) + +diff --git a/tools/scripts/gcov_merge.py b/tools/scripts/gcov_merge.py +index 0ac9bed..9f1cb8c 100644 +--- a/tools/scripts/gcov_merge.py ++++ b/tools/scripts/gcov_merge.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # + # Merge gcov graph from several test cases. This can be used to check + # the coverage of several test cases. +@@ -11,7 +11,7 @@ + import sys + + def die(str): +- print str ++ print(str) + sys.exit(-1) + + def die_on(cond, str): +@@ -55,11 +55,11 @@ def merge(gcls1, gcls2): + gcl1.merge(gcl2) + + def gcov_merge(fns, of): +- f = file(fns[0]) ++ f = open(fns[0]) + gcls_base = parse(f) + + for fn in fns[1:]: +- f = file(fn) ++ f = open(fn) + gcls = parse(f) + merge(gcls_base, gcls) + +@@ -67,10 +67,10 @@ def gcov_merge(fns, of): + gcl.write(of) + + def usage(): +- print 'Usage: %s <gcov graph files>' % (sys.argv[0]) ++ print('Usage: %s <gcov graph files>' % (sys.argv[0])) + + if __name__ == '__main__': + if len(sys.argv) <= 1: + usage() +- exit -1 ++ sys.exit(-1) + gcov_merge(sys.argv[1:], sys.stdout) +diff --git a/tools/scripts/scov_merge.py b/tools/scripts/scov_merge.py +index f83b922..bbcf760 100644 +--- a/tools/scripts/scov_merge.py ++++ b/tools/scripts/scov_merge.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # + # Merge mce serverity coverage file from several test cases. This can + # be used to check the coverage of several test cases. +@@ -11,7 +11,7 @@ + import sys + + def die(str): +- print str ++ print(str) + sys.exit(-1) + + def die_on(cond, str): +@@ -47,11 +47,11 @@ def merge(gcls1, gcls2): + gcl1.merge(gcl2) + + def scov_merge(fns, of): +- f = file(fns[0]) ++ f = open(fns[0]) + gcls_base = parse(f) + + for fn in fns[1:]: +- f = file(fn) ++ f = open(fn) + gcls = parse(f) + merge(gcls_base, gcls) + +@@ -59,10 +59,10 @@ def scov_merge(fns, of): + gcl.write(of) + + def usage(): +- print 'Usage: %s <severities coverage files>' % (sys.argv[0]) ++ print('Usage: %s <severities coverage files>' % (sys.argv[0])) + + if __name__ == '__main__': + if len(sys.argv) <= 1: + usage() +- exit -1 ++ sys.exit(-1) + scov_merge(sys.argv[1:], sys.stdout) +-- +2.24.1 + diff --git a/meta-oe/recipes-support/mcelog/mce-test_git.bb b/meta-oe/recipes-support/mcelog/mce-test_git.bb index 007b3944ae..05e98e86ed 100644 --- a/meta-oe/recipes-support/mcelog/mce-test_git.bb +++ b/meta-oe/recipes-support/mcelog/mce-test_git.bb @@ -7,24 +7,27 @@ DESCRIPTION = "The MCE test suite is a collection of tools and test scripts for testing the Linux RAS related features, including CPU/Memory error \ containment and recovery, ACPI/APEI support etc." -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" -SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mce-test.git;protocol=git \ +SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mce-test.git;protocol=git;branch=master \ file://makefile-remove-ldflags.patch \ + file://0001-gcov_merge.py-scov_merge.py-switch-to-python3.patch \ " -SRCREV = "7643baf6c3919b3d727e6ba6c2e545dc6a653307" -PV = "20190917+git${SRCPV}" +SRCREV = "025014dedca39d2b8a57a82e52286e72e157d73a" +PV = "20222810+git" -RDEPENDS_${PN} = "mcelog mce-inject dialog bash" +RDEPENDS:${PN} = "mcelog mce-inject dialog bash" COMPATIBLE_HOST = '(i.86|x86_64).*-linux' S ="${WORKDIR}/git" -do_install_append(){ +EXTRA_OEMAKE += "CFLAGS='${CFLAGS}'" + +do_install:append(){ install -d ${D}/opt/mce-test cp -rf ${S}/* ${D}/opt/mce-test/ } -FILES_${PN} += "/opt" +FILES:${PN} += "/opt" diff --git a/meta-oe/recipes-support/mcelog/mcelog/0001-client-Include-string.h-form-mem-function-prototypes.patch b/meta-oe/recipes-support/mcelog/mcelog/0001-client-Include-string.h-form-mem-function-prototypes.patch new file mode 100644 index 0000000000..3b6fd7d702 --- /dev/null +++ b/meta-oe/recipes-support/mcelog/mcelog/0001-client-Include-string.h-form-mem-function-prototypes.patch @@ -0,0 +1,26 @@ +From c7753f82261d49862d5e0f9691bf87799d36ef0c Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 31 Aug 2022 16:20:03 -0700 +Subject: [PATCH] client: Include string.h form mem* function prototypes + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + client.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/client.c b/client.c +index 883b1de..e474e55 100644 +--- a/client.c ++++ b/client.c +@@ -16,6 +16,7 @@ + on your Linux system; if not, write to the Free Software Foundation, + Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + #include <stdio.h> ++#include <string.h> + #include <sys/socket.h> + #include <sys/un.h> + #include <unistd.h> +-- +2.37.3 + diff --git a/meta-oe/recipes-support/mcelog/mcelog/0001-server-Correct-prameter-type-for-connect-API.patch b/meta-oe/recipes-support/mcelog/mcelog/0001-server-Correct-prameter-type-for-connect-API.patch new file mode 100644 index 0000000000..2f26f9ced5 --- /dev/null +++ b/meta-oe/recipes-support/mcelog/mcelog/0001-server-Correct-prameter-type-for-connect-API.patch @@ -0,0 +1,43 @@ +From 0370e7a9fb0ca1b27d7b0897739e2a7cce8977ab Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 11 May 2024 22:42:07 -0700 +Subject: [PATCH] server: Correct prameter type for connect() API + +connect() function expects the second argument to be point to sockaddr +as per man sockaddr + +int connect (int, const struct sockaddr *, socklen_t); + +Fixes build failures with -Wincompatible-pointer-types when using GCC-14 +and musl + +Fixes +| server.c: In function 'server_ping': +| server.c:308:33: error: passing argument 2 of 'connect' from incompatible pointer type [-Wincompatible-pointer-types] +| 308 | if (connect(fd, un, sizeof(struct sockaddr_un)) < 0) +| | ^~ +| | | +| | struct sockaddr_un * + +Upstream-Status: Submitted [ sent to contact@mcelog.org ] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + server.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/server.c b/server.c +index 54c7d57..51b7d3a 100644 +--- a/server.c ++++ b/server.c +@@ -305,7 +305,7 @@ static int server_ping(struct sockaddr_un *un) + if (sigsetjmp(ping_timeout_ctx, 1) == 0) { + ret = -1; + alarm(initial_ping_timeout); +- if (connect(fd, un, sizeof(struct sockaddr_un)) < 0) ++ if (connect(fd, (const struct sockaddr *)un, sizeof(struct sockaddr_un)) < 0) + goto cleanup; + if (write(fd, PAIR("ping\n")) < 0) + goto cleanup; +-- +2.45.0 + diff --git a/meta-oe/recipes-support/mcelog/mcelog/run-ptest b/meta-oe/recipes-support/mcelog/mcelog/run-ptest index ba7a2c7683..320240f276 100644 --- a/meta-oe/recipes-support/mcelog/mcelog/run-ptest +++ b/meta-oe/recipes-support/mcelog/mcelog/run-ptest @@ -1,3 +1,9 @@ #!/bin/sh -make -C tests test +make -C tests test | sed -e '/\[PASS\]/ s/^/PASS: /g' \ + -e '/\[FAIL\]/ s/^/FAIL: /g' \ + -e '/\[IGNORE\]/ s/^/SKIP: /g' \ + -e 's/IGNORE:/SKIP:/' \ + -e 's/: \[PASS\]//' \ + -e 's/: \[FAIL\]//' \ + -e 's/: \[IGNORE\]//' diff --git a/meta-oe/recipes-support/mcelog/mcelog_166.bb b/meta-oe/recipes-support/mcelog/mcelog_198.bb index 3b4ea1f67a..10b2293195 100644 --- a/meta-oe/recipes-support/mcelog/mcelog_166.bb +++ b/meta-oe/recipes-support/mcelog/mcelog_198.bb @@ -2,25 +2,35 @@ SUMMARY = "mcelog daemon accounts memory and some other errors in various ways." DESCRIPTION = "mcelog is required by both 32bit x86 Linux kernels (since 2.6.30) \ and 64bit Linux kernels (since early 2.6 kernel releases) to log machine checks \ and should run on all Linux systems that need error handling." -HOMEPAGE = "http://mcelog.org/" +HOMEPAGE = "https://mcelog.org/" SECTION = "System Environment/Base" -SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git;protocol=http; \ +SRC_URI = "\ + git://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git;protocol=http;;branch=master \ + file://0001-client-Include-string.h-form-mem-function-prototypes.patch \ + file://0001-server-Correct-prameter-type-for-connect-API.patch \ file://run-ptest \ " -SRCREV = "ee90ff20ce6a4d5e016aa249ce8b37f359f9fda4" +SRCREV = "ab58f07b9b1a4456fca0f5f41639d5cbecc80e36" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://README.md;md5=74bb47b9a68850cb398665cf78b31de6" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" S = "${WORKDIR}/git" -inherit autotools-brokensep ptest +inherit ptest COMPATIBLE_HOST = '(x86_64.*|i.86.*)-linux' -do_install_append() { +EXTRA_OEMAKE += "CFLAGS='${CFLAGS}'" + +do_compile() { + oe_runmake +} + +do_install() { + oe_runmake install DESTDIR=${D} install -d ${D}${sysconfdir}/cron.hourly install -m 0755 ${S}/mcelog.cron ${D}${sysconfdir}/cron.hourly/ sed -i 's/bash/sh/' ${D}${sysconfdir}/cron.hourly/mcelog.cron @@ -32,4 +42,4 @@ do_install_ptest() { sed -i 's#../../mcelog#mcelog#' ${D}${PTEST_PATH}/tests/test } -RDEPENDS_${PN}-ptest += "make bash mce-inject" +RDEPENDS:${PN}-ptest += "make bash mce-inject" diff --git a/meta-oe/recipes-support/md4c/md4c_0.5.2.bb b/meta-oe/recipes-support/md4c/md4c_0.5.2.bb new file mode 100644 index 0000000000..6c409666fc --- /dev/null +++ b/meta-oe/recipes-support/md4c/md4c_0.5.2.bb @@ -0,0 +1,17 @@ +SUMMARY = "Markdown for C" +DESCRIPTION = "MD4C is Markdown parser implementation in C." +HOMEPAGE = "http://github.com/mity/md4c" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=383f39920f391605af6e8e46e60e2378" + + +S = "${WORKDIR}/git" + +SRC_URI = " \ + git://github.com/mity/md4c.git;protocol=https;branch=master \ +" + +SRCREV = "729e6b8b320caa96328968ab27d7db2235e4fb47" + +inherit cmake diff --git a/meta-oe/recipes-support/mg/mg/0001-Undefine-REGEX-for-musl-based-systems.patch b/meta-oe/recipes-support/mg/mg/0001-Undefine-REGEX-for-musl-based-systems.patch index 1302679315..ce139a6387 100644 --- a/meta-oe/recipes-support/mg/mg/0001-Undefine-REGEX-for-musl-based-systems.patch +++ b/meta-oe/recipes-support/mg/mg/0001-Undefine-REGEX-for-musl-based-systems.patch @@ -5,35 +5,30 @@ Subject: [PATCH] Undefine REGEX for musl based systems Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + GNUmakefile | 1 - Makefile | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) -diff --git a/GNUmakefile b/GNUmakefile -index 7bf7dca..0e10030 100644 --- a/GNUmakefile +++ b/GNUmakefile -@@ -41,7 +41,6 @@ endif +@@ -45,7 +45,6 @@ endif CC?= gcc CFLAGS?= -O2 -pipe CFLAGS+= -g -Wall -CPPFLAGS= -DREGEX CPPFLAGS+= -D_GNU_SOURCE - CPPFLAGS+= $(BSD_CPPFLAGS) -D__dead=__dead2 + CPPFLAGS+= $(BSD_CPPFLAGS) LIBS= $(CURSES_LIBS) $(BSD_LIBS) -diff --git a/Makefile b/Makefile -index 94ce340..d516bbc 100644 --- a/Makefile +++ b/Makefile -@@ -10,7 +10,7 @@ DPADD+= ${LIBCURSES} ${LIBUTIL} - # REGEX -- create regular expression functions. +@@ -11,7 +11,7 @@ DPADD+= ${LIBUTIL} # STARTUPFILE -- look for and handle initialization file. + # MGLOG -- debug mg internals to a log file. # --CFLAGS+=-Wall -DREGEX -+CFLAGS+=-Wall +-CFLAGS+=-Wall -DREGEX `pkg-config --cflags-only-I ncurses` ++CFLAGS+=-Wall `pkg-config --cflags-only-I ncurses` SRCS= autoexec.c basic.c bell.c buffer.c cinfo.c dir.c display.c \ echo.c extend.c file.c fileio.c funmap.c help.c kbd.c keymap.c \ --- -2.12.2 - diff --git a/meta-oe/recipes-support/mg/mg/0001-fileio-Include-sys-param.h-for-MAXNAMLEN.patch b/meta-oe/recipes-support/mg/mg/0001-fileio-Include-sys-param.h-for-MAXNAMLEN.patch index 551f1df163..4eeb1d97dc 100644 --- a/meta-oe/recipes-support/mg/mg/0001-fileio-Include-sys-param.h-for-MAXNAMLEN.patch +++ b/meta-oe/recipes-support/mg/mg/0001-fileio-Include-sys-param.h-for-MAXNAMLEN.patch @@ -5,11 +5,11 @@ Subject: [PATCH 1/2] fileio: Include sys/param.h for MAXNAMLEN Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + fileio.c | 1 + 1 file changed, 1 insertion(+) -diff --git a/fileio.c b/fileio.c -index 48a67a2..9b69665 100644 --- a/fileio.c +++ b/fileio.c @@ -12,6 +12,7 @@ @@ -20,6 +20,3 @@ index 48a67a2..9b69665 100644 #include <dirent.h> #include <errno.h> #include <fcntl.h> --- -2.12.2 - diff --git a/meta-oe/recipes-support/mg/mg/0002-fileio-Define-DEFFILEMODE-if-platform-is-missing.patch b/meta-oe/recipes-support/mg/mg/0002-fileio-Define-DEFFILEMODE-if-platform-is-missing.patch index 907d67064a..ef7811081b 100644 --- a/meta-oe/recipes-support/mg/mg/0002-fileio-Define-DEFFILEMODE-if-platform-is-missing.patch +++ b/meta-oe/recipes-support/mg/mg/0002-fileio-Define-DEFFILEMODE-if-platform-is-missing.patch @@ -5,16 +5,16 @@ Subject: [PATCH 2/2] fileio: Define DEFFILEMODE if platform is missing Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + fileio.c | 4 ++++ 1 file changed, 4 insertions(+) -diff --git a/fileio.c b/fileio.c -index 9b69665..a852fd2 100644 --- a/fileio.c +++ b/fileio.c -@@ -28,6 +28,10 @@ - #include "kbd.h" - #include "pathnames.h" +@@ -36,6 +36,10 @@ + #define DEFFILEMODE 0666 + #endif +#if !defined(DEFFILEMODE) +# define DEFFILEMODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)/* 0666*/ @@ -23,6 +23,3 @@ index 9b69665..a852fd2 100644 static char *bkuplocation(const char *); static int bkupleavetmp(const char *); --- -2.12.2 - diff --git a/meta-oe/recipes-support/mg/mg_20170401.bb b/meta-oe/recipes-support/mg/mg_20230501.bb index dad1d008bf..ee00003977 100644 --- a/meta-oe/recipes-support/mg/mg_20170401.bb +++ b/meta-oe/recipes-support/mg/mg_20230501.bb @@ -1,19 +1,20 @@ SUMMARY = "A portable version of the mg maintained by the OpenBSD team" HOMEPAGE = "http://homepage.boetes.org/software/mg/" LICENSE = "PD" -LIC_FILES_CHKSUM = "file://version.c;md5=1895eb37bf6bd79cdc5c89d8166fabfb" +LIC_FILES_CHKSUM = "file://version.c;md5=a8e0b53d89d277bf3b40878ac568bedd" DEPENDS = "ncurses libbsd" SECTION = "console/editors" -SRC_URI = "http://homepage.boetes.org/software/mg/mg-${PV}.tar.gz \ +SRCREV = "f21c2ba36772ffa68d9cfa55305e427d37903b4a" +SRC_URI = "git://github.com/hboetes/mg;branch=master;protocol=https \ file://0001-fileio-Include-sys-param.h-for-MAXNAMLEN.patch \ file://0002-fileio-Define-DEFFILEMODE-if-platform-is-missing.patch \ " -SRC_URI_append_libc-musl = "\ +SRC_URI:append:libc-musl = "\ file://0001-Undefine-REGEX-for-musl-based-systems.patch \ " -SRC_URI[md5sum] = "884388589fb38c2109ad9fed328be20a" -SRC_URI[sha256sum] = "0a3608b17c153960cb1d954ca3b62445a77c0c1a18aa5c8c58aba9f6b8d62aab" + +S = "${WORKDIR}/git" # CFLAGS isn't in EXTRA_OEMAKE, as the makefile picks it up via ?= EXTRA_OEMAKE = "\ diff --git a/meta-oe/recipes-support/mime-support/mime-support_3.48.bb b/meta-oe/recipes-support/mime-support/mime-support_3.62.bb index d617b6620c..46def2a23c 100644 --- a/meta-oe/recipes-support/mime-support/mime-support_3.48.bb +++ b/meta-oe/recipes-support/mime-support/mime-support_3.62.bb @@ -1,18 +1,24 @@ SECTION = "base" SUMMARY = "MIME files 'mime.types' & 'mailcap', and support programs" -LICENSE = "PD" -LIC_FILES_CHKSUM = "file://debian/README;md5=36bbe2ace0a05c3fb684b73208fbf30b" +LICENSE = "PD & Bellcore" +LICENSE:${PN} = "PD" +# mailcap.man's license is Bellcore +LICENSE:${PN}-doc = "PD & Bellcore" +LIC_FILES_CHKSUM = "file://debian/copyright;md5=53c851e31d27c3ea8a6217073a5ff01c" DEPENDS = "file" -RDEPENDS_${PN} = "perl" -RRECOMMENDS_${PN} = "file" +RDEPENDS:${PN} = "perl" +RRECOMMENDS:${PN} = "file" -SRC_URI = "${DEBIAN_MIRROR}/main/m/mime-support/mime-support_${PV}-1.tar.gz" +SRC_URI = "${DEBIAN_MIRROR}/main/m/mime-support/mime-support_${PV}.tar.gz" +SRC_URI[sha256sum] = "54e0a03e0cd63c7c9fe68a18ead0a2143fd3c327604215f989d85484d0409f4a" S = "${WORKDIR}/${BPN}" -FILES_${PN} += " ${libdir}/mime" +inherit update-alternatives -docdir_append = "/${BPN}" +FILES:${PN} += " ${libdir}/mime" + +docdir:append = "/${BPN}" do_install () { install -d ${D}${sysconfdir} @@ -25,22 +31,22 @@ do_install () { install -d ${D}${mandir}/man8 install -m 644 mime.types ${D}${sysconfdir}/ install -m 644 mailcap ${D}${libdir}/mime/ - install -m 644 mailcap.order ${D}${sysconfdir}/ + install -m 644 mailcap.order ${D}${sysconfdir}/ install -m 644 mailcap.man ${D}${mandir}/man5/mailcap.5 - install -m 644 mailcap.order.man ${D}${mandir}/man5/mailcap.order.5 -# install -m 755 install-mime ${D}${sbindir}/ -# install -m 644 install-mime.man ${D}${mandir}/man8/install-mime.8 + install -m 644 mailcap.order.man ${D}${mandir}/man5/mailcap.order.5 +# install -m 755 install-mime ${D}${sbindir}/ +# install -m 644 install-mime.man ${D}${mandir}/man8/install-mime.8 install -m 755 update-mime ${D}${sbindir}/ - install -m 644 update-mime.man ${D}${mandir}/man8/update-mime.8 + install -m 644 update-mime.man ${D}${mandir}/man8/update-mime.8 install -m 755 run-mailcap ${D}${bindir}/ - install -m 644 run-mailcap.man ${D}${mandir}/man1/run-mailcap.1 -# install -m 644 rfcs/* ${D}${docdir}/ - install -m 644 debian/changelog ${D}${docdir}/changelog.Debian - install -m 644 debian/README ${D}${docdir}/copyright + install -m 644 run-mailcap.man ${D}${mandir}/man1/run-mailcap.1 +# install -m 644 rfcs/* ${D}${docdir}/ + install -m 644 debian/changelog ${D}${docdir}/changelog.Debian + install -m 644 debian/copyright ${D}${docdir}/copyright install -m 755 debian-view ${D}${libdir}/mime/ - install -m 755 playaudio ${D}${libdir}/mime/ + install -m 755 playaudio ${D}${libdir}/mime/ install -m 755 playdsp ${D}${libdir}/mime/ - install -m 644 mailcap.entries ${D}${libdir}/mime/packages/mime-support + install -m 644 mailcap.entries ${D}${libdir}/mime/packages/mime-support cd ${D}${mandir}; gzip -9fv */* cd ${D}${docdir}; gzip -9v * cd ${D}${docdir}; gunzip copyright.gz @@ -54,5 +60,6 @@ do_install () { cd ${D}${mandir}/man1; ln -s run-mailcap.1.gz print.1.gz } -SRC_URI[md5sum] = "d6e5d715e331147352c50c158dbdec6d" -SRC_URI[sha256sum] = "a529c7892cb786f514af71f4ca5a4c3ebc58b538a49ff959c0d97592d38f040a" +ALTERNATIVE_PRIORITY = "90" +ALTERNATIVE:${PN} = "mime.types" +ALTERNATIVE_LINK_NAME[mime.types] = "${sysconfdir}/mime.types" diff --git a/meta-oe/recipes-support/mini-iconv/mini-iconv.bb b/meta-oe/recipes-support/mini-iconv/mini-iconv.bb deleted file mode 100644 index 44f55b58df..0000000000 --- a/meta-oe/recipes-support/mini-iconv/mini-iconv.bb +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright (C) 2012 Khem Raj <raj.khem@gmail.com> -# Released under the MIT license (see COPYING.MIT for the terms) - -SUMMARY = "A minimal iconv implementation w/ support for UTF-8, ASCII, ISO-8859-1" -HOMEPAGE = "http://tinderbox.dev.gentoo.org/portage/local/misc/mini-iconv/" -LICENSE = "MPL-1.1" -SECTION = "libs" -DEPENDS = "" -PROVIDES = "virtual/libiconv" -LIC_FILES_CHKSUM = "file://iconv.c;beginline=1;endline=6;md5=35af9d9924327fe8a0a1fe3a2cb454c8" -SRC_URI = "http://mirror.meleeweb.net/pub/linux/gentoo/distfiles/mini-iconv.tar.bz2" -SRC_URI[md5sum] = "84412221e26505a2b3855d4a1cdcd0e0" -SRC_URI[sha256sum] = "3552262bf1bcf8e859a2a3a7adfb0367af8593383e730c492e981477aac0a0d4" - - -S = "${WORKDIR}/${BPN}" - -do_install() { - oe_runmake install DESTDIR=${D} PREFIX=${prefix} LIB=${base_libdir} -} diff --git a/meta-oe/recipes-support/monit/monit/monit b/meta-oe/recipes-support/monit/monit/monit new file mode 100644 index 0000000000..394704e061 --- /dev/null +++ b/meta-oe/recipes-support/monit/monit/monit @@ -0,0 +1,42 @@ +#! /bin/sh +# +# This is an init script for openembedded +# Copy it to /etc/init.d/monit and type +# > update-rc.d monit defaults 89 +# +monit=/usr/bin/monit +pidfile=/var/run/monit.pid +monit_args="-c /etc/monitrc" + +test -x "$monit" || exit 0 + +case "$1" in + start) + echo -n "Starting Monit" + start-stop-daemon --start --quiet --exec $monit -- $monit_args + RETVAL=$? + echo "." + ;; + stop) + echo -n "Stopping Monit" + start-stop-daemon --stop --quiet --pidfile $pidfile + RETVAL=$? + echo "." + ;; + restart) + $0 stop + $0 start + RETVAL=$? + ;; + status) + $monit $monit_args status + RETVAL=$? + echo "." + ;; + *) + echo "Usage: $0 {start|stop|restart|status}" + exit 1 +esac + +exit $RETVAL + diff --git a/meta-oe/recipes-support/monit/monit/monitrc b/meta-oe/recipes-support/monit/monit/monitrc new file mode 100644 index 0000000000..af7bd2be53 --- /dev/null +++ b/meta-oe/recipes-support/monit/monit/monitrc @@ -0,0 +1,50 @@ +############################################################################### +## Monit control file +############################################################################### +## +## Comments begin with a '#' and extend through the end of the line. Keywords +## are case insensitive. All path's MUST BE FULLY QUALIFIED, starting with '/'. +## +## Below you will find examples of some frequently used statements. For +## information about the control file and a complete list of statements and +## options, please have a look in the Monit manual. +## +## +############################################################################### +## Global section +############################################################################### +## +## Start Monit in the background (run as a daemon): +# +set daemon 30 # check services at 30 seconds intervals +# with start delay 240 # optional: delay the first check by 4-minutes (by +# # default Monit check immediately after Monit start) +# +# + +# set monit files in temporary locations +set pidfile /var/run/.monit.pid +set statefile /var/run/.monit.state +set idfile /var/run/.monit.id + +## Set syslog logging. If you want to log to a standalone log file instead, +## specify the full path to the log file +# +set log syslog + +set httpd port 2812 + allow 0.0.0.0/0 # allow localhost to connect to the server and + allow admin:monit # require user 'admin' with password 'monit' + #with ssl { # enable SSL/TLS and set path to server certificate + # pemfile: /etc/ssl/certs/monit.pem + #} + +############################################################################### +## Includes +############################################################################### +## +## It is possible to include additional configuration parts from other files or +## directories. +# +include /etc/monit.d/* + diff --git a/meta-oe/recipes-support/monit/monit_5.33.0.bb b/meta-oe/recipes-support/monit/monit_5.33.0.bb new file mode 100644 index 0000000000..9d7b358381 --- /dev/null +++ b/meta-oe/recipes-support/monit/monit_5.33.0.bb @@ -0,0 +1,56 @@ +DESCRIPTION = "Monit is a free open source utility for managing and monitoring, \ +processes, programs, files, directories and filesystems on a UNIX system. \ +Monit conducts automatic maintenance and repair and can execute meaningful \ +causal actions in error situations." + +HOMEPAGE = "http://mmonit.com/monit/" + +LICENSE = "AGPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=ea116a7defaf0e93b3bb73b2a34a3f51 \ + file://libmonit/COPYING;md5=2405f1c59ed1bf3714cebdb40162ce92" + +SRC_URI = " \ + https://mmonit.com/monit/dist/monit-${PV}.tar.gz \ + file://monit \ + file://monitrc \ +" + +SRC_URI[sha256sum] = "1ace889c0183473a9d70160df6533bb6e1338dc1354f5928507803e1e2a863b5" + +DEPENDS = "zlib bison-native libnsl2 flex-native openssl virtual/crypt" + +inherit autotools-brokensep systemd update-rc.d + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" +PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam" + +EXTRA_OECONF = "\ + libmonit_cv_setjmp_available=no \ + libmonit_cv_vsnprintf_c99_conformant=no \ + --with-ssl-lib-dir=${STAGING_LIBDIR} \ + --with-ssl-incl-dir=${STAGING_INCDIR} \ +" + +SYSTEMD_SERVICE:${PN} = "monit.service" +SYSTEMD_AUTO_ENABLE = "enable" + +INITSCRIPT_PACKAGES = "${PN}" +INITSCRIPT_NAME:${PN} = "monit" +INITSCRIPT_PARAMS:${PN} = "defaults 89" + +do_configure:prepend() { + rm -rf ${S}/m4/* +} + +do_install:append() { + + # Configuration file + install -Dm 0600 ${UNPACKDIR}/monitrc ${D}${sysconfdir}/monitrc + + # SystemD + install -Dm 0644 ${S}/system/startup/monit.service.in ${D}${systemd_system_unitdir}/monit.service + sed -i -e 's,@prefix@,${exec_prefix},g' ${D}${systemd_unitdir}/system/monit.service + + # SysV + install -Dm 0755 ${UNPACKDIR}/monit ${D}${sysconfdir}/init.d/monit +} diff --git a/meta-oe/recipes-support/mscgen/mscgen_0.20.bb b/meta-oe/recipes-support/mscgen/mscgen_0.20.bb index 276ad201fd..371281d6e4 100644 --- a/meta-oe/recipes-support/mscgen/mscgen_0.20.bb +++ b/meta-oe/recipes-support/mscgen/mscgen_0.20.bb @@ -1,7 +1,7 @@ SUMMARY = "Mscgen is a small program that parses Message Sequence Chart descriptions and produces PNG, SVG, EPS or server side image maps (ismaps) as the output." HOMEPAGE = "http://www.mcternan.me.uk/mscgen/" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b1e6a340187c1cf716513439d07c1d79" SRC_URI = "http://www.mcternan.me.uk/mscgen/software/${BPN}-src-${PV}.tar.gz" @@ -11,8 +11,10 @@ SRC_URI[sha256sum] = "3c3481ae0599e1c2d30b7ed54ab45249127533ab2f20e768a0ae58d855 DEPENDS = "gd " -inherit autotools gettext +inherit autotools gettext pkgconfig -do_configure_prepend() { +do_configure:prepend() { sed -i "s#AC_PATH_PROG(GDLIB_CONFIG,gdlib-config)#AC_PATH_PROG([GDLIB_CONFIG],[gdlib-config], ,[${STAGING_BINDIR_CROSS}])#" ${S}/configure.ac } + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/msktutil/msktutil/0001-configure.ac-Remove-native-include-path.patch b/meta-oe/recipes-support/msktutil/msktutil/0001-configure.ac-Remove-native-include-path.patch new file mode 100644 index 0000000000..1643c08566 --- /dev/null +++ b/meta-oe/recipes-support/msktutil/msktutil/0001-configure.ac-Remove-native-include-path.patch @@ -0,0 +1,31 @@ +From bf9795ffbda7bb241b708ff261976016efb943b1 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 25 Jan 2023 23:12:19 -0800 +Subject: [PATCH] configure.ac: Remove native include path + +On OE com_err.h is found in /usr/include too, therefore adding new path +to include search path is not needed. Moreover it fixed QA checks where +it warns about using build system paths. + +Upstream-Status: Inappropriate [Cross-compile specific] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index eaac16f..d23d0b0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -134,7 +134,6 @@ fi + # Fedora, RHEL, Centos has com_err.h in /usr/include/et + AC_CHECK_HEADERS([et/com_err.h]) + if test "$ac_cv_header_et_com_err_h" = "yes"; then +- CPPFLAGS="-I/usr/include/et $CPPFLAGS" + AC_DEFINE(HAVE_COM_ERR_H, 1) + fi + +-- +2.39.1 + diff --git a/meta-oe/recipes-support/msktutil/msktutil_1.2.1.bb b/meta-oe/recipes-support/msktutil/msktutil_1.2.1.bb new file mode 100644 index 0000000000..b4f4651e37 --- /dev/null +++ b/meta-oe/recipes-support/msktutil/msktutil_1.2.1.bb @@ -0,0 +1,16 @@ +SUMMARY = "Program for interoperability with Active Directory" +DESCRIPTION = "Msktutil creates user or computer accounts in Active Directory, \ + creates Kerberos keytabs on Unix/Linux systems, adds and removes \ + principals to and from keytabs and changes the user or computer \ + account's password." + +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=eb723b61539feef013de476e68b5c50a" + +SRC_URI = "https://github.com/msktutil/msktutil/releases/download/${PV}/${BP}.tar.bz2 \ + file://0001-configure.ac-Remove-native-include-path.patch" +SRC_URI[sha256sum] = "f9686237c4e24414802415f4c8627c7343da365c5a3bcdef7a853fa3cd27b45d" + +DEPENDS += "krb5 cyrus-sasl openldap" + +inherit autotools diff --git a/meta-oe/recipes-support/multipath-tools/files/0001-RH-fixup-udev-rules-for-redhat.patch b/meta-oe/recipes-support/multipath-tools/files/0001-RH-fixup-udev-rules-for-redhat.patch new file mode 100644 index 0000000000..74ae1530cb --- /dev/null +++ b/meta-oe/recipes-support/multipath-tools/files/0001-RH-fixup-udev-rules-for-redhat.patch @@ -0,0 +1,76 @@ +From 1e1ba9ecc16895bf472eae345d44631b65629611 Mon Sep 17 00:00:00 2001 +From: Benjamin Marzinski <bmarzins@redhat.com> +Date: Thu, 13 Apr 2017 07:22:23 -0500 +Subject: [PATCH 01/12] RH: fixup udev rules for redhat + +The multipath rules need to run after scsi_id is run. This means moving +them after 60-persistent-storage.rules for redhat. Redhat also uses a +different naming scheme for partitions than SuSE. Also, there are some +false warnings that gcc throws because of the changed options. Fix these +too. + +Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> + +[OP: Rebase to 0.9.3] +Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> + +Rebase to 0.9.8 +Signed-off-by: Changqing Li <changqing.li@windriver.com> + +Upstream-Status: Pending +--- + Makefile.inc | 2 +- + kpartx/kpartx.rules | 2 +- + multipath/Makefile | 4 ++-- + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Makefile.inc b/Makefile.inc +index 5668e638..de89b21f 100644 +--- a/Makefile.inc ++++ b/Makefile.inc +@@ -59,7 +59,7 @@ tmpfilesdir := $(systemd_prefix)lib/tmpfiles.d + modulesloaddir := $(systemd_prefix)lib/modules-load.d + libudevdir := $(systemd_prefix)lib/udev + udevrulesdir := $(libudevdir)/rules.d +-bindir := $(exec_prefix)sbin ++bindir := $(exec_prefix)/usr/sbin + mandir := $(usr_prefix)share/man + LIB := $(if $(shell test -d /lib64 && echo 1),lib64,lib) + syslibdir := $(prefix)$(LIB) +diff --git a/kpartx/kpartx.rules b/kpartx/kpartx.rules +index 1969dee0..d2b28233 100644 +--- a/kpartx/kpartx.rules ++++ b/kpartx/kpartx.rules +@@ -39,6 +39,6 @@ LABEL="mpath_kpartx_end" + GOTO="kpartx_end" + + LABEL="run_kpartx" +-RUN+="/sbin/kpartx -un -p -part /dev/$name" ++RUN+="/sbin/kpartx -un /dev/$name" + + LABEL="kpartx_end" +diff --git a/multipath/Makefile b/multipath/Makefile +index 67fb5e62..2ea9e528 100644 +--- a/multipath/Makefile ++++ b/multipath/Makefile +@@ -27,7 +27,7 @@ install: + $(Q)$(INSTALL_PROGRAM) -d $(DESTDIR)$(udevrulesdir) + $(Q)$(INSTALL_PROGRAM) -m 644 11-dm-mpath.rules $(DESTDIR)$(udevrulesdir) + $(Q)$(INSTALL_PROGRAM) -m 644 99-z-dm-mpath-late.rules $(DESTDIR)$(udevrulesdir) +- $(Q)$(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)$(udevrulesdir)/56-multipath.rules ++ $(Q)$(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)$(udevrulesdir)/62-multipath.rules + $(Q)$(INSTALL_PROGRAM) -d $(DESTDIR)$(tmpfilesdir) + $(Q)$(INSTALL_PROGRAM) -m 644 tmpfiles.conf $(DESTDIR)$(tmpfilesdir)/multipath.conf + $(Q)$(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir)/man8 +@@ -50,7 +50,7 @@ uninstall: + $(Q)$(RM) $(DESTDIR)$(udevrulesdir)/99-z-dm-mpath-late.rules + $(Q)$(RM) $(DESTDIR)$(modulesloaddir)/multipath.conf + $(Q)$(RM) $(DESTDIR)$(modulesloaddir)/scsi_dh.conf +- $(Q)$(RM) $(DESTDIR)$(libudevdir)/rules.d/56-multipath.rules ++ $(Q)$(RM) $(DESTDIR)$(libudevdir)/rules.d/62-multipath.rules + $(Q)$(RM) $(DESTDIR)$(mandir)/man8/$(EXEC).8 + $(Q)$(RM) $(DESTDIR)$(mandir)/man5/$(EXEC).conf.5 + $(Q)$(RM) $(DESTDIR)$(tmpfilesdir)/multipath.conf +-- +2.25.1 + diff --git a/meta-oe/recipes-support/multipath-tools/files/0001-libmultipath-always-use-glibc-basename.patch b/meta-oe/recipes-support/multipath-tools/files/0001-libmultipath-always-use-glibc-basename.patch new file mode 100644 index 0000000000..0365a7ef64 --- /dev/null +++ b/meta-oe/recipes-support/multipath-tools/files/0001-libmultipath-always-use-glibc-basename.patch @@ -0,0 +1,42 @@ +From 389286b25a903be62ce7f964246824fcc20c4c67 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 26 Mar 2024 18:56:55 -0700 +Subject: [PATCH] libmultipath: always use glibc basename() + +There is a use of basename() which expects it to be GNU version of +basename, which is not available in other libcs e.g. musl on Linux +therefore provide a version for such cases + +Upstream-Status: Submitted [https://github.com/opensvc/multipath-tools/pull/84] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + libmultipath/configure.c | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +diff --git a/libmultipath/configure.c b/libmultipath/configure.c +index 4ecf6ba4..e81cc67c 100644 +--- a/libmultipath/configure.c ++++ b/libmultipath/configure.c +@@ -43,6 +43,19 @@ + #include "sysfs.h" + #include "io_err_stat.h" + ++#ifndef __GLIBC__ ++/* ++ * glibc's non-destructive version of basename() ++ * License: LGPL-2.1-or-later ++ */ ++static const char *__basename(const char *filename) ++{ ++ char *p = strrchr(filename, '/'); ++ return p ? p + 1 : filename; ++} ++#define basename(x) __basename(x) ++#endif ++ + /* group paths in pg by host adapter + */ + int group_by_host_adapter(struct pathgroup *pgp, vector adapters) +-- +2.44.0 + diff --git a/meta-oe/recipes-support/multipath-tools/files/0022-RH-Remove-the-property-blacklist-exception-builtin.patch b/meta-oe/recipes-support/multipath-tools/files/0002-RH-Remove-the-property-blacklist-exception-builtin.patch index 21b8ec6b06..4b24bd2d35 100644 --- a/meta-oe/recipes-support/multipath-tools/files/0022-RH-Remove-the-property-blacklist-exception-builtin.patch +++ b/meta-oe/recipes-support/multipath-tools/files/0002-RH-Remove-the-property-blacklist-exception-builtin.patch @@ -1,7 +1,7 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 -00:00:00 2001 From:Benjamin Marzinski <bmarzins@redhat.com> Date: Wed, 2 Jul -2014 12:49:53 -0500 Subject: [PATCH] RH: Remove the property blacklist -exception builtin +From bb6db01cc19940bb5162c1cc0c9b5f8e4c209822 Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Fri, 1 Mar 2024 10:34:06 +0800 +Subject: [PATCH 02/12] RH: Remove the property blacklist exception builtin Multipath set the default property blacklist exceptions to (ID_SCSI_VPD|ID_WWN). This has the effect of blacklisting some internal @@ -15,30 +15,38 @@ Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> Upsteam-Status: Pending -Update patch to 0.8.2 +[OP: Rebase to 0.9.3] +Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> + +Rebase to 0.9.8 Signed-off-by: Changqing Li <changqing.li@windriver.com> + +Upstream-Status: Pending --- - libmultipath/blacklist.c | 13 +++++-------- - 1 file changed, 5 insertions(+), 8 deletions(-) + libmultipath/blacklist.c | 16 +++++----------- + 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/libmultipath/blacklist.c b/libmultipath/blacklist.c -index 00e8dbd..5204501 100644 +index 75100b20..4fdaca76 100644 --- a/libmultipath/blacklist.c +++ b/libmultipath/blacklist.c -@@ -192,12 +192,6 @@ setup_default_blist (struct config * conf) - char * str; +@@ -221,15 +221,6 @@ setup_default_blist (struct config * conf) + struct hwentry *hwe; int i; -- str = STRDUP("^(ram|zram|raw|loop|fd|md|dm-|sr|scd|st|dcssblk)[0-9]"); -- if (!str) -- return 1; -- if (store_ble(conf->blist_devnode, str, ORIGIN_DEFAULT)) -- return 1; -- - str = STRDUP("^(td|hd|vd)[a-z]"); - if (!str) +- if (nvme_multipath_enabled()) { +- if (store_ble(conf->blist_devnode, "!^(sd[a-z]|dasd[a-z])", +- ORIGIN_DEFAULT)) +- return 1; +- } else { +- if (store_ble(conf->blist_devnode, "!^(sd[a-z]|dasd[a-z]|nvme[0-9])", +- ORIGIN_DEFAULT)) +- return 1; +- } + if (store_ble(conf->elist_property, "(SCSI_IDENT_|ID_WWN)", ORIGIN_DEFAULT)) return 1; -@@ -437,8 +431,11 @@ filter_property(struct config *conf, struct udev_device *udev, int lvl, + +@@ -464,8 +455,11 @@ filter_property(const struct config *conf, struct udev_device *udev, r = MATCH_NOTHING; } @@ -53,5 +61,5 @@ index 00e8dbd..5204501 100644 static void free_ble(struct blentry *ble) -- -2.7.4 +2.25.1 diff --git a/meta-oe/recipes-support/multipath-tools/files/0023-RH-don-t-start-without-a-config-file.patch b/meta-oe/recipes-support/multipath-tools/files/0003-RH-don-t-start-without-a-config-file.patch index ea6137f878..54b3bdc863 100644 --- a/meta-oe/recipes-support/multipath-tools/files/0023-RH-don-t-start-without-a-config-file.patch +++ b/meta-oe/recipes-support/multipath-tools/files/0003-RH-don-t-start-without-a-config-file.patch @@ -1,10 +1,7 @@ -From 0bf8ff8dab26201b268b419809844c07e168f17d Mon Sep 17 00:00:00 2001 +From de8ee3480ec7479ed014c197a9d747403f6e0237 Mon Sep 17 00:00:00 2001 From: Changqing Li <changqing.li@windriver.com> Date: Fri, 23 Nov 2018 17:25:15 +0800 -Subject: [PATCH] From 0000000000000000000000000000000000000000 Mon Sep 17 - 00:00:00 2001 From: Benjamin Marzinski <bmarzins@redhat.com> Date: Wed, 15 - Oct 2014 10:39:30 -0500 Subject: [PATCH] RH: don't start without a config - file +Subject: [PATCH 03/12] RH: don't start without a config file If /etc/multipath.conf doesn't exist, don't start multipathd and blacklist all devices when running multipath. A completely blank configuration file @@ -17,32 +14,35 @@ Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> Upstream-Status: Pending -update this patch to new version +[OP: Rebase to 0.9.3] +Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> + +Rebase to 0.9.8 Signed-off-by: Changqing Li <changqing.li@windriver.com> --- - libmultipath/config.c | 18 ++++++++++++++++++ - libmultipath/config.h | 1 + - multipath/multipath.rules | 1 + - multipathd/multipathd.8 | 2 ++ - multipathd/multipathd.service | 1 + + libmultipath/config.c | 18 ++++++++++++++++++ + libmultipath/config.h | 1 + + multipath/multipath.rules.in | 1 + + multipathd/multipathd.8.in | 2 ++ + multipathd/multipathd.service.in | 1 + 5 files changed, 23 insertions(+) diff --git a/libmultipath/config.c b/libmultipath/config.c -index 5af7af5..e4233f1 100644 +index 83fa7369..8a3a8f37 100644 --- a/libmultipath/config.c +++ b/libmultipath/config.c @@ -26,6 +26,7 @@ - #include "devmapper.h" #include "mpath_cmd.h" #include "propsel.h" + #include "foreign.h" +#include "version.h" - static int - hwe_strmatch (const struct hwentry *hwe1, const struct hwentry *hwe2) -@@ -743,6 +745,23 @@ load_config (char * file) - goto out; + /* + * We don't support re-initialization after +@@ -959,6 +960,23 @@ int _init_config (const char *file, struct config *conf) } factorize_hwtable(conf->hwtable, builtin_hwtable_size, file); + validate_pctable(conf->overrides, 0, file); + } else { + condlog(0, "/etc/multipath.conf does not exist, blacklisting all devices."); + if (conf->blist_devnode == NULL) { @@ -64,21 +64,21 @@ index 5af7af5..e4233f1 100644 conf->processed_main_config = 1; diff --git a/libmultipath/config.h b/libmultipath/config.h -index 7d0cd9a..d7fb8e2 100644 +index 384193ab..158cebf0 100644 --- a/libmultipath/config.h +++ b/libmultipath/config.h -@@ -9,6 +9,7 @@ +@@ -10,6 +10,7 @@ #define ORIGIN_DEFAULT 0 #define ORIGIN_CONFIG 1 +#define ORIGIN_NO_CONFIG 2 - /* - * In kernel, fast_io_fail == 0 means immediate failure on rport delete. -diff --git a/multipath/multipath.rules b/multipath/multipath.rules -index 9df11a9..0486bf7 100644 ---- a/multipath/multipath.rules -+++ b/multipath/multipath.rules + enum devtypes { + DEV_NONE, +diff --git a/multipath/multipath.rules.in b/multipath/multipath.rules.in +index 780bf852..2c518378 100644 +--- a/multipath/multipath.rules.in ++++ b/multipath/multipath.rules.in @@ -9,6 +9,7 @@ IMPORT{cmdline}="nompath" ENV{nompath}=="?*", GOTO="end_mpath" IMPORT{cmdline}="multipath" @@ -87,31 +87,31 @@ index 9df11a9..0486bf7 100644 ENV{DEVTYPE}!="partition", GOTO="test_dev" IMPORT{parent}="DM_MULTIPATH_DEVICE_PATH" -diff --git a/multipathd/multipathd.8 b/multipathd/multipathd.8 -index 94c3f97..ed13efd 100644 ---- a/multipathd/multipathd.8 -+++ b/multipathd/multipathd.8 -@@ -38,6 +38,8 @@ map regains its maximum performance and redundancy. - This daemon executes the external \fBmultipath\fR tool when events occur. - In turn, the multipath tool signals the multipathd daemon when it is done with - devmap reconfiguration, so that it can refresh its failed path list. +diff --git a/multipathd/multipathd.8.in b/multipathd/multipathd.8.in +index f1cab3ff..5ae21db1 100644 +--- a/multipathd/multipathd.8.in ++++ b/multipathd/multipathd.8.in +@@ -49,6 +49,8 @@ map regains its maximum performance and redundancy. + With the \fB-k\fR option, \fBmultipathd\fR acts as a client utility that + sends commands to a running instance of the multipathd daemon (see + \fBCOMMANDS\fR below). + +In this Linux distribution, multipathd does not run unless a /etc/multipath.conf file exists. . . .\" ---------------------------------------------------------------------------- -diff --git a/multipathd/multipathd.service b/multipathd/multipathd.service -index ba24983..17434ce 100644 ---- a/multipathd/multipathd.service -+++ b/multipathd/multipathd.service -@@ -4,6 +4,7 @@ Wants=systemd-udev-trigger.service systemd-udev-settle.service - Before=iscsi.service iscsid.service lvm2-activation-early.service - Before=local-fs-pre.target blk-availability.service - After=multipathd.socket systemd-udev-trigger.service systemd-udev-settle.service +diff --git a/multipathd/multipathd.service.in b/multipathd/multipathd.service.in +index 6d03ff71..0cd85102 100644 +--- a/multipathd/multipathd.service.in ++++ b/multipathd/multipathd.service.in +@@ -5,6 +5,7 @@ Before=local-fs-pre.target blk-availability.service shutdown.target + Wants=systemd-udevd-kernel.socket @MODPROBE_UNIT@ + After=systemd-udevd-kernel.socket @MODPROBE_UNIT@ + After=multipathd.socket systemd-remount-fs.service +ConditionPathExists=/etc/multipath.conf + Before=initrd-cleanup.service DefaultDependencies=no Conflicts=shutdown.target - ConditionKernelCommandLine=!nompath -- -2.7.4 +2.25.1 diff --git a/meta-oe/recipes-support/multipath-tools/files/0004-RH-use-rpm-optflags-if-present.patch b/meta-oe/recipes-support/multipath-tools/files/0004-RH-use-rpm-optflags-if-present.patch new file mode 100644 index 0000000000..91477a44cb --- /dev/null +++ b/meta-oe/recipes-support/multipath-tools/files/0004-RH-use-rpm-optflags-if-present.patch @@ -0,0 +1,55 @@ +From f1b74f21875d6d9f0a5ac3d67df40a28b167052a Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Mon, 26 Nov 2018 09:19:17 +0800 +Subject: [PATCH 04/12] RH: use rpm optflags if present + +Use the passed in optflags when compiling as an RPM, and keep the +default flags as close as possible to the current fedora flags, while +still being generic. + +Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> + +Upstream-Status: Pending + +[OP: Rebase to 0.9.3] +Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> + +Rebase to 0.9.8 +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + Makefile.inc | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +diff --git a/Makefile.inc b/Makefile.inc +index de89b21f..6ac632ff 100644 +--- a/Makefile.inc ++++ b/Makefile.inc +@@ -95,7 +95,15 @@ SYSTEMD_LIBDEPS := $(if $(SYSTEMD),$(if $(shell test $(SYSTEMD) -gt 209 && echo + MODPROBE_UNIT := $(shell test "0$(SYSTEMD)" -lt 245 2>/dev/null || \ + echo "modprobe@dm_multipath.service") + +-OPTFLAGS := -O2 -g $(STACKPROT) --param=ssp-buffer-size=4 ++ifndef RPM_OPT_FLAGS ++ OPTFLAGS := -O2 -g $(STACKPROT) --param=ssp-buffer-size=4 ++else ++ OPTFLAGS = $(RPM_OPT_FLAGS) ++endif ++OPTFLAGS += -Wextra -Wstrict-prototypes -Wformat=0 -Werror=implicit-int \ ++ -Werror=implicit-function-declaration -Wno-sign-compare \ ++ -Wno-unused-parameter -Werror=cast-qual \ ++ -Werror=discarded-qualifiers + WARNFLAGS := -Werror -Wall -Wextra -Wformat=2 $(WFORMATOVERFLOW) -Werror=implicit-int \ + -Werror=implicit-function-declaration -Werror=format-security \ + $(WNOCLOBBERED) -Werror=cast-qual $(ERROR_DISCARDED_QUALIFIERS) $(W_URCU_TYPE_LIMITS) +@@ -105,7 +113,7 @@ CPPFLAGS := $(FORTIFY_OPT) $(CPPFLAGS) $(D_URCU_VERSION) \ + -DRUNTIME_DIR=\"$(runtimedir)\" -DCONFIG_DIR=\"$(configdir)\" \ + -DDEFAULT_CONFIGFILE=\"$(configfile)\" -DSTATE_DIR=\"$(statedir)\" \ + -DEXTRAVERSION=\"$(EXTRAVERSION)\" -MMD -MP +-CFLAGS := -std=gnu99 $(CFLAGS) $(OPTFLAGS) $(WARNFLAGS) -pipe ++CFLAGS := -std=gnu99 $(CFLAGS) $(OPTFLAGS) -pipe + BIN_CFLAGS := -fPIE -DPIE + LIB_CFLAGS := -fPIC + SHARED_FLAGS := -shared +-- +2.25.1 + diff --git a/meta-oe/recipes-support/multipath-tools/files/0025-RH-add-mpathconf.patch b/meta-oe/recipes-support/multipath-tools/files/0005-RH-add-mpathconf.patch index a1407718d5..c6089612b3 100644 --- a/meta-oe/recipes-support/multipath-tools/files/0025-RH-add-mpathconf.patch +++ b/meta-oe/recipes-support/multipath-tools/files/0005-RH-add-mpathconf.patch @@ -1,9 +1,7 @@ -From eb5a36e6e0caedf06008e48eb77b7bf7c6534ee5 Mon Sep 17 00:00:00 2001 +From 8f52504859704466667e042baf437c2b6272ffb9 Mon Sep 17 00:00:00 2001 From: Changqing Li <changqing.li@windriver.com> Date: Mon, 26 Nov 2018 09:55:12 +0800 -Subject: [PATCH] From 0000000000000000000000000000000000000000 Mon Sep 17 - 00:00:00 2001 From: Benjamin Marzinski <bmarzins@redhat.com> Date: Thu, 16 - Oct 2014 15:49:01 -0500 Subject: [PATCH] RH: add mpathconf +Subject: [PATCH 05/12] RH: add mpathconf mpathconf is a program (largely based on lvmcomf) to help users configure /etc/multipath.conf and enable or disable multipathing. It @@ -16,24 +14,26 @@ Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> Upstream-Status: Pending -update this patch to new version +[OP: Rebase to 0.9.3] +Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> +Rebase to 0.9.8 Signed-off-by: Changqing Li <changqing.li@windriver.com> --- libmultipath/config.c | 1 + - multipath/Makefile | 5 + - multipath/mpathconf | 464 ++++++++++++++++++++++++++++++++++++++++++++++++++ - multipath/mpathconf.8 | 101 +++++++++++ - 4 files changed, 571 insertions(+) + multipath/Makefile | 4 + + multipath/mpathconf | 464 ++++++++++++++++++++++++++++++++++++++++++ + multipath/mpathconf.8 | 101 +++++++++ + 4 files changed, 570 insertions(+) create mode 100644 multipath/mpathconf create mode 100644 multipath/mpathconf.8 diff --git a/libmultipath/config.c b/libmultipath/config.c -index e4233f1..b779505 100644 +index 8a3a8f37..a40b41ab 100644 --- a/libmultipath/config.c +++ b/libmultipath/config.c -@@ -747,6 +747,7 @@ load_config (char * file) - factorize_hwtable(conf->hwtable, builtin_hwtable_size, file); +@@ -962,6 +962,7 @@ int _init_config (const char *file, struct config *conf) + validate_pctable(conf->overrides, 0, file); } else { condlog(0, "/etc/multipath.conf does not exist, blacklisting all devices."); + condlog(0, "You can run /sbin/mpathconf to create or modify /etc/multipath.conf"); @@ -41,42 +41,39 @@ index e4233f1..b779505 100644 conf->blist_devnode = vector_alloc(); if (!conf->blist_devnode) { diff --git a/multipath/Makefile b/multipath/Makefile -index b9bbb3c..e720c7f 100644 +index 2ea9e528..6b1fa09e 100644 --- a/multipath/Makefile +++ b/multipath/Makefile -@@ -18,10 +18,12 @@ $(EXEC): $(OBJS) $(multipathdir)/libmultipath.so $(mpathcmddir)/libmpathcmd.so - $(CC) $(CFLAGS) $(OBJS) -o $(EXEC) $(LDFLAGS) $(LIBDEPS) - $(GZIP) $(EXEC).8 > $(EXEC).8.gz - $(GZIP) $(EXEC).conf.5 > $(EXEC).conf.5.gz -+ $(GZIP) mpathconf.8 > mpathconf.8.gz - +@@ -24,6 +24,7 @@ $(EXEC): $(OBJS) $(multipathdir)/libmultipath.so $(mpathcmddir)/libmpathcmd.so install: - $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) - $(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)/ -+ $(INSTALL_PROGRAM) -m 755 mpathconf $(DESTDIR)$(bindir)/ - $(INSTALL_PROGRAM) -d $(DESTDIR)$(udevrulesdir) - $(INSTALL_PROGRAM) -m 644 11-dm-mpath.rules $(DESTDIR)$(udevrulesdir) - $(INSTALL_PROGRAM) -m 644 $(EXEC).rules $(DESTDIR)$(libudevdir)/rules.d/62-multipath.rules -@@ -29,13 +31,16 @@ install: - $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(man8dir) - $(INSTALL_PROGRAM) -d $(DESTDIR)$(man5dir) - $(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5.gz $(DESTDIR)$(man5dir) -+ $(INSTALL_PROGRAM) -m 644 mpathconf.8.gz $(DESTDIR)$(man8dir) - - uninstall: - $(RM) $(DESTDIR)$(bindir)/$(EXEC) - $(RM) $(DESTDIR)$(udevrulesdir)/11-dm-mpath.rules - $(RM) $(DESTDIR)$(libudevdir)/rules.d/62-multipath.rules -+ $(RM) $(DESTDIR)$(bindir)/mpathconf - $(RM) $(DESTDIR)$(man8dir)/$(EXEC).8.gz - $(RM) $(DESTDIR)$(man5dir)/$(EXEC).conf.5.gz -+ $(RM) $(DESTDIR)$(man8dir)/mpathconf.8.gz + $(Q)$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) + $(Q)$(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)/ ++ $(Q)$(INSTALL_PROGRAM) -m 755 mpathconf $(DESTDIR)$(bindir)/ + $(Q)$(INSTALL_PROGRAM) -d $(DESTDIR)$(udevrulesdir) + $(Q)$(INSTALL_PROGRAM) -m 644 11-dm-mpath.rules $(DESTDIR)$(udevrulesdir) + $(Q)$(INSTALL_PROGRAM) -m 644 99-z-dm-mpath-late.rules $(DESTDIR)$(udevrulesdir) +@@ -34,6 +35,7 @@ install: + $(Q)$(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir)/man8 + $(Q)$(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir)/man5 + $(Q)$(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5 $(DESTDIR)$(mandir)/man5 ++ $(Q)$(INSTALL_PROGRAM) -m 644 mpathconf.8 $(DESTDIR)$(mandir)/man8 + $(Q)$(INSTALL_PROGRAM) -d $(DESTDIR)$(modulesloaddir) + ifeq ($(MODPROBE_UNIT),) + $(Q)$(INSTALL_PROGRAM) -m 644 modules-load.conf $(DESTDIR)$(modulesloaddir)/multipath.conf +@@ -51,8 +53,10 @@ uninstall: + $(Q)$(RM) $(DESTDIR)$(modulesloaddir)/multipath.conf + $(Q)$(RM) $(DESTDIR)$(modulesloaddir)/scsi_dh.conf + $(Q)$(RM) $(DESTDIR)$(libudevdir)/rules.d/62-multipath.rules ++ $(Q)$(RM) $(DESTDIR)$(bindir)/mpathconf + $(Q)$(RM) $(DESTDIR)$(mandir)/man8/$(EXEC).8 + $(Q)$(RM) $(DESTDIR)$(mandir)/man5/$(EXEC).conf.5 ++ $(Q)$(RM) $(DESTDIR)$(mandir)/man8/mpathconf.8 + $(Q)$(RM) $(DESTDIR)$(tmpfilesdir)/multipath.conf clean: dep_clean - $(RM) core *.o $(EXEC) *.gz diff --git a/multipath/mpathconf b/multipath/mpathconf new file mode 100644 -index 0000000..e839134 +index 00000000..e8391347 --- /dev/null +++ b/multipath/mpathconf @@ -0,0 +1,464 @@ @@ -546,7 +543,7 @@ index 0000000..e839134 +fi diff --git a/multipath/mpathconf.8 b/multipath/mpathconf.8 new file mode 100644 -index 0000000..4cd3267 +index 00000000..4cd32672 --- /dev/null +++ b/multipath/mpathconf.8 @@ -0,0 +1,101 @@ @@ -652,5 +649,5 @@ index 0000000..4cd3267 +.SH AUTHOR +Benjamin Marzinski <bmarzins@redhat.com> -- -2.7.4 +2.25.1 diff --git a/meta-oe/recipes-support/multipath-tools/files/0006-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch b/meta-oe/recipes-support/multipath-tools/files/0006-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch new file mode 100644 index 0000000000..8df7de3b48 --- /dev/null +++ b/meta-oe/recipes-support/multipath-tools/files/0006-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch @@ -0,0 +1,95 @@ +From f93248d8e3598ccdc42b6d639107917c9cda268c Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Thu, 26 Sep 2019 16:29:48 +0800 +Subject: [PATCH 06/12] RH: add wwids from kernel cmdline mpath.wwids with -A + +This patch adds another option to multipath, "-A", which reads +/proc/cmdline for mpath.wwid=<WWID> options, and adds any wwids it finds +to /etc/multipath/wwids. While this isn't usually important during +normal operation, since these wwids should already be added, it can be +helpful during installation, to make sure that multipath can claim +devices as its own, before LVM or something else makes use of them. The +patch also execs "/sbin/multipath -A" before running multipathd in +multipathd.service + +Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> + +Upstream-Status: Pending + +[OP: Rebase to 0.9.3] +Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> + +Rebase to 0.9.8 +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + libmultipath/wwids.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ + libmultipath/wwids.h | 1 + + 2 files changed, 45 insertions(+) + +diff --git a/libmultipath/wwids.c b/libmultipath/wwids.c +index 591cd09b..b01f1b85 100644 +--- a/libmultipath/wwids.c ++++ b/libmultipath/wwids.c +@@ -439,3 +439,47 @@ int unmark_failed_wwid(const char *wwid) + print_failed_wwid_result("unmark_failed", wwid, r); + return r; + } ++ ++int remember_cmdline_wwid(void) ++{ ++ FILE *f = NULL; ++ char buf[LINE_MAX], *next, *ptr; ++ int ret = 0; ++ ++ f = fopen("/proc/cmdline", "re"); ++ if (!f) { ++ condlog(0, "can't open /proc/cmdline : %s", strerror(errno)); ++ return -1; ++ } ++ ++ if (!fgets(buf, sizeof(buf), f)) { ++ if (ferror(f)) ++ condlog(0, "read of /proc/cmdline failed : %s", ++ strerror(errno)); ++ else ++ condlog(0, "couldn't read /proc/cmdline"); ++ fclose(f); ++ return -1; ++ } ++ fclose(f); ++ next = buf; ++ while((ptr = strstr(next, "mpath.wwid="))) { ++ ptr += 11; ++ next = strpbrk(ptr, " \t\n"); ++ if (next) { ++ *next = '\0'; ++ next++; ++ } ++ if (strlen(ptr)) { ++ if (remember_wwid(ptr) != 0) ++ ret = -1; ++ } ++ else { ++ condlog(0, "empty mpath.wwid kernel command line option"); ++ ret = -1; ++ } ++ if (!next) ++ break; ++ } ++ return ret; ++} +diff --git a/libmultipath/wwids.h b/libmultipath/wwids.h +index 0c6ee54d..e32a0b0e 100644 +--- a/libmultipath/wwids.h ++++ b/libmultipath/wwids.h +@@ -17,6 +17,7 @@ int remember_wwid(char *wwid); + int check_wwids_file(char *wwid, int write_wwid); + int remove_wwid(char *wwid); + int replace_wwids(vector mp); ++int remember_cmdline_wwid(void); + + enum { + WWID_IS_NOT_FAILED = 0, +-- +2.25.1 + diff --git a/meta-oe/recipes-support/multipath-tools/files/0007-RH-warn-on-invalid-regex-instead-of-failing.patch b/meta-oe/recipes-support/multipath-tools/files/0007-RH-warn-on-invalid-regex-instead-of-failing.patch new file mode 100644 index 0000000000..c64b8aeabc --- /dev/null +++ b/meta-oe/recipes-support/multipath-tools/files/0007-RH-warn-on-invalid-regex-instead-of-failing.patch @@ -0,0 +1,105 @@ +From 49d0b0279f54ceb96878e8e72e828efbb84a534c Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Fri, 1 Mar 2024 11:45:10 +0800 +Subject: [PATCH 07/12] RH: warn on invalid regex instead of failing + +multipath.conf used to allow "*" as a match everything regular expression, +instead of requiring ".*". Instead of erroring when the old style +regular expressions are used, it should print a warning and convert +them. + +Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> + +Upstream-Status: Pending + +[OP: Rebase to 0.9.3] +[OP: adjusted FREE() -> free(), made set_regex_value() static] +Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> + +Rebase to 0.9.8 +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + libmultipath/dict.c | 40 ++++++++++++++++++++++++++++++++++------ + 1 file changed, 34 insertions(+), 6 deletions(-) + +diff --git a/libmultipath/dict.c b/libmultipath/dict.c +index 5af036b7..e494419d 100644 +--- a/libmultipath/dict.c ++++ b/libmultipath/dict.c +@@ -189,6 +189,34 @@ set_str_noslash(vector strvec, void *ptr, const char *file, int line_nr) + return 0; + } + ++static void * ++set_regex_value(vector strvec) ++{ ++ char *buff = set_value(strvec); ++ ++ if (buff && strcmp("*", buff) == 0) { ++ condlog(0, "Invalid regular expression \"*\" in multipath.conf. Using \".*\""); ++ free(buff); ++ return strdup(".*"); ++ } ++ return buff; ++} ++ ++static int ++set_regex(vector strvec, void *ptr, const char *file, int line_nr) ++{ ++ char **str_ptr = (char **)ptr; ++ ++ if (*str_ptr) ++ free(*str_ptr); ++ *str_ptr = set_regex_value(strvec); ++ ++ if (!*str_ptr) ++ return 1; ++ ++ return 0; ++} ++ + static int + set_yes_no(vector strvec, void *ptr, const char *file, int line_nr) + { +@@ -1798,7 +1826,7 @@ ble_ ## option ## _handler (struct config *conf, vector strvec, \ + if (!conf->option) \ + return 1; \ + \ +- buff = set_value(strvec); \ ++ buff = set_regex_value(strvec); \ + if (!buff) \ + return 1; \ + \ +@@ -1818,7 +1846,7 @@ ble_ ## option ## _ ## name ## _handler (struct config *conf, vector strvec, \ + if (!conf->option) \ + return 1; \ + \ +- buff = set_value(strvec); \ ++ buff = set_regex_value(strvec); \ + if (!buff) \ + return 1; \ + \ +@@ -1924,16 +1952,16 @@ device_handler(struct config *conf, vector strvec, const char *file, + return 0; + } + +-declare_hw_handler(vendor, set_str) ++declare_hw_handler(vendor, set_regex) + declare_hw_snprint(vendor, print_str) + +-declare_hw_handler(product, set_str) ++declare_hw_handler(product, set_regex) + declare_hw_snprint(product, print_str) + +-declare_hw_handler(revision, set_str) ++declare_hw_handler(revision, set_regex) + declare_hw_snprint(revision, print_str) + +-declare_hw_handler(bl_product, set_str) ++declare_hw_handler(bl_product, set_regex) + declare_hw_snprint(bl_product, print_str) + + declare_hw_arg_str_handler(hwhandler, 0) +-- +2.25.1 + diff --git a/meta-oe/recipes-support/multipath-tools/files/0028-RH-reset-default-find_mutipaths-value-to-off.patch b/meta-oe/recipes-support/multipath-tools/files/0008-RH-reset-default-find_mutipaths-value-to-off.patch index ad03b8acc4..1fa1f3be27 100644 --- a/meta-oe/recipes-support/multipath-tools/files/0028-RH-reset-default-find_mutipaths-value-to-off.patch +++ b/meta-oe/recipes-support/multipath-tools/files/0008-RH-reset-default-find_mutipaths-value-to-off.patch @@ -1,10 +1,7 @@ -From 16900150e02e5b367a8b33621b393975ad011130 Mon Sep 17 00:00:00 2001 +From fcba3e0d4c8448a2510025acb255c7335413bf56 Mon Sep 17 00:00:00 2001 From: Changqing Li <changqing.li@windriver.com> Date: Mon, 26 Nov 2018 11:12:01 +0800 -Subject: [PATCH] From 0000000000000000000000000000000000000000 Mon Sep 17 - 00:00:00 2001 From: Benjamin Marzinski <bmarzins@redhat.com> Date: Thu, 7 Jun - 2018 17:43:52 -0500 Subject: [PATCH] RH: reset default find_mutipaths value - to off +Subject: [PATCH 08/12] RH: reset default find_mutipaths value to off Upstream has changed to default find_multipaths to "strict". For now Redhat will retain the previous default of "off". @@ -13,18 +10,17 @@ Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> Upstream-Status: Pending -Update this patch to new version - +Rebase to 0.9.8 Signed-off-by: Changqing Li <changqing.li@windriver.com> --- libmultipath/defaults.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libmultipath/defaults.h b/libmultipath/defaults.h -index 6576939..a2404b2 100644 +index 64b633f2..a06a8a41 100644 --- a/libmultipath/defaults.h +++ b/libmultipath/defaults.h -@@ -17,7 +17,7 @@ +@@ -23,7 +23,7 @@ #define DEFAULT_NO_PATH_RETRY NO_PATH_RETRY_UNDEF #define DEFAULT_VERBOSITY 2 #define DEFAULT_REASSIGN_MAPS 0 @@ -34,5 +30,5 @@ index 6576939..a2404b2 100644 #define DEFAULT_DEV_LOSS_TMO 600 #define DEFAULT_RETAIN_HWHANDLER RETAIN_HWHANDLER_ON -- -2.7.4 +2.25.1 diff --git a/meta-oe/recipes-support/multipath-tools/files/0009-multipath-tools-modify-create-config.mk-for-cross-co.patch b/meta-oe/recipes-support/multipath-tools/files/0009-multipath-tools-modify-create-config.mk-for-cross-co.patch new file mode 100644 index 0000000000..041b79a9af --- /dev/null +++ b/meta-oe/recipes-support/multipath-tools/files/0009-multipath-tools-modify-create-config.mk-for-cross-co.patch @@ -0,0 +1,40 @@ +From 7452549e572b1c40aefe25524bf4bbbf34c952e5 Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Tue, 4 Jun 2019 11:39:39 +0800 +Subject: [PATCH 09/12] multipath-tools: modify create-config.mk for + cross-compilation + +Do not look for systemd info on the host, and allow us to pass in CFLAGS +using the OPTFLAGS variable. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Joe Slater <joe.slater@windriver.com> + +[OP: Rebase to 0.9.3] +Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> + +Rebase to 0.9.8 +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + create-config.mk | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/create-config.mk b/create-config.mk +index 4d318b96..a65975ba 100644 +--- a/create-config.mk ++++ b/create-config.mk +@@ -127,10 +127,6 @@ ifeq ($(ENABLE_DMEVENTS_POLL),0) + DEFINES += -DNO_DMEVENTS_POLL + endif + +-SYSTEMD := $(strip $(or $(shell $(PKG_CONFIG) --modversion libsystemd 2>/dev/null | awk '{print $$1}'), \ +- $(shell systemctl --version 2>/dev/null | sed -n 's/systemd \([0-9]*\).*/\1/p'))) +- +- + # $(call TEST_CC_OPTION,option,fallback) + # Test if the C compiler supports the option. + # Evaluates to "option" if yes, and "fallback" otherwise. +-- +2.25.1 + diff --git a/meta-oe/recipes-support/multipath-tools/files/0010-Subject-PATCH-Always-use-devmapper.patch b/meta-oe/recipes-support/multipath-tools/files/0010-Subject-PATCH-Always-use-devmapper.patch new file mode 100644 index 0000000000..b48720b8a1 --- /dev/null +++ b/meta-oe/recipes-support/multipath-tools/files/0010-Subject-PATCH-Always-use-devmapper.patch @@ -0,0 +1,72 @@ +From 5d2fa3c5975266a6c02214afa6254e6eeeb1baad Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Mon, 26 Nov 2018 11:17:41 +0800 +Subject: [PATCH 10/12] Subject: [PATCH] Always use devmapper + +Do not try to compute several _API_ make variables +from host information when cross-compiling. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Aws Ismail <aws.ismail@windriver.com> +Signed-off-by: Joe Slater <joe.slater@windriver.com> + +[OP: Rebase to 0.9.3] +Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> + +Rebase to 0.9.8 +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + create-config.mk | 36 ++++++++---------------------------- + 1 file changed, 8 insertions(+), 28 deletions(-) + +diff --git a/create-config.mk b/create-config.mk +index a65975ba..8ba592f4 100644 +--- a/create-config.mk ++++ b/create-config.mk +@@ -79,34 +79,14 @@ URCU_VERSION = $(shell \ + + DEFINES := + +-ifneq ($(call check_func,dm_task_no_flush,$(devmapper_incdir)/libdevmapper.h),0) +- DEFINES += LIBDM_API_FLUSH +-endif +- +-ifneq ($(call check_func,dm_task_get_errno,$(devmapper_incdir)/libdevmapper.h),0) +- DEFINES += LIBDM_API_GET_ERRNO +-endif +- +-ifneq ($(call check_func,dm_task_set_cookie,$(devmapper_incdir)/libdevmapper.h),0) +- DEFINES += LIBDM_API_COOKIE +-endif +- +-ifneq ($(call check_func,udev_monitor_set_receive_buffer_size,$(libudev_incdir)/libudev.h),0) +- DEFINES += LIBUDEV_API_RECVBUF +-endif +- +-ifneq ($(call check_func,dm_task_deferred_remove,$(devmapper_incdir)/libdevmapper.h),0) +- DEFINES += LIBDM_API_DEFERRED +-endif +- +-ifneq ($(call check_func,dm_hold_control_dev,$(devmapper_incdir)/libdevmapper.h),0) +- DEFINES += LIBDM_API_HOLD_CONTROL +-endif +- +-ifneq ($(call check_var,ELS_DTAG_LNK_INTEGRITY,$(kernel_incdir)/scsi/fc/fc_els.h),0) +- DEFINES += FPIN_EVENT_HANDLER +- FPIN_SUPPORT = 1 +-endif ++DEFINES += LIBDM_API_FLUSH ++DEFINES += LIBDM_API_GET_ERRNO ++DEFINES += LIBDM_API_COOKIE ++DEFINES += LIBUDEV_API_RECVBUF ++DEFINES += LIBDM_API_DEFERRED ++DEFINES += LIBDM_API_HOLD_CONTROL ++DEFINES += FPIN_EVENT_HANDLER ++FPIN_SUPPORT = 1 + + libmount_h := $(shell $(PKG_CONFIG) --variable=includedir mount)/libmount/libmount.h + ifneq ($(call check_func,mnt_unref_cache,$(libmount_h)),0) +-- +2.25.1 + diff --git a/meta-oe/recipes-support/multipath-tools/files/0011-fix-bug-of-do_compile-and-do_install.patch b/meta-oe/recipes-support/multipath-tools/files/0011-fix-bug-of-do_compile-and-do_install.patch new file mode 100644 index 0000000000..abaea2cfb6 --- /dev/null +++ b/meta-oe/recipes-support/multipath-tools/files/0011-fix-bug-of-do_compile-and-do_install.patch @@ -0,0 +1,43 @@ +From 949070286692dfff89213792571da233fe82e440 Mon Sep 17 00:00:00 2001 +From: Wang Mingyu <wangmy@cn.fujitsu.com> +Date: Sun, 10 May 2020 21:22:53 +0800 +Subject: [PATCH 11/12] fix bug of do_compile and do_install + +when multiple processes make run in parallel, +because of dependency error will occur. + +Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com> + +[OP: Rebase to 0.9.3] +[OP: Drop dependencies that are already present in the 0.9.3 Makefile] +Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> + +Upstream-Status: Pending +--- + Makefile | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/Makefile b/Makefile +index 4df5f161..065249c2 100644 +--- a/Makefile ++++ b/Makefile +@@ -91,6 +91,16 @@ libmpathpersist libmpathvalid multipath multipathd: libmultipath + libmultipath/prioritizers libmultipath/checkers libmultipath/foreign: libmultipath + mpathpersist multipathd: libmpathpersist + ++DEPS_ON_MULTIPATH := \ ++ multipath \ ++ multipathd \ ++ mpathpersist \ ++ libmpathpersist ++ ++$(DEPS_ON_MULTIPATH:=.install): libmultipath.install ++mpathpersist.install: libmpathpersist.install ++libdmmp.install libmultipath/foreign.install: mpathpersist.install ++ + libmultipath/checkers.install \ + libmultipath/prioritizers.install \ + libmultipath/foreign.install: libmultipath.install +-- +2.25.1 + diff --git a/meta-oe/recipes-support/multipath-tools/files/0012-add-explicit-dependency-on-libraries.patch b/meta-oe/recipes-support/multipath-tools/files/0012-add-explicit-dependency-on-libraries.patch new file mode 100644 index 0000000000..2f774940d6 --- /dev/null +++ b/meta-oe/recipes-support/multipath-tools/files/0012-add-explicit-dependency-on-libraries.patch @@ -0,0 +1,40 @@ +From 7a46f43682641436464579d8bf76c382e71ea557 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Mon, 25 May 2020 23:22:55 -0700 +Subject: [PATCH 12/12] add explicit dependency on libraries + +[snip] +gcc/i686-overc-linux/10.1.0/ld: cannot find -lmpathpersist +collect2: error: ld returned 1 exit status +Makefile:36: recipe for target 'multipathd' failed +make[1]: *** [multipathd] Error 1 +make[1]: Leaving directory 'git/multipathd' +Makefile:29: recipe for target 'multipathd' failed +make: *** [multipathd] Error 2 +ln -sf libmpathpersist.so.0 libmpathpersist.so +[snip] + +Upstream-Status: Pending + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +[OP: Rebase to 0.9.3] +Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> +--- + Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Makefile b/Makefile +index 065249c2..0444c2ea 100644 +--- a/Makefile ++++ b/Makefile +@@ -90,6 +90,7 @@ libmultipath: libmpathutil + libmpathpersist libmpathvalid multipath multipathd: libmultipath + libmultipath/prioritizers libmultipath/checkers libmultipath/foreign: libmultipath + mpathpersist multipathd: libmpathpersist ++libmultipath mpathpersist multipath multipathd: libmpathcmd + + DEPS_ON_MULTIPATH := \ + multipath \ +-- +2.25.1 + diff --git a/meta-oe/recipes-support/multipath-tools/files/0021-RH-fixup-udev-rules-for-redhat.patch b/meta-oe/recipes-support/multipath-tools/files/0021-RH-fixup-udev-rules-for-redhat.patch deleted file mode 100644 index e88e25617d..0000000000 --- a/meta-oe/recipes-support/multipath-tools/files/0021-RH-fixup-udev-rules-for-redhat.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Benjamin Marzinski <bmarzins@redhat.com> -Date: Thu, 13 Apr 2017 07:22:23 -0500 -Subject: [PATCH] RH: fixup udev rules for redhat - -The multipath rules need to run after scsi_id is run. This means moving -them after 60-persistent-storage.rules for redhat. Redhat also uses a -different naming scheme for partitions than SuSE. Also, there are some -false warnings that gcc throws because of the changed options. Fix these -too. - -Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> - -Update patch to 0.8.0 - -Signed-off-by: Changqing Li <changqing.li@windriver.com> ---- - Makefile.inc | 2 +- - kpartx/kpartx.rules | 2 +- - multipath/Makefile | 4 ++-- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/Makefile.inc b/Makefile.inc -index fc728ca..2f0bcea 100644 ---- a/Makefile.inc -+++ b/Makefile.inc -@@ -48,7 +48,7 @@ endif - prefix = - exec_prefix = $(prefix) - usr_prefix = $(prefix) --bindir = $(exec_prefix)/sbin -+bindir = $(exec_prefix)/usr/sbin - libudevdir = $(prefix)/$(SYSTEMDPATH)/udev - udevrulesdir = $(libudevdir)/rules.d - multipathdir = $(TOPDIR)/libmultipath -diff --git a/kpartx/kpartx.rules b/kpartx/kpartx.rules -index 8f99049..8a3a171 100644 ---- a/kpartx/kpartx.rules -+++ b/kpartx/kpartx.rules -@@ -32,6 +32,6 @@ LABEL="mpath_kpartx_end" - GOTO="kpartx_end" - - LABEL="run_kpartx" --RUN+="/sbin/kpartx -un -p -part /dev/$name" -+RUN+="/sbin/kpartx -un /dev/$name" - - LABEL="kpartx_end" -diff --git a/multipath/Makefile b/multipath/Makefile -index 0828a8f..b9bbb3c 100644 ---- a/multipath/Makefile -+++ b/multipath/Makefile -@@ -24,7 +24,7 @@ install: - $(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)/ - $(INSTALL_PROGRAM) -d $(DESTDIR)$(udevrulesdir) - $(INSTALL_PROGRAM) -m 644 11-dm-mpath.rules $(DESTDIR)$(udevrulesdir) -- $(INSTALL_PROGRAM) -m 644 $(EXEC).rules $(DESTDIR)$(libudevdir)/rules.d/56-multipath.rules -+ $(INSTALL_PROGRAM) -m 644 $(EXEC).rules $(DESTDIR)$(libudevdir)/rules.d/62-multipath.rules - $(INSTALL_PROGRAM) -d $(DESTDIR)$(man8dir) - $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(man8dir) - $(INSTALL_PROGRAM) -d $(DESTDIR)$(man5dir) -@@ -33,7 +33,7 @@ install: - uninstall: - $(RM) $(DESTDIR)$(bindir)/$(EXEC) - $(RM) $(DESTDIR)$(udevrulesdir)/11-dm-mpath.rules -- $(RM) $(DESTDIR)$(libudevdir)/rules.d/56-multipath.rules -+ $(RM) $(DESTDIR)$(libudevdir)/rules.d/62-multipath.rules - $(RM) $(DESTDIR)$(man8dir)/$(EXEC).8.gz - $(RM) $(DESTDIR)$(man5dir)/$(EXEC).conf.5.gz - --- -2.7.4 - diff --git a/meta-oe/recipes-support/multipath-tools/files/0024-RH-use-rpm-optflags-if-present.patch b/meta-oe/recipes-support/multipath-tools/files/0024-RH-use-rpm-optflags-if-present.patch deleted file mode 100644 index 77dd96fee6..0000000000 --- a/meta-oe/recipes-support/multipath-tools/files/0024-RH-use-rpm-optflags-if-present.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 436f7594485e35523269e662c4b5dc3a2c10ff9b Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Mon, 26 Nov 2018 09:19:17 +0800 -Subject: [PATCH] From 0000000000000000000000000000000000000000 Mon Sep 17 - 00:00:00 2001 From: Benjamin Marzinski <bmarzins@redhat.com> Date: Wed, 19 - Apr 2017 06:10:01 -0500 Subject: [PATCH] RH: use rpm optflags if present - -Use the passed in optflags when compiling as an RPM, and keep the -default flags as close as possible to the current fedora flags, while -still being generic. - -Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> - -Upstream-Status: Pending - -update this patch to new version - -Signed-off-by: Changqing Li <changqing.li@windriver.com> ---- - Makefile.inc | 25 ++++++++++++++++--------- - 1 file changed, 16 insertions(+), 9 deletions(-) - -diff --git a/Makefile.inc b/Makefile.inc -index b86cba6..295afb9 100644 ---- a/Makefile.inc -+++ b/Makefile.inc -@@ -85,15 +85,22 @@ TEST_CC_OPTION = $(shell \ - echo "$(2)"; \ - fi) - --STACKPROT := $(call TEST_CC_OPTION,-fstack-protector-strong,-fstack-protector) --ERROR_DISCARDED_QUALIFIERS := $(call TEST_CC_OPTION,-Werror=discarded-qualifiers,) -- --OPTFLAGS = -O2 -g -pipe -Wall -Wextra -Wformat=2 -Werror=implicit-int \ -- -Werror=implicit-function-declaration -Werror=format-security \ -- -Wno-sign-compare -Wno-unused-parameter -Wno-clobbered \ -- -Werror=cast-qual $(ERROR_DISCARDED_QUALIFIERS) \ -- -Wp,-D_FORTIFY_SOURCE=2 $(STACKPROT) \ -- --param=ssp-buffer-size=4 -+ifndef RPM_OPT_FLAGS -+ STACKPROT := $(call TEST_CC_OPTION,-fstack-protector-strong,-fstack-protector) -+ OPTFLAGS = -O2 -g -pipe -Wall -Werror=format-security \ -+ -Wp,-D_FORTIFY_SOURCE=2 -fexceptions \ -+ $(STACKPROT) --param=ssp-buffer-size=4 \ -+ -grecord-gcc-switches -+ ifeq ($(shell test -f /usr/lib/rpm/redhat/redhat-hardened-cc1 && echo 1),1) -+ OPTFLAGS += -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -+ endif -+else -+ OPTFLAGS = $(RPM_OPT_FLAGS) -+endif -+OPTFLAGS += -Wextra -Wstrict-prototypes -Wformat=2 -Werror=implicit-int \ -+ -Werror=implicit-function-declaration -Wno-sign-compare \ -+ -Wno-unused-parameter -Werror=cast-qual \ -+ -Werror=discarded-qualifiers - - CFLAGS := $(OPTFLAGS) -DBIN_DIR=\"$(bindir)\" -DLIB_STRING=\"${LIB}\" -DRUN_DIR=\"${RUN}\" \ - -MMD -MP $(CFLAGS) --- -2.7.4 - diff --git a/meta-oe/recipes-support/multipath-tools/files/0026-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch b/meta-oe/recipes-support/multipath-tools/files/0026-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch deleted file mode 100644 index 724bef813a..0000000000 --- a/meta-oe/recipes-support/multipath-tools/files/0026-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch +++ /dev/null @@ -1,166 +0,0 @@ -From 0f54b3120ca06ff3168cdbf901a27b68c4638398 Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Thu, 26 Sep 2019 16:29:48 +0800 -Subject: [PATCH] From 0000000000000000000000000000000000000000 Mon Sep 17 - 00:00:00 2001 From: Benjamin Marzinski <bmarzins@redhat.com> Date: Fri, 17 - Oct 2014 11:20:34 -0500 Subject: [PATCH] RH: add wwids from kernel cmdline - mpath.wwids with -A - -This patch adds another option to multipath, "-A", which reads -/proc/cmdline for mpath.wwid=<WWID> options, and adds any wwids it finds -to /etc/multipath/wwids. While this isn't usually important during -normal operation, since these wwids should already be added, it can be -helpful during installation, to make sure that multipath can claim -devices as its own, before LVM or something else makes use of them. The -patch also execs "/sbin/multipath -A" before running multipathd in -multipathd.service - -Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> - -Upstream-Status: Pending - -Update this patch to new version 0.8.2 - -Signed-off-by: Changqing Li <changqing.li@windriver.com> ---- - libmultipath/wwids.c | 44 +++++++++++++++++++++++++++++++++++++++++++ - libmultipath/wwids.h | 1 + - multipath/main.c | 9 ++++++++- - multipath/multipath.8 | 3 +++ - multipathd/multipathd.service | 1 + - 5 files changed, 57 insertions(+), 1 deletion(-) - -diff --git a/libmultipath/wwids.c b/libmultipath/wwids.c -index ef74812..19c4d68 100644 ---- a/libmultipath/wwids.c -+++ b/libmultipath/wwids.c -@@ -444,3 +444,47 @@ int op ## _wwid(const char *wwid) \ - declare_failed_wwid_op(is_failed, false) - declare_failed_wwid_op(mark_failed, true) - declare_failed_wwid_op(unmark_failed, true) -+ -+int remember_cmdline_wwid(void) -+{ -+ FILE *f = NULL; -+ char buf[LINE_MAX], *next, *ptr; -+ int ret = 0; -+ -+ f = fopen("/proc/cmdline", "re"); -+ if (!f) { -+ condlog(0, "can't open /proc/cmdline : %s", strerror(errno)); -+ return -1; -+ } -+ -+ if (!fgets(buf, sizeof(buf), f)) { -+ if (ferror(f)) -+ condlog(0, "read of /proc/cmdline failed : %s", -+ strerror(errno)); -+ else -+ condlog(0, "couldn't read /proc/cmdline"); -+ fclose(f); -+ return -1; -+ } -+ fclose(f); -+ next = buf; -+ while((ptr = strstr(next, "mpath.wwid="))) { -+ ptr += 11; -+ next = strpbrk(ptr, " \t\n"); -+ if (next) { -+ *next = '\0'; -+ next++; -+ } -+ if (strlen(ptr)) { -+ if (remember_wwid(ptr) != 0) -+ ret = -1; -+ } -+ else { -+ condlog(0, "empty mpath.wwid kernel command line option"); -+ ret = -1; -+ } -+ if (!next) -+ break; -+ } -+ return ret; -+} -diff --git a/libmultipath/wwids.h b/libmultipath/wwids.h -index 0c6ee54..e32a0b0 100644 ---- a/libmultipath/wwids.h -+++ b/libmultipath/wwids.h -@@ -17,6 +17,7 @@ int remember_wwid(char *wwid); - int check_wwids_file(char *wwid, int write_wwid); - int remove_wwid(char *wwid); - int replace_wwids(vector mp); -+int remember_cmdline_wwid(void); - - enum { - WWID_IS_NOT_FAILED = 0, -diff --git a/multipath/main.c b/multipath/main.c -index 96a1146..5fc65ef 100644 ---- a/multipath/main.c -+++ b/multipath/main.c -@@ -139,6 +139,7 @@ usage (char * progname) - fprintf (stderr, " %s [-v level] [-l|-ll] [device]\n", progname); - fprintf (stderr, " %s [-v level] [-a|-w] device\n", progname); - fprintf (stderr, " %s [-v level] -W\n", progname); -+ fprintf (stderr, " %s [-v level] -A\n", progname); - fprintf (stderr, " %s [-v level] [-i] [-c|-C] device\n", progname); - fprintf (stderr, " %s [-v level] [-i] [-u|-U]\n", progname); - fprintf (stderr, " %s [-h|-t|-T]\n", progname); -@@ -151,6 +152,8 @@ usage (char * progname) - " -f flush a multipath device map\n" - " -F flush all multipath device maps\n" - " -a add a device wwid to the wwids file\n" -+ " -A add devices from kernel command line mpath.wwids\n" -+ " parameters to wwids file\n" - " -c check if a device should be a path in a multipath device\n" - " -C check if a multipath device has usable paths\n" - " -q allow queue_if_no_path when multipathd is not running\n" -@@ -905,7 +908,7 @@ main (int argc, char *argv[]) - exit(RTVL_FAIL); - multipath_conf = conf; - conf->retrigger_tries = 0; -- while ((arg = getopt(argc, argv, ":adcChl::FfM:v:p:b:BrR:itTquUwW")) != EOF ) { -+ while ((arg = getopt(argc, argv, ":aAdcChl::FfM:v:p:b:BrR:itTquUwW")) != EOF ) { - switch(arg) { - case 1: printf("optarg : %s\n",optarg); - break; -@@ -998,6 +1001,10 @@ main (int argc, char *argv[]) - case 'R': - retries = atoi(optarg); - break; -+ case 'A': -+ if (remember_cmdline_wwid() != 0) -+ exit(1); -+ exit(0); - case ':': - fprintf(stderr, "Missing option argument\n"); - usage(argv[0]); -diff --git a/multipath/multipath.8 b/multipath/multipath.8 -index 9cdd05a..1e120f3 100644 ---- a/multipath/multipath.8 -+++ b/multipath/multipath.8 -@@ -167,6 +167,9 @@ itself doesn't attempt to do I/O on the device. - Check if the device specified in the program environment should be - a path in a multipath device. - . -+.B \-A -+add wwids from any kernel command line mpath.wwid parameters to the wwids file -+. - .TP - .B \-U - Check if the device specified in the program environment is a multipath device -diff --git a/multipathd/multipathd.service b/multipathd/multipathd.service -index 17434ce..0fbcc46 100644 ---- a/multipathd/multipathd.service -+++ b/multipathd/multipathd.service -@@ -15,6 +15,7 @@ Type=notify - NotifyAccess=main - LimitCORE=infinity - ExecStartPre=-/sbin/modprobe -a scsi_dh_alua scsi_dh_emc scsi_dh_rdac dm-multipath -+ExecStartPre=-/sbin/multipath -A - ExecStart=/sbin/multipathd -d -s - ExecReload=/sbin/multipathd reconfigure - TasksMax=infinity --- -2.7.4 - diff --git a/meta-oe/recipes-support/multipath-tools/files/0027-RH-warn-on-invalid-regex-instead-of-failing.patch b/meta-oe/recipes-support/multipath-tools/files/0027-RH-warn-on-invalid-regex-instead-of-failing.patch deleted file mode 100644 index c59edbbb27..0000000000 --- a/meta-oe/recipes-support/multipath-tools/files/0027-RH-warn-on-invalid-regex-instead-of-failing.patch +++ /dev/null @@ -1,129 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 -00:00:00 2001 From: Benjamin Marzinski <bmarzins@redhat.com> Date: Mon, 6 Nov -2017 21:39:28 -0600 Subject: [PATCH] RH: warn on invalid regex instead of -failing - -multipath.conf used to allow "*" as a match everything regular expression, -instead of requiring ".*". Instead of erroring when the old style -regular expressions are used, it should print a warning and convert -them. - -Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> - -Upstream-Status: Pending - -update this patch to 0.8.2 - -Signed-off-by: Changqing Li <changqing.li@windriver.com> ---- - libmultipath/dict.c | 29 ++++++++++++++++++++++------- - libmultipath/parser.c | 13 +++++++++++++ - libmultipath/parser.h | 1 + - 3 files changed, 36 insertions(+), 7 deletions(-) - -diff --git a/libmultipath/dict.c b/libmultipath/dict.c -index c6eba0f..05ed3d8 100644 ---- a/libmultipath/dict.c -+++ b/libmultipath/dict.c -@@ -59,6 +59,21 @@ set_str(vector strvec, void *ptr) - } - - static int -+set_regex(vector strvec, void *ptr) -+{ -+ char **str_ptr = (char **)ptr; -+ -+ if (*str_ptr) -+ FREE(*str_ptr); -+ *str_ptr = set_regex_value(strvec); -+ -+ if (!*str_ptr) -+ return 1; -+ -+ return 0; -+} -+ -+static int - set_yes_no(vector strvec, void *ptr) - { - char * buff; -@@ -1415,8 +1430,8 @@ ble_ ## option ## _handler (struct config *conf, vector strvec) \ - \ - if (!conf->option) \ - return 1; \ -- \ -- buff = set_value(strvec); \ -+ \ -+ buff = set_regex_value(strvec); \ - if (!buff) \ - return 1; \ - \ -@@ -1432,7 +1447,7 @@ ble_ ## option ## _ ## name ## _handler (struct config *conf, vector strvec) \ - if (!conf->option) \ - return 1; \ - \ -- buff = set_value(strvec); \ -+ buff = set_regex_value(strvec); \ - if (!buff) \ - return 1; \ - \ -@@ -1535,16 +1550,16 @@ device_handler(struct config *conf, vector strvec) - return 0; - } - --declare_hw_handler(vendor, set_str) -+declare_hw_handler(vendor, set_regex) - declare_hw_snprint(vendor, print_str) - --declare_hw_handler(product, set_str) -+declare_hw_handler(product, set_regex) - declare_hw_snprint(product, print_str) - --declare_hw_handler(revision, set_str) -+declare_hw_handler(revision, set_regex) - declare_hw_snprint(revision, print_str) - --declare_hw_handler(bl_product, set_str) -+declare_hw_handler(bl_product, set_regex) - declare_hw_snprint(bl_product, print_str) - - declare_hw_handler(hwhandler, set_str) -diff --git a/libmultipath/parser.c b/libmultipath/parser.c -index e00c5ff..6ca5842 100644 ---- a/libmultipath/parser.c -+++ b/libmultipath/parser.c -@@ -382,6 +382,19 @@ oom: - return NULL; - } - -+void * -+set_regex_value(vector strvec) -+{ -+ char *buff = set_value(strvec); -+ -+ if (buff && strcmp("*", buff) == 0) { -+ condlog(0, "Invalid regular expression \"*\" in multipath.conf. Using \".*\""); -+ FREE(buff); -+ return strdup(".*"); -+ } -+ return buff; -+} -+ - /* non-recursive configuration stream handler */ - static int kw_level = 0; - -diff --git a/libmultipath/parser.h b/libmultipath/parser.h -index 62906e9..b791705 100644 ---- a/libmultipath/parser.h -+++ b/libmultipath/parser.h -@@ -77,6 +77,7 @@ extern void dump_keywords(vector keydump, int level); - extern void free_keywords(vector keywords); - extern vector alloc_strvec(char *string); - extern void *set_value(vector strvec); -+extern void *set_regex_value(vector strvec); - extern int process_file(struct config *conf, char *conf_file); - extern struct keyword * find_keyword(vector keywords, vector v, char * name); - int snprint_keyword(char *buff, int len, char *fmt, struct keyword *kw, --- -2.7.4 - diff --git a/meta-oe/recipes-support/multipath-tools/files/0029-multipath-tools-modify-Makefile.inc-for-cross-compil.patch b/meta-oe/recipes-support/multipath-tools/files/0029-multipath-tools-modify-Makefile.inc-for-cross-compil.patch deleted file mode 100644 index 3919f99045..0000000000 --- a/meta-oe/recipes-support/multipath-tools/files/0029-multipath-tools-modify-Makefile.inc-for-cross-compil.patch +++ /dev/null @@ -1,57 +0,0 @@ -From c3436ec8a502a40579abf62be0a479fa9d7888ad Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Tue, 4 Jun 2019 11:39:39 +0800 -Subject: [PATCH] multipath-tools: modify Makefile.inc for cross-compilation - -Do not look for systemd info on the host, and allow us to pass in CFLAGS -using the OPTFLAGS variable. - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Joe Slater <joe.slater@windriver.com> - -Update for version 0.5.0-144-g770e6d0 - -Signed-off-by: Kai Kang <kai.kang@windriver.com> - -Update for version 0.7.1 - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> - -update for version 0.7.7 - -remove change about CFLAGS part, since patch 0024 already have similar function. - -Signed-off-by: Changqing Li <changqing.li@windriver.com> - -update for version 0.8.1 -Signed-off-by: Changqing Li <changqing.li@windriver.com> ---- - Makefile.inc | 11 ----------- - 1 file changed, 11 deletions(-) - -diff --git a/Makefile.inc b/Makefile.inc -index 661f141..3f9fd28 100644 ---- a/Makefile.inc -+++ b/Makefile.inc -@@ -35,17 +35,6 @@ ifndef RUN - endif - endif - --ifndef SYSTEMD -- ifeq ($(shell pkg-config --modversion libsystemd >/dev/null 2>&1 && echo 1), 1) -- SYSTEMD = $(shell pkg-config --modversion libsystemd) -- else -- ifeq ($(shell systemctl --version >/dev/null 2>&1 && echo 1), 1) -- SYSTEMD = $(shell systemctl --version 2> /dev/null | \ -- sed -n 's/systemd \([0-9]*\).*/\1/p') -- endif -- endif --endif -- - ifndef SYSTEMDPATH - SYSTEMDPATH=usr/lib - endif --- -2.7.4 - diff --git a/meta-oe/recipes-support/multipath-tools/files/0030-Always-use-devmapper.patch b/meta-oe/recipes-support/multipath-tools/files/0030-Always-use-devmapper.patch deleted file mode 100644 index 3e88b41004..0000000000 --- a/meta-oe/recipes-support/multipath-tools/files/0030-Always-use-devmapper.patch +++ /dev/null @@ -1,60 +0,0 @@ -From e4acb46b10484d1da6f093257e34f269832e6a37 Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Mon, 26 Nov 2018 11:17:41 +0800 -Subject: [PATCH] Subject: [PATCH] Always use devmapper - -Do not try to compute several _API_ make variables -from host information when cross-compiling. - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Aws Ismail <aws.ismail@windriver.com> -Signed-off-by: Joe Slater <joe.slater@windriver.com> - -Rebase to 0.7.1 - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> - -Rebase to 0.7.7 - -Signed-off-by: Changqing Li <changqing.li@windriver.com> - -Rebase to 0.7.9 -Signed-off-by: Changqing Li <changqing.li@windriver.com> ---- - libmultipath/Makefile | 19 ++++--------------- - 1 file changed, 4 insertions(+), 15 deletions(-) - -diff --git a/libmultipath/Makefile b/libmultipath/Makefile -index 33f5269..adf6f4a 100644 ---- a/libmultipath/Makefile -+++ b/libmultipath/Makefile -@@ -20,21 +20,10 @@ ifdef SYSTEMD - endif - endif - --ifneq ($(call check_func,dm_task_no_flush,/usr/include/libdevmapper.h),0) -- CFLAGS += -DLIBDM_API_FLUSH -D_GNU_SOURCE --endif -- --ifneq ($(call check_func,dm_task_set_cookie,/usr/include/libdevmapper.h),0) -- CFLAGS += -DLIBDM_API_COOKIE --endif -- --ifneq ($(call check_func,udev_monitor_set_receive_buffer_size,/usr/include/libudev.h),0) -- CFLAGS += -DLIBUDEV_API_RECVBUF --endif -- --ifneq ($(call check_func,dm_task_deferred_remove,/usr/include/libdevmapper.h),0) -- CFLAGS += -DLIBDM_API_DEFERRED --endif -+CFLAGS += -DLIBDM_API_FLUSH -D_GNU_SOURCE -+CFLAGS += -DLIBDM_API_COOKIE -+CFLAGS += -DLIBUDEV_API_RECVBUF -+CFLAGS += -DLIBDM_API_DEFERRED - - OBJS = memory.o parser.o vector.o devmapper.o callout.o \ - hwtable.o blacklist.o util.o dmparser.o config.o \ --- -2.7.4 - diff --git a/meta-oe/recipes-support/multipath-tools/files/0031-Always-use-devmapper-for-kpartx.patch b/meta-oe/recipes-support/multipath-tools/files/0031-Always-use-devmapper-for-kpartx.patch deleted file mode 100644 index 418c0200f4..0000000000 --- a/meta-oe/recipes-support/multipath-tools/files/0031-Always-use-devmapper-for-kpartx.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 1fe937835311a2d0afbc85ce4a4dbd3c9e0c912f Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Mon, 26 Nov 2018 11:19:45 +0800 -Subject: [PATCH] Subject: [PATCH] Always use devmapper for kpartx - -Do not try to compute the LIBDM_API_COOKIE make variable -from host information when cross-compiling. - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Aws Ismail <aws.ismail@windriver.com> -Signed-off-by: Joe Slater <joe.slater@windriver.com> - -Rebase to 0.7.1 -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> - -Rebase to 0.7.7 -Signed-off-by: Changqing Li <changqing.li@windriver.com> - -Rebase to 0.7.9 -Signed-off-by: Changqing Li <changqing.li@windriver.com> ---- - kpartx/Makefile | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/kpartx/Makefile b/kpartx/Makefile -index 7eb467e..c143321 100644 ---- a/kpartx/Makefile -+++ b/kpartx/Makefile -@@ -8,9 +8,7 @@ LDFLAGS += $(BIN_LDFLAGS) - - LIBDEPS += -ldevmapper - --ifneq ($(call check_func,dm_task_set_cookie,/usr/include/libdevmapper.h),0) -- CFLAGS += -DLIBDM_API_COOKIE --endif -+CFLAGS += -DLIBDM_API_COOKIE - - OBJS = bsd.o dos.o kpartx.o solaris.o unixware.o dasd.o sun.o \ - gpt.o mac.o ps3.o crc32.o lopart.o xstrncpy.o devmapper.o --- -2.7.4 - diff --git a/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.3.bb b/meta-oe/recipes-support/multipath-tools/multipath-tools_0.9.8.bb index 358f0cb60b..374cda3b4e 100644 --- a/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.3.bb +++ b/meta-oe/recipes-support/multipath-tools/multipath-tools_0.9.8.bb @@ -27,33 +27,35 @@ DEPENDS = "libdevmapper \ json-c \ " -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" -SRC_URI = "git://git.opensvc.com/multipath-tools/.git;protocol=http \ +SRC_URI = "git://github.com/opensvc/multipath-tools.git;protocol=https;branch=master \ file://multipathd.oe \ file://multipath.conf.example \ - file://0021-RH-fixup-udev-rules-for-redhat.patch \ - file://0022-RH-Remove-the-property-blacklist-exception-builtin.patch \ - file://0023-RH-don-t-start-without-a-config-file.patch \ - file://0024-RH-use-rpm-optflags-if-present.patch \ - file://0025-RH-add-mpathconf.patch \ - file://0026-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch \ - file://0027-RH-warn-on-invalid-regex-instead-of-failing.patch \ - file://0028-RH-reset-default-find_mutipaths-value-to-off.patch \ - file://0029-multipath-tools-modify-Makefile.inc-for-cross-compil.patch \ - file://0030-Always-use-devmapper.patch \ - file://0031-Always-use-devmapper-for-kpartx.patch \ + file://0001-RH-fixup-udev-rules-for-redhat.patch \ + file://0002-RH-Remove-the-property-blacklist-exception-builtin.patch \ + file://0003-RH-don-t-start-without-a-config-file.patch \ + file://0004-RH-use-rpm-optflags-if-present.patch \ + file://0005-RH-add-mpathconf.patch \ + file://0006-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch \ + file://0007-RH-warn-on-invalid-regex-instead-of-failing.patch \ + file://0008-RH-reset-default-find_mutipaths-value-to-off.patch \ + file://0009-multipath-tools-modify-create-config.mk-for-cross-co.patch \ + file://0010-Subject-PATCH-Always-use-devmapper.patch \ + file://0011-fix-bug-of-do_compile-and-do_install.patch \ + file://0012-add-explicit-dependency-on-libraries.patch \ + file://0001-libmultipath-always-use-glibc-basename.patch \ " LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" -SRCREV = "6c3bd369b23e959700527e0e2e6d5b2a1bd36294" +SRCREV = "3daacfdfd110b24a3a7d5a276dcf8512b7039199" S = "${WORKDIR}/git" inherit systemd pkgconfig -SYSTEMD_SERVICE_${PN} = "multipathd.service" +SYSTEMD_SERVICE:${PN} = "multipathd.service" SYSTEMD_AUTO_ENABLE = "disable" TARGET_CC_ARCH += "${LDFLAGS}" @@ -63,16 +65,22 @@ TARGET_CC_ARCH += "${LDFLAGS}" # that only works on ARM when thumb is disabled. Otherwise one gets: # Error: shifts in CMP/MOV instructions are only supported in unified syntax -- `mov r12,r12,ror#3' # ../Makefile.inc:66: recipe for target 'debug.o' failed -ARM_INSTRUCTION_SET_armv4 = "arm" -ARM_INSTRUCTION_SET_armv5 = "arm" +ARM_INSTRUCTION_SET:armv4 = "arm" +ARM_INSTRUCTION_SET:armv5 = "arm" # The exact version of SYSTEMD does not matter but should be greater than 209. # EXTRA_OEMAKE = 'MULTIPATH_VERSION=${PV} DESTDIR=${D} syslibdir=${base_libdir} \ OPTFLAGS="${CFLAGS}" \ + prefix=${prefix} \ bindir=${base_sbindir} \ LIB=${base_libdir} libdir=${base_libdir}/multipath \ + usrlibdir=${libdir} \ + plugindir=${base_libdir}/multipath \ unitdir=${systemd_system_unitdir} \ + libudevdir=${nonarch_base_libdir}/udev \ + modulesloaddir=${sysconfdir}/modules-load.d \ + tmpfilesdir=${sysconfdir}/tmpfiles.d \ ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "SYSTEMD=216", "", d)} \ ' @@ -83,30 +91,35 @@ do_install() { # if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)};then install -d ${D}${sysconfdir}/init.d - cp ${WORKDIR}/multipathd.oe ${D}${sysconfdir}/init.d/multipathd + cp ${UNPACKDIR}/multipathd.oe ${D}${sysconfdir}/init.d/multipathd fi + sed -i "s:/usr/lib/udev/kpartx_id:${nonarch_base_libdir}/udev/kpartx_id:g" \ + ${D}${nonarch_base_libdir}/udev/rules.d/11-dm-mpath.rules + install -d ${D}${sysconfdir} - install -m 0644 ${WORKDIR}/multipath.conf.example \ + install -m 0644 ${UNPACKDIR}/multipath.conf.example \ ${D}${sysconfdir}/multipath.conf.example } -FILES_${PN}-dbg += "${base_libdir}/multipath/.debug" +FILES:${PN} += "${systemd_system_unitdir}" +FILES:${PN}-dbg += "${base_libdir}/multipath/.debug" PACKAGES =+ "${PN}-libs" -FILES_${PN}-libs = "${base_libdir}/lib*.so.* \ +FILES:${PN}-libs = "${base_libdir}/lib*.so.* \ ${base_libdir}/multipath/lib*.so*" -RDEPENDS_${PN} += "${PN}-libs bash" +RDEPENDS:${PN} += "${PN}-libs bash libgcc" PROVIDES += "device-mapper-multipath" -RPROVIDES_${PN} += "device-mapper-multipath" -RPROVIDES_${PN}-libs += "device-mapper-multipath-libs" +RPROVIDES:${PN} += "device-mapper-multipath" +RPROVIDES:${PN}-libs += "device-mapper-multipath-libs" -FILES_${PN}-dev += "${base_libdir}/pkgconfig" +FILES:${PN}-dev += "${base_libdir}/pkgconfig" PACKAGES =+ "kpartx" -FILES_kpartx = "${base_sbindir}/kpartx \ - ${nonarch_libdir}/udev/kpartx_id \ +FILES:kpartx = "${base_sbindir}/kpartx \ + ${nonarch_base_libdir}/udev/kpartx_id \ " -RDEPENDS_${PN} += "kpartx" +RDEPENDS:${PN} += "kpartx" +PARALLEL_MAKE = "" diff --git a/meta-oe/recipes-support/nano/nano_4.4.bb b/meta-oe/recipes-support/nano/nano_8.0.bb index 18121be06e..56aa47f641 100644 --- a/meta-oe/recipes-support/nano/nano_4.4.bb +++ b/meta-oe/recipes-support/nano/nano_8.0.bb @@ -1,19 +1,21 @@ +SUMMARY = "Small and friendly console text editor" DESCRIPTION = "GNU nano (Nano's ANOther editor, or \ Not ANOther editor) is an enhanced clone of the \ Pico text editor." HOMEPAGE = "http://www.nano-editor.org/" SECTION = "console/utils" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" DEPENDS = "ncurses file" -RDEPENDS_${PN} = "ncurses-terminfo-base" +RDEPENDS:${PN} = "ncurses-terminfo-base" PV_MAJOR = "${@d.getVar('PV').split('.')[0]}" SRC_URI = "https://nano-editor.org/dist/v${PV_MAJOR}/nano-${PV}.tar.xz" -SRC_URI[md5sum] = "9650dd3eb0adbab6aaa748a6f1398ccb" -SRC_URI[sha256sum] = "2af222e0354848ffaa3af31b5cd0a77917e9cb7742cd073d762f3c32f0f582c7" +SRC_URI[sha256sum] = "c17f43fc0e37336b33ee50a209c701d5beb808adc2d9f089ca831b40539c9ac4" + +UPSTREAM_CHECK_URI = "https://ftp.gnu.org/gnu/nano" inherit autotools gettext pkgconfig diff --git a/meta-oe/recipes-support/ne10/ne10/0001-CMakeLists.txt-Remove-mthumb-interwork.patch b/meta-oe/recipes-support/ne10/ne10/0001-CMakeLists.txt-Remove-mthumb-interwork.patch index 9f2faaa529..6b51f992f5 100644 --- a/meta-oe/recipes-support/ne10/ne10/0001-CMakeLists.txt-Remove-mthumb-interwork.patch +++ b/meta-oe/recipes-support/ne10/ne10/0001-CMakeLists.txt-Remove-mthumb-interwork.patch @@ -12,6 +12,8 @@ where this option is absent Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-oe/recipes-support/ne10/ne10/0001-Dont-specify-march-explicitly.patch b/meta-oe/recipes-support/ne10/ne10/0001-Dont-specify-march-explicitly.patch index a8fea82dc3..cb99daf78c 100644 --- a/meta-oe/recipes-support/ne10/ne10/0001-Dont-specify-march-explicitly.patch +++ b/meta-oe/recipes-support/ne10/ne10/0001-Dont-specify-march-explicitly.patch @@ -15,6 +15,8 @@ Fixes Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/ne10/ne10_1.2.1.bb b/meta-oe/recipes-support/ne10/ne10_1.2.1.bb index f37ccde1cb..b10c23984d 100644 --- a/meta-oe/recipes-support/ne10/ne10_1.2.1.bb +++ b/meta-oe/recipes-support/ne10/ne10_1.2.1.bb @@ -4,26 +4,26 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=e7fe20c9be97be5579e3ab5d92d3a218" SECTION = "libs" -SRC_URI = "git://github.com/projectNe10/Ne10.git \ +SRC_URI = "git://github.com/projectNe10/Ne10.git;branch=master;protocol=https \ file://0001-CMakeLists.txt-Remove-mthumb-interwork.patch \ file://0001-Dont-specify-march-explicitly.patch \ " SRCREV = "18c4c982a595dad069cd8df4932aefb1d257591f" S = "${WORKDIR}/git" -PV .= "gitr+${SRCPV}" +PV .= "+git" inherit cmake # Incompatible with archs other than armv7, armv7ve and aarch64 COMPATIBLE_MACHINE = "(^$)" -COMPATIBLE_MACHINE_aarch64 = "(.*)" -COMPATIBLE_MACHINE_armv7a = "(.*)" -COMPATIBLE_MACHINE_armv7ve = "(.*)" +COMPATIBLE_MACHINE:aarch64 = "(.*)" +COMPATIBLE_MACHINE:armv7a = "${@bb.utils.contains("TUNE_FEATURES","neon","(.*)","(^$)",d)}" +COMPATIBLE_MACHINE:armv7ve = "${@bb.utils.contains("TUNE_FEATURES","neon","(.*)","(^$)",d)}" NE10_TARGET_ARCH = "" -NE10_TARGET_ARCH_aarch64 = "aarch64" -NE10_TARGET_ARCH_armv7a = "armv7" -NE10_TARGET_ARCH_armv7ve = "armv7" +NE10_TARGET_ARCH:aarch64 = "aarch64" +NE10_TARGET_ARCH:armv7a = "${@bb.utils.contains("TUNE_FEATURES","neon","armv7","",d)}" +NE10_TARGET_ARCH:armv7ve = "${@bb.utils.contains("TUNE_FEATURES","neon","armv7","",d)}" EXTRA_OECMAKE = '-DGNULINUX_PLATFORM=ON -DNE10_BUILD_SHARED=ON -DNE10_LINUX_TARGET_ARCH="${NE10_TARGET_ARCH}"' @@ -38,4 +38,4 @@ do_install() { # ERROR: QA Issue: ELF binary 'ne10/1.2.1-r0/packages-split/ne10/usr/lib/libNE10.so.10' has relocations in .text [textrel] # ERROR: QA Issue: ELF binary 'ne10/1.2.1-r0/packages-split/ne10/usr/lib/libNE10.so.10' has relocations in .text [textrel] -INSANE_SKIP_${PN} += "textrel" +INSANE_SKIP:${PN} += "textrel" diff --git a/meta-oe/recipes-support/neon/neon/0001-Disable-installing-documentation.patch b/meta-oe/recipes-support/neon/neon/0001-Disable-installing-documentation.patch new file mode 100644 index 0000000000..177a71ec0a --- /dev/null +++ b/meta-oe/recipes-support/neon/neon/0001-Disable-installing-documentation.patch @@ -0,0 +1,30 @@ +From f477408f1c24ce6e5589e5a99d369279916c7c6e Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 24 Aug 2022 13:11:12 -0700 +Subject: [PATCH] Disable installing documentation + +It does not build + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.in b/Makefile.in +index ed87a69..c32405c 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -125,7 +125,7 @@ Makefile: $(srcdir)/Makefile.in + neon-config: $(srcdir)/neon-config.in + @./config.status neon-config + +-install-docs: install-man install-html ++install-docs: + + install-html: + $(INSTALL) -d $(DESTDIR)$(docdir)/html +-- +2.37.2 + diff --git a/meta-oe/recipes-support/neon/neon/run-ptest b/meta-oe/recipes-support/neon/neon/run-ptest new file mode 100644 index 0000000000..602084a52c --- /dev/null +++ b/meta-oe/recipes-support/neon/neon/run-ptest @@ -0,0 +1,25 @@ +#!/bin/sh + +set -eux + +rm -f debug.log child.log + +ulimit -c unlimited +ulimit -t 120 + +cd test +echo foobar > foobar.txt + +BASIC_TESTS="auth basic redirect request session socket string-tests \ + stubs uri-tests util-tests" +DAV_TESTS="acl3744 lock oldacl props xml xmlreq" +for t in $BASIC_TESTS $DAV_TESTS +do + echo "Running $t..." + if "./$t" + then + echo "PASS:$t" + else + echo "FAIL:$t" + fi +done diff --git a/meta-oe/recipes-support/neon/neon_0.30.2.bb b/meta-oe/recipes-support/neon/neon_0.30.2.bb deleted file mode 100644 index 00b79f6330..0000000000 --- a/meta-oe/recipes-support/neon/neon_0.30.2.bb +++ /dev/null @@ -1,38 +0,0 @@ -SUMMARY = "An HTTP and WebDAV client library with a C interface" -HOMEPAGE = "http://www.webdav.org/neon/" -SECTION = "libs" -LICENSE = "LGPLv2+" -LIC_FILES_CHKSUM = "file://src/COPYING.LIB;md5=f30a9716ef3762e3467a2f62bf790f0a \ - file://src/ne_utils.h;beginline=1;endline=20;md5=2caca609538eddaa6f6adf120a218037" - -SRC_URI = "${DEBIAN_MIRROR}/main/n/neon27/neon27_${PV}.orig.tar.gz \ - file://pkgconfig.patch \ - " - -SRC_URI[md5sum] = "e28d77bf14032d7f5046b3930704ef41" -SRC_URI[sha256sum] = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca" - -inherit autotools binconfig-disabled lib_package pkgconfig - -# Enable gnutls or openssl, not both -PACKAGECONFIG ?= "expat gnutls libproxy webdav zlib" -PACKAGECONFIG_class-native = "expat gnutls webdav zlib" - -PACKAGECONFIG[expat] = "--with-expat,--without-expat,expat" -PACKAGECONFIG[gnutls] = "--with-ssl=gnutls,,gnutls" -PACKAGECONFIG[gssapi] = "--with-gssapi,--without-gssapi,krb5" -PACKAGECONFIG[libproxy] = "--with-libproxy,--without-libproxy,libproxy" -PACKAGECONFIG[libxml2] = "--with-libxml2,--without-libxml2,libxml2" -PACKAGECONFIG[openssl] = "--with-ssl=openssl,,openssl" -PACKAGECONFIG[webdav] = "--enable-webdav,--disable-webdav," -PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib" - -EXTRA_OECONF += "--enable-shared" - -do_compile_append() { - oe_runmake -C test -} - -BINCONFIG = "${bindir}/neon-config" - -BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/neon/neon_0.33.0.bb b/meta-oe/recipes-support/neon/neon_0.33.0.bb new file mode 100644 index 0000000000..a0333f4560 --- /dev/null +++ b/meta-oe/recipes-support/neon/neon_0.33.0.bb @@ -0,0 +1,63 @@ +SUMMARY = "An HTTP and WebDAV client library with a C interface" +HOMEPAGE = "http://www.webdav.org/neon/" +SECTION = "libs" +LICENSE = "LGPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://src/COPYING.LIB;md5=f30a9716ef3762e3467a2f62bf790f0a \ + file://src/ne_utils.h;beginline=1;endline=20;md5=34c8e338bfa0237561e68d30c3c71133" + +SRC_URI = "${DEBIAN_MIRROR}/main/n/neon27/neon27_${PV}.orig.tar.gz \ + file://pkgconfig.patch \ + file://0001-Disable-installing-documentation.patch \ + file://run-ptest \ + " + +SRC_URI[sha256sum] = "659a5cc9cea05e6e7864094f1e13a77abbbdbab452f04d751a8c16a9447cf4b8" + +inherit autotools-brokensep binconfig-disabled lib_package pkgconfig ptest + +# Enable gnutls or openssl, not both +PACKAGECONFIG ?= "expat gnutls libproxy webdav zlib nls" +PACKAGECONFIG:class-native = "expat gnutls webdav zlib nls" +PACKAGECONFIG:remove:libc-musl = "nls" + +PACKAGECONFIG[expat] = "--with-expat,--without-expat,expat" +PACKAGECONFIG[gnutls] = "--with-ssl=gnutls,,gnutls" +PACKAGECONFIG[gssapi] = "--with-gssapi,--without-gssapi,krb5" +PACKAGECONFIG[libproxy] = "--with-libproxy,--without-libproxy,libproxy" +PACKAGECONFIG[libxml2] = "--with-libxml2,--without-libxml2,libxml2" +PACKAGECONFIG[nls] = ",--disable-nls,gettext-native" +PACKAGECONFIG[openssl] = "--with-ssl=openssl,,openssl" +PACKAGECONFIG[webdav] = "--enable-webdav,--disable-webdav," +PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib" + +EXTRA_OECONF += "--enable-shared --enable-threadsafe-ssl=posix" + +# Do not install into /usr/local +EXTRA_OEMAKE:append:class-native = " prefix=${prefix_native}" + +do_configure:prepend() { + echo "${PV}" > ${S}/.version +} + +do_compile:append() { + if ${@bb.utils.contains('PACKAGECONFIG', 'nls', 'true', 'false', d)}; then + oe_runmake compile-gmo + fi + oe_runmake -C test +} + +do_install_ptest(){ + BASIC_TESTS="auth basic redirect request session socket string-tests \ + stubs uri-tests util-tests" + DAV_TESTS="acl3744 lock oldacl props xml xmlreq" + mkdir "${D}${PTEST_PATH}/test" + for i in ${BASIC_TESTS} ${DAV_TESTS} + do + install -m 0755 "${B}/test/${i}" \ + "${D}${PTEST_PATH}/test" + done +} + +BINCONFIG = "${bindir}/neon-config" + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/nmon/nmon/0001-Fix-a-lot-of-Werror-format-security-errors-with-mvpr.patch b/meta-oe/recipes-support/nmon/nmon/0001-Fix-a-lot-of-Werror-format-security-errors-with-mvpr.patch new file mode 100644 index 0000000000..af79efed96 --- /dev/null +++ b/meta-oe/recipes-support/nmon/nmon/0001-Fix-a-lot-of-Werror-format-security-errors-with-mvpr.patch @@ -0,0 +1,175 @@ +From eba852316735daec27d4ff11483018ca596312d0 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 30 Oct 2021 02:11:49 -0700 +Subject: [PATCH] Fix a lot of -Werror=format-security errors with + mvprintw/mvwprintw + +In all these places a non-constant is used as a format string which +compiler complains about. Fix by using "%s" as format. + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + lmon16m.c | 86 +++++++++++++++++++++++++++---------------------------- + 1 file changed, 43 insertions(+), 43 deletions(-) + +diff --git a/lmon16m.c b/lmon16m.c +index 7e46642..1d53367 100644 +--- a/lmon16m.c ++++ b/lmon16m.c +@@ -5475,20 +5475,20 @@ int main(int argc, char **argv) + /* + *mvwprintw(padsmp,2, 0, "CPU User%% Sys%% Wait%% Idle|0 |25 |50 |75 100|"); + */ +- mvwprintw(padsmp, 1, 0, cpu_line); +- mvwprintw(padsmp, 2, 0, "CPU "); ++ mvwprintw(padsmp, 1, 0, "%s", cpu_line); ++ mvwprintw(padsmp, 2, 0, "%s", "CPU "); + COLOUR wattrset(padsmp, COLOR_PAIR(2)); /* Green */ +- mvwprintw(padsmp, 2, 4, "User%%"); ++ mvwprintw(padsmp, 2, 4, "%s", "User%%"); + COLOUR wattrset(padsmp, COLOR_PAIR(1)); /* Red */ +- mvwprintw(padsmp, 2, 9, " Sys%%"); ++ mvwprintw(padsmp, 2, 9, "%s", " Sys%%"); + COLOUR wattrset(padsmp, COLOR_PAIR(4)); /* Blue */ +- mvwprintw(padsmp, 2, 15, " Wait%%"); ++ mvwprintw(padsmp, 2, 15, "%s", " Wait%%"); + if (p->cpu_total.steal != q->cpu_total.steal) { + COLOUR wattrset(padsmp, COLOR_PAIR(5)); +- mvwprintw(padsmp, 2, 22, "Steal"); ++ mvwprintw(padsmp, 2, 22, "%s", "Steal"); + } else { + COLOUR wattrset(padsmp, COLOR_PAIR(0)); +- mvwprintw(padsmp, 2, 22, " Idle"); ++ mvwprintw(padsmp, 2, 22, "%s", " Idle"); + } + COLOUR wattrset(padsmp, COLOR_PAIR(0)); + mvwprintw(padsmp, 2, 27, +@@ -5579,8 +5579,8 @@ int main(int argc, char **argv) + /* lparcfg gathered above */ + if (lparcfg.smt_mode > 1 + && i % lparcfg.smt_mode == 0) { +- mvwprintw(padsmp, 3 + i, 27, "*"); +- mvwprintw(padsmp, 3 + i, 77, "*"); ++ mvwprintw(padsmp, 3 + i, 27, "%s", "*"); ++ mvwprintw(padsmp, 3 + i, 77, "%s", "*"); + } + #endif + +@@ -5597,7 +5597,7 @@ int main(int argc, char **argv) + 100.0); + } + } /* for (i = 0; i < cpus; i++) */ +- CURSE mvwprintw(padsmp, i + 3, 0, cpu_line); ++ CURSE mvwprintw(padsmp, i + 3, 0, "%s", cpu_line); + #ifdef POWER + /* proc_lparcfg called above in previous ifdef + */ +@@ -5673,7 +5673,7 @@ int main(int argc, char **argv) + 100.0); + } + +- CURSE mvwprintw(padsmp, i + 5, 0, cpu_line); ++ CURSE mvwprintw(padsmp, i + 5, 0, "%s", cpu_line); + i = i + 2; + } /* if (cpus > 1 || !cursed) */ + smp_first_time = 0; +@@ -5704,16 +5704,16 @@ int main(int argc, char **argv) + char *wide10 = + " 10%%-| |-10%%"; + +- mvwprintw(padwide, 1, 0, wide1); +- mvwprintw(padwide, 2, 0, wide2); +- mvwprintw(padwide, 3, 0, wide3); +- mvwprintw(padwide, 4, 0, wide4); +- mvwprintw(padwide, 5, 0, wide5); +- mvwprintw(padwide, 6, 0, wide6); +- mvwprintw(padwide, 7, 0, wide7); +- mvwprintw(padwide, 8, 0, wide8); +- mvwprintw(padwide, 9, 0, wide9); +- mvwprintw(padwide, 10, 0, wide10); ++ mvwprintw(padwide, 1, 0, "%s", wide1); ++ mvwprintw(padwide, 2, 0, "%s", wide2); ++ mvwprintw(padwide, 3, 0, "%s", wide3); ++ mvwprintw(padwide, 4, 0, "%s", wide4); ++ mvwprintw(padwide, 5, 0, "%s", wide5); ++ mvwprintw(padwide, 6, 0, "%s", wide6); ++ mvwprintw(padwide, 7, 0, "%s", wide7); ++ mvwprintw(padwide, 8, 0, "%s", wide8); ++ mvwprintw(padwide, 9, 0, "%s", wide9); ++ mvwprintw(padwide, 10, 0, "%s", wide10); + mvwprintw(padwide, 11, 0, + " CPU +1--------+10-------+20-------+30-------+40-------+50-------+60--+--0%%"); + mvwprintw(padwide, 1, 6, "CPU(s)=%d", cpus); +@@ -5755,16 +5755,16 @@ int main(int argc, char **argv) + rows = 12; + } + if (cpus > 63) { +- mvwprintw(padwide, rows + 0, 0, wide1); +- mvwprintw(padwide, rows + 1, 0, wide2); +- mvwprintw(padwide, rows + 2, 0, wide3); +- mvwprintw(padwide, rows + 3, 0, wide4); +- mvwprintw(padwide, rows + 4, 0, wide5); +- mvwprintw(padwide, rows + 5, 0, wide6); +- mvwprintw(padwide, rows + 6, 0, wide7); +- mvwprintw(padwide, rows + 7, 0, wide8); +- mvwprintw(padwide, rows + 8, 0, wide9); +- mvwprintw(padwide, rows + 9, 0, wide10); ++ mvwprintw(padwide, rows + 0, 0, "%s", wide1); ++ mvwprintw(padwide, rows + 1, 0, "%s", wide2); ++ mvwprintw(padwide, rows + 2, 0, "%s", wide3); ++ mvwprintw(padwide, rows + 3, 0, "%s", wide4); ++ mvwprintw(padwide, rows + 4, 0, "%s", wide5); ++ mvwprintw(padwide, rows + 5, 0, "%s", wide6); ++ mvwprintw(padwide, rows + 6, 0, "%s", wide7); ++ mvwprintw(padwide, rows + 7, 0, "%s", wide8); ++ mvwprintw(padwide, rows + 8, 0, "%s", wide9); ++ mvwprintw(padwide, rows + 9, 0, "%s", wide10); + mvwprintw(padwide, rows + 10, 0, + " CPU +65---+70-------+80-------+90-------+100------+110------+120-----+--0%%"); + if (wide_first_time) { +@@ -5813,16 +5813,16 @@ int main(int argc, char **argv) + rows = 23; + } + if (cpus > 127) { +- mvwprintw(padwide, rows + 0, 0, wide1); +- mvwprintw(padwide, rows + 1, 0, wide2); +- mvwprintw(padwide, rows + 2, 0, wide3); +- mvwprintw(padwide, rows + 3, 0, wide4); +- mvwprintw(padwide, rows + 4, 0, wide5); +- mvwprintw(padwide, rows + 5, 0, wide6); +- mvwprintw(padwide, rows + 6, 0, wide7); +- mvwprintw(padwide, rows + 7, 0, wide8); +- mvwprintw(padwide, rows + 8, 0, wide9); +- mvwprintw(padwide, rows + 9, 0, wide10); ++ mvwprintw(padwide, rows + 0, 0, "%s", wide1); ++ mvwprintw(padwide, rows + 1, 0, "%s", wide2); ++ mvwprintw(padwide, rows + 2, 0, "%s", wide3); ++ mvwprintw(padwide, rows + 3, 0, "%s", wide4); ++ mvwprintw(padwide, rows + 4, 0, "%s", wide5); ++ mvwprintw(padwide, rows + 5, 0, "%s", wide6); ++ mvwprintw(padwide, rows + 6, 0, "%s", wide7); ++ mvwprintw(padwide, rows + 7, 0, "%s", wide8); ++ mvwprintw(padwide, rows + 8, 0, "%s", wide9); ++ mvwprintw(padwide, rows + 9, 0, "%s", wide10); + mvwprintw(padwide, rows + 10, 0, + " CPU +129--------+140------+150------+160------+170------+180------+190--0%%"); + if (wide_first_time) { +@@ -8274,7 +8274,7 @@ I/F Name Recv=KB/s Trans=KB/s packin packout insize outsize Peak->Recv Trans + formatstring = + " PID %%CPU Size Res Res Res Res Shared Faults Command"; + } +- CURSE mvwprintw(padtop, 1, y, formatstring); ++ CURSE mvwprintw(padtop, 1, y, "%s", formatstring); + + if (show_args == ARGS_ONLY) { + formatstring = +@@ -8294,7 +8294,7 @@ I/F Name Recv=KB/s Trans=KB/s packin packout insize outsize Peak->Recv Trans + formatstring = + " Used KB Set Text Data Lib KB Min Maj "; + } +- CURSE mvwprintw(padtop, 2, 1, formatstring); ++ CURSE mvwprintw(padtop, 2, 1, "%s", formatstring); + for (j = 0; j < max_sorted; j++) { + i = topper[j].index; + if (!show_all) { diff --git a/meta-oe/recipes-support/nmon/nmon/0001-lmon16g.c-Adjust-system-headers.patch b/meta-oe/recipes-support/nmon/nmon/0001-lmon16g.c-Adjust-system-headers.patch index e8debe56af..6721d2b5e5 100644 --- a/meta-oe/recipes-support/nmon/nmon/0001-lmon16g.c-Adjust-system-headers.patch +++ b/meta-oe/recipes-support/nmon/nmon/0001-lmon16g.c-Adjust-system-headers.patch @@ -9,13 +9,15 @@ defines from sys/cdefs.h is used Signed-off-by: Khem Raj <raj.khem@gmail.com> --- - lmon16g.c | 4 ++-- +Upstream-Status: Pending + + lmon16m.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/lmon16g.c b/lmon16g.c +diff --git a/lmon16m.c b/lmon16m.c index cb27e09..d2a11c5 100644 ---- a/lmon16g.c -+++ b/lmon16g.c +--- a/lmon16m.c ++++ b/lmon16m.c @@ -63,7 +63,7 @@ static char *SccsId = "nmon " VERSION; #include <fcntl.h> #include <math.h> diff --git a/meta-oe/recipes-support/nmon/nmon_16g.bb b/meta-oe/recipes-support/nmon/nmon_16m.bb index e77faa30ad..1779dd2273 100644 --- a/meta-oe/recipes-support/nmon/nmon_16g.bb +++ b/meta-oe/recipes-support/nmon/nmon_16m.bb @@ -1,25 +1,25 @@ SUMMARY = "nmon performance monitor" HOMEPAGE = "http://nmon.sf.net" SECTION = "console/utils" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://${WORKDIR}/Documentation.txt;md5=dbb13658cf55d687c4f2ff771a696d4a" +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://Documentation.txt;md5=dbb13658cf55d687c4f2ff771a696d4a" DEPENDS = "ncurses" -DEPENDS_append_libc-musl = " bsd-headers" +DEPENDS:append:libc-musl = " bsd-headers" SRC_URI = "${SOURCEFORGE_MIRROR}/nmon/lmon${PV}.c;name=lmon \ ${SOURCEFORGE_MIRROR}/nmon/Documentation.txt;name=doc \ file://0001-lmon16g.c-Adjust-system-headers.patch \ -" -SRC_URI[lmon.md5sum] = "246ccfc74d5af55d992601fc4d3d4a72" -SRC_URI[lmon.sha256sum] = "da82dd693b503b062854dfe7dbb5d36b347872ab44a4aa05b97e9d577747f688" -SRC_URI[doc.md5sum] = "dbb13658cf55d687c4f2ff771a696d4a" + file://0001-Fix-a-lot-of-Werror-format-security-errors-with-mvpr.patch \ + " +SRC_URI[lmon.sha256sum] = "2bed4d45fdfdf1d1387ec91e139c04975d5f838e3e0d53c0fe2d803a707e5fc1" SRC_URI[doc.sha256sum] = "1f7f83afe62a7210be5e83cd24157adb854c14599efe0b377a7ecca933869278" CFLAGS += "-D JFS -D GETUSER -Wall -D LARGEMEM" LDFLAGS += "-ltinfo -lncursesw -lm" -ASNEEDED_pn-nmon = "" +ASNEEDED:pn-nmon = "" -S = "${WORKDIR}" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" do_compile() { ${CC} ${CFLAGS} ${LDFLAGS} lmon${PV}.c -o nmon diff --git a/meta-oe/recipes-support/nspr/nspr/0001-Fix-Wincompatible-function-pointer-types.patch b/meta-oe/recipes-support/nspr/nspr/0001-Fix-Wincompatible-function-pointer-types.patch new file mode 100644 index 0000000000..8515075fe0 --- /dev/null +++ b/meta-oe/recipes-support/nspr/nspr/0001-Fix-Wincompatible-function-pointer-types.patch @@ -0,0 +1,39 @@ +From d24dc9bebaefbd8abf32707bad5efc0c811c0cd4 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 18 Jan 2023 13:04:56 -0800 +Subject: [PATCH] Fix -Wincompatible-function-pointer-types + +Fixes warnings with clang16 +testfile.c:576:31: error: incompatible function pointer types passing 'PRInt32 (void *)' (aka 'int (void *)') to parameter of type 'void (*)(void *)' [-Wincompatible-function-pointe r-types] + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + pr/tests/testfile.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pr/tests/testfile.c b/pr/tests/testfile.c +index 79d8a05..42aa6a7 100644 +--- a/pr/tests/testfile.c ++++ b/pr/tests/testfile.c +@@ -123,7 +123,7 @@ PRThread* create_new_thread(PRThreadType type, + if (native_thread) { + #if defined(_PR_PTHREADS) + pthread_t tid; +- if (!pthread_create(&tid, NULL, start, arg)) { ++ if (!pthread_create(&tid, NULL, (void*(*)(void*))start, arg)) { + return((PRThread *) tid); + } + else { +@@ -573,7 +573,7 @@ static PRInt32 RunDirTest(void) + + thrarg.done= 0; + t = create_new_thread(PR_USER_THREAD, +- DirTest, &thrarg, ++ (void (*)(void *))DirTest, &thrarg, + PR_PRIORITY_NORMAL, + PR_LOCAL_THREAD, + PR_UNJOINABLE_THREAD, +-- +2.39.1 + diff --git a/meta-oe/recipes-support/nspr/nspr/0001-config-nspr-config.in-don-t-pass-LDFLAGS.patch b/meta-oe/recipes-support/nspr/nspr/0001-config-nspr-config.in-don-t-pass-LDFLAGS.patch new file mode 100644 index 0000000000..6ebc9c4ae6 --- /dev/null +++ b/meta-oe/recipes-support/nspr/nspr/0001-config-nspr-config.in-don-t-pass-LDFLAGS.patch @@ -0,0 +1,30 @@ +From 13e9d66c24d1dce5179805ae5e1bf940409b4914 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Wed, 10 Aug 2022 15:21:07 +0800 +Subject: [PATCH] config/nspr-config.in: don't pass LDFLAGS + +Don't pass LDFLAGS to avoid exposing the build env info. + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + config/nspr-config.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/config/nspr-config.in b/config/nspr-config.in +index 2cb62a0..2bec715 100755 +--- a/config/nspr-config.in ++++ b/config/nspr-config.in +@@ -136,7 +136,7 @@ if test "$echo_libs" = "yes"; then + if test -n "$lib_nspr"; then + libdirs="$libdirs -lnspr${major_version}" + fi +- os_ldflags="@LDFLAGS@" ++ os_ldflags="LDFLAGS" + for i in $os_ldflags ; do + if echo $i | grep \^-L >/dev/null; then + libdirs="$libdirs $i" +-- +2.25.1 + diff --git a/meta-oe/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch b/meta-oe/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch new file mode 100644 index 0000000000..09855a03dc --- /dev/null +++ b/meta-oe/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch @@ -0,0 +1,28 @@ +From 5f6fcaeb0b7a319c8afd32ddb48b3515b63a6c0c Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 18 Sep 2017 17:22:43 -0700 +Subject: [PATCH] md: Fix build with musl + +The MIPS specific header <sgidefs.h> is not provided by musl +linux kernel headers provide <asm/sgidefs.h> which has same definitions + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- + pr/include/md/_linux.cfg | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pr/include/md/_linux.cfg b/pr/include/md/_linux.cfg +index aa3af78..899826f 100644 +--- a/pr/include/md/_linux.cfg ++++ b/pr/include/md/_linux.cfg +@@ -511,7 +511,7 @@ + #error "Unknown MIPS endianness." + #endif + +-#if _MIPS_SIM == _ABI64 ++#if _MIPS_SIM == _MIPS_SIM_ABI64 + + #define IS_64 + diff --git a/meta-oe/recipes-support/nspr/nspr/0002-Add-nios2-support.patch b/meta-oe/recipes-support/nspr/nspr/0002-Add-nios2-support.patch new file mode 100644 index 0000000000..dab2a4e291 --- /dev/null +++ b/meta-oe/recipes-support/nspr/nspr/0002-Add-nios2-support.patch @@ -0,0 +1,89 @@ +From 4760065a58153e4dae24e4e437a5136592c624bc Mon Sep 17 00:00:00 2001 +From: Marek Vasut <marex@denx.de> +Date: Sat, 30 Jan 2016 07:18:02 +0100 +Subject: [PATCH] Add nios2 support + +Add support for the nios2 CPU. + +Signed-off-by: Marek Vasut <marex@denx.de> +Upstream-Status: Submitted [ https://bugzilla.mozilla.org/show_bug.cgi?id=1244421 ] + +--- + pr/include/md/_linux.cfg | 45 +++++++++++++++++++++++++++++++++++ + pr/include/md/_linux.h | 4 +++- + 2 files changed, 48 insertions(+), 1 deletion(-) + +--- a/pr/include/md/_linux.cfg ++++ b/pr/include/md/_linux.cfg +@@ -975,6 +975,51 @@ + #define PR_BYTES_PER_WORD_LOG2 2 + #define PR_BYTES_PER_DWORD_LOG2 3 + ++#elif defined(__nios2__) ++ ++#define IS_LITTLE_ENDIAN 1 ++#undef IS_BIG_ENDIAN ++ ++#define PR_BYTES_PER_BYTE 1 ++#define PR_BYTES_PER_SHORT 2 ++#define PR_BYTES_PER_INT 4 ++#define PR_BYTES_PER_INT64 8 ++#define PR_BYTES_PER_LONG 4 ++#define PR_BYTES_PER_FLOAT 4 ++#define PR_BYTES_PER_DOUBLE 8 ++#define PR_BYTES_PER_WORD 4 ++#define PR_BYTES_PER_DWORD 8 ++ ++#define PR_BITS_PER_BYTE 8 ++#define PR_BITS_PER_SHORT 16 ++#define PR_BITS_PER_INT 32 ++#define PR_BITS_PER_INT64 64 ++#define PR_BITS_PER_LONG 32 ++#define PR_BITS_PER_FLOAT 32 ++#define PR_BITS_PER_DOUBLE 64 ++#define PR_BITS_PER_WORD 32 ++ ++#define PR_BITS_PER_BYTE_LOG2 3 ++#define PR_BITS_PER_SHORT_LOG2 4 ++#define PR_BITS_PER_INT_LOG2 5 ++#define PR_BITS_PER_INT64_LOG2 6 ++#define PR_BITS_PER_LONG_LOG2 5 ++#define PR_BITS_PER_FLOAT_LOG2 5 ++#define PR_BITS_PER_DOUBLE_LOG2 6 ++#define PR_BITS_PER_WORD_LOG2 5 ++ ++#define PR_ALIGN_OF_SHORT 2 ++#define PR_ALIGN_OF_INT 4 ++#define PR_ALIGN_OF_LONG 4 ++#define PR_ALIGN_OF_INT64 4 ++#define PR_ALIGN_OF_FLOAT 4 ++#define PR_ALIGN_OF_DOUBLE 4 ++#define PR_ALIGN_OF_POINTER 4 ++#define PR_ALIGN_OF_WORD 4 ++ ++#define PR_BYTES_PER_WORD_LOG2 2 ++#define PR_BYTES_PER_DWORD_LOG2 3 ++ + #elif defined(__or1k__) + + #undef IS_LITTLE_ENDIAN +--- a/pr/include/md/_linux.h ++++ b/pr/include/md/_linux.h +@@ -55,6 +55,8 @@ + #define _PR_SI_ARCHITECTURE "avr32" + #elif defined(__m32r__) + #define _PR_SI_ARCHITECTURE "m32r" ++#elif defined(__nios2__) ++#define _PR_SI_ARCHITECTURE "nios2" + #elif defined(__or1k__) + #define _PR_SI_ARCHITECTURE "or1k" + #elif defined(__riscv) && (__riscv_xlen == 32) +@@ -143,7 +145,7 @@ extern PRInt32 _PR_x86_64_AtomicSet(PRIn + #define _MD_ATOMIC_SET _PR_x86_64_AtomicSet + #endif + +-#if defined(__loongarch__) ++#if defined(__loongarch__) || defined(__nios2__) + #if defined(__GNUC__) + /* Use GCC built-in functions */ + #define _PR_HAVE_ATOMIC_OPS diff --git a/meta-oe/recipes-support/nspr/nspr/Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch b/meta-oe/recipes-support/nspr/nspr/Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch new file mode 100644 index 0000000000..90fe45f34d --- /dev/null +++ b/meta-oe/recipes-support/nspr/nspr/Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch @@ -0,0 +1,103 @@ +From 8a592e4ead4ed6befe6044da3dd2dc7523c33905 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <Mingli.Yu@windriver.com> +Date: Fri, 16 Nov 2018 13:52:49 +0800 +Subject: [PATCH] Makefile.in: remove _BUILD_STRING and _BUILD_TIME + +Remove _BUILD_STRING and _BUILD_TIME to avoid +adding timestamp to _pl_bld.h which can result +in adding timestamp in library file such as +libnspr4.so. + $ readelf --wide --decompress --hex-dump=.rodata libnspr4.so + [snip] + 0x00004000 32303138 2d31312d 31352030 353a3439 2018-11-15 05:49 + [snip] + +Upstream-Status: Pending + +Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> +--- + lib/ds/Makefile.in | 8 +------- + lib/libc/src/Makefile.in | 8 +------- + lib/prstreams/Makefile.in | 8 +------- + pr/src/Makefile.in | 8 +------- + 4 files changed, 4 insertions(+), 28 deletions(-) + +diff --git a/lib/ds/Makefile.in b/lib/ds/Makefile.in +index e737791..b578476 100644 +--- a/lib/ds/Makefile.in ++++ b/lib/ds/Makefile.in +@@ -114,13 +114,7 @@ GARBAGE += $(TINC) + + $(TINC): + @$(MAKE_OBJDIR) +- @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC) +- @if test ! -z "$(SH_NOW)"; then \ +- $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \ +- else \ +- true; \ +- fi +- @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC) ++ @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC) + + + $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC) +diff --git a/lib/libc/src/Makefile.in b/lib/libc/src/Makefile.in +index e8a6d9f..978ed28 100644 +--- a/lib/libc/src/Makefile.in ++++ b/lib/libc/src/Makefile.in +@@ -116,13 +116,7 @@ GARBAGE += $(TINC) + + $(TINC): + @$(MAKE_OBJDIR) +- @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC) +- @if test ! -z "$(SH_NOW)"; then \ +- $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \ +- else \ +- true; \ +- fi +- @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC) ++ @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC) + + + $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC) +diff --git a/lib/prstreams/Makefile.in b/lib/prstreams/Makefile.in +index aeb2944..f318097 100644 +--- a/lib/prstreams/Makefile.in ++++ b/lib/prstreams/Makefile.in +@@ -116,13 +116,7 @@ endif + + $(TINC): + @$(MAKE_OBJDIR) +- @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC) +- @if test ! -z "$(SH_NOW)"; then \ +- $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \ +- else \ +- true; \ +- fi +- @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC) ++ @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC) + + + $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC) +diff --git a/pr/src/Makefile.in b/pr/src/Makefile.in +index 19c5a69..b4ac31c 100644 +--- a/pr/src/Makefile.in ++++ b/pr/src/Makefile.in +@@ -326,13 +326,7 @@ GARBAGE += $(TINC) + + $(TINC): + @$(MAKE_OBJDIR) +- @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC) +- @if test ! -z "$(SH_NOW)"; then \ +- $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \ +- else \ +- true; \ +- fi +- @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC) ++ @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC) + + + $(OBJDIR)/prvrsion.$(OBJ_SUFFIX): prvrsion.c $(TINC) +-- +2.7.4 + diff --git a/meta-oe/recipes-support/nspr/nspr/fix-build-on-x86_64.patch b/meta-oe/recipes-support/nspr/nspr/fix-build-on-x86_64.patch new file mode 100644 index 0000000000..f12acc8548 --- /dev/null +++ b/meta-oe/recipes-support/nspr/nspr/fix-build-on-x86_64.patch @@ -0,0 +1,52 @@ +Fix build failure on x86_64 + +When the target_cpu is x86_64, we should assume that the pkg uses 64bit, +only if USE_N32 is set, we can assume that the pkg uses 32bit. It used a +opposite logic before. + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> + +Upstream-Status: Pending +--- + configure.in | 12 ++++++------ + 1 files changed, 6 insertions(+), 6 deletions(-) + +Index: nspr/configure.in +=================================================================== +--- nspr.orig/configure.in ++++ nspr/configure.in +@@ -1875,28 +1875,24 @@ tools are selected during the Xcode/Deve + PR_MD_ASFILES=os_Linux_ia64.s + ;; + x86_64) +- if test -n "$USE_64"; then +- PR_MD_ASFILES=os_Linux_x86_64.s +- elif test -n "$USE_X32"; then ++ if test -n "$USE_X32"; then ++ AC_DEFINE(i386) + PR_MD_ASFILES=os_Linux_x86_64.s + CC="$CC -mx32" + CXX="$CXX -mx32" + else +- AC_DEFINE(i386) +- PR_MD_ASFILES=os_Linux_x86.s +- CC="$CC -m32" +- CXX="$CXX -m32" ++ PR_MD_ASFILES=os_Linux_x86_64.s + fi + ;; + ppc|powerpc) + PR_MD_ASFILES=os_Linux_ppc.s + ;; + powerpc64) +- if test -n "$USE_64"; then ++ if test -n "$USE_N32"; then ++ PR_MD_ASFILES=os_Linux_ppc.s ++ else + CC="$CC -m64" + CXX="$CXX -m64" +- else +- PR_MD_ASFILES=os_Linux_ppc.s + fi + ;; + esac diff --git a/meta-oe/recipes-support/nspr/nspr/nspr.pc.in b/meta-oe/recipes-support/nspr/nspr/nspr.pc.in new file mode 100644 index 0000000000..1f15d19cfa --- /dev/null +++ b/meta-oe/recipes-support/nspr/nspr/nspr.pc.in @@ -0,0 +1,11 @@ +os_libs=-lpthread -ldl +prefix=OEPREFIX +exec_prefix=OEEXECPREFIX +libdir=OELIBDIR +includedir=OEINCDIR + +Name: NSPR +Description: The Netscape Portable Runtime +Version: NSPRVERSION +Libs: -L${libdir} -lplds4 -lplc4 -lnspr4 -lpthread -ldl +Cflags: -I${includedir}/nspr diff --git a/meta-oe/recipes-support/nspr/nspr/remove-rpath-from-tests.patch b/meta-oe/recipes-support/nspr/nspr/remove-rpath-from-tests.patch new file mode 100644 index 0000000000..7ba59ed644 --- /dev/null +++ b/meta-oe/recipes-support/nspr/nspr/remove-rpath-from-tests.patch @@ -0,0 +1,26 @@ +Author: Andrei Gherzan <andrei@gherzan.ro> +Date: Thu Feb 9 00:03:38 2012 +0200 + +Avoid QA warnings by removing hardcoded rpath from binaries. + +[...] +WARNING: QA Issue: package nspr contains bad RPATH {builddir}/tmp/work/armv5te-poky-linux-gnueabi/nspr-4.8.9-r1/nspr-4.8.9/mozilla/nsprpub/pr/tests/../../dist/lib +in file {builddir}/tmp/work/armv5te-poky-linux-gnueabi/nspr-4.8.9-r1/packages-split/nspr/usr/lib/nspr/tests/multiwait +[...] + +Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> +Upstream-Status: Pending + +Index: nspr/pr/tests/Makefile.in +=================================================================== +--- nspr.orig/pr/tests/Makefile.in ++++ nspr/pr/tests/Makefile.in +@@ -316,7 +316,7 @@ ifeq ($(OS_ARCH), SunOS) + endif # SunOS + + ifeq (,$(filter-out Linux GNU GNU_%,$(OS_ARCH))) +- LDOPTS += -Xlinker -rpath $(ABSOLUTE_LIB_DIR) ++ LDOPTS += -Xlinker + ifeq ($(USE_PTHREADS),1) + EXTRA_LIBS = -lpthread + endif diff --git a/meta-oe/recipes-support/nspr/nspr_4.35.bb b/meta-oe/recipes-support/nspr/nspr_4.35.bb new file mode 100644 index 0000000000..abd750b138 --- /dev/null +++ b/meta-oe/recipes-support/nspr/nspr_4.35.bb @@ -0,0 +1,199 @@ +SUMMARY = "Netscape Portable Runtime Library" +HOMEPAGE = "http://www.mozilla.org/projects/nspr/" +LICENSE = "GPL-2.0-only | MPL-2.0 | LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://configure.in;beginline=3;endline=6;md5=90c2fdee38e45d6302abcfe475c8b5c5 \ + file://Makefile.in;beginline=4;endline=38;md5=beda1dbb98a515f557d3e58ef06bca99" +SECTION = "libs/network" + +SRC_URI = "http://ftp.mozilla.org/pub/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz \ + file://remove-rpath-from-tests.patch \ + file://fix-build-on-x86_64.patch \ + file://0002-Add-nios2-support.patch \ + file://0001-md-Fix-build-with-musl.patch \ + file://Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch \ + file://0001-config-nspr-config.in-don-t-pass-LDFLAGS.patch \ + file://0001-Fix-Wincompatible-function-pointer-types.patch \ + file://nspr.pc.in \ + " + +CACHED_CONFIGUREVARS:append:libc-musl = " CFLAGS='${CFLAGS} -D_PR_POLL_AVAILABLE \ + -D_PR_HAVE_LARGE_OFF_T -D_PR_INET6 -D_PR_HAVE_INET_NTOP \ + -D_PR_HAVE_GETHOSTBYNAME2 -D_PR_HAVE_GETADDRINFO \ + -D_PR_INET6_PROBE -DNO_DLOPEN_NULL'" + +UPSTREAM_CHECK_URI = "http://ftp.mozilla.org/pub/nspr/releases/" +UPSTREAM_CHECK_REGEX = "v(?P<pver>\d+(\.\d+)+)/" + +SRC_URI[sha256sum] = "7ea3297ea5969b5d25a5dd8d47f2443cda88e9ee746301f6e1e1426f8a6abc8f" + +CVE_PRODUCT = "netscape_portable_runtime" + +S = "${WORKDIR}/nspr-${PV}/nspr" + +RDEPENDS:${PN}-dev += "perl" +TARGET_CC_ARCH += "${LDFLAGS}" + +TESTS = " \ + accept \ + acceptread \ + acceptreademu \ + affinity \ + alarm \ + anonfm \ + atomic \ + attach \ + bigfile \ + cleanup \ + cltsrv \ + concur \ + cvar \ + cvar2 \ + dlltest \ + dtoa \ + errcodes \ + exit \ + fdcach \ + fileio \ + foreign \ + formattm \ + fsync \ + gethost \ + getproto \ + i2l \ + initclk \ + inrval \ + instrumt \ + intrio \ + intrupt \ + io_timeout \ + ioconthr \ + join \ + joinkk \ + joinku \ + joinuk \ + joinuu \ + layer \ + lazyinit \ + libfilename \ + lltest \ + lock \ + lockfile \ + logfile \ + logger \ + many_cv \ + multiwait \ + nameshm1 \ + nblayer \ + nonblock \ + ntioto \ + ntoh \ + op_2long \ + op_excl \ + op_filnf \ + op_filok \ + op_nofil \ + parent \ + parsetm \ + peek \ + perf \ + pipeping \ + pipeping2 \ + pipeself \ + poll_nm \ + poll_to \ + pollable \ + prftest \ + primblok \ + provider \ + prpollml \ + ranfile \ + randseed \ + reinit \ + rwlocktest \ + sel_spd \ + selct_er \ + selct_nm \ + selct_to \ + selintr \ + sema \ + semaerr \ + semaping \ + sendzlf \ + server_test \ + servr_kk \ + servr_uk \ + servr_ku \ + servr_uu \ + short_thread \ + sigpipe \ + socket \ + sockopt \ + sockping \ + sprintf \ + stack \ + stdio \ + str2addr \ + strod \ + switch \ + system \ + testbit \ + testfile \ + threads \ + timemac \ + timetest \ + tpd \ + udpsrv \ + vercheck \ + version \ + writev \ + xnotify \ + zerolen" + +inherit autotools multilib_script + +MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/nspr-config" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," + +# Do not install nspr in usr/include, but in usr/include/nspr, the +# preferred path upstream. +EXTRA_OECONF += "--includedir=${includedir}/nspr" + +EXTRA_OEMAKE:append:class-native = " EXTRA_LIBS='-lpthread -lrt -ldl'" + +do_compile:prepend() { + oe_runmake CROSS_COMPILE=1 CFLAGS="-DXP_UNIX ${BUILD_CFLAGS}" LDFLAGS="" CC="${BUILD_CC}" -C config export +} + +do_compile:append() { + oe_runmake -C pr/tests +} + +do_install:append() { + install -D ${UNPACKDIR}/nspr.pc.in ${D}${libdir}/pkgconfig/nspr.pc + sed -i \ + -e 's:NSPRVERSION:${PV}:g' \ + -e 's:OEPREFIX:${prefix}:g' \ + -e 's:OELIBDIR:${libdir}:g' \ + -e 's:OEINCDIR:${includedir}:g' \ + -e 's:OEEXECPREFIX:${exec_prefix}:g' \ + ${D}${libdir}/pkgconfig/nspr.pc + + mkdir -p ${D}${libdir}/nspr/tests + install -m 0755 ${S}/pr/tests/runtests.pl ${D}${libdir}/nspr/tests + install -m 0755 ${S}/pr/tests/runtests.sh ${D}${libdir}/nspr/tests + cd ${B}/pr/tests + install -m 0755 ${TESTS} ${D}${libdir}/nspr/tests + + # delete compile-et.pl and perr.properties from ${bindir} because these are + # only used to generate prerr.c and prerr.h files from prerr.et at compile + # time + rm ${D}${bindir}/compile-et.pl ${D}${bindir}/prerr.properties +} + +FILES:${PN} = "${libdir}/lib*.so" +FILES:${PN}-dev = "${bindir}/* ${libdir}/nspr/tests/* ${libdir}/pkgconfig \ + ${includedir}/* ${datadir}/aclocal/* " + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch b/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch new file mode 100644 index 0000000000..b7f1b01a14 --- /dev/null +++ b/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch @@ -0,0 +1,57 @@ +From 7c8f367faf8848a43a414079189e10270d6c0fcc Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Wed, 18 Dec 2019 12:29:50 +0100 +Subject: [PATCH] freebl: add a configure option to disable ARM HW crypto + +Not all current hardware supports it, particularly anything +prior to armv8 does not. + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + +--- + nss/lib/freebl/Makefile | 3 +++ + nss/lib/freebl/gcm.c | 2 ++ + 2 files changed, 5 insertions(+) + +diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile +index 7ee8736..f9b4925 100644 +--- a/nss/lib/freebl/Makefile ++++ b/nss/lib/freebl/Makefile +@@ -142,6 +142,8 @@ endif + endif + endif + endif ++ifdef NSS_USE_ARM_HW_CRYPTO ++ DEFINES += -DNSS_USE_ARM_HW_CRYPTO + ifeq ($(CPU_ARCH),aarch64) + ifdef CC_IS_CLANG + DEFINES += -DUSE_HW_AES -DUSE_HW_SHA1 -DUSE_HW_SHA2 +@@ -183,6 +185,7 @@ endif + endif + endif + endif ++endif + + ifeq (OS2,$(OS_TARGET)) + ASFILES = mpi_x86_os2.s +diff --git a/nss/lib/freebl/gcm.c b/nss/lib/freebl/gcm.c +index 2dae724..9ee7fc8 100644 +--- a/nss/lib/freebl/gcm.c ++++ b/nss/lib/freebl/gcm.c +@@ -18,6 +18,7 @@ + + #include <limits.h> + ++#ifdef NSS_USE_ARM_HW_CRYPTO + /* old gcc doesn't support some poly64x2_t intrinsic */ + #if defined(__aarch64__) && defined(IS_LITTLE_ENDIAN) && \ + (defined(__clang__) || defined(__GNUC__) && __GNUC__ > 6) +@@ -27,6 +28,7 @@ + /* We don't test on big endian platform, so disable this on big endian. */ + #define USE_ARM_GCM + #endif ++#endif + + /* Forward declarations */ + SECStatus gcm_HashInit_hw(gcmHashContext *ghash); diff --git a/meta-oe/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch b/meta-oe/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch new file mode 100644 index 0000000000..2385fd3b9d --- /dev/null +++ b/meta-oe/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch @@ -0,0 +1,51 @@ +From 46ab1ca6e6fb8e1196e0665a54506dff370f8f2a Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Wed, 22 Feb 2017 11:36:11 +0200 +Subject: [PATCH] nss: fix support cross compiling + +Let some make variables be assigned from outside makefile. + +Upstream-Status: Inappropriate [configuration] +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + +--- + nss/coreconf/arch.mk | 4 ++-- + nss/lib/freebl/Makefile | 6 ++++++ + 2 files changed, 8 insertions(+), 2 deletions(-) + +diff --git a/nss/coreconf/arch.mk b/nss/coreconf/arch.mk +index 17e9fae..bc4180a 100644 +--- a/nss/coreconf/arch.mk ++++ b/nss/coreconf/arch.mk +@@ -26,11 +26,11 @@ OS_ARCH := $(subst /,_,$(shell uname -s)) + # Attempt to differentiate between sparc and x86 Solaris + # + +-OS_TEST := $(shell uname -m) ++OS_TEST ?= $(shell uname -m) + ifeq ($(OS_TEST),i86pc) + OS_RELEASE := $(shell uname -r)_$(OS_TEST) + else +- OS_RELEASE := $(shell uname -r) ++ OS_RELEASE ?= $(shell uname -r) + endif + + +diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile +index eeee90a..7ee8736 100644 +--- a/nss/lib/freebl/Makefile ++++ b/nss/lib/freebl/Makefile +@@ -36,6 +36,12 @@ ifdef USE_64 + DEFINES += -DNSS_USE_64 + endif + ++ifeq ($(OS_TEST),mips) ++ifndef USE_64 ++ DEFINES += -DNS_PTR_LE_32 ++endif ++endif ++ + ifdef USE_ABI32_FPU + DEFINES += -DNSS_USE_ABI32_FPU + endif diff --git a/meta-oe/recipes-support/nss/nss/blank-cert9.db b/meta-oe/recipes-support/nss/nss/blank-cert9.db Binary files differnew file mode 100644 index 0000000000..7d4bcf2582 --- /dev/null +++ b/meta-oe/recipes-support/nss/nss/blank-cert9.db diff --git a/meta-oe/recipes-support/nss/nss/blank-key4.db b/meta-oe/recipes-support/nss/nss/blank-key4.db Binary files differnew file mode 100644 index 0000000000..d47f08d04f --- /dev/null +++ b/meta-oe/recipes-support/nss/nss/blank-key4.db diff --git a/meta-oe/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch b/meta-oe/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch new file mode 100644 index 0000000000..4c9bea30c0 --- /dev/null +++ b/meta-oe/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch @@ -0,0 +1,42 @@ +From f613c9a9107435a40d91329f33f12cfb16927f07 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 7 Mar 2020 08:34:02 -0800 +Subject: [PATCH] nss,nspr: Add recipes + +clang 3.9 add this warning to rightly flag undefined +behavior, we relegate this to be just a warning instead +of error and keep the behavior as it was. Right fix would +be to not pass enum to the function with variadic arguments +as last named argument + +Fixes errors like +ocsp.c:2220:22: error: passing an object that undergoes default argument promotion to 'va_start' has undefined behavior [-Werror,-Wvarargs] + va_start(ap, responseType0); + ^ +ocsp.c:2200:43: note: parameter of type 'SECOidTag' is declared here + SECOidTag responseType0, ...) + +see +https://www.securecoding.cert.org/confluence/display/cplusplus/EXP58-CPP.+Pass+an+object+of+the+correct+type+to+va_start +for more details + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Pending + +--- + nss/coreconf/Werror.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/nss/coreconf/Werror.mk b/nss/coreconf/Werror.mk +index a569a49..687fe58 100644 +--- a/nss/coreconf/Werror.mk ++++ b/nss/coreconf/Werror.mk +@@ -56,7 +56,7 @@ ifndef WARNING_CFLAGS + ifdef CC_IS_CLANG + # -Qunused-arguments : clang objects to arguments that it doesn't understand + # and fixing this would require rearchitecture +- WARNING_CFLAGS += -Qunused-arguments ++ WARNING_CFLAGS += -Qunused-arguments -Wno-error=varargs + # -Wno-parentheses-equality : because clang warns about macro expansions + WARNING_CFLAGS += $(call disable_warning,parentheses-equality) + ifdef BUILD_OPT diff --git a/meta-oe/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch b/meta-oe/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch new file mode 100644 index 0000000000..735b06b5ca --- /dev/null +++ b/meta-oe/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch @@ -0,0 +1,91 @@ +From 2ce67b1f4b1f582d556ae058da10698bbaa0edc1 Mon Sep 17 00:00:00 2001 +From: Ovidiu Panait <ovidiu.panait@windriver.com> +Date: Mon, 13 Jul 2020 12:12:31 +0300 +Subject: [PATCH] nss: fix incorrect shebang of perl + +Replace incorrect shebang of perl with `#!/usr/bin/env perl'. + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +Upstream-Status: Pending +Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> + +--- + nss/cmd/signver/examples/1/form.pl | 2 +- + nss/cmd/signver/examples/1/signedForm.pl | 2 +- + nss/cmd/smimetools/smime | 2 +- + nss/coreconf/version.pl | 2 +- + nss/tests/clean_tbx | 2 +- + nss/tests/iopr/server_scr/client.cgi | 2 +- + nss/tests/path_uniq | 2 +- + 7 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/nss/cmd/signver/examples/1/form.pl b/nss/cmd/signver/examples/1/form.pl +index f2cfddc..af58d54 100755 +--- a/nss/cmd/signver/examples/1/form.pl ++++ b/nss/cmd/signver/examples/1/form.pl +@@ -1,4 +1,4 @@ +-#! /usr/bin/perl ++#!/usr/bin/env perl + # This Source Code Form is subject to the terms of the Mozilla Public + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. +diff --git a/nss/cmd/signver/examples/1/signedForm.pl b/nss/cmd/signver/examples/1/signedForm.pl +index 847814c..64a31ff 100755 +--- a/nss/cmd/signver/examples/1/signedForm.pl ++++ b/nss/cmd/signver/examples/1/signedForm.pl +@@ -1,4 +1,4 @@ +-#! /usr/bin/perl ++#!/usr/bin/env perl + # This Source Code Form is subject to the terms of the Mozilla Public + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. +diff --git a/nss/cmd/smimetools/smime b/nss/cmd/smimetools/smime +index e67f6be..6cd85e6 100755 +--- a/nss/cmd/smimetools/smime ++++ b/nss/cmd/smimetools/smime +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/env perl + + # This Source Code Form is subject to the terms of the Mozilla Public + # License, v. 2.0. If a copy of the MPL was not distributed with this +diff --git a/nss/coreconf/version.pl b/nss/coreconf/version.pl +index d2a4942..3ba7323 100644 +--- a/nss/coreconf/version.pl ++++ b/nss/coreconf/version.pl +@@ -1,4 +1,4 @@ +-#!/usr/sbin/perl ++#!/usr/bin/env perl + # + # This Source Code Form is subject to the terms of the Mozilla Public + # License, v. 2.0. If a copy of the MPL was not distributed with this +diff --git a/nss/tests/clean_tbx b/nss/tests/clean_tbx +index 4de9555..c15a069 100755 +--- a/nss/tests/clean_tbx ++++ b/nss/tests/clean_tbx +@@ -1,4 +1,4 @@ +-#! /bin/perl ++#!/usr/bin/env perl + + ####################################################################### + # +diff --git a/nss/tests/iopr/server_scr/client.cgi b/nss/tests/iopr/server_scr/client.cgi +index 581ad06..34ea170 100644 +--- a/nss/tests/iopr/server_scr/client.cgi ++++ b/nss/tests/iopr/server_scr/client.cgi +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl ++#!/usr/bin/env perl + + # This Source Code Form is subject to the terms of the Mozilla Public + # License, v. 2.0. If a copy of the MPL was not distributed with this +diff --git a/nss/tests/path_uniq b/nss/tests/path_uniq +index f29f60a..850332a 100755 +--- a/nss/tests/path_uniq ++++ b/nss/tests/path_uniq +@@ -1,4 +1,4 @@ +-#! /bin/perl ++#!/usr/bin/env perl + + ######################################################################## + # diff --git a/meta-oe/recipes-support/nss/nss/nss-fix-nsinstall-build.patch b/meta-oe/recipes-support/nss/nss/nss-fix-nsinstall-build.patch new file mode 100644 index 0000000000..a1897f88d8 --- /dev/null +++ b/meta-oe/recipes-support/nss/nss/nss-fix-nsinstall-build.patch @@ -0,0 +1,44 @@ +From f9b2b1c738576a17460aebd005f511f427aa1974 Mon Sep 17 00:00:00 2001 +From: Wenzong Fan <wenzong.fan@windriver.com> +Date: Sat, 7 Mar 2020 08:34:02 -0800 +Subject: [PATCH] Fix nss multilib build on openSUSE 11.x 32bit + +While building lib64-nss on openSUSE 11.x 32bit, the nsinstall will +fail with error: + +* nsinstall.c:1:0: sorry, unimplemented: 64-bit mode not compiled + +It caused by the '-m64' option which passed to host gcc. + +The nsinstall was built first while nss starting to build, it only runs +on host to install built files, it doesn't need any cross-compling or +multilib build options. Just clean the ARCHFLAG and LDFLAGS to fix this +error. + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> +=================================================== + +--- + nss/coreconf/nsinstall/Makefile | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/nss/coreconf/nsinstall/Makefile b/nss/coreconf/nsinstall/Makefile +index 08dfbc2..e97fb5f 100644 +--- a/nss/coreconf/nsinstall/Makefile ++++ b/nss/coreconf/nsinstall/Makefile +@@ -18,6 +18,13 @@ INTERNAL_TOOLS = 1 + + include $(DEPTH)/coreconf/config.mk + ++# nsinstall is unfit for cross-compiling/multilib-build since it was ++# always run on local host to install built files. This change intends ++# to clean the '-m64' from ARCHFLAG and LDFLAGS. ++ARCHFLAG = ++LDFLAGS = ++# CFLAGS = ++ + ifeq (,$(filter-out OS2 WIN%,$(OS_TARGET))) + PROGRAM = + TARGETS = diff --git a/meta-oe/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch b/meta-oe/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch new file mode 100644 index 0000000000..8c715cc447 --- /dev/null +++ b/meta-oe/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch @@ -0,0 +1,28 @@ +From 73edfbdf33fe4e41724e7e947033d8caeec8f3d0 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Sat, 7 Mar 2020 08:34:02 -0800 +Subject: [PATCH] nss:no rpath for cross compiling + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +Upstream-Status: Inappropriate [configuration] + +--- + nss/cmd/platlibs.mk | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/nss/cmd/platlibs.mk b/nss/cmd/platlibs.mk +index 6401778..e5c4e16 100644 +--- a/nss/cmd/platlibs.mk ++++ b/nss/cmd/platlibs.mk +@@ -18,9 +18,9 @@ endif + + ifeq ($(OS_ARCH), Linux) + ifeq ($(USE_64), 1) +-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib' ++#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib' + else +-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib' ++#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib' + endif + endif + diff --git a/meta-oe/recipes-support/nss/nss/nss.pc.in b/meta-oe/recipes-support/nss/nss/nss.pc.in new file mode 100644 index 0000000000..402b4ecb33 --- /dev/null +++ b/meta-oe/recipes-support/nss/nss/nss.pc.in @@ -0,0 +1,11 @@ +prefix=OEPREFIX +exec_prefix=OEEXECPREFIX +libdir=OELIBDIR +includedir=OEINCDIR + +Name: NSS +Description: Network Security Services +Version: %NSS_VERSION% +Requires: nspr >= %NSPR_VERSION% +Libs: -L${libdir} -lssl3 -lsmime3 -lnss3 -lsoftokn3 -lnssutil3 +Cflags: -IOEINCDIR diff --git a/meta-oe/recipes-support/nss/nss/pqg.c-ULL_addend.patch b/meta-oe/recipes-support/nss/nss/pqg.c-ULL_addend.patch new file mode 100644 index 0000000000..589b4d5e7f --- /dev/null +++ b/meta-oe/recipes-support/nss/nss/pqg.c-ULL_addend.patch @@ -0,0 +1,32 @@ +From cbd367160338847b28fc801a12c74f1c8b5b03ee Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 7 Mar 2020 08:34:02 -0800 +Subject: [PATCH] nss does not build on mips with clang because wrong types are + used? + +pqg.c:339:16: error: comparison of constant 18446744073709551615 with expression of type 'unsigned long' is always true [-Werror,-Wtautological-constant-out-of-range-compare] + if (addend < MP_DIGIT_MAX) { + ~~~~~~ ^ ~~~~~~~~~~~~ + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Pending + +--- + nss/lib/freebl/pqg.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/nss/lib/freebl/pqg.c b/nss/lib/freebl/pqg.c +index 1b03278..ad895b7 100644 +--- a/nss/lib/freebl/pqg.c ++++ b/nss/lib/freebl/pqg.c +@@ -326,8 +326,8 @@ generate_h_candidate(SECItem *hit, mp_int *H) + + static SECStatus + addToSeed(const SECItem *seed, +- unsigned long addend, +- int seedlen, /* g in 186-1 */ ++ unsigned long long addend, ++ int seedlen, /* g in 186-1 */ + SECItem *seedout) + { + mp_int s, sum, modulus, tmp; diff --git a/meta-oe/recipes-support/nss/nss/system-pkcs11.txt b/meta-oe/recipes-support/nss/nss/system-pkcs11.txt new file mode 100644 index 0000000000..1a264e9cc4 --- /dev/null +++ b/meta-oe/recipes-support/nss/nss/system-pkcs11.txt @@ -0,0 +1,5 @@ +library= +name=NSS Internal PKCS #11 Module +parameters=configdir='sql:/etc/pki/nssdb' certPrefix='' keyPrefix='' secmod='secmod.db' flags= updatedir='' updateCertPrefix='' updateKeyPrefix='' updateid='' updateTokenDescription='' +NSS=Flags=internal,critical trustOrder=75 cipherOrder=100 slotParams=(1={slotFlags=[ECC,RSA,DSA,DH,RC2,RC4,DES,RANDOM,SHA1,MD5,MD2,SSL,TLS,AES,Camellia,SEED,SHA256,SHA512] askpw=any timeout=30}) + diff --git a/meta-oe/recipes-support/nss/nss_3.98.bb b/meta-oe/recipes-support/nss/nss_3.98.bb new file mode 100644 index 0000000000..0ceefb5e3e --- /dev/null +++ b/meta-oe/recipes-support/nss/nss_3.98.bb @@ -0,0 +1,289 @@ +SUMMARY = "Mozilla's SSL and TLS implementation" +DESCRIPTION = "Network Security Services (NSS) is a set of libraries \ +designed to support cross-platform development of \ +security-enabled client and server applications. \ +Applications built with NSS can support SSL v2 and v3, \ +TLS, PKCS 5, PKCS 7, PKCS 11, PKCS 12, S/MIME, X.509 \ +v3 certificates, and other security standards." +HOMEPAGE = "http://www.mozilla.org/projects/security/pki/nss/" +SECTION = "libs" + +DEPENDS = "sqlite3 nspr zlib nss-native" +DEPENDS:class-native = "sqlite3-native nspr-native zlib-native" + +LICENSE = "(MPL-2.0 & MIT) | (MPL-2.0 & GPL-2.0-or-later & MIT) | (MPL-2.0 & LGPL-2.1-or-later & MIT)" + +LIC_FILES_CHKSUM = "file://nss/COPYING;md5=3b1e88e1b9c0b5a4b2881d46cce06a18 \ + file://nss/lib/freebl/mpi/doc/LICENSE;md5=491f158d09d948466afce85d6f1fe18f \ + file://nss/lib/freebl/mpi/doc/LICENSE-MPL;md5=5d425c8f3157dbf212db2ec53d9e5132 \ + file://nss/lib/freebl/verified/Hacl_Poly1305_256.c;beginline=1;endline=22;md5=cc22f07b95d28d56baeb757df46ee7c8" + +VERSION_DIR = "${@d.getVar('BP').upper().replace('-', '_').replace('.', '_') + '_RTM'}" + +SRC_URI = "http://ftp.mozilla.org/pub/security/nss/releases/${VERSION_DIR}/src/${BP}.tar.gz \ + file://nss.pc.in \ + file://0001-nss-fix-support-cross-compiling.patch \ + file://nss-no-rpath-for-cross-compiling.patch \ + file://nss-fix-incorrect-shebang-of-perl.patch \ + file://disable-Wvarargs-with-clang.patch \ + file://pqg.c-ULL_addend.patch \ + file://blank-cert9.db \ + file://blank-key4.db \ + file://system-pkcs11.txt \ + file://nss-fix-nsinstall-build.patch \ + file://0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \ + " +SRC_URI[sha256sum] = "f549cc33d35c0601674bfacf7c6ad683c187595eb4125b423238d3e9aa4209ce" + +UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases" +UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes" + +inherit siteinfo + +TD = "${S}/tentative-dist" +TDS = "${S}/tentative-dist-staging" + +TARGET_CC_ARCH += "${LDFLAGS}" + +CFLAGS:append:class-native = " -D_XOPEN_SOURCE " + +do_configure:prepend:libc-musl () { + sed -i -e '/-DHAVE_SYS_CDEFS_H/d' ${S}/nss/lib/dbm/config/config.mk +} + +do_configure:prepend:powerpc64le:toolchain-clang () { + sed -i -e 's/\-std=c99/\-std=gnu99/g' ${S}/nss/coreconf/command.mk +} + +do_configure:prepend:powerpc64:toolchain-clang () { + sed -i -e 's/\-std=c99/\-std=gnu99/g' ${S}/nss/coreconf/command.mk +} + +do_compile:prepend:class-native() { + export NSPR_INCLUDE_DIR=${STAGING_INCDIR_NATIVE}/nspr + export NSPR_LIB_DIR=${STAGING_LIBDIR_NATIVE} +} + +do_compile:prepend:class-nativesdk() { + export LDFLAGS="" +} + +do_compile:prepend:class-native() { + # Need to set RPATH so that chrpath will do its job correctly + RPATH="-Wl,-rpath-link,${STAGING_LIBDIR_NATIVE} -Wl,-rpath-link,${STAGING_BASE_LIBDIR_NATIVE} -Wl,-rpath,${STAGING_LIBDIR_NATIVE} -Wl,-rpath,${STAGING_BASE_LIBDIR_NATIVE}" +} + +do_compile() { + export NSPR_INCLUDE_DIR=${STAGING_INCDIR}/nspr + + export CROSS_COMPILE=1 + export NATIVE_CC="${BUILD_CC}" + # Additional defines needed on Centos 7 + export NATIVE_FLAGS="${BUILD_CFLAGS} -DLINUX -Dlinux" + export BUILD_OPT=1 + + # POSIX.1-2001 states that the behaviour of getcwd() when passing a null + # pointer as the buf argument, is unspecified. + export NATIVE_FLAGS="${NATIVE_FLAGS} -DGETCWD_CANT_MALLOC" + + export FREEBL_NO_DEPEND=1 + export FREEBL_LOWHASH=1 + + export LIBDIR=${libdir} + export MOZILLA_CLIENT=1 + export NS_USE_GCC=1 + export NSS_USE_SYSTEM_SQLITE=1 + export NSS_ENABLE_ECC=1 + export NSS_ENABLE_WERROR=0 + + ${@bb.utils.contains("TUNE_FEATURES", "crypto", "export NSS_USE_ARM_HW_CRYPTO=1", "", d)} + + export OS_RELEASE=3.4 + export OS_TARGET=Linux + export OS_ARCH=Linux + + if [ "${TARGET_ARCH}" = "powerpc" ]; then + OS_TEST=ppc + elif [ "${TARGET_ARCH}" = "powerpc64" -o "${TARGET_ARCH}" = "powerpc64le" ]; then + OS_TEST=ppc64 + elif [ "${TARGET_ARCH}" = "mips" -o "${TARGET_ARCH}" = "mipsel" -o "${TARGET_ARCH}" = "mips64" -o "${TARGET_ARCH}" = "mips64el" ]; then + OS_TEST=mips + elif [ "${TARGET_ARCH}" = "aarch64_be" ]; then + OS_TEST="aarch64" + else + OS_TEST="${TARGET_ARCH}" + fi + + if [ "${SITEINFO_BITS}" = "64" ]; then + export USE_64=1 + elif [ "${TARGET_ARCH}" = "x86_64" -a "${SITEINFO_BITS}" = "32" ]; then + export USE_X32=1 + fi + + export NSS_DISABLE_GTESTS=1 + # We can modify CC in the environment, but if we set it via an + # argument to make, nsinstall, a host program, will also build with it! + # + # nss pretty much does its own thing with CFLAGS, so we put them into CC. + # Optimization will get clobbered, but most of the stuff will survive. + # The motivation for this is to point to the correct place for debug + # source files and CFLAGS does that. Nothing uses CCC. + # + export CC="${CC} ${CFLAGS}" + make -C ./nss CCC="${CXX} -g" \ + OS_TEST=${OS_TEST} \ + RPATH="${RPATH}" \ + autobuild +} + +do_compile[vardepsexclude] += "SITEINFO_BITS" + +do_install:prepend:class-nativesdk() { + export LDFLAGS="" +} + +do_install() { + export CROSS_COMPILE=1 + export NATIVE_CC="${BUILD_CC}" + export BUILD_OPT=1 + + export FREEBL_NO_DEPEND=1 + + export LIBDIR=${libdir} + export MOZILLA_CLIENT=1 + export NS_USE_GCC=1 + export NSS_USE_SYSTEM_SQLITE=1 + export NSS_ENABLE_ECC=1 + + export OS_RELEASE=3.4 + export OS_TARGET=Linux + export OS_ARCH=Linux + + if [ "${TARGET_ARCH}" = "powerpc" ]; then + OS_TEST=ppc + elif [ "${TARGET_ARCH}" = "powerpc64" -o "${TARGET_ARCH}" = "powerpc64le" ]; then + OS_TEST=ppc64 + elif [ "${TARGET_ARCH}" = "mips" -o "${TARGET_ARCH}" = "mipsel" -o "${TARGET_ARCH}" = "mips64" -o "${TARGET_ARCH}" = "mips64el" ]; then + OS_TEST=mips + elif [ "${TARGET_ARCH}" = "aarch64_be" ]; then + CPU_ARCH=aarch64 + OS_TEST="aarch64" + else + OS_TEST="${TARGET_ARCH}" + fi + if [ "${SITEINFO_BITS}" = "64" ]; then + export USE_64=1 + elif [ "${TARGET_ARCH}" = "x86_64" -a "${SITEINFO_BITS}" = "32" ]; then + export USE_X32=1 + fi + + export NSS_DISABLE_GTESTS=1 + + make -C ./nss \ + CCC="${CXX}" \ + OS_TEST=${OS_TEST} \ + SOURCE_LIB_DIR="${TD}/${libdir}" \ + SOURCE_BIN_DIR="${TD}/${bindir}" \ + install + + install -d ${D}/${libdir}/ + for file in ${S}/dist/*.OBJ/lib/*.so; do + echo "Installing `basename $file`..." + cp $file ${D}/${libdir}/ + done + + for shared_lib in ${TD}/${libdir}/*.so.*; do + if [ -f $shared_lib ]; then + cp $shared_lib ${D}/${libdir} + ln -sf $(basename $shared_lib) ${D}/${libdir}/$(basename $shared_lib .1oe) + fi + done + for shared_lib in ${TD}/${libdir}/*.so; do + if [ -f $shared_lib -a ! -e ${D}/${libdir}/$shared_lib ]; then + cp $shared_lib ${D}/${libdir} + fi + done + + install -d ${D}/${includedir}/nss3 + install -m 644 -t ${D}/${includedir}/nss3 dist/public/nss/* + + install -d ${D}/${bindir} + for binary in ${TD}/${bindir}/*; do + install -m 755 -t ${D}/${bindir} $binary + done +} + +do_install[vardepsexclude] += "SITEINFO_BITS" + +do_install:append() { + # Create empty .chk files for the NSS libraries at build time. They could + # be regenerated at target's boot time. + for file in libsoftokn3.chk libfreebl3.chk libnssdbm3.chk; do + touch ${D}/${libdir}/$file + chmod 755 ${D}/${libdir}/$file + done + + install -d ${D}${libdir}/pkgconfig/ + sed 's/%NSS_VERSION%/${PV}/' ${UNPACKDIR}/nss.pc.in | sed 's/%NSPR_VERSION%/4.9.2/' > ${D}${libdir}/pkgconfig/nss.pc + sed -i s:OEPREFIX:${prefix}:g ${D}${libdir}/pkgconfig/nss.pc + sed -i s:OEEXECPREFIX:${exec_prefix}:g ${D}${libdir}/pkgconfig/nss.pc + sed -i s:OELIBDIR:${libdir}:g ${D}${libdir}/pkgconfig/nss.pc + sed -i s:OEINCDIR:${includedir}/nss3:g ${D}${libdir}/pkgconfig/nss.pc +} + +do_install:append:class-target() { + # It used to call certutil to create a blank certificate with empty password at + # build time, but the checksum of key4.db changes every time when certutil is called. + # It causes non-determinism issue, so provide databases with a blank certificate + # which are originally from output of nss in qemux86-64 build. You can get these + # databases by: + # certutil -N -d sql:/database/path/ --empty-password + install -d ${D}${sysconfdir}/pki/nssdb/ + install -m 0644 ${UNPACKDIR}/blank-cert9.db ${D}${sysconfdir}/pki/nssdb/cert9.db + install -m 0644 ${UNPACKDIR}/blank-key4.db ${D}${sysconfdir}/pki/nssdb/key4.db + install -m 0644 ${UNPACKDIR}/system-pkcs11.txt ${D}${sysconfdir}/pki/nssdb/pkcs11.txt +} + +PACKAGE_WRITE_DEPS += "nss-native" + +pkg_postinst:${PN} () { + for I in $D${libdir}/lib*.chk; do + DN=`dirname $I` + BN=`basename $I .chk` + FN=$DN/$BN.so + shlibsign -i $FN + if [ $? -ne 0 ]; then + echo "shlibsign -i $FN failed" + fi + done +} + +PACKAGES =+ "${PN}-smime" +FILES:${PN}-smime = "\ + ${bindir}/smime \ +" + +FILES:${PN} = "\ + ${sysconfdir} \ + ${bindir} \ + ${libdir}/lib*.chk \ + ${libdir}/lib*.so \ + " + +FILES:${PN}-dev = "\ + ${libdir}/nss \ + ${libdir}/pkgconfig/* \ + ${includedir}/* \ + " + +RDEPENDS:${PN}-smime = "perl" + +BBCLASSEXTEND = "native nativesdk" + +CVE_PRODUCT += "network_security_services" + +CVE_STATUS_GROUPS += "CVE_STATUS_NSS" +CVE_STATUS_NSS[status] = "not-applicable-config: This only affect the legacy db (libnssdbm), only compiled with --enable-legacy-db" +CVE_STATUS_NSS = "CVE-2017-11695 CVE-2017-11696 CVE-2017-11697 CVE-2017-11698" + +CVE_STATUS[CVE-2022-3479] = "not-applicable-config: vulnerability was introduced in 3.77 and fixed in 3.87" diff --git a/meta-oe/recipes-support/numactl/numactl/0001-define-run-test-target.patch b/meta-oe/recipes-support/numactl/numactl/0001-define-run-test-target.patch deleted file mode 100644 index 78ffb22f89..0000000000 --- a/meta-oe/recipes-support/numactl/numactl/0001-define-run-test-target.patch +++ /dev/null @@ -1,32 +0,0 @@ -rename test target as run-test - -Upstream-Statue: Pending - -test target not only compile the test files, but also run them, which is -not suitable for cross-compile environment, so rename it as run-test. - -and define test target to compile the test files. - -Signed-off-by: Roy Li <rongqing.li@windriver.com> ---- - Makefile.am | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index b6db339..de176c4 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -124,7 +124,9 @@ regress2: $(check_PROGRAMS) - test_numademo: numademo - ./numademo -t -e 10M - --test: all $(check_PROGRAMS) regress1 regress2 test_numademo -+test: all $(check_PROGRAMS) -+ -+run-test: all $(check_PROGRAMS) regress1 regress2 test_numademo - - TESTS_ENVIRONMENT = builddir='$(builddir)'; export builddir; - --- -1.9.1 - diff --git a/meta-oe/recipes-support/numactl/numactl/0001-numademo-fix-error-on-32bit-system.patch b/meta-oe/recipes-support/numactl/numactl/0001-numademo-fix-error-on-32bit-system.patch deleted file mode 100644 index 506101711a..0000000000 --- a/meta-oe/recipes-support/numactl/numactl/0001-numademo-fix-error-on-32bit-system.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 68485f8516884377e54c623b0deff73f97321d96 Mon Sep 17 00:00:00 2001 -From: "Hongzhi.Song" <hongzhi.song@windriver.com> -Date: Thu, 19 Sep 2019 04:32:31 -0400 -Subject: [PATCH] numademo: fix error on 32bit system - -Error Info on 32bit: -root@intel-x86:~# numademo -t -e 1M -Configured Nodes does not match available memory nodes - -That's because sizeof(long)=4Word, but sizeof(long long)=8Word -on 32bit. So (long long) assigning to (long) maybe cause overflow. - -long numa_node_size(int node, long *freep) -{ - ... - long sz = numa_node_size64_int(node, &f2); - ~^^~ - return sz; - ... -} -long long numa_node_size64(int node, long long *freep) -~^^ ^^~ -{ - ... -} - -Unify the return type of above functions. - -Upstream-Status: Accepted [next version is after 2.0.13 or 2.0.14] -[https://github.com/numactl/numactl/commit/a7c4bc790a191d3e42b63850b409c1a72b75a4e1] - Submitted [https://github.com/numactl/numactl/pull/79] -[The first patch was merged but has a error, then the second fix it.] - -Signed-off-by: Hongzhi.Song <hongzhi.song@windriver.com> ---- - libnuma.c | 4 ++-- - numa.h | 2 +- - numademo.c | 2 +- - test/move_pages.c | 2 +- - 4 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/libnuma.c b/libnuma.c -index cac8851..8b5c6aa 100644 ---- a/libnuma.c -+++ b/libnuma.c -@@ -791,10 +791,10 @@ long long numa_node_size64(int node, long long *freep) - - make_internal_alias(numa_node_size64); - --long numa_node_size(int node, long *freep) -+long long numa_node_size(int node, long long *freep) - { - long long f2; -- long sz = numa_node_size64_int(node, &f2); -+ long long sz = numa_node_size64_int(node, &f2); - if (freep) - *freep = f2; - return sz; -diff --git a/numa.h b/numa.h -index 3a8c543..268fb1d 100644 ---- a/numa.h -+++ b/numa.h -@@ -143,7 +143,7 @@ int numa_preferred(void); - - /* Return node size and free memory */ - long long numa_node_size64(int node, long long *freep); --long numa_node_size(int node, long *freep); -+long long numa_node_size(int node, long long *freep); - - int numa_pagesize(void); - -diff --git a/numademo.c b/numademo.c -index a720db0..8c56da8 100644 ---- a/numademo.c -+++ b/numademo.c -@@ -301,7 +301,7 @@ int max_node, numnodes; - int get_node_list(void) - { - int a, got_nodes = 0; -- long free_node_sizes; -+ long long free_node_sizes; - - numnodes = numa_num_configured_nodes(); - node_to_use = (int *)malloc(numnodes * sizeof(int)); -diff --git a/test/move_pages.c b/test/move_pages.c -index d1d8436..f8ff25d 100644 ---- a/test/move_pages.c -+++ b/test/move_pages.c -@@ -26,7 +26,7 @@ int *node_to_use; - int get_node_list() - { - int a, got_nodes = 0, max_node, numnodes; -- long free_node_sizes; -+ long long free_node_sizes; - - numnodes = numa_num_configured_nodes(); - node_to_use = (int *)malloc(numnodes * sizeof(int)); --- -2.23.0 - diff --git a/meta-oe/recipes-support/numactl/numactl/Fix-the-test-output-format.patch b/meta-oe/recipes-support/numactl/numactl/Fix-the-test-output-format.patch deleted file mode 100644 index 9812ecc8b3..0000000000 --- a/meta-oe/recipes-support/numactl/numactl/Fix-the-test-output-format.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 59fd750a84bbe5874dec936d2bee9ef11a1b6505 Mon Sep 17 00:00:00 2001 -From: Li xin <lixin.fnst@cn.fujitsu.com> -Date: Tue, 21 Jul 2015 02:01:22 +0900 -Subject: [PATCH] Fix the test output format - -Upstream-Status: Pending - -Signed-off-by: Roy Li <rongqing.li@windriver.com> -Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> ---- - test/regress | 6 +++--- - test/regress2 | 11 +++++------ - 2 files changed, 8 insertions(+), 9 deletions(-) - -diff --git a/test/regress b/test/regress -index 2ce1705..d086a47 100755 ---- a/test/regress -+++ b/test/regress -@@ -74,6 +74,7 @@ probe_hardware() - if [ $numnodes -lt 2 ] ; then - echo "need at least two nodes with at least $NEEDPAGES each of" - echo "free memory for mempolicy regression tests" -+ echo "FAIL: numa regress" - exit 77 # Skip test - fi - } -@@ -207,10 +208,9 @@ main() - rm A B - - if [ "$EXIT" = 0 ] ; then -- echo '========SUCCESS' -+ echo 'PASS: numactl regress' - else -- echo '========FAILURE' -- exit 1 -+ echo 'FAIL: numactl regress' - fi - } - -diff --git a/test/regress2 b/test/regress2 -index aa6ea41..450c510 100755 ---- a/test/regress2 -+++ b/test/regress2 -@@ -9,12 +9,11 @@ testdir=`dirname "$0"` - export PATH=${builddir}:$PATH - - T() { -- echo "$@" -- if ! $VALGRIND "$@" ; then -- echo $1 FAILED!!!! -- exit 1 -- fi -- echo -+ if ! $VALGRIND "$@" 2>&1 1>/dev/null; then -+ echo "FAIL: $1" -+ else -+ echo "PASS: $1" -+ fi - } - - # still broken --- -1.8.4.2 - diff --git a/meta-oe/recipes-support/numactl/numactl/Makefile b/meta-oe/recipes-support/numactl/numactl/Makefile deleted file mode 100644 index 9a5134c3f2..0000000000 --- a/meta-oe/recipes-support/numactl/numactl/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -.PHONY: regress1 regress2 - -regress1: - cd test ; ./regress - -regress2: - cd test ; ./regress2 diff --git a/meta-oe/recipes-support/numactl/numactl/run-ptest b/meta-oe/recipes-support/numactl/numactl/run-ptest deleted file mode 100755 index 215f7c25b9..0000000000 --- a/meta-oe/recipes-support/numactl/numactl/run-ptest +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -make regress1 -make regress2 -if numademo -t -e 10M; then - echo "PASS: numademo" -else - echo "FAIL: numademo" -fi - diff --git a/meta-oe/recipes-support/numactl/numactl_git.bb b/meta-oe/recipes-support/numactl/numactl_git.bb deleted file mode 100644 index 20b7fed862..0000000000 --- a/meta-oe/recipes-support/numactl/numactl_git.bb +++ /dev/null @@ -1,60 +0,0 @@ -SUMMARY = "Development package for building Applications that use numa" -HOMEPAGE = "http://oss.sgi.com/projects/libnuma/" -DESCRIPTION = "Simple NUMA policy support. It consists of a numactl program \ -to run other programs with a specific NUMA policy and a libnuma to do \ -allocations with NUMA policy in applications." -LICENSE = "GPL-2.0 & LGPL-2.1" -SECTION = "apps" - -inherit autotools-brokensep ptest - -LIC_FILES_CHKSUM = "file://README.md;beginline=19;endline=32;md5=f8ff2391624f28e481299f3f677b21bb" - -SRCREV = "5d9f16722e3df49dc618a9f361bd482559695db7" -PV = "2.0.13+git${SRCPV}" - -SRC_URI = "git://github.com/numactl/numactl \ - file://Fix-the-test-output-format.patch \ - file://Makefile \ - file://run-ptest \ - file://0001-define-run-test-target.patch \ - file://0001-numademo-fix-error-on-32bit-system.patch \ -" - -S = "${WORKDIR}/git" - -# ARM does not currently support NUMA -COMPATIBLE_HOST = "^((?!arm).*)$" - -do_install() { - oe_runmake DESTDIR=${D} prefix=${D}/usr install - #remove the empty man2 directory - rm -r ${D}${mandir}/man2 -} - -do_compile_ptest() { - oe_runmake test -} - -do_install_ptest() { - #install tests binaries - local test_binaries="distance ftok mbind_mig_pages migrate_pages move_pages \ - mynode nodemap node-parse pagesize prefered randmap realloc_test \ - tbitmap tshared" - - [ ! -d ${D}/${PTEST_PATH}/test ] && mkdir -p ${D}/${PTEST_PATH}/test - for i in $test_binaries; do - install -m 0755 ${B}/test/.libs/$i ${D}${PTEST_PATH}/test - done - - local test_scripts="checktopology checkaffinity printcpu regress regress2 \ - shmtest runltp bind_range" - for i in $test_scripts; do - install -m 0755 ${B}/test/$i ${D}${PTEST_PATH}/test - done - - install -m 0755 ${WORKDIR}/Makefile ${D}${PTEST_PATH}/ - install -m 0755 ${B}/.libs/numactl ${D}${PTEST_PATH}/ -} - -RDEPENDS_${PN}-ptest = "bash" diff --git a/meta-oe/recipes-support/onig/files/configure.patch b/meta-oe/recipes-support/onig/files/configure.patch deleted file mode 100644 index 5fa700f190..0000000000 --- a/meta-oe/recipes-support/onig/files/configure.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: onig-5.9.3/configure.in -=================================================================== ---- onig-5.9.3.orig/configure.in 2012-10-26 07:06:14.000000000 +0000 -+++ onig-5.9.3/configure.in 2014-07-18 08:02:52.701574484 +0000 -@@ -3,7 +3,7 @@ - - AC_CONFIG_MACRO_DIR([m4]) - --AM_INIT_AUTOMAKE -+AM_INIT_AUTOMAKE([foreign]) - AC_CONFIG_HEADER(config.h) - - diff --git a/meta-oe/recipes-support/onig/files/do-not-use-system-headers.patch b/meta-oe/recipes-support/onig/files/do-not-use-system-headers.patch deleted file mode 100644 index b93602a268..0000000000 --- a/meta-oe/recipes-support/onig/files/do-not-use-system-headers.patch +++ /dev/null @@ -1,44 +0,0 @@ -Author: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> - -When build on host with older eglibc (Ubuntu 12.04) build fails with: - -/tmp/OE/build/tmp-eglibc/sysroots/genericarmv8/usr/include/bits/predefs.h:23:3: error: #error "Never use <bits/predefs.h> directly; include <stdc-predef.h> instead." - -Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> - -Upstream-Status: Inappropriate [embedded specific] - ---- - Makefile.am | 2 +- - sample/Makefile.am | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - ---- onig-5.9.3.orig/Makefile.am -+++ onig-5.9.3/Makefile.am -@@ -4,11 +4,11 @@ sampledir = $(top_srcdir)/sample - libname = libonig.la - - ACLOCAL_AMFLAGS = -I m4 - #AM_CFLAGS = -DNOT_RUBY - AM_CFLAGS = --INCLUDES = -I$(top_srcdir) -I$(includedir) -+INCLUDES = -I$(top_srcdir) - - SUBDIRS = . sample - - include_HEADERS = oniguruma.h oniggnu.h onigposix.h - lib_LTLIBRARIES = $(libname) ---- onig-5.9.3.orig/sample/Makefile.am -+++ onig-5.9.3/sample/Makefile.am -@@ -1,10 +1,10 @@ - noinst_PROGRAMS = encode listcap names posix simple sql syntax crnl - - libname = $(top_builddir)/libonig.la - LDADD = $(libname) --INCLUDES = -I$(top_srcdir) -I$(includedir) -+INCLUDES = -I$(top_srcdir) - - encode_SOURCES = encode.c - listcap_SOURCES = listcap.c - names_SOURCES = names.c - posix_SOURCES = posix.c diff --git a/meta-oe/recipes-support/onig/onig/0001-build-don-t-link-against-host-system-libraries.patch b/meta-oe/recipes-support/onig/onig/0001-build-don-t-link-against-host-system-libraries.patch new file mode 100644 index 0000000000..1db9684abd --- /dev/null +++ b/meta-oe/recipes-support/onig/onig/0001-build-don-t-link-against-host-system-libraries.patch @@ -0,0 +1,42 @@ +From 543990bc34a0e5d4f66a9167efb1f3b8de6a3635 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <git@andred.net> +Date: Mon, 6 Jan 2020 16:56:31 +0000 +Subject: [PATCH 1/2] build: don't link against (host) system libraries +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [OE specific] +Signed-off-by: André Draszik <git@andred.net> +--- + sample/Makefile.am | 1 - + test/Makefile.am | 1 - + 2 files changed, 2 deletions(-) + +diff --git a/sample/Makefile.am b/sample/Makefile.am +index 681cd2a933de..c4f796d36da0 100644 +--- a/sample/Makefile.am ++++ b/sample/Makefile.am +@@ -4,7 +4,6 @@ lib_onig = ../src/libonig.la + LDADD = $(lib_onig) + + AM_CFLAGS = -Wall +-AM_LDFLAGS = -L$(libdir) + AM_CPPFLAGS = -I$(top_srcdir)/src + + if ENABLE_POSIX_API +diff --git a/test/Makefile.am b/test/Makefile.am +index 94739a24ab22..a23ef1e2e139 100644 +--- a/test/Makefile.am ++++ b/test/Makefile.am +@@ -1,7 +1,6 @@ + ## Makefile.am for Oniguruma + lib_onig = ../src/libonig.la + +-AM_LDFLAGS = -L$(libdir) + AM_CFLAGS = -Wall -Wno-invalid-source-encoding + AM_CPPFLAGS = -I$(top_srcdir)/src + +-- +2.35.1 + diff --git a/meta-oe/recipes-support/onig/onig/0002-build-enable-serial-tests-automake-option-for-ptest.patch b/meta-oe/recipes-support/onig/onig/0002-build-enable-serial-tests-automake-option-for-ptest.patch new file mode 100644 index 0000000000..096b8baa79 --- /dev/null +++ b/meta-oe/recipes-support/onig/onig/0002-build-enable-serial-tests-automake-option-for-ptest.patch @@ -0,0 +1,38 @@ +From 1ab999aa5a7a21329bab13e05f843e5e029493e1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <git@andred.net> +Date: Mon, 6 Jan 2020 15:10:30 +0000 +Subject: [PATCH 2/2] build: enable serial-tests automake option (for ptest) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +For ptest, we need to be able to compile the tests without +running them. + +Enabling the serial-tests automake option will add +buildtest-TESTS and runtest-TESTS makefile targets, the +former being what we want. + +Signed-off-by: André Draszik <git@andred.net> +--- +Upstream-Status: Pending + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 079fef9a1a52..058b5504b9b7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3,7 +3,7 @@ AC_INIT(onig, 6.9.8) + + AC_CONFIG_MACRO_DIR([m4]) + +-AM_INIT_AUTOMAKE([-Wno-portability]) ++AM_INIT_AUTOMAKE([-Wno-portability serial-tests]) + AC_CONFIG_HEADERS([src/config.h]) + + +-- +2.35.1 + diff --git a/meta-oe/recipes-support/onig/onig/run-ptest b/meta-oe/recipes-support/onig/onig/run-ptest new file mode 100755 index 0000000000..fbce336990 --- /dev/null +++ b/meta-oe/recipes-support/onig/onig/run-ptest @@ -0,0 +1,47 @@ +#!/bin/sh -eu + +my_cleanup() { + [ -n "${workdir:-}" ] && rm -rf "${workdir}" +} + +trap "my_cleanup" EXIT +for sig in INT TERM ; do + # We want sig to expand right here and now, as it's + # a loop variable, not when signalled. For $$ it + # doesn't matter. + # shellcheck disable=SC2064 + trap "my_cleanup ; trap - EXIT ; trap - ${sig} ; kill -s ${sig} $$" ${sig} +done + +workdir=$(mktemp -d -t onig.ptest.XXXXXX) +status="${workdir}/failed" +touch "${status}" + +find tests/ -perm -111 -type f ! -path "tests/.debug/*" -exec sh -c ' + workdir="${1}" + status="${2}" + t="${3}" + t_log="${workdir}/$(basename ${t}).log" + + res=0 + ./${t} > "${t_log}" 2>&1 \ + || res=$? + if [ $res -eq 0 ] ; then + echo "PASS: ${t}" + else + echo "FAIL: ${t}" + echo "$(basename ${t}): ${t_log}" >> "${status}" + fi + ' _ "${workdir}" "${status}" {} \; + +if [ $(stat -c '%s' "${status}") -ne 0 ] ; then + exec >&2 + while IFS=': ' read -r t t_log ; do + printf "\n=========================\n" + printf "ERROR: %s:\n" "${t}" + printf -- "-------------------------\n" + cat "${t_log}" + done < "${status}" +fi + +[ $(stat -c '%s' "${status}") -eq 0 ] diff --git a/meta-oe/recipes-support/onig/onig_5.9.6.bb b/meta-oe/recipes-support/onig/onig_5.9.6.bb deleted file mode 100644 index 20a71c6c9b..0000000000 --- a/meta-oe/recipes-support/onig/onig_5.9.6.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "Regular expressions library. The characteristics of this \ -library is that different character encoding for every regular expression \ -object can be specified." -HOMEPAGE = "https://web.archive.org/web/20150807014439/http://www.geocities.jp/kosako3/oniguruma/" -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=0d4861b5bc0c392a5aa90d9d76ebd86f" - -SRC_URI = "https://web.archive.org/web/20150807014439/http://www.geocities.jp/kosako3/oniguruma/archive/${BP}.tar.gz \ - file://do-not-use-system-headers.patch \ - file://configure.patch" - -SRC_URI[md5sum] = "d08f10ea5c94919780e6b7bed1ef9830" -SRC_URI[sha256sum] = "d5642010336a6f68b7f2e34b1f1cb14be333e4d95c2ac02b38c162caf44e47a7" - -BINCONFIG = "${bindir}/onig-config" - -inherit autotools binconfig-disabled - -BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/onig/onig_6.9.9.bb b/meta-oe/recipes-support/onig/onig_6.9.9.bb new file mode 100644 index 0000000000..b29437db1e --- /dev/null +++ b/meta-oe/recipes-support/onig/onig_6.9.9.bb @@ -0,0 +1,34 @@ +SUMMARY = "Regular expressions library" +DESCRIPTION = "Oniguruma is a modern and flexible regular expressions library. \ +It encompasses features from different regular expression \ +implementations that traditionally exist in different languages. \ +Character encoding can be specified per regular expression object." +HOMEPAGE = "https://github.com/kkos/oniguruma" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=e6365c225bb5cc4321d0913f0baffa04" + +SRC_URI = "\ + https://github.com/kkos/oniguruma/releases/download/v${PV}/${BP}.tar.gz \ + file://0001-build-don-t-link-against-host-system-libraries.patch \ + file://0002-build-enable-serial-tests-automake-option-for-ptest.patch \ + file://run-ptest \ +" + +SRC_URI[sha256sum] = "60162bd3b9fc6f4886d4c7a07925ffd374167732f55dce8c491bfd9cd818a6cf" + +BINCONFIG = "${bindir}/onig-config" + +inherit autotools binconfig-disabled ptest + +BBCLASSEXTEND = "native" + +do_compile_ptest() { + oe_runmake -C test buildtest-TESTS +} + +do_install_ptest() { + mkdir -p ${D}${PTEST_PATH}/tests + install -m 0755 -t ${D}${PTEST_PATH}/tests/ ${B}/test/.libs/* +} + +PROVIDES += "oniguruma" diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-GitHub-Issue-367.-Remove-references-to-deprecated-G_.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-GitHub-Issue-367.-Remove-references-to-deprecated-G_.patch deleted file mode 100644 index 6cb5dfcccb..0000000000 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-GitHub-Issue-367.-Remove-references-to-deprecated-G_.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 6fb28085e867d7c3ef46577d9ff193a185693bcb Mon Sep 17 00:00:00 2001 -From: Oliver Kurth <okurth@vmware.com> -Date: Mon, 30 Sep 2019 16:24:27 -0700 -Subject: [PATCH] GitHub Issue #367. Remove references to deprecated G_INLINE_FUNC. - -G_INLINE_FUNC was a work-around for compilers that didn't support -static inline. Change uses of it to static inline. - -Upstream-Status: Backport -[https://github.com/vmware/open-vm-tools/commit/89c0d444567eb525e8d083fb564c46d68e96660c] - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - open-vm-tools/lib/include/vmware/tools/plugin.h | 2 +- - open-vm-tools/lib/include/vmware/tools/threadPool.h | 8 ++++---- - open-vm-tools/lib/include/vmware/tools/utils.h | 9 --------- - 3 files changed, 5 insertions(+), 14 deletions(-) - -diff --git a/open-vm-tools/lib/include/vmware/tools/plugin.h b/open-vm-tools/lib/include/vmware/tools/plugin.h -index f9acc6a2..deefd1f3 100644 ---- a/open-vm-tools/lib/include/vmware/tools/plugin.h -+++ b/open-vm-tools/lib/include/vmware/tools/plugin.h -@@ -290,7 +290,7 @@ typedef struct ToolsAppCtx { - * - * @return TRUE if COM is initialized when the function returns. - */ --G_INLINE_FUNC gboolean -+static inline gboolean - ToolsCore_InitializeCOM(ToolsAppCtx *ctx) - { - if (!ctx->comInitialized) { -diff --git a/open-vm-tools/lib/include/vmware/tools/threadPool.h b/open-vm-tools/lib/include/vmware/tools/threadPool.h -index 3f2082b3..5880fbcf 100644 ---- a/open-vm-tools/lib/include/vmware/tools/threadPool.h -+++ b/open-vm-tools/lib/include/vmware/tools/threadPool.h -@@ -91,7 +91,7 @@ typedef struct ToolsCorePool { - ******************************************************************************* - */ - --G_INLINE_FUNC ToolsCorePool * -+static inline ToolsCorePool * - ToolsCorePool_GetPool(ToolsAppCtx *ctx) - { - ToolsCorePool *pool = NULL; -@@ -123,7 +123,7 @@ ToolsCorePool_GetPool(ToolsAppCtx *ctx) - ******************************************************************************* - */ - --G_INLINE_FUNC guint -+static inline guint - ToolsCorePool_SubmitTask(ToolsAppCtx *ctx, - ToolsCorePoolCb cb, - gpointer data, -@@ -153,7 +153,7 @@ ToolsCorePool_SubmitTask(ToolsAppCtx *ctx, - ******************************************************************************* - */ - --G_INLINE_FUNC void -+static inline void - ToolsCorePool_CancelTask(ToolsAppCtx *ctx, - guint taskId) - { -@@ -197,7 +197,7 @@ ToolsCorePool_CancelTask(ToolsAppCtx *ctx, - ******************************************************************************* - */ - --G_INLINE_FUNC gboolean -+static inline gboolean - ToolsCorePool_StartThread(ToolsAppCtx *ctx, - const gchar *threadName, - ToolsCorePoolCb cb, -diff --git a/open-vm-tools/lib/include/vmware/tools/utils.h b/open-vm-tools/lib/include/vmware/tools/utils.h -index f6574590..a3292d5c 100644 ---- a/open-vm-tools/lib/include/vmware/tools/utils.h -+++ b/open-vm-tools/lib/include/vmware/tools/utils.h -@@ -51,15 +51,6 @@ - # include <sys/time.h> - #endif - -- --/* Work around a glib limitation: it doesn't set G_INLINE_FUNC on Win32. */ --#if defined(G_PLATFORM_WIN32) --# if defined(G_INLINE_FUNC) --# undef G_INLINE_FUNC --# endif --# define G_INLINE_FUNC static __inline --#endif -- - #ifndef ABS - # define ABS(x) (((x) >= 0) ? (x) : -(x)) - #endif --- -2.23.0 - diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-Make-HgfsConvertFromNtTimeNsec-aware-of-64-bit-time_.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-Make-HgfsConvertFromNtTimeNsec-aware-of-64-bit-time_.patch deleted file mode 100644 index 61a681f17f..0000000000 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-Make-HgfsConvertFromNtTimeNsec-aware-of-64-bit-time_.patch +++ /dev/null @@ -1,78 +0,0 @@ -From caf80e220b055dbce259078be96e899dc78ec1d2 Mon Sep 17 00:00:00 2001 -From: Bartosz Brachaczek <b.brachaczek@gmail.com> -Date: Tue, 12 Nov 2019 14:31:08 +0100 -Subject: [PATCH] Make HgfsConvertFromNtTimeNsec aware of 64-bit time_t on i386 - -I verified that this function behaves as expected on x86_64, i386 with -32-bit time_t, and i386 with 64-bit time_t for the following values of -ntTtime: - -UNIX_EPOCH-1, UNIX_EPOCH, UNIX_EPOCH+1, UNIX_S32_MAX-1, UNIX_S32_MAX, -UNIX_S32_MAX+1, UNIX_S32_MAX*2+1 - -I did not verify whether the use of Div643264 is optimal, performance -wise. - -Upstream-Status: Submitted [https://github.com/vmware/open-vm-tools/pull/387] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - open-vm-tools/lib/hgfs/hgfsUtil.c | 34 +++++++++++++++++-------------- - 1 file changed, 19 insertions(+), 15 deletions(-) - -diff --git a/open-vm-tools/lib/hgfs/hgfsUtil.c b/open-vm-tools/lib/hgfs/hgfsUtil.c -index cc580ab8..49b10040 100644 ---- a/open-vm-tools/lib/hgfs/hgfsUtil.c -+++ b/open-vm-tools/lib/hgfs/hgfsUtil.c -@@ -110,23 +110,21 @@ HgfsConvertFromNtTimeNsec(struct timespec *unixTime, // OUT: Time in UNIX format - uint64 ntTime) // IN: Time in Windows NT format - { - #ifdef __i386__ -- uint32 sec; -- uint32 nsec; -+ uint64 sec64; -+ uint32 sec32, nsec; -+#endif - - ASSERT(unixTime); -- /* We assume that time_t is 32bit */ -- ASSERT_ON_COMPILE(sizeof (unixTime->tv_sec) == 4); - -- /* Cap NT time values that are outside of Unix time's range */ -+ if (sizeof (unixTime->tv_sec) == 4) { -+ /* Cap NT time values that are outside of Unix time's range */ - -- if (ntTime >= UNIX_S32_MAX) { -- unixTime->tv_sec = 0x7FFFFFFF; -- unixTime->tv_nsec = 0; -- return 1; -+ if (ntTime >= UNIX_S32_MAX) { -+ unixTime->tv_sec = 0x7FFFFFFF; -+ unixTime->tv_nsec = 0; -+ return 1; -+ } - } --#else -- ASSERT(unixTime); --#endif - - if (ntTime < UNIX_EPOCH) { - unixTime->tv_sec = 0; -@@ -135,9 +133,15 @@ HgfsConvertFromNtTimeNsec(struct timespec *unixTime, // OUT: Time in UNIX format - } - - #ifdef __i386__ -- Div643232(ntTime - UNIX_EPOCH, 10000000, &sec, &nsec); -- unixTime->tv_sec = sec; -- unixTime->tv_nsec = nsec * 100; -+ if (sizeof (unixTime->tv_sec) == 4) { -+ Div643232(ntTime - UNIX_EPOCH, 10000000, &sec32, &nsec); -+ unixTime->tv_sec = sec32; -+ unixTime->tv_nsec = nsec * 100; -+ } else { -+ Div643264(ntTime - UNIX_EPOCH, 10000000, &sec64, &nsec); -+ unixTime->tv_sec = sec64; -+ unixTime->tv_nsec = nsec * 100; -+ } - #else - unixTime->tv_sec = (ntTime - UNIX_EPOCH) / 10000000; - unixTime->tv_nsec = ((ntTime - UNIX_EPOCH) % 10000000) * 100; diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-configure.ac-don-t-use-dnet-config.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-configure.ac-don-t-use-dnet-config.patch deleted file mode 100644 index a711f5e5d2..0000000000 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-configure.ac-don-t-use-dnet-config.patch +++ /dev/null @@ -1,36 +0,0 @@ -From fc9bf1ce9f1a21150b10736a1c968d4ca6d4eaa3 Mon Sep 17 00:00:00 2001 -From: Martin Kelly <mkelly@xevo.com> -Date: Fri, 7 Apr 2017 15:20:30 -0700 -Subject: [PATCH] configure.ac: don't use dnet-config - -The dnet-config tool doesn't know about cross-compilation, so it injects --I/usr/include into the path, causing compiler errors. So instead find dnet via --ldnet. - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Martin Kelly <mkelly@xevo.com> ---- - open-vm-tools/configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/open-vm-tools/configure.ac -+++ b/open-vm-tools/configure.ac -@@ -937,7 +937,7 @@ if test "$with_dnet" = "yes"; then - AC_VMW_CHECK_LIB([dnet], - [DNET], - [], -- [dnet-config], -+ [], - [], - [dnet.h], - [intf_open], -@@ -947,7 +947,7 @@ if test "$with_dnet" = "yes"; then - - if test $have_dnet = "no"; then - AC_MSG_ERROR( -- [dnet-config was not found on your PATH. Please configure without dnet or install dnet - http://libdnet.sourceforge.net]) -+ [dnet was not found. Please configure without dnet (using --without-dnet) or install dnet - http://libdnet.sourceforge.net]) - fi - fi - diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0002-add-include-sys-sysmacros.h.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0002-add-include-sys-sysmacros.h.patch deleted file mode 100644 index 34628ffbef..0000000000 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0002-add-include-sys-sysmacros.h.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 3fa237b3afabc293e563292b8d89265a871626ad Mon Sep 17 00:00:00 2001 -From: Martin Kelly <mkelly@xevo.com> -Date: Mon, 22 May 2017 17:00:05 -0700 -Subject: [PATCH] add #include <sys/sysmacros.h> - -In newer glibc versions, the definition for major() has been moved to -sys/sysmacros.h, and using the older version in <sys/types.h> has been -deprecated. So, add an include for <sys/sysmacros.h>. - -Upstream-Status: Pending - -Signed-off-by: Martin Kelly <mkelly@xevo.com> ---- - open-vm-tools/lib/wiper/wiperPosix.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/open-vm-tools/lib/wiper/wiperPosix.c b/open-vm-tools/lib/wiper/wiperPosix.c -index bd542410..ccf06293 100644 ---- a/open-vm-tools/lib/wiper/wiperPosix.c -+++ b/open-vm-tools/lib/wiper/wiperPosix.c -@@ -43,6 +43,9 @@ - # include <libgen.h> - # endif /* __FreeBSD_version >= 500000 */ - #endif -+#if defined(__linux__) -+#include <sys/sysmacros.h> -+#endif - #include <unistd.h> - - #include "vmware.h" diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0002-hgfsServerLinux-Consider-64bit-time_t-possibility.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0002-hgfsServerLinux-Consider-64bit-time_t-possibility.patch deleted file mode 100644 index 0f64eabc94..0000000000 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0002-hgfsServerLinux-Consider-64bit-time_t-possibility.patch +++ /dev/null @@ -1,41 +0,0 @@ -From fe56b67a2915a8632ea30604c14241f335dd3c15 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 12 Nov 2019 10:49:46 -0800 -Subject: [PATCH] hgfsServerLinux: Consider 64bit time_t possibility - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - .../lib/hgfsServer/hgfsServerLinux.c | 19 +++++-------------- - 1 file changed, 5 insertions(+), 14 deletions(-) - -diff --git a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c -index 03175623..554da67f 100644 ---- a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c -+++ b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c -@@ -2561,20 +2561,11 @@ HgfsStatToFileAttr(struct stat *stats, // IN: stat information - LOG(4, ("%s: done, permissions %o%o%o%o, size %"FMT64"u\n", __FUNCTION__, - attr->specialPerms, attr->ownerPerms, attr->groupPerms, - attr->otherPerms, attr->size)); --#ifdef __FreeBSD__ --# if !defined(VM_X86_64) && __FreeBSD_version >= 500043 --# define FMTTIMET "" --# else --# define FMTTIMET "l" --# endif --#else --# define FMTTIMET "l" --#endif -- LOG(4, ("access: %"FMTTIMET"d/%"FMT64"u \nwrite: %"FMTTIMET"d/%"FMT64"u \n" -- "attr: %"FMTTIMET"d/%"FMT64"u\n", -- stats->st_atime, attr->accessTime, stats->st_mtime, attr->writeTime, -- stats->st_ctime, attr->attrChangeTime)); --#undef FMTTIMET -+ LOG(4, ("access: %jd/%"FMT64"u \nwrite: %jd/%"FMT64"u \n" -+ "attr: %jd/%"FMT64"u\n", -+ (intmax_t)stats->st_atime, attr->accessTime, -+ (intmax_t)stats->st_mtime, attr->writeTime, -+ (intmax_t)stats->st_ctime, attr->attrChangeTime)); - - attr->userId = stats->st_uid; - attr->groupId = stats->st_gid; diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0003-Use-configure-test-for-struct-timespec.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0003-Use-configure-test-for-struct-timespec.patch deleted file mode 100644 index 6d2e498141..0000000000 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0003-Use-configure-test-for-struct-timespec.patch +++ /dev/null @@ -1,45 +0,0 @@ -From bf9292ff9bd25467a014d6c2070805d163daa4c9 Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Wed, 18 Nov 2015 09:03:00 +0000 -Subject: [PATCH] Use configure test for struct timespec - -Use the configure script to test for struct time spec instead of trying -to keep track of what platforms has it. - -Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> ---- - open-vm-tools/configure.ac | 1 + - open-vm-tools/lib/include/hgfsUtil.h | 8 +------- - 2 files changed, 2 insertions(+), 7 deletions(-) - -diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac -index 713ea683..48ff1ef3 100644 ---- a/open-vm-tools/configure.ac -+++ b/open-vm-tools/configure.ac -@@ -1208,6 +1208,7 @@ AC_TYPE_OFF_T - AC_TYPE_PID_T - AC_TYPE_SIZE_T - AC_CHECK_MEMBERS([struct stat.st_rdev]) -+AC_CHECK_MEMBERS([struct timespec.tv_sec],[],[],[[#include <time.h>]]) - AC_HEADER_TIME - AC_STRUCT_TM - AC_C_VOLATILE -diff --git a/open-vm-tools/lib/include/hgfsUtil.h b/open-vm-tools/lib/include/hgfsUtil.h -index 609f4c00..a3a022d4 100644 ---- a/open-vm-tools/lib/include/hgfsUtil.h -+++ b/open-vm-tools/lib/include/hgfsUtil.h -@@ -53,13 +53,7 @@ - # include <time.h> - # endif - # include "vm_basic_types.h" --# if !defined _STRUCT_TIMESPEC && \ -- !defined _TIMESPEC_DECLARED && \ -- !defined __timespec_defined && \ -- !defined sun && \ -- !defined __FreeBSD__ && \ -- !__APPLE__ && \ -- !defined _WIN32 -+# if !defined HAVE_STRUCT_TIMESPEC_TV_SEC - struct timespec { - time_t tv_sec; - long tv_nsec; diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0004-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0004-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch deleted file mode 100644 index e107ecf235..0000000000 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0004-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 5a795b234c617150915a607776c76377948870a6 Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Wed, 18 Nov 2015 09:10:14 +0000 -Subject: [PATCH] Fix definition of ALLPERMS and ACCESSPERMS - -The ALLPERMS and ACCESSPERMS defines are not specified in POSIX so -assume it is not there instead of testing for specific implementations. - -This is needed for musl libc. - -Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> ---- - open-vm-tools/lib/hgfsServer/hgfsServerLinux.c | 8 +++++--- - open-vm-tools/services/plugins/dndcp/dnd/dndLinux.c | 3 +-- - 2 files changed, 6 insertions(+), 5 deletions(-) - -diff --git a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c -index f2b7ce67..0e6351a9 100644 ---- a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c -+++ b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c -@@ -105,11 +105,13 @@ typedef struct DirectoryEntry { - #endif - - /* -- * ALLPERMS (mode 07777) and ACCESSPERMS (mode 0777) are not defined in the -- * Solaris version of <sys/stat.h>. -+ * ALLPERMS (mode 07777) and ACCESSPERMS (mode 0777) are not specified in -+ * POSIX. - */ --#ifdef sun -+#ifndef ACCESSPERMS - # define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO) -+#endif -+#ifndef ALLPERMS - # define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO) - #endif - -diff --git a/open-vm-tools/services/plugins/dndcp/dnd/dndLinux.c b/open-vm-tools/services/plugins/dndcp/dnd/dndLinux.c -index 89133652..7e9c3a91 100644 ---- a/open-vm-tools/services/plugins/dndcp/dnd/dndLinux.c -+++ b/open-vm-tools/services/plugins/dndcp/dnd/dndLinux.c -@@ -52,7 +52,7 @@ - - #define DND_ROOTDIR_PERMS (S_IRWXU | S_IRWXG | S_IRWXO) - #define DND_STAGINGDIR_PERMS (S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH) --#ifdef sun -+#ifndef ACCESSPERMS - #define ACCESSPERMS (S_IRWXU | S_IRWXG | S_IRWXO) - #endif - #ifdef __ANDROID__ -@@ -61,7 +61,6 @@ - */ - #define NO_SETMNTENT - #define NO_ENDMNTENT --#define ACCESSPERMS (S_IRWXU | S_IRWXG | S_IRWXO) - #endif - - diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0005-Use-configure-to-test-for-feature-instead-of-platfor.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0005-Use-configure-to-test-for-feature-instead-of-platfor.patch deleted file mode 100644 index c6378b8086..0000000000 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0005-Use-configure-to-test-for-feature-instead-of-platfor.patch +++ /dev/null @@ -1,135 +0,0 @@ -From 719d60978f979cf2e03771a9b8a62e36c92639f9 Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Wed, 18 Nov 2015 10:05:07 +0000 -Subject: [PATCH] Use configure to test for feature instead of platform - -Test for various functions instead of trying to keep track of what -platform and what version of the given platform has support for what. - -This should make it easier to port to currently unknown platforms and -will solve the issue if a platform add support for a missing feature in -the future. - -The features we test for are: -- getifaddrs -- getauxval -- issetugid -- __secure_getenv - -This is needed for musl libc. - -Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> ---- - open-vm-tools/configure.ac | 4 ++++ - open-vm-tools/lib/misc/idLinux.c | 30 +++++++++++------------- - open-vm-tools/lib/nicInfo/nicInfoPosix.c | 6 ++++- - 3 files changed, 23 insertions(+), 17 deletions(-) - -diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac -index 48ff1ef3..71e684bb 100644 ---- a/open-vm-tools/configure.ac -+++ b/open-vm-tools/configure.ac -@@ -897,6 +897,7 @@ AC_CHECK_FUNCS( - - AC_CHECK_FUNCS([ecvt]) - AC_CHECK_FUNCS([fcvt]) -+AC_CHECK_FUNCS([getifaddrs getauxval issetugid __secure_getenv]) - - AC_CHECK_FUNC([mkdtemp], [have_mkdtemp=yes]) - -@@ -1145,10 +1146,13 @@ fi - ### - - AC_CHECK_HEADERS([crypt.h]) -+AC_CHECK_HEADERS([ifaddrs.h]) - AC_CHECK_HEADERS([inttypes.h]) - AC_CHECK_HEADERS([stdint.h]) - AC_CHECK_HEADERS([stdlib.h]) - AC_CHECK_HEADERS([wchar.h]) -+AC_CHECK_HEADERS([net/if.h]) -+AC_CHECK_HEADERS([sys/auxv.h]) - AC_CHECK_HEADERS([sys/inttypes.h]) - AC_CHECK_HEADERS([sys/io.h]) - AC_CHECK_HEADERS([sys/param.h]) # Required to make the sys/user.h check work correctly on FreeBSD -diff --git a/open-vm-tools/lib/misc/idLinux.c b/open-vm-tools/lib/misc/idLinux.c -index b950cf84..1dcfb508 100644 ---- a/open-vm-tools/lib/misc/idLinux.c -+++ b/open-vm-tools/lib/misc/idLinux.c -@@ -27,12 +27,9 @@ - #include <sys/syscall.h> - #include <string.h> - #include <unistd.h> --#ifdef __linux__ --#if defined(__GLIBC__) && \ -- (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 16)) -+#ifdef HAVE_SYS_AUXV_H - #include <sys/auxv.h> - #endif --#endif - #ifdef __APPLE__ - #include <sys/socket.h> - #include <TargetConditionals.h> -@@ -997,31 +994,32 @@ Id_EndSuperUser(uid_t uid) // IN: - static Bool - IdIsSetUGid(void) - { --#if defined(__ANDROID__) -- /* Android does not have a secure_getenv, so be conservative. */ -- return TRUE; --#else - /* - * We use __secure_getenv, which returns NULL if the binary is -- * setuid or setgid. Alternatives include, -+ * setuid or setgid, when issetugid or getauxval(AT_SECURE) is not -+ * available. Alternatives include, - * -- * a) getauxval(AT_SECURE); not available until glibc 2.16. -- * b) __libc_enable_secure; may not be exported. -+ * a) issetugid(); not (yet?) available in glibc. -+ * b) getauxval(AT_SECURE); not available until glibc 2.16. -+ * c) __libc_enable_secure; may not be exported. - * -- * Use (a) when we are based on glibc 2.16, or newer. -+ * Use (b) when we are based on glibc 2.16, or newer. - */ - --#if defined(__GLIBC__) && \ -- (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 16)) -+#if HAVE_ISSETUGID -+ return issetugid(); -+#elif HAVE_GETAUXVAL - return getauxval(AT_SECURE) != 0; --#else -+#elif HAVE___SECURE_GETENV - static const char envName[] = "VMW_SETUGID_TEST"; - - if (setenv(envName, "1", TRUE) == -1) { - return TRUE; /* Conservative */ - } - return __secure_getenv(envName) == NULL; --#endif -+#else -+ /* Android does not have a secure_getenv, so be conservative. */ -+ return TRUE; - #endif - } - #endif -diff --git a/open-vm-tools/lib/nicInfo/nicInfoPosix.c b/open-vm-tools/lib/nicInfo/nicInfoPosix.c -index a22981d5..b4e08681 100644 ---- a/open-vm-tools/lib/nicInfo/nicInfoPosix.c -+++ b/open-vm-tools/lib/nicInfo/nicInfoPosix.c -@@ -34,9 +34,13 @@ - #include <sys/socket.h> - #include <sys/stat.h> - #include <errno.h> --#if defined(__FreeBSD__) || defined(__APPLE__) -+#if HAVE_SYS_SYSCTL_H - # include <sys/sysctl.h> -+#endif -+#if HAVE_IFADDRS_H - # include <ifaddrs.h> -+#endif -+#if HAVE_NET_IF_H - # include <net/if.h> - #endif - #ifndef NO_DNET diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0006-Use-configure-test-for-sys-stat.h-include.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0006-Use-configure-test-for-sys-stat.h-include.patch deleted file mode 100644 index 9a227f9ec7..0000000000 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0006-Use-configure-test-for-sys-stat.h-include.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 11adcf43a1e7aa39ee4d82fa567f37e5b0c6ca81 Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Wed, 18 Nov 2015 10:41:01 +0000 -Subject: [PATCH] Use configure test for sys/stat.h include - -This is needed for musl libc. - -Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> ---- - open-vm-tools/services/plugins/vix/vixTools.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/open-vm-tools/services/plugins/vix/vixTools.c b/open-vm-tools/services/plugins/vix/vixTools.c -index e5273786..cabc4137 100644 ---- a/open-vm-tools/services/plugins/vix/vixTools.c -+++ b/open-vm-tools/services/plugins/vix/vixTools.c -@@ -66,7 +66,7 @@ - #include <unistd.h> - #endif - --#if defined(sun) || defined(__FreeBSD__) || defined(__APPLE__) -+#ifdef HAVE_SYS_STAT_H - #include <sys/stat.h> - #endif - diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0007-Fix-subdir-objects-configure-error.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0007-Fix-subdir-objects-configure-error.patch deleted file mode 100644 index 11be2d4a07..0000000000 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0007-Fix-subdir-objects-configure-error.patch +++ /dev/null @@ -1,24 +0,0 @@ -From cf1284fda8fb22a2b27cb2ce7962f166166e74c3 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 13 Jun 2018 23:48:04 -0700 -Subject: [PATCH] Fix subdir objects configure error - -Fix build on musl while here - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - open-vm-tools/configure.ac | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac -index 71e684bb..b76a7966 100644 ---- a/open-vm-tools/configure.ac -+++ b/open-vm-tools/configure.ac -@@ -303,6 +303,7 @@ AC_ARG_ENABLE( - [], - [enable_resolutionkms="auto"]) - -+AM_INIT_AUTOMAKE([subdir-objects]) - AM_INIT_AUTOMAKE - - ### diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0008-include-poll.h-instead-of-sys-poll.h.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0008-include-poll.h-instead-of-sys-poll.h.patch deleted file mode 100644 index 814b9e3b25..0000000000 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0008-include-poll.h-instead-of-sys-poll.h.patch +++ /dev/null @@ -1,26 +0,0 @@ -From e4f0b99d90e26b15106f634caad1c3dea9e09cb8 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 13 Jun 2018 23:02:50 -0700 -Subject: [PATCH] include poll.h instead of sys/poll.h - -including sys/poll.h is deprecated - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - open-vm-tools/lib/asyncsocket/asyncsocket.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/open-vm-tools/lib/asyncsocket/asyncsocket.c b/open-vm-tools/lib/asyncsocket/asyncsocket.c -index 65b07109..b41aa29d 100644 ---- a/open-vm-tools/lib/asyncsocket/asyncsocket.c -+++ b/open-vm-tools/lib/asyncsocket/asyncsocket.c -@@ -69,8 +69,8 @@ - #else - #include <stddef.h> - #include <ctype.h> -+#include <poll.h> - #include <sys/types.h> --#include <sys/poll.h> - #include <sys/socket.h> - #include <sys/un.h> - #include <netdb.h> diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0009-Rename-poll.h-to-vm_poll.h.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0009-Rename-poll.h-to-vm_poll.h.patch deleted file mode 100644 index 9cf54f6f44..0000000000 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0009-Rename-poll.h-to-vm_poll.h.patch +++ /dev/null @@ -1,742 +0,0 @@ -From 8793466326dd10b0d2dbb83c64beff5cc8c0fc7d Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 13 Jun 2018 23:11:58 -0700 -Subject: [PATCH] Rename poll.h to vm_poll.h - -musl libc's system headers pulls in open-vm-tools' poll.h. To avoid this -we rename poll.h to vm_poll.h. - -Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - open-vm-tools/lib/asyncsocket/asyncsocket.c | 2 +- - open-vm-tools/lib/hgfsServer/hgfsServer.c | 2 +- - open-vm-tools/lib/include/asyncsocket.h | 2 +- - open-vm-tools/lib/include/pollImpl.h | 2 +- - open-vm-tools/lib/include/{poll.h => vm_poll.h} | 2 +- - open-vm-tools/lib/rpcIn/rpcin.c | 2 +- - .../services/plugins/grabbitmqProxy/grabbitmqProxyPlugin.c | 2 +- - 7 files changed, 7 insertions(+), 7 deletions(-) - rename open-vm-tools/lib/include/{poll.h => vm_poll.h} (99%) - ---- a/open-vm-tools/lib/asyncsocket/asyncsocket.c -+++ b/open-vm-tools/lib/asyncsocket/asyncsocket.c -@@ -86,7 +86,7 @@ - #include "random.h" - #include "asyncsocket.h" - #include "asyncSocketBase.h" --#include "poll.h" -+#include "vm_poll.h" - #include "log.h" - #include "err.h" - #include "hostinfo.h" ---- a/open-vm-tools/lib/hgfsServer/hgfsServer.c -+++ b/open-vm-tools/lib/hgfsServer/hgfsServer.c -@@ -48,7 +48,7 @@ - #include "hgfsServerOplock.h" - #include "hgfsDirNotify.h" - #include "userlock.h" --#include "poll.h" -+#include "vm_poll.h" - #include "mutexRankLib.h" - #include "vm_basic_asm.h" - #include "unicodeOperations.h" ---- a/open-vm-tools/lib/include/asyncsocket.h -+++ b/open-vm-tools/lib/include/asyncsocket.h -@@ -164,7 +164,7 @@ typedef struct AsyncSocket AsyncSocket; - * Or the client can specify its favorite poll class and locking behavior. - * Use of IVmdbPoll is only supported for regular sockets and for Attach. - */ --#include "poll.h" -+#include "vm_poll.h" - struct IVmdbPoll; - typedef struct AsyncSocketPollParams { - int flags; /* Default 0, only POLL_FLAG_NO_BULL is valid */ ---- a/open-vm-tools/lib/include/pollImpl.h -+++ b/open-vm-tools/lib/include/pollImpl.h -@@ -44,7 +44,7 @@ - #define INCLUDE_ALLOW_USERLEVEL - #include "includeCheck.h" - --#include "poll.h" -+#include "vm_poll.h" - #include "vm_basic_asm.h" - - #if defined(__cplusplus) ---- a/open-vm-tools/lib/include/poll.h -+++ /dev/null -@@ -1,330 +0,0 @@ --/********************************************************* -- * Copyright (C) 1998-2018 VMware, Inc. All rights reserved. -- * -- * This program is free software; you can redistribute it and/or modify it -- * under the terms of the GNU Lesser General Public License as published -- * by the Free Software Foundation version 2.1 and no later version. -- * -- * This program is distributed in the hope that it will be useful, but -- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -- * or FITNESS FOR A PARTICULAR PURPOSE. See the Lesser GNU General Public -- * License for more details. -- * -- * You should have received a copy of the GNU Lesser General Public License -- * along with this program; if not, write to the Free Software Foundation, Inc., -- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -- * -- *********************************************************/ -- --/********************************************************* -- * The contents of this file are subject to the terms of the Common -- * Development and Distribution License (the "License") version 1.0 -- * and no later version. You may not use this file except in -- * compliance with the License. -- * -- * You can obtain a copy of the License at -- * http://www.opensource.org/licenses/cddl1.php -- * -- * See the License for the specific language governing permissions -- * and limitations under the License. -- * -- *********************************************************/ -- -- --#ifndef _POLL_H_ --#define _POLL_H_ -- --#define INCLUDE_ALLOW_USERLEVEL --#define INCLUDE_ALLOW_VMCORE --#include "includeCheck.h" -- --#include "vm_basic_types.h" --#include "vm_basic_defs.h" --#include "vmware.h" --#include "userlock.h" -- --#if defined(__cplusplus) --extern "C" { --#endif -- --#ifdef _WIN32 --#define HZ 100 --#elif defined linux --#include <asm/param.h> --#elif __APPLE__ --#include <TargetConditionals.h> --/* -- * Old SDKs don't define TARGET_OS_IPHONE at all. -- * New ones define it to 0 on Mac OS X, 1 on iOS. -- */ --#if !defined(TARGET_OS_IPHONE) || TARGET_OS_IPHONE == 0 --#include <sys/kernel.h> --#endif --#include <sys/poll.h> --#define HZ 100 --#endif --#ifdef __ANDROID__ --/* -- * <poll.h> of android should be included, but its name is same -- * with this file. So its content is put here to avoid conflict. -- */ --#include <asm/poll.h> --#define HZ 100 --typedef unsigned int nfds_t; --int poll(struct pollfd *, nfds_t, long); --#endif -- -- --/* -- * Poll event types: each type has a different reason for firing, -- * or condition that must be met before firing. -- */ -- --typedef enum { -- /* -- * Actual Poll queue types against which you can register callbacks. -- */ -- POLL_VIRTUALREALTIME = -1, /* Negative because it doesn't have its own Q */ -- POLL_VTIME = 0, -- POLL_REALTIME, -- POLL_DEVICE, -- POLL_MAIN_LOOP, -- POLL_NUM_QUEUES --} PollEventType; -- -- --/* -- * Classes of events -- * -- * These are the predefined classes. More can be declared -- * with Poll_AllocClass(). -- */ -- --typedef enum PollClass { -- POLL_CLASS_MAIN, -- POLL_CLASS_PAUSE, -- POLL_CLASS_IPC, -- POLL_CLASS_CPT, -- POLL_CLASS_MKS, -- POLL_FIXED_CLASSES, -- POLL_DEFAULT_FIXED_CLASSES, -- /* Size enum to maximum */ -- POLL_MAX_CLASSES = 31, --} PollClass; -- --/* -- * Do not use; Special pseudo private poll class supported by -- * PollDefault only -- */ --#define POLL_DEFAULT_CLASS_NET POLL_FIXED_CLASSES --#define POLL_DEFAULT_CS_NET PollClassSet_Singleton(POLL_DEFAULT_CLASS_NET) -- --/* -- * Each callback is registered in a set of classes -- */ -- --typedef struct PollClassSet { -- uintptr_t bits; --} PollClassSet; -- --/* An empty PollClassSet. */ --static INLINE PollClassSet --PollClassSet_Empty(void) --{ -- PollClassSet set = { 0 }; -- return set; --} -- --/* A PollClassSet with the single member. */ --static INLINE PollClassSet --PollClassSet_Singleton(PollClass c) --{ -- PollClassSet s = PollClassSet_Empty(); -- -- ASSERT_ON_COMPILE(POLL_MAX_CLASSES < sizeof s.bits * 8); -- ASSERT(c < POLL_MAX_CLASSES); -- -- s.bits = CONST3264U(1) << c; -- return s; --} -- --/* Combine two PollClassSets. */ --static INLINE PollClassSet --PollClassSet_Union(PollClassSet lhs, PollClassSet rhs) --{ -- PollClassSet set; -- set.bits = lhs.bits | rhs.bits; -- return set; --} -- --/* Add single class to PollClassSet. */ --static INLINE PollClassSet --PollClassSet_Include(PollClassSet set, PollClass c) --{ -- return PollClassSet_Union(set, PollClassSet_Singleton(c)); --} -- -- --#define POLL_CS_MAIN PollClassSet_Singleton(POLL_CLASS_MAIN) --#define POLL_CS_PAUSE PollClassSet_Union(POLL_CS_MAIN, \ -- PollClassSet_Singleton(POLL_CLASS_PAUSE)) --#define POLL_CS_CPT PollClassSet_Union(POLL_CS_PAUSE, \ -- PollClassSet_Singleton(POLL_CLASS_CPT)) --#define POLL_CS_IPC PollClassSet_Union(POLL_CS_CPT, \ -- PollClassSet_Singleton(POLL_CLASS_IPC)) --#define POLL_CS_VMDB POLL_CS_PAUSE /* POLL_CLASS_VMDB is retired */ --#define POLL_CS_MKS PollClassSet_Singleton(POLL_CLASS_MKS) --/* -- * DANGER. You don't need POLL_CS_ALWAYS. Really. So don't use it. -- */ --#define POLL_CS_ALWAYS PollClassSet_Union(POLL_CS_CPT, POLL_CS_IPC) -- --/* -- * Poll class-set taxonomy: -- * POLL_CS_MAIN -- * - Unless you NEED another class, use POLL_CS_MAIN. -- * POLL_CS_PAUSE -- * - For callbacks that must occur even if the guest is paused. -- * Most VMDB or Foundry commands are in this category. -- * POLL_CS_CPT -- * - Only for callbacks which can trigger intermediate Checkpoint -- * transitions. -- * The ONLY such callback is Migrate. -- * POLL_CS_IPC -- * - Only for callbacks which can contain Msg_(Post|Hint|Question) -- * responses, and for signal handlers (why)? -- * Vigor, VMDB, and Foundry can contain Msg_* responses. -- * POLL_CS_MKS -- * - Callback runs in MKS thread. -- * POLL_CS_ALWAYS -- * - Only for events that must be processed immediately. -- * The ONLY such callback is OvhdMemVmxSizeCheck. -- */ -- -- --/* -- * Poll_Callback flags -- */ -- --#define POLL_FLAG_PERIODIC 0x01 // keep after firing --#define POLL_FLAG_REMOVE_AT_POWEROFF 0x02 // self-explanatory --#define POLL_FLAG_READ 0x04 // device is ready for reading --#define POLL_FLAG_WRITE 0x08 // device is ready for writing --#define POLL_FLAG_SOCKET 0x10 // device is a Windows socket --#define POLL_FLAG_NO_BULL 0x20 // callback does its own locking --#define POLL_FLAG_WINSOCK 0x40 // Winsock style write events --#define POLL_FLAG_FD 0x80 // device is a Windows file descriptor. --#define POLL_FLAG_ACCEPT_INVALID_FDS 0x100 // For broken 3rd party libs, e.g. curl --#define POLL_FLAG_THUNK_TO_WND 0x200 // thunk callback to window message loop -- -- --typedef void (*PollerFunction)(void *clientData); --typedef void (*PollerFireWrapper)(PollerFunction func, -- void *funcData, -- void *wrapperData); --typedef Bool (*PollerErrorFn)(const char *errorStr); -- --/* -- * Initialisers: -- * -- * For the sake of convenience, we declare the initialisers -- * for custom implmentations here, even though the actual -- * implementations are distinct from the core poll code. -- */ -- --typedef struct PollOptions { -- Bool locked; // Use internal MXUser for locking -- Bool allowFullQueue; // Don't assert when device event queue is full. -- VThreadID windowsMsgThread; // thread that processes Windows messages -- PollerFireWrapper fireWrapperFn; // optional; may be useful for stats -- void *fireWrapperData; // optional -- PollerErrorFn errorFn; // optional; called upon unrecoverable error --} PollOptions; -- -- --void Poll_InitDefault(void); --void Poll_InitDefaultEx(const PollOptions *opts); --void Poll_InitGtk(void); // On top of glib for Linux --void Poll_InitCF(void); // On top of CoreFoundation for OSX -- -- --/* -- * Functions -- */ --int Poll_SocketPair(Bool vmci, Bool stream, int fds[2]); --void Poll_Loop(Bool loop, Bool *exit, PollClass c); --void Poll_LoopTimeout(Bool loop, Bool *exit, PollClass c, int timeout); --Bool Poll_LockingEnabled(void); --void Poll_Exit(void); -- -- --/* -- * Poll_Callback adds a callback regardless of whether an identical one exists. -- * The exception to this rule is POLL_DEVICE callbacks: there is a maximum of -- * one read and one write callback per fd. -- * -- * Poll_CallbackRemove removes one callback. If there are multiple identical -- * callbacks, which one is removed is an implementation detail. Note that in -- * the case of POLL_DEVICE and POLL_REALTIME callbacks, the fd/delay used to -- * create the callback is not specified when removing, so all callbacks -- * of those types with the same flags, function, and clientData are considered -- * "identical" even if their fd/delay differed. -- */ -- --VMwareStatus Poll_Callback(PollClassSet classSet, -- int flags, -- PollerFunction f, -- void *clientData, -- PollEventType type, -- PollDevHandle info, // fd/microsec delay -- MXUserRecLock *lck); --Bool Poll_CallbackRemove(PollClassSet classSet, -- int flags, -- PollerFunction f, -- void *clientData, -- PollEventType type); --Bool Poll_CallbackRemoveOneByCB(PollClassSet classSet, -- int flags, -- PollerFunction f, -- PollEventType type, -- void **clientData); -- --void Poll_NotifyChange(PollClassSet classSet); -- --/* -- * Wrappers for Poll_Callback and Poll_CallbackRemove that present -- * simpler subsets of those interfaces. -- */ -- --VMwareStatus Poll_CB_Device(PollerFunction f, -- void *clientData, -- PollDevHandle device, -- Bool periodic); -- --Bool Poll_CB_DeviceRemove(PollerFunction f, -- void *clientData, -- Bool periodic); -- -- --VMwareStatus Poll_CB_RTime(PollerFunction f, -- void *clientData, -- int64 delay, // microseconds -- Bool periodic, -- MXUserRecLock *lock); -- --Bool Poll_CB_RTimeRemove(PollerFunction f, -- void *clientData, -- Bool periodic); -- -- --#ifdef _WIN32 --void Poll_SetPumpsWindowsMessages(Bool pumps); --void Poll_SetWindowMessageRecipient(HWND hWnd, UINT msg, Bool alwaysThunk); --Bool Poll_FireWndCallback(void *lparam); --#endif -- --#if defined(__cplusplus) --} // extern "C" --#endif -- --#endif // _POLL_H_ ---- /dev/null -+++ b/open-vm-tools/lib/include/vm_poll.h -@@ -0,0 +1,330 @@ -+/********************************************************* -+ * Copyright (C) 1998-2018 VMware, Inc. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU Lesser General Public License as published -+ * by the Free Software Foundation version 2.1 and no later version. -+ * -+ * This program is distributed in the hope that it will be useful, but -+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -+ * or FITNESS FOR A PARTICULAR PURPOSE. See the Lesser GNU General Public -+ * License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public License -+ * along with this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ *********************************************************/ -+ -+/********************************************************* -+ * The contents of this file are subject to the terms of the Common -+ * Development and Distribution License (the "License") version 1.0 -+ * and no later version. You may not use this file except in -+ * compliance with the License. -+ * -+ * You can obtain a copy of the License at -+ * http://www.opensource.org/licenses/cddl1.php -+ * -+ * See the License for the specific language governing permissions -+ * and limitations under the License. -+ * -+ *********************************************************/ -+ -+ -+#ifndef _POLL_H_ -+#define _POLL_H_ -+ -+#define INCLUDE_ALLOW_USERLEVEL -+#define INCLUDE_ALLOW_VMCORE -+#include "includeCheck.h" -+ -+#include "vm_basic_types.h" -+#include "vm_basic_defs.h" -+#include "vmware.h" -+#include "userlock.h" -+ -+#if defined(__cplusplus) -+extern "C" { -+#endif -+ -+#ifdef _WIN32 -+#define HZ 100 -+#elif defined linux -+#include <asm/param.h> -+#elif __APPLE__ -+#include <TargetConditionals.h> -+/* -+ * Old SDKs don't define TARGET_OS_IPHONE at all. -+ * New ones define it to 0 on Mac OS X, 1 on iOS. -+ */ -+#if !defined(TARGET_OS_IPHONE) || TARGET_OS_IPHONE == 0 -+#include <sys/kernel.h> -+#endif -+#include <poll.h> -+#define HZ 100 -+#endif -+#ifdef __ANDROID__ -+/* -+ * <poll.h> of android should be included, but its name is same -+ * with this file. So its content is put here to avoid conflict. -+ */ -+#include <asm/poll.h> -+#define HZ 100 -+typedef unsigned int nfds_t; -+int poll(struct pollfd *, nfds_t, long); -+#endif -+ -+ -+/* -+ * Poll event types: each type has a different reason for firing, -+ * or condition that must be met before firing. -+ */ -+ -+typedef enum { -+ /* -+ * Actual Poll queue types against which you can register callbacks. -+ */ -+ POLL_VIRTUALREALTIME = -1, /* Negative because it doesn't have its own Q */ -+ POLL_VTIME = 0, -+ POLL_REALTIME, -+ POLL_DEVICE, -+ POLL_MAIN_LOOP, -+ POLL_NUM_QUEUES -+} PollEventType; -+ -+ -+/* -+ * Classes of events -+ * -+ * These are the predefined classes. More can be declared -+ * with Poll_AllocClass(). -+ */ -+ -+typedef enum PollClass { -+ POLL_CLASS_MAIN, -+ POLL_CLASS_PAUSE, -+ POLL_CLASS_IPC, -+ POLL_CLASS_CPT, -+ POLL_CLASS_MKS, -+ POLL_FIXED_CLASSES, -+ POLL_DEFAULT_FIXED_CLASSES, -+ /* Size enum to maximum */ -+ POLL_MAX_CLASSES = 31, -+} PollClass; -+ -+/* -+ * Do not use; Special pseudo private poll class supported by -+ * PollDefault only -+ */ -+#define POLL_DEFAULT_CLASS_NET POLL_FIXED_CLASSES -+#define POLL_DEFAULT_CS_NET PollClassSet_Singleton(POLL_DEFAULT_CLASS_NET) -+ -+/* -+ * Each callback is registered in a set of classes -+ */ -+ -+typedef struct PollClassSet { -+ uintptr_t bits; -+} PollClassSet; -+ -+/* An empty PollClassSet. */ -+static INLINE PollClassSet -+PollClassSet_Empty(void) -+{ -+ PollClassSet set = { 0 }; -+ return set; -+} -+ -+/* A PollClassSet with the single member. */ -+static INLINE PollClassSet -+PollClassSet_Singleton(PollClass c) -+{ -+ PollClassSet s = PollClassSet_Empty(); -+ -+ ASSERT_ON_COMPILE(POLL_MAX_CLASSES < sizeof s.bits * 8); -+ ASSERT(c < POLL_MAX_CLASSES); -+ -+ s.bits = CONST3264U(1) << c; -+ return s; -+} -+ -+/* Combine two PollClassSets. */ -+static INLINE PollClassSet -+PollClassSet_Union(PollClassSet lhs, PollClassSet rhs) -+{ -+ PollClassSet set; -+ set.bits = lhs.bits | rhs.bits; -+ return set; -+} -+ -+/* Add single class to PollClassSet. */ -+static INLINE PollClassSet -+PollClassSet_Include(PollClassSet set, PollClass c) -+{ -+ return PollClassSet_Union(set, PollClassSet_Singleton(c)); -+} -+ -+ -+#define POLL_CS_MAIN PollClassSet_Singleton(POLL_CLASS_MAIN) -+#define POLL_CS_PAUSE PollClassSet_Union(POLL_CS_MAIN, \ -+ PollClassSet_Singleton(POLL_CLASS_PAUSE)) -+#define POLL_CS_CPT PollClassSet_Union(POLL_CS_PAUSE, \ -+ PollClassSet_Singleton(POLL_CLASS_CPT)) -+#define POLL_CS_IPC PollClassSet_Union(POLL_CS_CPT, \ -+ PollClassSet_Singleton(POLL_CLASS_IPC)) -+#define POLL_CS_VMDB POLL_CS_PAUSE /* POLL_CLASS_VMDB is retired */ -+#define POLL_CS_MKS PollClassSet_Singleton(POLL_CLASS_MKS) -+/* -+ * DANGER. You don't need POLL_CS_ALWAYS. Really. So don't use it. -+ */ -+#define POLL_CS_ALWAYS PollClassSet_Union(POLL_CS_CPT, POLL_CS_IPC) -+ -+/* -+ * Poll class-set taxonomy: -+ * POLL_CS_MAIN -+ * - Unless you NEED another class, use POLL_CS_MAIN. -+ * POLL_CS_PAUSE -+ * - For callbacks that must occur even if the guest is paused. -+ * Most VMDB or Foundry commands are in this category. -+ * POLL_CS_CPT -+ * - Only for callbacks which can trigger intermediate Checkpoint -+ * transitions. -+ * The ONLY such callback is Migrate. -+ * POLL_CS_IPC -+ * - Only for callbacks which can contain Msg_(Post|Hint|Question) -+ * responses, and for signal handlers (why)? -+ * Vigor, VMDB, and Foundry can contain Msg_* responses. -+ * POLL_CS_MKS -+ * - Callback runs in MKS thread. -+ * POLL_CS_ALWAYS -+ * - Only for events that must be processed immediately. -+ * The ONLY such callback is OvhdMemVmxSizeCheck. -+ */ -+ -+ -+/* -+ * Poll_Callback flags -+ */ -+ -+#define POLL_FLAG_PERIODIC 0x01 // keep after firing -+#define POLL_FLAG_REMOVE_AT_POWEROFF 0x02 // self-explanatory -+#define POLL_FLAG_READ 0x04 // device is ready for reading -+#define POLL_FLAG_WRITE 0x08 // device is ready for writing -+#define POLL_FLAG_SOCKET 0x10 // device is a Windows socket -+#define POLL_FLAG_NO_BULL 0x20 // callback does its own locking -+#define POLL_FLAG_WINSOCK 0x40 // Winsock style write events -+#define POLL_FLAG_FD 0x80 // device is a Windows file descriptor. -+#define POLL_FLAG_ACCEPT_INVALID_FDS 0x100 // For broken 3rd party libs, e.g. curl -+#define POLL_FLAG_THUNK_TO_WND 0x200 // thunk callback to window message loop -+ -+ -+typedef void (*PollerFunction)(void *clientData); -+typedef void (*PollerFireWrapper)(PollerFunction func, -+ void *funcData, -+ void *wrapperData); -+typedef Bool (*PollerErrorFn)(const char *errorStr); -+ -+/* -+ * Initialisers: -+ * -+ * For the sake of convenience, we declare the initialisers -+ * for custom implmentations here, even though the actual -+ * implementations are distinct from the core poll code. -+ */ -+ -+typedef struct PollOptions { -+ Bool locked; // Use internal MXUser for locking -+ Bool allowFullQueue; // Don't assert when device event queue is full. -+ VThreadID windowsMsgThread; // thread that processes Windows messages -+ PollerFireWrapper fireWrapperFn; // optional; may be useful for stats -+ void *fireWrapperData; // optional -+ PollerErrorFn errorFn; // optional; called upon unrecoverable error -+} PollOptions; -+ -+ -+void Poll_InitDefault(void); -+void Poll_InitDefaultEx(const PollOptions *opts); -+void Poll_InitGtk(void); // On top of glib for Linux -+void Poll_InitCF(void); // On top of CoreFoundation for OSX -+ -+ -+/* -+ * Functions -+ */ -+int Poll_SocketPair(Bool vmci, Bool stream, int fds[2]); -+void Poll_Loop(Bool loop, Bool *exit, PollClass c); -+void Poll_LoopTimeout(Bool loop, Bool *exit, PollClass c, int timeout); -+Bool Poll_LockingEnabled(void); -+void Poll_Exit(void); -+ -+ -+/* -+ * Poll_Callback adds a callback regardless of whether an identical one exists. -+ * The exception to this rule is POLL_DEVICE callbacks: there is a maximum of -+ * one read and one write callback per fd. -+ * -+ * Poll_CallbackRemove removes one callback. If there are multiple identical -+ * callbacks, which one is removed is an implementation detail. Note that in -+ * the case of POLL_DEVICE and POLL_REALTIME callbacks, the fd/delay used to -+ * create the callback is not specified when removing, so all callbacks -+ * of those types with the same flags, function, and clientData are considered -+ * "identical" even if their fd/delay differed. -+ */ -+ -+VMwareStatus Poll_Callback(PollClassSet classSet, -+ int flags, -+ PollerFunction f, -+ void *clientData, -+ PollEventType type, -+ PollDevHandle info, // fd/microsec delay -+ MXUserRecLock *lck); -+Bool Poll_CallbackRemove(PollClassSet classSet, -+ int flags, -+ PollerFunction f, -+ void *clientData, -+ PollEventType type); -+Bool Poll_CallbackRemoveOneByCB(PollClassSet classSet, -+ int flags, -+ PollerFunction f, -+ PollEventType type, -+ void **clientData); -+ -+void Poll_NotifyChange(PollClassSet classSet); -+ -+/* -+ * Wrappers for Poll_Callback and Poll_CallbackRemove that present -+ * simpler subsets of those interfaces. -+ */ -+ -+VMwareStatus Poll_CB_Device(PollerFunction f, -+ void *clientData, -+ PollDevHandle device, -+ Bool periodic); -+ -+Bool Poll_CB_DeviceRemove(PollerFunction f, -+ void *clientData, -+ Bool periodic); -+ -+ -+VMwareStatus Poll_CB_RTime(PollerFunction f, -+ void *clientData, -+ int64 delay, // microseconds -+ Bool periodic, -+ MXUserRecLock *lock); -+ -+Bool Poll_CB_RTimeRemove(PollerFunction f, -+ void *clientData, -+ Bool periodic); -+ -+ -+#ifdef _WIN32 -+void Poll_SetPumpsWindowsMessages(Bool pumps); -+void Poll_SetWindowMessageRecipient(HWND hWnd, UINT msg, Bool alwaysThunk); -+Bool Poll_FireWndCallback(void *lparam); -+#endif -+ -+#if defined(__cplusplus) -+} // extern "C" -+#endif -+ -+#endif // _POLL_H_ ---- a/open-vm-tools/lib/rpcIn/rpcin.c -+++ b/open-vm-tools/lib/rpcIn/rpcin.c -@@ -57,7 +57,7 @@ - - #if defined(VMTOOLS_USE_VSOCKET) - # include <glib.h> --# include "poll.h" -+# include "vm_poll.h" - # include "asyncsocket.h" - # include "vmci_defs.h" - #include "dataMap.h" diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0010-use-posix-strerror_r-unless-on-gnu-libc-system.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0010-use-posix-strerror_r-unless-on-gnu-libc-system.patch deleted file mode 100644 index 784b4fc6c5..0000000000 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0010-use-posix-strerror_r-unless-on-gnu-libc-system.patch +++ /dev/null @@ -1,39 +0,0 @@ -From e86a259e1ce19c70ecfdece69ab53a07c63a34e1 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 13 Jun 2018 23:16:53 -0700 -Subject: [PATCH] use posix strerror_r unless on gnu libc system - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - open-vm-tools/lib/err/errPosix.c | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) - -diff --git a/open-vm-tools/lib/err/errPosix.c b/open-vm-tools/lib/err/errPosix.c -index c81b4c13..7a403640 100644 ---- a/open-vm-tools/lib/err/errPosix.c -+++ b/open-vm-tools/lib/err/errPosix.c -@@ -31,6 +31,7 @@ - #include <errno.h> - #include <string.h> - #include <locale.h> -+#include <stdio.h> - - #include "vmware.h" - #include "errInt.h" -@@ -63,11 +64,13 @@ ErrErrno2String(Err_Number errorNumber, // IN - { - char *p; - --#if defined(__linux__) && !defined(__ANDROID__) -+#if defined(__GLIBC__) && !defined(__ANDROID__) - p = strerror_r(errorNumber, buf, bufSize); - #else -- p = strerror(errorNumber); --#endif -+ if (strerror_r(errorNumber, buf, bufSize) != 0) -+ snprintf(buf, bufSize, "unknown error %i", errorNumber); -+ p = buf; -+#endif /* defined __GLIBC__ */ - ASSERT(p != NULL); - return p; - } diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0011-Use-uintmax_t-for-handling-rlim_t.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0011-Use-uintmax_t-for-handling-rlim_t.patch deleted file mode 100644 index 0a1d008733..0000000000 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0011-Use-uintmax_t-for-handling-rlim_t.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 18eea61a7a768c6c3b57c6683c7bef7049f0f6ab Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 13 Jun 2018 23:37:09 -0700 -Subject: [PATCH] Use uintmax_t for handling rlim_t - -rlimit types are not representable with long or long long -formats, therefore use uintmax_t to typecast rlim_t types -and use %j to print it - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - open-vm-tools/lib/hgfsServer/hgfsServerLinux.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c -index 0e6351a9..a2ee1740 100644 ---- a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c -+++ b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c -@@ -5294,8 +5294,8 @@ HgfsWriteCheckIORange(off_t offset, // IN: - goto exit; - } - -- LOG(6, ("%s: File Size limits: 0x%"FMT64"x 0x%"FMT64"x\n", -- __FUNCTION__, fileSize.rlim_cur, fileSize.rlim_max)); -+ LOG(6, ("%s: File Size limits: 0x%jx 0x%jx\n", -+ __FUNCTION__, (uintmax_t)fileSize.rlim_cur, (uintmax_t)fileSize.rlim_max)); - - /* - * Check the offset is within the file size range. diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0012-Use-off64_t-instead-of-__off64_t.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0012-Use-off64_t-instead-of-__off64_t.patch deleted file mode 100644 index d69b74e23a..0000000000 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0012-Use-off64_t-instead-of-__off64_t.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 123c690f12f560022305b0cf19499e7f81a690ae Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 27 Aug 2018 23:22:21 -0700 -Subject: [PATCH] Use off64_t instead of __off64_t - -Fixes -unknown type name '__off64_t' - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - open-vm-tools/lib/file/fileIOPosix.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/open-vm-tools/lib/file/fileIOPosix.c b/open-vm-tools/lib/file/fileIOPosix.c -index 23108279..bcd2ddc5 100644 ---- a/open-vm-tools/lib/file/fileIOPosix.c -+++ b/open-vm-tools/lib/file/fileIOPosix.c -@@ -206,10 +206,10 @@ static AlignedPool alignedPool; - * the symbols (and anyone building XOPEN<700 gets nothing). - */ - extern ssize_t preadv64(int fd, const struct iovec *iov, int iovcnt, -- __off64_t offset) __attribute__ ((weak)); -+ off64_t offset) __attribute__ ((weak)); - - extern ssize_t pwritev64(int fd, const struct iovec *iov, int iovcnt, -- __off64_t offset) __attribute__ ((weak)); -+ off64_t offset) __attribute__ ((weak)); - #else - #error "Large file support unavailable. Aborting." - #endif diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0013-misc-Do-not-print-NULL-string-into-logs.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0013-misc-Do-not-print-NULL-string-into-logs.patch deleted file mode 100644 index 3e4753b2a6..0000000000 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0013-misc-Do-not-print-NULL-string-into-logs.patch +++ /dev/null @@ -1,27 +0,0 @@ -From cfc6839362bd96bf2f42954160f16a60bf1de377 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 22 Dec 2018 19:59:02 -0800 -Subject: [PATCH] misc: Do not print NULL string into logs - -string format %s is getting a NULL pointer for 'expand' -parameter always since the check for chunks[i] == NULL will ensure that -its always null when the Log() API is called - -Upstream-Status: Submitted [https://github.com/vmware/open-vm-tools/pull/312] - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - open-vm-tools/lib/misc/util_misc.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/open-vm-tools/lib/misc/util_misc.c -+++ b/open-vm-tools/lib/misc/util_misc.c -@@ -719,7 +719,7 @@ Util_ExpandString(const char *fileName) - ASSERT(!freeChunk[i]); - chunks[i] = expand; - if (chunks[i] == NULL) { -- Log("%s: Cannot allocate memory to expand $ in \"%s\".\n", -+ Log("%s: Cannot allocate memory to expand in \"%s\".\n", - __FUNCTION__, fileName); - goto out; - } diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/tools.conf b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/tools.conf deleted file mode 100644 index f6cae70cc5..0000000000 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/tools.conf +++ /dev/null @@ -1,2 +0,0 @@ -[guestinfo] -disable-perf-mon=1 diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/vmtoolsd.init b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/vmtoolsd.init deleted file mode 100644 index 38280464a7..0000000000 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/vmtoolsd.init +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/sh -# -# vmtoolsd Start/stop the vmware tools daemon -# -# chkconfig: 2345 90 60 -# description: vmtoolsd is a daemon that starts up. for some reason, it -# doesn't include a sysv init startup file in the latest release. -# so i have to write this -# - -### BEGIN INIT INFO -# Provides: vmtoolsd -# Required-Start: $local_fs $syslog -# Required-Stop: $local_fs $syslog -# Default-Start: 2345 -# Default-Stop: 90 -# Short-Description: Run vmware tools daemon -### END INIT INFO - -PATH=/sbin:/bin:/usr/sbin:/usr/bin -DAEMON=/usr/bin/vmtoolsd -NAME=vmtoolsd -DESC="vmware tools daemon" -VMTOOLSDARGS=" -b /var/run/vmtoolsd.pid " -RETVAL="1" - -# source function library -. /etc/init.d/functions - -test -f $DAEMON || exit 0 - - -case "$1" in - start) - echo -n "Starting vmware tools daemon: " - start-stop-daemon --start --quiet --exec $DAEMON -- $VMTOOLSDARGS - RETVAL=$? - if [ $RETVAL -eq 0 ] ; then - echo "OK" - else - echo "FAIL" - fi - ;; - stop) - echo -n "Stopping vmware tools daemon: " - start-stop-daemon --stop --quiet --pidfile /var/run/vmtoolsd.pid - RETVAL=$? - if [ $RETVAL -eq 0 ] ; then - echo "OK" - else - echo "FAIL" - fi - ;; - status) - status vmtoolsd - exit $? - ;; - restart) - $0 stop && sleep 1 && $0 start - ;; - *) - echo "Usage: /etc/init.d/vmtoolsd {start|stop|status|restart}" - exit 1 -esac - -exit $RETVAL diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/vmtoolsd.service b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/vmtoolsd.service deleted file mode 100644 index d30e38055c..0000000000 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/vmtoolsd.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Open Virtual Machine Tools (VMware Tools) -ConditionVirtualization=vmware - -[Service] -ExecStart=/usr/bin/vmtoolsd -Restart=on-failure -KillSignal=SIGKILL - -[Install] -WantedBy=multi-user.target diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools_11.0.1.bb b/meta-oe/recipes-support/open-vm-tools/open-vm-tools_11.0.1.bb deleted file mode 100644 index 9e4aa4881a..0000000000 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools_11.0.1.bb +++ /dev/null @@ -1,110 +0,0 @@ -# This recipe is modified from the recipe originally found in the Open-Switch -# repository: -# -# https://github.com/open-switch/ops-build -# yocto/openswitch/meta-foss-openswitch/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.0.5.bb -# Commit 9008de2d8e100f3f868c66765742bca9fa98f3f9 -# -# The recipe packaging has been relicensed under the MIT license for inclusion -# in meta-openembedded by agreement of the author (Diego Dompe). -# - -SUMMARY = "Tools to enhance VMWare guest integration and performance" -HOMEPAGE = "https://github.com/vmware/open-vm-tools" -SECTION = "vmware-tools" - -LICENSE = "LGPL-2.0 & GPL-2.0 & BSD & CDDL-1.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=559317809c5444fb39ceaf6ac45c43ac" -LICENSE_modules/freebsd/vmblock = "BSD" -LICENSE_modules/freebsd/vmmemctl = "GPL-2.0" -LICENSE_modules/freebsd/vmxnet = "GPL-2.0" -LICENSE_modules/linux = "GPL-2.0" -LICENSE_modules/solaris = "CDDL-1.0" - -SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https \ - file://tools.conf \ - file://vmtoolsd.service \ - file://vmtoolsd.init \ - file://0001-configure.ac-don-t-use-dnet-config.patch;patchdir=.. \ - file://0002-add-include-sys-sysmacros.h.patch;patchdir=.. \ - file://0003-Use-configure-test-for-struct-timespec.patch;patchdir=.. \ - file://0004-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch;patchdir=.. \ - file://0005-Use-configure-to-test-for-feature-instead-of-platfor.patch;patchdir=.. \ - file://0006-Use-configure-test-for-sys-stat.h-include.patch;patchdir=.. \ - file://0007-Fix-subdir-objects-configure-error.patch;patchdir=.. \ - file://0008-include-poll.h-instead-of-sys-poll.h.patch;patchdir=.. \ - file://0009-Rename-poll.h-to-vm_poll.h.patch;patchdir=.. \ - file://0010-use-posix-strerror_r-unless-on-gnu-libc-system.patch;patchdir=.. \ - file://0011-Use-uintmax_t-for-handling-rlim_t.patch;patchdir=.. \ - file://0012-Use-off64_t-instead-of-__off64_t.patch;patchdir=.. \ - file://0013-misc-Do-not-print-NULL-string-into-logs.patch;patchdir=.. \ - file://0001-GitHub-Issue-367.-Remove-references-to-deprecated-G_.patch;patchdir=.. \ - file://0001-Make-HgfsConvertFromNtTimeNsec-aware-of-64-bit-time_.patch;patchdir=.. \ - file://0002-hgfsServerLinux-Consider-64bit-time_t-possibility.patch;patchdir=.. \ -" - -SRCREV = "d3edfd142a81096f9f58aff17d84219b457f4987" - -S = "${WORKDIR}/git/open-vm-tools" - -DEPENDS = "glib-2.0 glib-2.0-native util-linux libdnet procps libtirpc" - -# open-vm-tools is supported only on x86. -COMPATIBLE_HOST = '(x86_64.*|i.86.*)-linux' - -inherit autotools pkgconfig systemd update-rc.d - -SYSTEMD_SERVICE_${PN} = "vmtoolsd.service" - -EXTRA_OECONF = "--without-icu --disable-multimon --disable-docs \ - --disable-tests --without-gtkmm --without-xerces --without-pam \ - --disable-vgauth --disable-deploypkg \ - --without-root-privileges --without-kernel-modules --with-tirpc" - -NO_X11_FLAGS = "--without-x --without-gtk2 --without-gtk3" -X11_DEPENDS = "libxext libxi libxrender libxrandr libxtst gtk+ gdk-pixbuf" -PACKAGECONFIG[x11] = ",${NO_X11_FLAGS},${X11_DEPENDS}" - -# fuse gets implicitly detected; there is no --without-fuse option. -PACKAGECONFIG[fuse] = ",,fuse" - -CFLAGS_append_toolchain-clang = " -Wno-address-of-packed-member" -FILES_${PN} += "\ - ${libdir}/open-vm-tools/plugins/vmsvc/lib*.so \ - ${libdir}/open-vm-tools/plugins/common/lib*.so \ - ${sysconfdir}/vmware-tools/tools.conf \ -" -FILES_${PN}-locale += "${datadir}/open-vm-tools/messages" -FILES_${PN}-dev += "${libdir}/open-vm-tools/plugins/common/lib*.la" - -CONFFILES_${PN} += "${sysconfdir}/vmware-tools/tools.conf" - -RDEPENDS_${PN} = "util-linux libdnet fuse" - -do_install_append() { - ln -sf ${sbindir}/mount.vmhgfs ${D}/sbin/mount.vmhgfs - install -d ${D}${sysconfdir}/vmware-tools - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -d ${D}${systemd_unitdir}/system - install -m 644 ${WORKDIR}/*.service ${D}${systemd_unitdir}/system - else - install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/vmtoolsd.init ${D}${sysconfdir}/init.d/vmtoolsd - fi - install -m 0644 ${WORKDIR}/tools.conf ${D}${sysconfdir}/vmware-tools/tools.conf -} - -do_configure_prepend() { - export CUSTOM_DNET_NAME=dnet - export CUSTOM_DNET_LIBS=-L${STAGING_LIBDIR}/libdnet.so -} - -INITSCRIPT_PACKAGES = "${PN}" -INITSCRIPT_NAME_${PN} = "vmtoolsd" -INITSCRIPT_PARAMS_${PN} = "start 90 2 3 4 5 . stop 60 0 1 6 ." - -python() { - if 'networking-layer' not in d.getVar('BBFILE_COLLECTIONS').split() or \ - 'filesystems-layer' not in d.getVar('BBFILE_COLLECTIONS').split(): - raise bb.parse.SkipRecipe('Requires meta-networking and meta-filesystems to be present.') -} diff --git a/meta-oe/recipes-support/opencl/clinfo_2.2.18.04.06.bb b/meta-oe/recipes-support/opencl/clinfo_3.0.23.01.25.bb index 9fd88ced95..6cacd3722c 100644 --- a/meta-oe/recipes-support/opencl/clinfo_2.2.18.04.06.bb +++ b/meta-oe/recipes-support/opencl/clinfo_3.0.23.01.25.bb @@ -7,14 +7,14 @@ HOMEPAGE = "https://github.com/Oblomov/clinfo" LICENSE = "CC0-1.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=fd8857f774dfb0eefe1e80c8f9240a7e" -SRC_URI = "git://github.com/Oblomov/clinfo.git;protocol=https" +SRC_URI = "git://github.com/Oblomov/clinfo.git;protocol=https;branch=master" -SRCREV = "59d0daf898e48d76ccbb788acbba258fa0a8ba7c" +SRCREV = "748c3930a9b9cb826e631d77439e2cb8f84f5bcf" S = "${WORKDIR}/git" -DEPENDS += "opencl-headers opencl-icd-loader" +DEPENDS += "opencl-headers virtual/opencl-icd" do_install() { - install -D -m 755 clinfo ${D}${bindir}/clinfo + oe_runmake install PREFIX=${D}${prefix} MANDIR=${D}${mandir} } diff --git a/meta-oe/recipes-support/openct/openct/0001-m4-Just-emit-the-first-line-of-compiler-version.patch b/meta-oe/recipes-support/openct/openct/0001-m4-Just-emit-the-first-line-of-compiler-version.patch new file mode 100644 index 0000000000..9bd3d18d6e --- /dev/null +++ b/meta-oe/recipes-support/openct/openct/0001-m4-Just-emit-the-first-line-of-compiler-version.patch @@ -0,0 +1,31 @@ +From 146b5116140d719e4e9ae19748c0b6dee7d82f96 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 22 May 2023 22:01:28 -0700 +Subject: [PATCH] m4: Just emit the first line of compiler version + +Avoids emitting buildpaths into comments +Fixes +WARNING: openct-0.6.20-r0 do_package_qa: QA Issue: File /usr/include/openct/types.h in package openct-dev contains reference to TMPDIR [buildpaths] + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + m4/ac_create_stdint_h.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/m4/ac_create_stdint_h.m4 b/m4/ac_create_stdint_h.m4 +index 66de704..4b7223a 100644 +--- a/m4/ac_create_stdint_h.m4 ++++ b/m4/ac_create_stdint_h.m4 +@@ -110,7 +110,7 @@ echo "#define" $_ac_stdint_h "1" >>$ac_stdint_h + echo "#ifndef" _GENERATED_STDINT_H >>$ac_stdint_h + echo "#define" _GENERATED_STDINT_H '"'$PACKAGE $VERSION'"' >>$ac_stdint_h + if test "$GCC" = "yes" ; then +- echo "/* generated using a gnu compiler version" `$CC --version` "*/" \ ++ echo "/* generated using a gnu compiler version" `$CC --version|head -1` "*/" \ + >>$ac_stdint_h + else + echo "/* generated using $CC */" >>$ac_stdint_h +-- +2.40.1 + diff --git a/meta-oe/recipes-support/openct/openct/etc-openct.udev.in-disablePROGRAM.patch b/meta-oe/recipes-support/openct/openct/etc-openct.udev.in-disablePROGRAM.patch index 745f923af1..e2401bb31b 100644 --- a/meta-oe/recipes-support/openct/openct/etc-openct.udev.in-disablePROGRAM.patch +++ b/meta-oe/recipes-support/openct/openct/etc-openct.udev.in-disablePROGRAM.patch @@ -5,7 +5,7 @@ Subject: [PATCH 1/2] etc/openct.udev.in: disablePROGRAM Bug fix: https://bugzilla.redhat.com/show_bug.cgi?id=287871 -Upstream-status: Pending +Upstream-Status: Pending Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> --- diff --git a/meta-oe/recipes-support/openct/openct/etc-openct_usb.in-modify-UDEVINFO.patch b/meta-oe/recipes-support/openct/openct/etc-openct_usb.in-modify-UDEVINFO.patch index d5e3fe5753..22eda729fb 100644 --- a/meta-oe/recipes-support/openct/openct/etc-openct_usb.in-modify-UDEVINFO.patch +++ b/meta-oe/recipes-support/openct/openct/etc-openct_usb.in-modify-UDEVINFO.patch @@ -5,7 +5,7 @@ Subject: [PATCH 2/2] etc/openct_usb.in: modify UDEVINFO this patch is from Fedora -Upstream-status: Pending +Upstream-Status: Pending Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> --- diff --git a/meta-oe/recipes-support/openct/openct_0.6.20.bb b/meta-oe/recipes-support/openct/openct_0.6.20.bb index 08b2e3c232..e4b99089f5 100644 --- a/meta-oe/recipes-support/openct/openct_0.6.20.bb +++ b/meta-oe/recipes-support/openct/openct_0.6.20.bb @@ -1,4 +1,4 @@ -Summanry = "Middleware framework for smart card terminals" +SUMMARY = "Middleware framework for smart card terminals" HOMEPAGE = "https://github.com/OpenSC/openct/wiki" DESCRIPTION = " \ OpenCT implements drivers for several smart card readers. \ @@ -11,9 +11,10 @@ readers to remote machines via TCP/IP." DEPENDS += "libtool pcsc-lite libusb-compat" SRC_URI = " \ - ${DEBIAN_MIRROR}/main/o/${BPN}/${BPN}_${PV}.orig.tar.gz \ + https://downloads.sourceforge.net/project/opensc/${BPN}/${BPN}-${PV}.tar.gz \ file://etc-openct.udev.in-disablePROGRAM.patch \ file://etc-openct_usb.in-modify-UDEVINFO.patch \ + file://0001-m4-Just-emit-the-first-line-of-compiler-version.patch \ file://openct.init \ file://openct.sysconfig \ file://openct.service \ @@ -22,11 +23,11 @@ SRC_URI = " \ SRC_URI[md5sum] = "a1da3358ab798f1cb9232f1dbababc21" SRC_URI[sha256sum] = "6cd3e2933d29eb1f875c838ee58b8071fd61f0ec8ed5922a86c01c805d181a68" -LICENSE = "LGPLv2+" +LICENSE = "LGPL-2.0-or-later" LIC_FILES_CHKSUM = "file://LGPL-2.1;md5=2d5025d4aa3495befef8f17206a5b0a1" inherit systemd -SYSTEMD_SERVICE_${PN} += "openct.service " +SYSTEMD_SERVICE:${PN} += "openct.service " SYSTEMD_AUTO_ENABLE = "enable" EXTRA_OECONF=" \ @@ -35,54 +36,49 @@ EXTRA_OECONF=" \ --enable-pcsc \ --enable-doc \ --enable-api-doc \ - --with-udev=${nonarch_base_libdir}/udev \ + --with-udev=${nonarch_libdir}/udev \ --with-bundle=${libdir}/pcsc/drivers \ " inherit autotools pkgconfig -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/ctapi \ - ${nonarch_base_libdir}/udev \ + ${nonarch_libdir}/udev \ ${libdir}/openct-ifd.so \ ${libdir}/pcsc \ - /run/openct/status \ " -FILES_${PN}-dbg += " \ +FILES:${PN}-dbg += " \ ${libdir}/ctapi/.debug \ ${libdir}/pcsc/drivers/openct-ifd.bundle/Contents/Linux/.debug \ " -INSANE_SKIP_${PN} += "dev-deps" +INSANE_SKIP:${PN} += "dev-deps" + +do_install[cleandirs] += "${D}" do_install () { - rm -rf ${D} - install -d ${D}/etc - install -dm 755 ${D}${nonarch_base_libdir}/udev + install -d ${D}${sysconfdir} # fix up hardcoded paths sed -i -e 's,/etc/,${sysconfdir}/,' -e 's,/usr/sbin/,${sbindir}/,' \ - ${WORKDIR}/openct.service ${WORKDIR}/openct.init + ${UNPACKDIR}/openct.service ${UNPACKDIR}/openct.init oe_runmake install DESTDIR=${D} install -dm 755 ${D}${libdir}/ctapi/ mv ${D}${libdir}/libopenctapi.so ${D}${libdir}/ctapi/ - install -Dpm 644 etc/openct.udev ${D}/etc/udev/rules.d/60-openct.rules - install -pm 644 etc/openct.conf ${D}/etc/openct.conf + install -Dpm 644 etc/openct.udev ${D}${nonarch_libdir}/udev/rules.d/60-openct.rules + install -pm 644 etc/openct.conf ${D}${sysconfdir}/openct.conf - install -Dpm 755 ${WORKDIR}/openct.init ${D}/etc/init.d/openct - install -Dpm 644 ${WORKDIR}/openct.sysconfig ${D}/etc/sysconfig/openct + install -Dpm 755 ${UNPACKDIR}/openct.init ${D}${sysconfdir}/init.d/openct + install -Dpm 644 ${UNPACKDIR}/openct.sysconfig ${D}${sysconfdir}/sysconfig/openct - install -d ${D}/${systemd_unitdir}/system - install -m 644 ${WORKDIR}/openct.service ${D}/${systemd_unitdir}/system + install -d ${D}${systemd_unitdir}/system + install -m 644 ${UNPACKDIR}/openct.service ${D}${systemd_unitdir}/system so=$(find ${D} -name \*.so | sed "s|^${D}||") sed -i -e 's|\\(LIBPATH\\s*\\).*|\\1$so|' etc/reader.conf - install -Dpm 644 etc/reader.conf ${D}/etc/reader.conf.d/openct.conf - - install -dm 755 ${D}${localstatedir}/run/openct - touch ${D}${localstatedir}/run/openct/status - chmod 644 ${D}${localstatedir}/run/openct/status - - rm -r ${D}/${localstatedir}/run + install -Dpm 644 etc/reader.conf ${D}${sysconfdir}/reader.conf.d/openct.conf } + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/opencv/ade_0.1.1f.bb b/meta-oe/recipes-support/opencv/ade_0.1.2.bb index 332820d149..93b14ad4f3 100644 --- a/meta-oe/recipes-support/opencv/ade_0.1.1f.bb +++ b/meta-oe/recipes-support/opencv/ade_0.1.2.bb @@ -4,10 +4,9 @@ and processing framework. ADE Framework is suitable for \ organizing data flow processing and execution." HOMEPAGE = "https://github.com/opencv/ade" -SRC_URI = "git://github.com/opencv/ade.git \ - " +SRC_URI = "git://github.com/opencv/ade.git;branch=master;protocol=https" -SRCREV = "58b2595a1a95cc807be8bf6222f266a9a1f393a9" +SRCREV = "1e02d7486bdb9c87993d91b9910e7cc6c4ddbf66" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" @@ -18,4 +17,4 @@ S = "${WORKDIR}/git" EXTRA_OECMAKE += " -DCMAKE_BUILD_TYPE=Release" -FILES_${PN}-dev += "${datadir}/${BPN}/*.cmake" +FILES:${PN}-dev += "${datadir}/${BPN}/*.cmake" diff --git a/meta-oe/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch b/meta-oe/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch deleted file mode 100644 index 5f909c1a8f..0000000000 --- a/meta-oe/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 85b882b4ceb57fe6538f47af58d0a970923fde0e Mon Sep 17 00:00:00 2001 -From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> -Date: Thu, 31 Mar 2016 00:20:15 +0200 -Subject: [PATCH] 3rdparty/ippicv: Use pre-downloaded ipp - -Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> -Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com> - ---- - 3rdparty/ippicv/ippicv.cmake | 15 +-------------- - 1 file changed, 1 insertion(+), 14 deletions(-) - -diff --git a/3rdparty/ippicv/ippicv.cmake b/3rdparty/ippicv/ippicv.cmake -index ae8748c..305abdb 100644 ---- a/3rdparty/ippicv/ippicv.cmake -+++ b/3rdparty/ippicv/ippicv.cmake -@@ -39,18 +39,5 @@ function(download_ippicv root_var) - endif() - - set(THE_ROOT "${OpenCV_BINARY_DIR}/3rdparty/ippicv") -- ocv_download(FILENAME ${OPENCV_ICV_NAME} -- HASH ${OPENCV_ICV_HASH} -- URL -- "${OPENCV_IPPICV_URL}" -- "$ENV{OPENCV_IPPICV_URL}" -- "https://raw.githubusercontent.com/opencv/opencv_3rdparty/${IPPICV_COMMIT}/ippicv/" -- DESTINATION_DIR "${THE_ROOT}" -- ID IPPICV -- STATUS res -- UNPACK RELATIVE_URL) -- -- if(res) -- set(${root_var} "${THE_ROOT}/${OPENCV_ICV_PACKAGE_SUBDIR}" PARENT_SCOPE) -- endif() -+ set(${root_var} "${THE_ROOT}/${OPENCV_ICV_PACKAGE_SUBDIR}" PARENT_SCOPE) - endfunction() diff --git a/meta-oe/recipes-support/opencv/opencv/0001-Dont-use-isystem.patch b/meta-oe/recipes-support/opencv/opencv/0001-Dont-use-isystem.patch index 40d3f53e1a..948a80fafa 100644 --- a/meta-oe/recipes-support/opencv/opencv/0001-Dont-use-isystem.patch +++ b/meta-oe/recipes-support/opencv/opencv/0001-Dont-use-isystem.patch @@ -1,4 +1,4 @@ -From 9659f5a1e75fc29c9879c301767bba72ecf9042a Mon Sep 17 00:00:00 2001 +From 66e50ee69fa9ee2469d349100e70d8b296c4b4dc Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Tue, 11 Sep 2018 00:21:18 -0700 Subject: [PATCH] Dont use isystem @@ -14,7 +14,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 2 insertions(+) diff --git a/cmake/OpenCVPCHSupport.cmake b/cmake/OpenCVPCHSupport.cmake -index 59bc826..055dfce 100644 +index 08cd06def4..46c9c02da3 100644 --- a/cmake/OpenCVPCHSupport.cmake +++ b/cmake/OpenCVPCHSupport.cmake @@ -18,6 +18,8 @@ IF(CV_GCC) diff --git a/meta-oe/recipes-support/opencv/opencv/0001-Make-ts-module-external.patch b/meta-oe/recipes-support/opencv/opencv/0001-Make-ts-module-external.patch new file mode 100644 index 0000000000..d56b8ae67e --- /dev/null +++ b/meta-oe/recipes-support/opencv/opencv/0001-Make-ts-module-external.patch @@ -0,0 +1,42 @@ +From 11bbf909e08594628bd757d989ae34cf1bfe200b Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Thu, 18 Jun 2020 05:51:38 +0000 +Subject: [PATCH] Make ts module external + +Make ts module external + +Reference: https://github.com/qbonnard/opencv/commit/6b229c5834cb9a0930425e762a6c7b03244d7abb + +Upstream-Status: Submitted [https://github.com/opencv/opencv/issues/8408] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + modules/ts/CMakeLists.txt | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/modules/ts/CMakeLists.txt b/modules/ts/CMakeLists.txt +index f95bed0793..66f315bcca 100644 +--- a/modules/ts/CMakeLists.txt ++++ b/modules/ts/CMakeLists.txt +@@ -4,9 +4,6 @@ if(NOT BUILD_opencv_ts AND NOT BUILD_TESTS AND NOT BUILD_PERF_TESTS) + ocv_module_disable(ts) + endif() + +-set(OPENCV_MODULE_TYPE STATIC) +-set(OPENCV_MODULE_IS_PART_OF_WORLD FALSE) +- + if(WINRT) + # WINRT doesn't have access to environment variables + # so adding corresponding macros during CMake run +@@ -16,7 +13,7 @@ endif() + + ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef) + +-ocv_add_module(ts INTERNAL opencv_core opencv_imgproc opencv_imgcodecs opencv_videoio opencv_highgui) ++ocv_add_module(ts opencv_core opencv_imgproc opencv_imgcodecs opencv_videoio opencv_highgui) + + ocv_glob_module_sources() + ocv_module_include_directories() +-- +2.24.1 + diff --git a/meta-oe/recipes-support/opencv/opencv/0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch b/meta-oe/recipes-support/opencv/opencv/0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch index f8ccd1d558..a3bbefaabe 100644 --- a/meta-oe/recipes-support/opencv/opencv/0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch +++ b/meta-oe/recipes-support/opencv/opencv/0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch @@ -1,4 +1,4 @@ -From fe27d0e2341683606704115949d16250e4cacbfa Mon Sep 17 00:00:00 2001 +From e4ec6cea72da9e9ae5ba57140fa2f5c63f1f8295 Mon Sep 17 00:00:00 2001 From: Jason Wessel <jason.wessel@windriver.com> Date: Wed, 9 May 2018 13:33:59 -0700 Subject: [PATCH] Temporarliy work around deprecated ffmpeg RAW function @@ -7,14 +7,16 @@ Subject: [PATCH] Temporarliy work around deprecated ffmpeg RAW function Signed-off-by: Jason Wessel <jason.wessel@windriver.com> --- +Upstream-Status: Pending + modules/videoio/src/cap_ffmpeg_impl.hpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/videoio/src/cap_ffmpeg_impl.hpp b/modules/videoio/src/cap_ffmpeg_impl.hpp -index 0d360ad..566df66 100644 +index 6dca724a89..ae55dd4555 100644 --- a/modules/videoio/src/cap_ffmpeg_impl.hpp +++ b/modules/videoio/src/cap_ffmpeg_impl.hpp -@@ -736,6 +736,14 @@ struct ImplMutex::Impl +@@ -774,6 +774,14 @@ struct ImplMutex::Impl #endif diff --git a/meta-oe/recipes-support/opencv/opencv/0001-Use-Os-to-compile-tinyxml2.cpp.patch b/meta-oe/recipes-support/opencv/opencv/0001-Use-Os-to-compile-tinyxml2.cpp.patch new file mode 100644 index 0000000000..c5a64387f5 --- /dev/null +++ b/meta-oe/recipes-support/opencv/opencv/0001-Use-Os-to-compile-tinyxml2.cpp.patch @@ -0,0 +1,31 @@ +From 59fafe6e39759e193b5764b36b4c5a93da352123 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 18 Aug 2020 00:36:49 -0700 +Subject: [PATCH] Use -Os to compile tinyxml2.cpp + +This workarounds issue [1] seen on riscv with gcc + +[1] https://github.com/riscv/riscv-gnu-toolchain/issues/624 + +Upstream-Status: Inappropriate [ OE-Specific ] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + modules/datasets/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules/datasets/CMakeLists.txt b/modules/datasets/CMakeLists.txt +index 56ca9e310..99b7a33f6 100644 +--- a/modules/datasets/CMakeLists.txt ++++ b/modules/datasets/CMakeLists.txt +@@ -2,7 +2,7 @@ set(the_description "datasets framework") + + set(filter_srcs "${CMAKE_CURRENT_LIST_DIR}/src/tinyxml2/tinyxml2.cpp") + if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") +- ocv_append_source_files_cxx_compiler_options(filter_srcs "-Wno-suggest-override") # GCC ++ ocv_append_source_files_cxx_compiler_options(filter_srcs "-Wno-suggest-override -Os") # GCC + elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + ocv_append_source_files_cxx_compiler_options(filter_srcs "-Wno-inconsistent-missing-override") # Clang + endif() +-- +2.28.0 + diff --git a/meta-oe/recipes-support/opencv/opencv/0002-Make-opencv-ts-create-share-library-intead-of-static.patch b/meta-oe/recipes-support/opencv/opencv/0002-Make-opencv-ts-create-share-library-intead-of-static.patch deleted file mode 100644 index 46198fb7be..0000000000 --- a/meta-oe/recipes-support/opencv/opencv/0002-Make-opencv-ts-create-share-library-intead-of-static.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 46ffa1f8f443b71673774fcb864eb741bbc26200 Mon Sep 17 00:00:00 2001 -From: Bian Naimeng <biannm@cn.fujitsu.com> -Date: Wed, 19 Apr 2017 03:11:37 +0900 -Subject: [PATCH] Make opencv-ts create share library intead of static. - -Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> - ---- - modules/ts/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules/ts/CMakeLists.txt b/modules/ts/CMakeLists.txt -index f95bed0..ee67858 100644 ---- a/modules/ts/CMakeLists.txt -+++ b/modules/ts/CMakeLists.txt -@@ -4,7 +4,7 @@ if(NOT BUILD_opencv_ts AND NOT BUILD_TESTS AND NOT BUILD_PERF_TESTS) - ocv_module_disable(ts) - endif() - --set(OPENCV_MODULE_TYPE STATIC) -+#set(OPENCV_MODULE_TYPE STATIC) - set(OPENCV_MODULE_IS_PART_OF_WORLD FALSE) - - if(WINRT) diff --git a/meta-oe/recipes-support/opencv/opencv/0003-To-fix-errors-as-following.patch b/meta-oe/recipes-support/opencv/opencv/0003-To-fix-errors-as-following.patch index 336c2e08e6..9df419d0b8 100644 --- a/meta-oe/recipes-support/opencv/opencv/0003-To-fix-errors-as-following.patch +++ b/meta-oe/recipes-support/opencv/opencv/0003-To-fix-errors-as-following.patch @@ -1,4 +1,4 @@ -From 867caccc358266f7021f076fc8c8e41bf048782c Mon Sep 17 00:00:00 2001 +From f42c9b8c7bafcadc7e95fb25a391707f970eb426 Mon Sep 17 00:00:00 2001 From: Huang Qiyu <huangqy.fnst@cn.fujitsu.com> Date: Fri, 19 May 2017 04:27:50 +0900 Subject: [PATCH] To fix errors as following: @@ -15,16 +15,18 @@ ts module. Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com> --- +Upstream-Status: Pending + modules/ts/include/opencv2/ts.hpp | 4 ++-- modules/ts/include/opencv2/ts/ocl_test.hpp | 2 +- modules/ts/include/opencv2/ts/ts_ext.hpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/ts/include/opencv2/ts.hpp b/modules/ts/include/opencv2/ts.hpp -index b9d6b74..f1ee7ee 100644 +index ed7491a89a..80919d13ee 100644 --- a/modules/ts/include/opencv2/ts.hpp +++ b/modules/ts/include/opencv2/ts.hpp -@@ -622,7 +622,7 @@ protected: +@@ -728,7 +728,7 @@ protected: } }; @@ -33,7 +35,7 @@ index b9d6b74..f1ee7ee 100644 struct DefaultRngAuto { -@@ -685,7 +685,7 @@ private: +@@ -791,7 +791,7 @@ private: #endif #endif @@ -43,7 +45,7 @@ index b9d6b74..f1ee7ee 100644 #define CV_TEST_INIT0_NOOP (void)0 diff --git a/modules/ts/include/opencv2/ts/ocl_test.hpp b/modules/ts/include/opencv2/ts/ocl_test.hpp -index 11572e9..438112e 100644 +index 11572e9f48..438112e2aa 100644 --- a/modules/ts/include/opencv2/ts/ocl_test.hpp +++ b/modules/ts/include/opencv2/ts/ocl_test.hpp @@ -82,7 +82,7 @@ inline UMat ToUMat(InputArray src) @@ -56,7 +58,7 @@ index 11572e9..438112e 100644 #define MAX_VALUE 357 diff --git a/modules/ts/include/opencv2/ts/ts_ext.hpp b/modules/ts/include/opencv2/ts/ts_ext.hpp -index b5cea3e..e5b0b4b 100644 +index b2a4cac241..b94c681c0c 100644 --- a/modules/ts/include/opencv2/ts/ts_ext.hpp +++ b/modules/ts/include/opencv2/ts/ts_ext.hpp @@ -9,7 +9,7 @@ diff --git a/meta-oe/recipes-support/opencv/opencv/0008-Do-not-embed-build-directory-in-binaries.patch b/meta-oe/recipes-support/opencv/opencv/0008-Do-not-embed-build-directory-in-binaries.patch new file mode 100644 index 0000000000..8fda857080 --- /dev/null +++ b/meta-oe/recipes-support/opencv/opencv/0008-Do-not-embed-build-directory-in-binaries.patch @@ -0,0 +1,138 @@ +From: Victor Westerhuis <victor@westerhu.is> +Date: Sat, 19 Nov 2022 21:45:39 +0100 +Subject: Do not embed build directory in binaries + +This makes the opencv core module build reproducibly. + +https://salsa.debian.org/science-team/opencv/-/raw/master/debian/patches/0008-Do-not-embed-build-directory-in-binaries.patch +Upstream-Status: Backport +Signed-off-by: Chee Yang Lee <chee.yang.lee@intel.com> +--- + modules/core/CMakeLists.txt | 10 ------ + modules/core/include/opencv2/core/private.hpp | 4 +-- + modules/core/include/opencv2/core/utility.hpp | 4 +-- + modules/core/src/utils/datafile.cpp | 48 +-------------------------- + 4 files changed, 5 insertions(+), 61 deletions(-) + +diff --git a/modules/core/CMakeLists.txt b/modules/core/CMakeLists.txt +index b78bb98..d96b669 100644 +--- a/modules/core/CMakeLists.txt ++++ b/modules/core/CMakeLists.txt +@@ -188,16 +188,6 @@ if(OPENCV_OTHER_INSTALL_PATH) + ") + endif() + +-set(OPENCV_DATA_CONFIG_STR "${OPENCV_DATA_CONFIG_STR} +-#define OPENCV_BUILD_DIR \"${CMAKE_BINARY_DIR}\" +-") +- +-file(RELATIVE_PATH SOURCE_DIR_RELATIVE ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}) +-set(OPENCV_DATA_CONFIG_STR "${OPENCV_DATA_CONFIG_STR} +-#define OPENCV_DATA_BUILD_DIR_SEARCH_PATHS \\ +- \"${SOURCE_DIR_RELATIVE}/\" +-") +- + if(WIN32) + file(RELATIVE_PATH INSTALL_DATA_DIR_RELATIVE "${CMAKE_INSTALL_PREFIX}/${OPENCV_BIN_INSTALL_PATH}" "${CMAKE_INSTALL_PREFIX}/${OPENCV_OTHER_INSTALL_PATH}") + else() +diff --git a/modules/core/include/opencv2/core/private.hpp b/modules/core/include/opencv2/core/private.hpp +index 146d37f..dd675bc 100644 +--- a/modules/core/include/opencv2/core/private.hpp ++++ b/modules/core/include/opencv2/core/private.hpp +@@ -818,10 +818,10 @@ Search directories: + 2. Check path specified by configuration parameter with "_HINT" suffix (name of environment variable). + 3. Check path specified by configuration parameter (name of environment variable). + If parameter value is not empty and nothing is found then stop searching. +-4. Detects build/install path based on: ++4. Detects install path based on: + a. current working directory (CWD) + b. and/or binary module location (opencv_core/opencv_world, doesn't work with static linkage) +-5. Scan `<source>/{,data}` directories if build directory is detected or the current directory is in source tree. ++5. Scan `<source>/{,data}` directories if the current directory is in source tree. + 6. Scan `<install>/share/OpenCV` directory if install directory is detected. + + @param relative_path Relative path to data file +diff --git a/modules/core/include/opencv2/core/utility.hpp b/modules/core/include/opencv2/core/utility.hpp +index 108c0d9..f15d9ea 100644 +--- a/modules/core/include/opencv2/core/utility.hpp ++++ b/modules/core/include/opencv2/core/utility.hpp +@@ -1163,10 +1163,10 @@ Search directories: + 2. OPENCV_SAMPLES_DATA_PATH_HINT environment variable + 3. OPENCV_SAMPLES_DATA_PATH environment variable + If parameter value is not empty and nothing is found then stop searching. +-4. Detects build/install path based on: ++4. Detects install path based on: + a. current working directory (CWD) + b. and/or binary module location (opencv_core/opencv_world, doesn't work with static linkage) +-5. Scan `<source>/{,data,samples/data}` directories if build directory is detected or the current directory is in source tree. ++5. Scan `<source>/{,data,samples/data}` directories if the current directory is in source tree. + 6. Scan `<install>/share/OpenCV` directory if install directory is detected. + + @see cv::utils::findDataFile +diff --git a/modules/core/src/utils/datafile.cpp b/modules/core/src/utils/datafile.cpp +index 3af83a5..6bda857 100644 +--- a/modules/core/src/utils/datafile.cpp ++++ b/modules/core/src/utils/datafile.cpp +@@ -280,32 +280,8 @@ cv::String findDataFile(const cv::String& relative_path, + + + // Steps: 4, 5, 6 +- cv::String cwd = utils::fs::getcwd(); +- cv::String build_dir(OPENCV_BUILD_DIR); +- bool has_tested_build_directory = false; +- if (isSubDirectory(build_dir, cwd) || isSubDirectory(utils::fs::canonical(build_dir), utils::fs::canonical(cwd))) +- { +- CV_LOG_DEBUG(NULL, "utils::findDataFile(): the current directory is build sub-directory: " << cwd); +- const char* build_subdirs[] = { OPENCV_DATA_BUILD_DIR_SEARCH_PATHS }; +- for (size_t k = 0; k < sizeof(build_subdirs)/sizeof(build_subdirs[0]); k++) +- { +- CV_LOG_DEBUG(NULL, "utils::findDataFile(): <build>/" << build_subdirs[k]); +- cv::String datapath = utils::fs::join(build_dir, build_subdirs[k]); +- if (utils::fs::isDirectory(datapath)) +- { +- for(size_t i = search_subdir.size(); i > 0; i--) +- { +- const cv::String& subdir = search_subdir[i - 1]; +- cv::String prefix = utils::fs::join(datapath, subdir); +- TRY_FILE_WITH_PREFIX(prefix); +- } +- } +- } +- has_tested_build_directory = true; +- } +- + cv::String source_dir; +- cv::String try_source_dir = cwd; ++ cv::String try_source_dir = utils::fs::getcwd(); + for (int levels = 0; levels < 3; ++levels) + { + if (utils::fs::exists(utils::fs::join(try_source_dir, "modules/core/include/opencv2/core/version.hpp"))) +@@ -341,28 +317,6 @@ cv::String findDataFile(const cv::String& relative_path, + CV_LOG_INFO(NULL, "Can't detect module binaries location"); + } + +- if (!has_tested_build_directory && +- (isSubDirectory(build_dir, module_path) || isSubDirectory(utils::fs::canonical(build_dir), utils::fs::canonical(module_path))) +- ) +- { +- CV_LOG_DEBUG(NULL, "utils::findDataFile(): the binary module directory is build sub-directory: " << module_path); +- const char* build_subdirs[] = { OPENCV_DATA_BUILD_DIR_SEARCH_PATHS }; +- for (size_t k = 0; k < sizeof(build_subdirs)/sizeof(build_subdirs[0]); k++) +- { +- CV_LOG_DEBUG(NULL, "utils::findDataFile(): <build>/" << build_subdirs[k]); +- cv::String datapath = utils::fs::join(build_dir, build_subdirs[k]); +- if (utils::fs::isDirectory(datapath)) +- { +- for(size_t i = search_subdir.size(); i > 0; i--) +- { +- const cv::String& subdir = search_subdir[i - 1]; +- cv::String prefix = utils::fs::join(datapath, subdir); +- TRY_FILE_WITH_PREFIX(prefix); +- } +- } +- } +- } +- + #if defined OPENCV_INSTALL_DATA_DIR_RELATIVE + if (!module_path.empty()) // require module path + { diff --git a/meta-oe/recipes-support/opencv/opencv/download.patch b/meta-oe/recipes-support/opencv/opencv/download.patch new file mode 100644 index 0000000000..33ac483123 --- /dev/null +++ b/meta-oe/recipes-support/opencv/opencv/download.patch @@ -0,0 +1,41 @@ +From b18a280fab06a680d9f831bf8b462647f3cb6214 Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@intel.com> +Date: Thu, 9 Jan 2020 16:24:24 +0000 +Subject: [PATCH] opencv: abort configure if we need to download + +This CMake module will download files during do_configure. This is bad as it +means we can't do offline builds. + +Add an option to disallow downloads by emitting a fatal error. + +Upstream-Status: Pending +Signed-off-by: Ross Burton <ross.burton@intel.com> + +--- + cmake/OpenCVDownload.cmake | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/cmake/OpenCVDownload.cmake b/cmake/OpenCVDownload.cmake +index 63cf6d3238..4acf477f70 100644 +--- a/cmake/OpenCVDownload.cmake ++++ b/cmake/OpenCVDownload.cmake +@@ -14,6 +14,7 @@ + # RELATIVE_URL - if set, then URL is treated as a base, and FILENAME will be appended to it + # Note: uses OPENCV_DOWNLOAD_PATH folder as cache, default is <opencv>/.cache + ++set(OPENCV_ALLOW_DOWNLOADS ON CACHE BOOL "Allow downloads") + set(HELP_OPENCV_DOWNLOAD_PATH "Cache directory for downloaded files") + if(DEFINED ENV{OPENCV_DOWNLOAD_PATH}) + set(OPENCV_DOWNLOAD_PATH "$ENV{OPENCV_DOWNLOAD_PATH}" CACHE PATH "${HELP_OPENCV_DOWNLOAD_PATH}") +@@ -156,6 +157,11 @@ function(ocv_download) + + # Download + if(NOT EXISTS "${CACHE_CANDIDATE}") ++ if(NOT OPENCV_ALLOW_DOWNLOADS) ++ message(FATAL_ERROR "Not going to download ${DL_FILENAME}") ++ return() ++ endif() ++ + ocv_download_log("#cmake_download \"${CACHE_CANDIDATE}\" \"${DL_URL}\"") + foreach(try ${OPENCV_DOWNLOAD_TRIES_LIST}) + ocv_download_log("#try ${try}") diff --git a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb deleted file mode 100644 index 5e89db0977..0000000000 --- a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb +++ /dev/null @@ -1,181 +0,0 @@ -SUMMARY = "Opencv : The Open Computer Vision Library" -HOMEPAGE = "http://opencv.org/" -SECTION = "libs" - -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=6450921bb12a3133c8f5cb2a80343710" - -ARM_INSTRUCTION_SET_armv4 = "arm" -ARM_INSTRUCTION_SET_armv5 = "arm" - -DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp" - -SRCREV_opencv = "371bba8f54560b374fbcd47e7e02f015ac4969ad" -SRCREV_contrib = "2c32791a9c500343568a21ea34bf2daeac2adae7" -SRCREV_ipp = "32e315a5b106a7b89dbed51c28f8120a48b368b4" -SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" -SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d" - -def ipp_filename(d): - import re - arch = d.getVar('TARGET_ARCH') - if re.match("i.86$", arch): - return "ippicv_2019_lnx_ia32_general_20180723.tgz" - else: - return "ippicv_2019_lnx_intel64_general_20180723.tgz" - -def ipp_md5sum(d): - import re - arch = d.getVar('TARGET_ARCH') - if re.match("i.86$", arch): - return "4f38432c30bfd6423164b7a24bbc98a0" - else: - return "c0bd78adb4156bbf552c1dfe90599607" - -IPP_FILENAME = "${@ipp_filename(d)}" -IPP_MD5 = "${@ipp_md5sum(d)}" - -SRCREV_FORMAT = "opencv_contrib_ipp_boostdesc_vgg" -SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \ - git://github.com/opencv/opencv_contrib.git;destsuffix=contrib;name=contrib \ - git://github.com/opencv/opencv_3rdparty.git;branch=ippicv/master_20180723;destsuffix=ipp;name=ipp \ - git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_boostdesc_20161012;destsuffix=boostdesc;name=boostdesc \ - git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=vgg;name=vgg \ - file://0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch \ - file://0002-Make-opencv-ts-create-share-library-intead-of-static.patch \ - file://0003-To-fix-errors-as-following.patch \ - file://0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch \ - file://0001-Dont-use-isystem.patch \ - " -PV = "4.1.0" - -S = "${WORKDIR}/git" - -do_unpack_extra() { - tar xzf ${WORKDIR}/ipp/ippicv/${IPP_FILENAME} -C ${WORKDIR} - cp ${WORKDIR}/vgg/*.i ${WORKDIR}/contrib/modules/xfeatures2d/src - cp ${WORKDIR}/boostdesc/*.i ${WORKDIR}/contrib/modules/xfeatures2d/src -} -addtask unpack_extra after do_unpack before do_patch - -EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \ - -DWITH_1394=OFF \ - -DENABLE_PRECOMPILED_HEADERS=OFF \ - -DCMAKE_SKIP_RPATH=ON \ - -DOPENCV_ICV_HASH=${IPP_MD5} \ - -DIPPROOT=${WORKDIR}/ippicv_lnx \ - -DOPENCV_GENERATE_PKGCONFIG=ON \ - ${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \ - ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1", "", d)} \ - ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.2", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1 -DENABLE_SSE42=1", "", d)} \ -" -EXTRA_OECMAKE_append_x86 = " -DX86=ON" - -PACKAGECONFIG ??= "python3 eigen jpeg png tiff v4l libv4l gstreamer samples tbb gphoto2 \ - ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)} \ - ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "libav", "", d)}" - -PACKAGECONFIG[amdblas] = "-DWITH_OPENCLAMDBLAS=ON,-DWITH_OPENCLAMDBLAS=OFF,libclamdblas," -PACKAGECONFIG[amdfft] = "-DWITH_OPENCLAMDFFT=ON,-DWITH_OPENCLAMDFFT=OFF,libclamdfft," -PACKAGECONFIG[dnn] = "-DBUILD_opencv_dnn=ON -DPROTOBUF_UPDATE_FILES=ON -DBUILD_PROTOBUF=OFF,-DBUILD_opencv_dnn=OFF,protobuf protobuf-native," -PACKAGECONFIG[eigen] = "-DWITH_EIGEN=ON,-DWITH_EIGEN=OFF,libeigen gflags glog," -PACKAGECONFIG[freetype] = "-DBUILD_opencv_freetype=ON,-DBUILD_opencv_freetype=OFF,freetype," -PACKAGECONFIG[gphoto2] = "-DWITH_GPHOTO2=ON,-DWITH_GPHOTO2=OFF,libgphoto2," -PACKAGECONFIG[gstreamer] = "-DWITH_GSTREAMER=ON,-DWITH_GSTREAMER=OFF,gstreamer1.0 gstreamer1.0-plugins-base," -PACKAGECONFIG[gtk] = "-DWITH_GTK=ON,-DWITH_GTK=OFF,gtk+3," -PACKAGECONFIG[jasper] = "-DWITH_JASPER=ON,-DWITH_JASPER=OFF,jasper," -PACKAGECONFIG[java] = "-DJAVA_INCLUDE_PATH=${JAVA_HOME}/include -DJAVA_INCLUDE_PATH2=${JAVA_HOME}/include/linux -DJAVA_AWT_INCLUDE_PATH=${JAVA_HOME}/include -DJAVA_AWT_LIBRARY=${JAVA_HOME}/lib/amd64/libjawt.so -DJAVA_JVM_LIBRARY=${JAVA_HOME}/lib/amd64/server/libjvm.so,,ant-native fastjar-native openjdk-8-native," -PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON,-DWITH_JPEG=OFF,jpeg," -PACKAGECONFIG[libav] = "-DWITH_FFMPEG=ON,-DWITH_FFMPEG=OFF,libav," -PACKAGECONFIG[libv4l] = "-DWITH_LIBV4L=ON,-DWITH_LIBV4L=OFF,v4l-utils," -PACKAGECONFIG[opencl] = "-DWITH_OPENCL=ON,-DWITH_OPENCL=OFF,opencl-headers virtual/opencl-icd," -PACKAGECONFIG[oracle-java] = "-DJAVA_INCLUDE_PATH=${ORACLE_JAVA_HOME}/include -DJAVA_INCLUDE_PATH2=${ORACLE_JAVA_HOME}/include/linux -DJAVA_AWT_INCLUDE_PATH=${ORACLE_JAVA_HOME}/include -DJAVA_AWT_LIBRARY=${ORACLE_JAVA_HOME}/lib/amd64/libjawt.so -DJAVA_JVM_LIBRARY=${ORACLE_JAVA_HOME}/lib/amd64/server/libjvm.so,,ant-native oracle-jse-jdk oracle-jse-jdk-native," -PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng," -PACKAGECONFIG[python2] = "-DPYTHON2_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/core/include,,python-numpy," -PACKAGECONFIG[python3] = "-DPYTHON3_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/core/include,,python3-numpy," -PACKAGECONFIG[samples] = "-DBUILD_EXAMPLES=ON -DINSTALL_PYTHON_EXAMPLES=ON,-DBUILD_EXAMPLES=OFF,," -PACKAGECONFIG[tbb] = "-DWITH_TBB=ON,-DWITH_TBB=OFF,tbb," -PACKAGECONFIG[text] = "-DBUILD_opencv_text=ON,-DBUILD_opencv_text=OFF,tesseract," -PACKAGECONFIG[tiff] = "-DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff," -PACKAGECONFIG[v4l] = "-DWITH_V4L=ON,-DWITH_V4L=OFF,v4l-utils," - -inherit pkgconfig cmake - -inherit ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'distutils3-base', '', d)} -inherit ${@bb.utils.contains('PACKAGECONFIG', 'python2', 'distutils-base', '', d)} - -export PYTHON_CSPEC="-I${STAGING_INCDIR}/${PYTHON_DIR}" -export PYTHON="${STAGING_BINDIR_NATIVE}/${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3', 'python', d)}" -export ORACLE_JAVA_HOME="${STAGING_DIR_NATIVE}/usr/bin/java" -export JAVA_HOME="${STAGING_DIR_NATIVE}/usr/lib/jvm/openjdk-8-native" -export ANT_DIR="${STAGING_DIR_NATIVE}/usr/share/ant/" - -TARGET_CC_ARCH += "-I${S}/include " - -PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'samples', '${PN}-samples', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'oracle-java', '${PN}-java', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'java', '${PN}-java', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'python2', 'python-${BPN}', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3-${BPN}', '', d)} \ - ${PN}-apps" - -python populate_packages_prepend () { - cv_libdir = d.expand('${libdir}') - do_split_packages(d, cv_libdir, '^lib(.*)\.so$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev', allow_links=True) - do_split_packages(d, cv_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') - do_split_packages(d, cv_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') - do_split_packages(d, cv_libdir, '^lib(.*)\.so\.*', 'lib%s', 'OpenCV %s library', extra_depends='', allow_links=True) - - pn = d.getVar('PN') - metapkg = pn + '-dev' - d.setVar('ALLOW_EMPTY_' + metapkg, "1") - blacklist = [ metapkg ] - metapkg_rdepends = [ ] - packages = d.getVar('PACKAGES').split() - for pkg in packages[1:]: - if not pkg in blacklist and not pkg in metapkg_rdepends and pkg.endswith('-dev'): - metapkg_rdepends.append(pkg) - d.setVar('RRECOMMENDS_' + metapkg, ' '.join(metapkg_rdepends)) - - metapkg = pn - d.setVar('ALLOW_EMPTY_' + metapkg, "1") - blacklist = [ metapkg, "libopencv-ts" ] - metapkg_rdepends = [ ] - for pkg in packages[1:]: - if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.endswith('-dev') and not pkg.endswith('-dbg') and not pkg.endswith('-doc') and not pkg.endswith('-locale') and not pkg.endswith('-staticdev'): - metapkg_rdepends.append(pkg) - d.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends)) -} - -PACKAGES_DYNAMIC += "^libopencv-.*" - -FILES_${PN} = "" -FILES_${PN}-dbg += "${datadir}/OpenCV/java/.debug/* ${datadir}/OpenCV/samples/bin/.debug/*" -FILES_${PN}-dev = "${includedir} ${libdir}/pkgconfig ${libdir}/cmake/opencv4/*.cmake" -FILES_${PN}-staticdev += "${libdir}/opencv4/3rdparty/*.a" -FILES_${PN}-apps = "${bindir}/* ${datadir}/opencv4 ${datadir}/licenses" -FILES_${PN}-java = "${datadir}/OpenCV/java" -FILES_${PN}-samples = "${datadir}/opencv4/samples/" - -INSANE_SKIP_${PN}-java = "libdir" -INSANE_SKIP_${PN}-dbg = "libdir" - -ALLOW_EMPTY_${PN} = "1" - -SUMMARY_python-opencv = "Python bindings to opencv" -FILES_python-opencv = "${PYTHON_SITEPACKAGES_DIR}/*" -RDEPENDS_python-opencv = "python-core python-numpy" - -SUMMARY_python3-opencv = "Python bindings to opencv" -FILES_python3-opencv = "${PYTHON_SITEPACKAGES_DIR}/*" -RDEPENDS_python3-opencv = "python3-core python3-numpy" - -RDEPENDS_${PN}-apps = "bash" - -do_install_append() { - # Move Python files into correct library folder (for multilib build) - if [ "$libdir" != "/usr/lib" -a -d ${D}/usr/lib ]; then - mv ${D}/usr/lib/* ${D}/${libdir}/ - rm -rf ${D}/usr/lib - fi -} diff --git a/meta-oe/recipes-support/opencv/opencv_4.9.0.bb b/meta-oe/recipes-support/opencv/opencv_4.9.0.bb new file mode 100644 index 0000000000..cf836d3ecf --- /dev/null +++ b/meta-oe/recipes-support/opencv/opencv_4.9.0.bb @@ -0,0 +1,210 @@ +SUMMARY = "Opencv : The Open Computer Vision Library" +HOMEPAGE = "http://opencv.org/" +SECTION = "libs" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +ARM_INSTRUCTION_SET:armv4 = "arm" +ARM_INSTRUCTION_SET:armv5 = "arm" + +DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp" + +SRCREV_opencv = "dad8af6b17f8e60d7b95a1203a1b4d22f56574cf" +SRCREV_contrib = "c7602a8f74205e44389bd6a4e8d727d32e7e27b4" +SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" +SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d" +SRCREV_face = "8afa57abc8229d611c4937165d20e2a2d9fc5a12" +SRCREV_wechat-qrcode = "a8b69ccc738421293254aec5ddb38bd523503252" + + +SRCREV_FORMAT = "opencv_contrib_ipp_boostdesc_vgg" +SRC_URI = "git://github.com/opencv/opencv.git;name=opencv;branch=4.x;protocol=https \ + git://github.com/opencv/opencv_contrib.git;destsuffix=git/contrib;name=contrib;branch=4.x;protocol=https \ + git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_boostdesc_20161012;destsuffix=git/boostdesc;name=boostdesc;protocol=https \ + git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=git/vgg;name=vgg;protocol=https \ + git://github.com/opencv/opencv_3rdparty.git;branch=contrib_face_alignment_20170818;destsuffix=git/face;name=face;protocol=https \ + git://github.com/WeChatCV/opencv_3rdparty.git;branch=wechat_qrcode;destsuffix=git/wechat_qrcode;name=wechat-qrcode;protocol=https \ + file://0003-To-fix-errors-as-following.patch \ + file://0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch \ + file://0001-Dont-use-isystem.patch \ + file://download.patch \ + file://0001-Make-ts-module-external.patch \ + file://0008-Do-not-embed-build-directory-in-binaries.patch \ + " +SRC_URI:append:riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=contrib" + +S = "${WORKDIR}/git" + +# OpenCV wants to download more files during configure. We download these in +# do_fetch and construct a source cache in the format it expects +OPENCV_DLDIR = "${WORKDIR}/downloads" + +do_unpack_extra() { + + md5() { + # Return the MD5 of $1 + echo $(md5sum $1 | cut -d' ' -f1) + } + cache() { + TAG=$1 + shift + mkdir --parents ${OPENCV_DLDIR}/$TAG + for F in $*; do + DEST=${OPENCV_DLDIR}/$TAG/$(md5 $F)-$(basename $F) + test -e $DEST || ln -s $F $DEST + done + } + cache xfeatures2d/boostdesc ${S}/boostdesc/*.i + cache xfeatures2d/vgg ${S}/vgg/*.i + cache data ${S}/face/*.dat + cache wechat_qrcode ${S}/wechat_qrcode/*.caffemodel + cache wechat_qrcode ${S}/wechat_qrcode/*.prototxt +} +addtask unpack_extra after do_unpack before do_patch + +CMAKE_VERBOSE = "VERBOSE=1" + +EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${S}/contrib/modules \ + -DWITH_1394=OFF \ + -DENABLE_PRECOMPILED_HEADERS=OFF \ + -DCMAKE_SKIP_RPATH=ON \ + -DWITH_IPP=OFF \ + -DOPENCV_GENERATE_PKGCONFIG=ON \ + -DOPENCV_DOWNLOAD_PATH=${OPENCV_DLDIR} \ + -DOPENCV_ALLOW_DOWNLOADS=OFF \ + ${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \ + ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1", "", d)} \ + ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.2", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1 -DENABLE_SSE42=1", "", d)} \ +" +LDFLAGS:append:mips = " -Wl,--no-as-needed -latomic -Wl,--as-needed" +LDFLAGS:append:riscv32 = " -Wl,--no-as-needed -latomic -Wl,--as-needed" + +EXTRA_OECMAKE:append:x86 = " -DX86=ON" +# disable sse4.1 and sse4.2 to fix 32bit build failure +# https://github.com/opencv/opencv/issues/21597 +EXTRA_OECMAKE:remove:x86 = " -DENABLE_SSE41=1 -DENABLE_SSE42=1" + +PACKAGECONFIG ??= "gapi python3 eigen jpeg png tiff v4l libv4l gstreamer samples tbb gphoto2 \ + ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)} \ + ${@bb.utils.contains_any("LICENSE_FLAGS_ACCEPTED", "commercial_ffmpeg commercial", "libav", "", d)}" + +# TBB does not build for powerpc so disable that package config +PACKAGECONFIG:remove:powerpc = "tbb" +# tbb now needs getcontect/setcontext which is not there for all arches on musl +PACKAGECONFIG:remove:libc-musl:riscv64 = "tbb" +PACKAGECONFIG:remove:libc-musl:riscv32 = "tbb" + +PACKAGECONFIG[gapi] = "-DWITH_ADE=ON -Dade_DIR=${STAGING_LIBDIR},-DWITH_ADE=OFF,ade" +PACKAGECONFIG[amdblas] = "-DWITH_OPENCLAMDBLAS=ON,-DWITH_OPENCLAMDBLAS=OFF,libclamdblas," +PACKAGECONFIG[amdfft] = "-DWITH_OPENCLAMDFFT=ON,-DWITH_OPENCLAMDFFT=OFF,libclamdfft," +PACKAGECONFIG[dnn] = "-DBUILD_opencv_dnn=ON -DPROTOBUF_UPDATE_FILES=ON -DBUILD_PROTOBUF=OFF -DCMAKE_CXX_STANDARD=17,-DBUILD_opencv_dnn=OFF,protobuf protobuf-native," +PACKAGECONFIG[eigen] = "-DWITH_EIGEN=ON,-DWITH_EIGEN=OFF,libeigen gflags glog," +PACKAGECONFIG[freetype] = "-DBUILD_opencv_freetype=ON,-DBUILD_opencv_freetype=OFF,freetype," +PACKAGECONFIG[gphoto2] = "-DWITH_GPHOTO2=ON,-DWITH_GPHOTO2=OFF,libgphoto2," +PACKAGECONFIG[gstreamer] = "-DWITH_GSTREAMER=ON,-DWITH_GSTREAMER=OFF,gstreamer1.0 gstreamer1.0-plugins-base," +PACKAGECONFIG[gtk] = "-DWITH_GTK=ON,-DWITH_GTK=OFF,gtk+3," +PACKAGECONFIG[jasper] = "-DWITH_JASPER=ON,-DWITH_JASPER=OFF,jasper," +PACKAGECONFIG[java] = "-DJAVA_INCLUDE_PATH=${JAVA_HOME}/include -DJAVA_INCLUDE_PATH2=${JAVA_HOME}/include/linux -DJAVA_AWT_INCLUDE_PATH=${JAVA_HOME}/include -DJAVA_AWT_LIBRARY=${JAVA_HOME}/lib/amd64/libjawt.so -DJAVA_JVM_LIBRARY=${JAVA_HOME}/lib/amd64/server/libjvm.so,,ant-native fastjar-native openjdk-8-native," +PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON,-DWITH_JPEG=OFF,jpeg," +PACKAGECONFIG[libav] = "-DWITH_FFMPEG=ON,-DWITH_FFMPEG=OFF,libav," +PACKAGECONFIG[libv4l] = "-DWITH_LIBV4L=ON,-DWITH_LIBV4L=OFF,v4l-utils," +PACKAGECONFIG[opencl] = "-DWITH_OPENCL=ON,-DWITH_OPENCL=OFF,opencl-headers virtual/opencl-icd," +PACKAGECONFIG[openvino] = "-DWITH_OPENVINO=ON,-DWITH_OPENVINO=OFF,openvino-inference-engine,openvino-inference-engine" +PACKAGECONFIG[oracle-java] = "-DJAVA_INCLUDE_PATH=${ORACLE_JAVA_HOME}/include -DJAVA_INCLUDE_PATH2=${ORACLE_JAVA_HOME}/include/linux -DJAVA_AWT_INCLUDE_PATH=${ORACLE_JAVA_HOME}/include -DJAVA_AWT_LIBRARY=${ORACLE_JAVA_HOME}/lib/amd64/libjawt.so -DJAVA_JVM_LIBRARY=${ORACLE_JAVA_HOME}/lib/amd64/server/libjvm.so,,ant-native oracle-jse-jdk oracle-jse-jdk-native," +PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng," +PACKAGECONFIG[python3] = "-DPYTHON3_INCLUDE_PATH=${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI} -DPYTHON3_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/core/include,,python3-numpy," +PACKAGECONFIG[samples] = "-DBUILD_EXAMPLES=ON -DINSTALL_PYTHON_EXAMPLES=ON,-DBUILD_EXAMPLES=OFF,," +PACKAGECONFIG[tbb] = "-DWITH_TBB=ON,-DWITH_TBB=OFF,tbb," +PACKAGECONFIG[tests] = "-DBUILD_TESTS=ON,-DBUILD_TESTS=OFF,," +PACKAGECONFIG[text] = "-DBUILD_opencv_text=ON,-DBUILD_opencv_text=OFF,tesseract," +PACKAGECONFIG[tiff] = "-DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff," +PACKAGECONFIG[v4l] = "-DWITH_V4L=ON,-DWITH_V4L=OFF,v4l-utils," + +inherit pkgconfig cmake setuptools3-base python3native + +export PYTHON_CSPEC="-I${STAGING_INCDIR}/${PYTHON_DIR}" +export ORACLE_JAVA_HOME="${STAGING_DIR_NATIVE}/usr/bin/java" +export JAVA_HOME="${STAGING_DIR_NATIVE}/usr/lib/jvm/openjdk-8-native" +export ANT_DIR="${STAGING_DIR_NATIVE}/usr/share/ant/" + +TARGET_CC_ARCH += "-I${S}/include " + +PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'samples', '${PN}-samples', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'oracle-java', '${PN}-java', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'java', '${PN}-java', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3-${BPN}', '', d)} \ + ${PN}-apps" + +python populate_packages:prepend () { + cv_libdir = d.expand('${libdir}') + do_split_packages(d, cv_libdir, r'^lib(.*)\.so$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev', allow_links=True) + do_split_packages(d, cv_libdir, r'^lib(.*)\.la$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') + do_split_packages(d, cv_libdir, r'^lib(.*)\.a$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') + do_split_packages(d, cv_libdir, r'^lib(.*)\.so\.*', 'lib%s', 'OpenCV %s library', extra_depends='', allow_links=True) + + pn = d.getVar('PN') + metapkg = pn + '-dev' + d.setVar('ALLOW_EMPTY:' + metapkg, "1") + blacklist = [ metapkg ] + metapkg_rdepends = [ ] + packages = d.getVar('PACKAGES').split() + for pkg in packages[1:]: + if not pkg in blacklist and not pkg in metapkg_rdepends and pkg.endswith('-dev'): + metapkg_rdepends.append(pkg) + d.setVar('RRECOMMENDS:' + metapkg, ' '.join(metapkg_rdepends)) + + metapkg = pn + d.setVar('ALLOW_EMPTY:' + metapkg, "1") + blacklist = [ metapkg ] + metapkg_rdepends = [ ] + for pkg in packages[1:]: + if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.endswith('-dev') and not pkg.endswith('-dbg') and not pkg.endswith('-doc') and not pkg.endswith('-locale') and not pkg.endswith('-staticdev'): + metapkg_rdepends.append(pkg) + d.setVar('RDEPENDS:' + metapkg, ' '.join(metapkg_rdepends)) +} + +PACKAGES_DYNAMIC += "^libopencv-.*" + +FILES:${PN} = "" +FILES:${PN}-dbg += "${datadir}/OpenCV/java/.debug/* ${datadir}/OpenCV/samples/bin/.debug/*" +FILES:${PN}-dev = "${includedir} ${libdir}/pkgconfig ${libdir}/cmake/opencv4/*.cmake" +FILES:${PN}-staticdev += "${libdir}/opencv4/3rdparty/*.a" +FILES:${PN}-apps = "${bindir}/* ${datadir}/opencv4 ${datadir}/licenses" +FILES:${PN}-java = "${datadir}/OpenCV/java" +FILES:${PN}-samples = "${datadir}/opencv4/samples/" + +INSANE_SKIP:${PN}-java = "libdir" +INSANE_SKIP:${PN}-dbg = "libdir" + +ALLOW_EMPTY:${PN} = "1" + +SUMMARY:python3-opencv = "Python bindings to opencv" +FILES:python3-opencv = "${PYTHON_SITEPACKAGES_DIR}/*" +RDEPENDS:python3-opencv = "python3-core python3-numpy" + +RDEPENDS:${PN}-apps = "bash" + +do_compile:prepend() { + # remove the build host info to improve reproducibility + if [ -f ${WORKDIR}/build/modules/core/version_string.inc ]; then + sed -i "s#${WORKDIR}#/workdir#g" ${WORKDIR}/build/modules/core/version_string.inc + fi +} + +do_install:append() { + # Move Python files into correct library folder (for multilib build) + if [ "$libdir" != "/usr/lib" -a -d ${D}/usr/lib ]; then + mv ${D}/usr/lib/* ${D}/${libdir}/ + rm -rf ${D}/usr/lib + fi + # remove build host path to improve reproducibility + if [ -f ${D}${libdir}/cmake/opencv4/OpenCVModules.cmake ]; then + sed -e 's@${STAGING_DIR_HOST}@@g' \ + -i ${D}${libdir}/cmake/opencv4/OpenCVModules.cmake + fi + # remove setup_vars_opencv4.sh as its content is confusing and useless + if [ -f ${D}${bindir}/setup_vars_opencv4.sh ]; then + rm -rf ${D}${bindir}/setup_vars_opencv4.sh + fi +} diff --git a/meta-oe/recipes-support/openldap/openldap/0001-build-top.mk-unset-STRIP_OPTS.patch b/meta-oe/recipes-support/openldap/openldap/0001-build-top.mk-unset-STRIP_OPTS.patch new file mode 100644 index 0000000000..9d25f2c599 --- /dev/null +++ b/meta-oe/recipes-support/openldap/openldap/0001-build-top.mk-unset-STRIP_OPTS.patch @@ -0,0 +1,38 @@ +From 321839cbd1d57f12d3d6695254d2003473d8dd1a Mon Sep 17 00:00:00 2001 +From: Yi Zhao <yi.zhao@windriver.com> +Date: Wed, 8 Dec 2021 16:58:55 +0800 +Subject: [PATCH] build/top.mk: unset STRIP_OPTS + +Unset STRIP_OPTS to disable strip to fix QA errors: + +ERROR: openldap-2.5.9-r0 do_package: QA Issue: File +'/usr/bin/ldapcompare' from openldap was already stripped, this will +prevent future debugging! [already-stripped] + +ERROR: openldap-2.5.9-r0 do_package: QA Issue: File +'/usr/bin/ldapdelete' from openldap was already stripped, this will +prevent future debugging! [already-stripped] + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + build/top.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/build/top.mk b/build/top.mk +index 38ce146..6e9fe1f 100644 +--- a/build/top.mk ++++ b/build/top.mk +@@ -60,7 +60,7 @@ INSTALL_PROGRAM = $(INSTALL) + INSTALL_DATA = $(INSTALL) -m 644 + INSTALL_SCRIPT = $(INSTALL) + +-STRIP_OPTS = -s ++STRIP_OPTS = + + LINT = lint + 5LINT = 5lint +-- +2.17.1 + diff --git a/meta-oe/recipes-support/openldap/openldap/install-strip.patch b/meta-oe/recipes-support/openldap/openldap/install-strip.patch deleted file mode 100644 index 7c675962b6..0000000000 --- a/meta-oe/recipes-support/openldap/openldap/install-strip.patch +++ /dev/null @@ -1,17 +0,0 @@ -# This patch ensures that the install operations which strip -# programs and libraries (LTINSTALL) work in a cross build -# environment. - -Upstream-Status: Pending - ---- openldap-2.2.24/.pc/install-strip.patch/build/top.mk 2005-01-20 09:00:55.000000000 -0800 -+++ openldap-2.2.24/build/top.mk 2005-04-16 13:48:20.536710376 -0700 -@@ -116,7 +116,7 @@ - LTLINK_MOD = $(LIBTOOL) $(LTONLY_MOD) --mode=link \ - $(CC) $(LT_CFLAGS) $(LDFLAGS) $(LTFLAGS_MOD) - --LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL) -+LTINSTALL = STRIPPROG="" $(LIBTOOL) --mode=install $(top_srcdir)/contrib/ldapc++/install-sh -c - LTFINISH = $(LIBTOOL) --mode=finish - - # Misc UNIX commands used in build environment diff --git a/meta-oe/recipes-support/openldap/openldap/kill-icu.patch b/meta-oe/recipes-support/openldap/openldap/kill-icu.patch deleted file mode 100644 index 35e46465a4..0000000000 --- a/meta-oe/recipes-support/openldap/openldap/kill-icu.patch +++ /dev/null @@ -1,30 +0,0 @@ -From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> - -slapd depends on ICU if it was built first. - -Upstream-Status: inappropiate [embedded specific] ---- - configure.in | 8 -------- - 1 file changed, 8 deletions(-) - ---- openldap-2.4.23.orig/configure.in -+++ openldap-2.4.23/configure.in -@@ -2045,18 +2045,10 @@ if test $ol_enable_ndb != no ; then - SLAPD_LIBS="$SLAPD_LIBS \$(SLAPD_NDB_LIBS)" - fi - fi - - dnl ---------------------------------------------------------------- --dnl International Components for Unicode --OL_ICU --if test "$ol_icu" = no ; then -- AC_MSG_WARN([ICU not available]) --else -- ICU_LIBS="$ol_icu" --fi --dnl ---------------------------------------------------------------- - dnl - dnl Check for Cyrus SASL - dnl - WITH_SASL=no - ol_link_sasl=no diff --git a/meta-oe/recipes-support/openldap/openldap/openldap-2.4.28-gnutls-gcrypt.patch b/meta-oe/recipes-support/openldap/openldap/openldap-2.4.28-gnutls-gcrypt.patch deleted file mode 100644 index 86d0767a47..0000000000 --- a/meta-oe/recipes-support/openldap/openldap/openldap-2.4.28-gnutls-gcrypt.patch +++ /dev/null @@ -1,17 +0,0 @@ -From http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-nds/openldap/files/ - -Upstream-status: Pending - --- - ---- openldap-2.4.28/configure.in.orig 2012-02-11 22:40:36.004360795 +0000 -+++ openldap-2.4.28/configure.in 2012-02-11 22:40:13.410986851 +0000 -@@ -1214,7 +1214,7 @@ - ol_with_tls=gnutls - ol_link_tls=yes - -- TLS_LIBS="-lgnutls" -+ TLS_LIBS="-lgnutls -lgcrypt" - - AC_DEFINE(HAVE_GNUTLS, 1, - [define if you have GNUtls]) diff --git a/meta-oe/recipes-support/openldap/openldap/openldap-CVE-2015-3276.patch b/meta-oe/recipes-support/openldap/openldap/openldap-CVE-2015-3276.patch deleted file mode 100644 index ce8b47ae4e..0000000000 --- a/meta-oe/recipes-support/openldap/openldap/openldap-CVE-2015-3276.patch +++ /dev/null @@ -1,63 +0,0 @@ -openldap CVE-2015-3276 - -the patch comes from: -https://bugzilla.redhat.com/show_bug.cgi?id=1238322 -https://bugzilla.redhat.com/attachment.cgi?id=1055640 - -The nss_parse_ciphers function in libraries/libldap/tls_m.c in -OpenLDAP does not properly parse OpenSSL-style multi-keyword mode -cipher strings, which might cause a weaker than intended cipher to -be used and allow remote attackers to have unspecified impact via -unknown vectors. - -Upstream-Status: Pending - -CVE: CVE-2015-3276 - -Signed-off-by: Li Wang <li.wang@windriver.com> ---- - libraries/libldap/tls_m.c | 27 ++++++++++++++++----------- - 1 file changed, 16 insertions(+), 11 deletions(-) - -diff --git a/libraries/libldap/tls_m.c b/libraries/libldap/tls_m.c -index 9b101f9..e6f3051 100644 ---- a/libraries/libldap/tls_m.c -+++ b/libraries/libldap/tls_m.c -@@ -621,18 +621,23 @@ nss_parse_ciphers(const char *cipherstr, int cipher_list[ciphernum]) - */ - if (mask || strength || protocol) { - for (i=0; i<ciphernum; i++) { -- if (((ciphers_def[i].attr & mask) || -- (ciphers_def[i].strength & strength) || -- (ciphers_def[i].version & protocol)) && -- (cipher_list[i] != -1)) { -- /* Enable the NULL ciphers only if explicity -- * requested */ -- if (ciphers_def[i].attr & SSL_eNULL) { -- if (mask & SSL_eNULL) -- cipher_list[i] = action; -- } else -+ /* if more than one mask is provided -+ * then AND logic applies (to match openssl) -+ */ -+ if ( cipher_list[i] == -1) ) -+ continue; -+ if ( mask && ! (ciphers_def[i].attr & mask) ) -+ continue; -+ if ( strength && ! (ciphers_def[i].strength & strength) ) -+ continue; -+ if ( protocol && ! (ciphers_def[i].version & protocol) ) -+ continue; -+ /* Enable the NULL ciphers only if explicity requested */ -+ if (ciphers_def[i].attr & SSL_eNULL) { -+ if (mask & SSL_eNULL) - cipher_list[i] = action; -- } -+ } else -+ cipher_list[i] = action; - } - } else { - for (i=0; i<ciphernum; i++) { --- -1.7.9.5 - diff --git a/meta-oe/recipes-support/openldap/openldap/openldap-m4-pthread.patch b/meta-oe/recipes-support/openldap/openldap/openldap-m4-pthread.patch deleted file mode 100644 index 38c0a5af2f..0000000000 --- a/meta-oe/recipes-support/openldap/openldap/openldap-m4-pthread.patch +++ /dev/null @@ -1,22 +0,0 @@ -Upstream-Status: Pending - ---- openldap-2.3.11/build/openldap.m4.orig 2005-11-11 00:11:18.604322590 -0800 -+++ openldap-2.3.11/build/openldap.m4 2005-11-11 00:26:21.621145856 -0800 -@@ -788,7 +788,7 @@ AC_DEFUN([OL_PTHREAD_TEST_FUNCTION],[[ - ]]) - - AC_DEFUN([OL_PTHREAD_TEST_PROGRAM], --AC_LANG_SOURCE([OL_PTHREAD_TEST_INCLUDES -+[AC_LANG_SOURCE([[OL_PTHREAD_TEST_INCLUDES - - int main(argc, argv) - int argc; -@@ -796,7 +796,7 @@ int main(argc, argv) - { - OL_PTHREAD_TEST_FUNCTION - } --])) -+]])]) - dnl -------------------------------------------------------------------- - AC_DEFUN([OL_PTHREAD_TRY], [# Pthread try link: $1 ($2) - if test "$ol_link_threads" = no ; then diff --git a/meta-oe/recipes-support/openldap/openldap/remove-user-host-pwd-from-version.patch b/meta-oe/recipes-support/openldap/openldap/remove-user-host-pwd-from-version.patch index 870fc98adf..7a1b5aaad7 100644 --- a/meta-oe/recipes-support/openldap/openldap/remove-user-host-pwd-from-version.patch +++ b/meta-oe/recipes-support/openldap/openldap/remove-user-host-pwd-from-version.patch @@ -12,8 +12,6 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com> build/mkversion | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) -diff --git a/build/mkversion b/build/mkversion -index 4e35723..9fa3bee 100755 --- a/build/mkversion +++ b/build/mkversion @@ -53,8 +53,12 @@ APPLICATION=$1 @@ -39,6 +37,3 @@ index 4e35723..9fa3bee 100755 "\t$WHOWHERE\n"; __EOF__ --- -2.7.4 - diff --git a/meta-oe/recipes-support/openldap/openldap/thread_stub.patch b/meta-oe/recipes-support/openldap/openldap/thread_stub.patch deleted file mode 100644 index 540ba4a635..0000000000 --- a/meta-oe/recipes-support/openldap/openldap/thread_stub.patch +++ /dev/null @@ -1,20 +0,0 @@ -openldap: set pointer - -When the function ldap_pvt_thread_pool_getkey() succeeds, it -must set the value of *data since the caller may try to use it. - -Upstream-Status: pending - -Signed-off-by: Joe Slater <jslater@windriver.com> - - ---- a/libraries/libldap_r/thr_stub.c -+++ b/libraries/libldap_r/thr_stub.c -@@ -217,6 +217,7 @@ ldap_pvt_thread_pool_unidle ( ldap_pvt_t - int ldap_pvt_thread_pool_getkey ( - void *ctx, void *key, void **data, ldap_pvt_thread_pool_keyfree_t **kfree ) - { -+ if (data) *data = NULL; /* avoid problems with uninitialized *data */ - return(0); - } - diff --git a/meta-oe/recipes-support/openldap/openldap/use-urandom.patch b/meta-oe/recipes-support/openldap/openldap/use-urandom.patch deleted file mode 100644 index e7b988fafd..0000000000 --- a/meta-oe/recipes-support/openldap/openldap/use-urandom.patch +++ /dev/null @@ -1,38 +0,0 @@ -openldap: assume /dev/urandom exists - -When we are cross-compiling, we want to assume -that /dev/urandom exists. We could change the source -code to look for it, but this is the easy way out. - -Upstream-Status: pending - -Signed-off-by: Joe Slater <jslater@windriver.com> - - ---- a/configure.in -+++ b/configure.in -@@ -2142,8 +2142,8 @@ fi - - dnl ---------------------------------------------------------------- - dnl Check for entropy sources -+dev=no - if test $cross_compiling != yes && test "$ac_cv_mingw32" != yes ; then -- dev=no - if test -r /dev/urandom ; then - dev="/dev/urandom"; - elif test -r /idev/urandom ; then -@@ -2156,9 +2156,11 @@ if test $cross_compiling != yes && test - dev="/idev/random"; - fi - -- if test $dev != no ; then -- AC_DEFINE_UNQUOTED(URANDOM_DEVICE,"$dev",[set to urandom device]) -- fi -+elif test $cross_compiling == yes ; then -+ dev="/dev/urandom"; -+fi -+if test $dev != no ; then -+ AC_DEFINE_UNQUOTED(URANDOM_DEVICE,"$dev",[set to urandom device]) - fi - - dnl ---------------------------------------------------------------- diff --git a/meta-oe/recipes-support/openldap/openldap_2.4.48.bb b/meta-oe/recipes-support/openldap/openldap_2.6.7.bb index ecc219d35d..c229667d68 100644 --- a/meta-oe/recipes-support/openldap/openldap_2.4.48.bb +++ b/meta-oe/recipes-support/openldap/openldap_2.6.7.bb @@ -7,7 +7,7 @@ HOMEPAGE = "http://www.OpenLDAP.org/license.html" # basically BSD. opensource.org does not record this license # at present (so it is apparently not OSI certified). LICENSE = "OpenLDAP" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=ad914c35f97b468f421f8ac0f3d821f4 \ +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=beceb5ac7100b6430640c61655b25c1f \ file://LICENSE;md5=153d07ef052c4a37a8fac23bc6031972 \ " SECTION = "libs" @@ -15,28 +15,17 @@ SECTION = "libs" LDAP_VER = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" SRC_URI = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/${BP}.tgz \ - file://openldap-m4-pthread.patch \ - file://kill-icu.patch \ - file://openldap-2.4.28-gnutls-gcrypt.patch \ - file://use-urandom.patch \ file://initscript \ file://slapd.service \ - file://thread_stub.patch \ - file://openldap-CVE-2015-3276.patch \ file://remove-user-host-pwd-from-version.patch \ + file://0001-build-top.mk-unset-STRIP_OPTS.patch \ " -SRC_URI[md5sum] = "0729a0711fe096831dedc159e0bbe73f" -SRC_URI[sha256sum] = "d9523ffcab5cd14b709fcf3cb4d04e8bc76bb8970113255f372bc74954c6074d" +SRC_URI[sha256sum] = "cd775f625c944ed78a3da18a03b03b08eea73c8aabc97b41bb336e9a10954930" DEPENDS = "util-linux groff-native" -# The original top.mk used INSTALL, not INSTALL_STRIP_PROGRAM when -# installing .so and executables, this fails in cross compilation -# environments -SRC_URI += "file://install-strip.patch" - -inherit autotools-brokensep update-rc.d systemd +inherit autotools-brokensep update-rc.d systemd pkgconfig # CV SETTINGS # Required to work round AC_FUNC_MEMCMP which gets the wrong answer @@ -51,12 +40,12 @@ EXTRA_OECONF += "--with-yielding-select=yes" # Shared libraries are nice... EXTRA_OECONF += "--enable-dynamic" -PACKAGECONFIG ??= "gnutls modules \ - mdb ldap meta monitor null passwd shell proxycache dnssrv \ +PACKAGECONFIG ??= "asyncmeta gnutls modules \ + mdb ldap meta null passwd proxycache dnssrv \ ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ " #--with-tls with TLS/SSL support auto|openssl|gnutls [auto] -PACKAGECONFIG[gnutls] = "--with-tls=gnutls,,gnutls libgcrypt" +PACKAGECONFIG[gnutls] = "--with-tls=gnutls,,gnutls" PACKAGECONFIG[openssl] = "--with-tls=openssl,,openssl" PACKAGECONFIG[sasl] = "--with-cyrus-sasl,--without-cyrus-sasl,cyrus-sasl" @@ -73,25 +62,20 @@ EXTRA_OECONF += "--enable-crypt" # The backend must be set by the configuration. This controls the # required database. # -# Backends="bdb dnssrv hdb ldap mdb meta monitor ndb null passwd perl relay shell sock sql" +# Backends="asyncmeta dnssrv ldap mdb meta null passwd perl relay sock sql wt" # # Note that multiple backends can be built. The ldbm backend requires a -# build-time choice of database API. The bdb backend forces this to be -# DB4. To use the gdbm (or other) API the Berkely database module must -# be removed from the build. +# build-time choice of database API. To use the gdbm (or other) API the +# Berkely database module must be removed from the build. md = "${libexecdir}/openldap" # -#--enable-bdb enable Berkeley DB backend no|yes|mod yes -# The Berkely DB is the standard choice. This version of OpenLDAP requires -# the version 4 implementation or better. -PACKAGECONFIG[bdb] = "--enable-bdb=yes,--enable-bdb=no,db" + +#--enable-asyncmeta enable asyncmeta backend no|yes|mod no +PACKAGECONFIG[asyncmeta] = "--enable-asyncmeta=mod,--enable-asyncmeta=no" #--enable-dnssrv enable dnssrv backend no|yes|mod no PACKAGECONFIG[dnssrv] = "--enable-dnssrv=mod,--enable-dnssrv=no" -#--enable-hdb enable Hierarchical DB backend no|yes|mod no -PACKAGECONFIG[hdb] = "--enable-hdb=yes,--enable-hdb=no,db" - #--enable-ldap enable ldap backend no|yes|mod no PACKAGECONFIG[ldap] = "--enable-ldap=mod,--enable-ldap=no," @@ -101,12 +85,6 @@ PACKAGECONFIG[mdb] = "--enable-mdb=yes,--enable-mdb=no," #--enable-meta enable metadirectory backend no|yes|mod no PACKAGECONFIG[meta] = "--enable-meta=mod,--enable-meta=no," -#--enable-monitor enable monitor backend no|yes|mod yes -PACKAGECONFIG[monitor] = "--enable-monitor=mod,--enable-monitor=no," - -#--enable-ndb enable MySQL NDB Cluster backend no|yes|mod [no] -PACKAGECONFIG[ndb] = "--enable-ndb=mod,--enable-ndb=no," - #--enable-null enable null backend no|yes|mod no PACKAGECONFIG[null] = "--enable-null=mod,--enable-null=no," @@ -122,10 +100,6 @@ PACKAGECONFIG[perl] = "--enable-perl=mod,--enable-perl=no,perl" #--enable-relay enable relay backend no|yes|mod [yes] PACKAGECONFIG[relay] = "--enable-relay=mod,--enable-relay=no," -#--enable-shell enable shell backend no|yes|mod no -# configure: WARNING: Use of --without-threads is recommended with back-shell -PACKAGECONFIG[shell] = "--enable-shell=mod --without-threads,--enable-shell=no," - #--enable-sock enable sock backend no|yes|mod [no] PACKAGECONFIG[sock] = "--enable-sock=mod,--enable-sock=no," @@ -134,6 +108,10 @@ PACKAGECONFIG[sock] = "--enable-sock=mod,--enable-sock=no," # sqlite.h (which may be compatible but hasn't been tried.) PACKAGECONFIG[sql] = "--enable-sql=mod,--enable-sql=no,sqlite3" +#--enable-wt enable wt backend no|yes|mod no +# back-wt is marked currently as experimental +PACKAGECONFIG[wt] = "--enable-wt=mod,--enable-wt=no" + #--enable-dyngroup Dynamic Group overlay no|yes|mod no # This is a demo, Proxy Cache defines init_module which conflicts with the # same symbol in dyngroup @@ -141,22 +119,24 @@ PACKAGECONFIG[dyngroup] = "--enable-dyngroup=mod,--enable-dyngroup=no," #--enable-proxycache Proxy Cache overlay no|yes|mod no PACKAGECONFIG[proxycache] = "--enable-proxycache=mod,--enable-proxycache=no," -FILES_${PN}-overlay-proxycache = "${md}/pcache-*.so.*" +FILES:${PN}-overlay-proxycache = "${md}/pcache.so.*" PACKAGES += "${PN}-overlay-proxycache" # Append URANDOM_DEVICE='/dev/urandom' to CPPFLAGS: # This allows tls to obtain random bits from /dev/urandom, by default # it was disabled for cross-compiling. -CPPFLAGS_append = " -D_GNU_SOURCE -DURANDOM_DEVICE=\'/dev/urandom\' -fPIC" +CPPFLAGS:append = " -D_GNU_SOURCE -DURANDOM_DEVICE=\\"/dev/urandom\\" -fPIC" -LDFLAGS_append = " -pthread" +LDFLAGS:append = " -pthread" do_configure() { - cp ${STAGING_DATADIR_NATIVE}/libtool/build-aux/ltmain.sh ${S}/build rm -f ${S}/libtool aclocal libtoolize --force --copy gnu-configize + cp ${STAGING_DATADIR_NATIVE}/libtool/build-aux/ltmain.sh ${S}/build + cp ${STAGING_DATADIR_NATIVE}/libtool/build-aux/missing ${S}/build + cp ${STAGING_DATADIR_NATIVE}/libtool/build-aux/compile ${S}/build autoconf oe_runconf } @@ -169,18 +149,18 @@ LEAD_SONAME = "libldap-${LDAP_VER}.so.*" PACKAGES += "${PN}-slapd ${PN}-slurpd ${PN}-bin" # Package contents - shift most standard contents to -bin -FILES_${PN} = "${libdir}/lib*.so.* ${sysconfdir}/openldap/ldap.* ${localstatedir}/${BPN}/data" -FILES_${PN}-slapd = "${sysconfdir}/init.d ${libexecdir}/slapd ${sbindir} ${localstatedir}/run ${localstatedir}/volatile/run \ +FILES:${PN} = "${libdir}/lib*.so.* ${sysconfdir}/openldap/ldap.* ${localstatedir}/${BPN}/data" +FILES:${PN}-slapd = "${sysconfdir}/init.d ${libexecdir}/slapd ${sbindir} ${localstatedir}/run ${localstatedir}/volatile/run \ ${sysconfdir}/openldap/slapd.* ${sysconfdir}/openldap/schema \ ${sysconfdir}/openldap/DB_CONFIG.example ${systemd_unitdir}/system/*" -FILES_${PN}-slurpd = "${libexecdir}/slurpd ${localstatedir}/openldap-slurp ${localstatedir}/run ${localstatedir}/volatile/run" -FILES_${PN}-bin = "${bindir}" -FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la ${libdir}/*.a ${libexecdir}/openldap/*.a ${libexecdir}/openldap/*.la ${libexecdir}/openldap/*.so" -FILES_${PN}-dbg += "${libexecdir}/openldap/.debug" +FILES:${PN}-slurpd = "${libexecdir}/slurpd ${localstatedir}/openldap-slurp" +FILES:${PN}-bin = "${bindir}" +FILES:${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la ${libexecdir}/openldap/*.a ${libexecdir}/openldap/*.la ${libexecdir}/openldap/*.so ${libdir}/pkgconfig/*.pc" +FILES:${PN}-dbg += "${libexecdir}/openldap/.debug" -do_install_append() { +do_install:append() { install -d ${D}${sysconfdir}/init.d - cat ${WORKDIR}/initscript > ${D}${sysconfdir}/init.d/openldap + cat ${UNPACKDIR}/initscript > ${D}${sysconfdir}/init.d/openldap chmod 755 ${D}${sysconfdir}/init.d/openldap # This is duplicated in /etc/openldap and is for slapd rm -f ${D}${localstatedir}/openldap-data/DB_CONFIG.example @@ -188,7 +168,7 @@ do_install_append() { # Installing slapd under ${sbin} is more FHS and LSB compliance mv ${D}${libexecdir}/slapd ${D}/${sbindir}/slapd rmdir --ignore-fail-on-non-empty ${D}${libexecdir} - SLAPTOOLS="slapadd slapcat slapdn slapindex slappasswd slaptest slapauth slapacl slapschema" + SLAPTOOLS="slapadd slapcat slapdn slapindex slappasswd slaptest slapauth slapacl slapschema slapmodify" cd ${D}/${sbindir}/ rm -f ${SLAPTOOLS} for i in ${SLAPTOOLS}; do ln -sf slapd $i; done @@ -197,7 +177,7 @@ do_install_append() { rmdir --ignore-fail-on-non-empty "${D}${localstatedir}" install -d ${D}${systemd_unitdir}/system/ - install -m 0644 ${WORKDIR}/slapd.service ${D}${systemd_unitdir}/system/ + install -m 0644 ${UNPACKDIR}/slapd.service ${D}${systemd_unitdir}/system/ sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/*.service # Uses mdm as the database @@ -209,45 +189,41 @@ do_install_append() { -i ${D}${sysconfdir}/openldap/slapd.conf mkdir -p ${D}${localstatedir}/${BPN}/data - - } INITSCRIPT_PACKAGES = "${PN}-slapd" -INITSCRIPT_NAME_${PN}-slapd = "openldap" -INITSCRIPT_PARAMS_${PN}-slapd = "defaults" -SYSTEMD_SERVICE_${PN}-slapd = "hostapd.service" -SYSTEMD_AUTO_ENABLE_${PN}-slapd ?= "disable" - +INITSCRIPT_NAME:${PN}-slapd = "openldap" +INITSCRIPT_PARAMS:${PN}-slapd = "defaults" +SYSTEMD_PACKAGES = "${PN}-slapd" +SYSTEMD_SERVICE:${PN}-slapd = "slapd.service" +SYSTEMD_AUTO_ENABLE:${PN}-slapd ?= "disable" PACKAGES_DYNAMIC += "^${PN}-backends.* ^${PN}-backend-.*" # The modules require their .so to be dynamicaly loaded -INSANE_SKIP_${PN}-backend-dnssrv += "dev-so" -INSANE_SKIP_${PN}-backend-ldap += "dev-so" -INSANE_SKIP_${PN}-backend-meta += "dev-so" -INSANE_SKIP_${PN}-backend-mdb += "dev-so" -INSANE_SKIP_${PN}-backend-monitor += "dev-so" -INSANE_SKIP_${PN}-backend-null += "dev-so" -INSANE_SKIP_${PN}-backend-passwd += "dev-so" -INSANE_SKIP_${PN}-backend-shell += "dev-so" - - -python populate_packages_prepend () { +INSANE_SKIP:${PN}-backend-asyncmeta += "dev-so" +INSANE_SKIP:${PN}-backend-dnssrv += "dev-so" +INSANE_SKIP:${PN}-backend-ldap += "dev-so" +INSANE_SKIP:${PN}-backend-meta += "dev-so" +INSANE_SKIP:${PN}-backend-mdb += "dev-so" +INSANE_SKIP:${PN}-backend-null += "dev-so" +INSANE_SKIP:${PN}-backend-passwd += "dev-so" + +python populate_packages:prepend () { backend_dir = d.expand('${libexecdir}/openldap') - do_split_packages(d, backend_dir, 'back_([a-z]*)\.so$', 'openldap-backend-%s', 'OpenLDAP %s backend', prepend=True, extra_depends='', allow_links=True) - do_split_packages(d, backend_dir, 'back_([a-z]*)\-.*\.so\..*$', 'openldap-backend-%s', 'OpenLDAP %s backend', extra_depends='', allow_links=True) + do_split_packages(d, backend_dir, r'back_([a-z]*)\.so$', 'openldap-backend-%s', 'OpenLDAP %s backend', prepend=True, extra_depends='', allow_links=True) + do_split_packages(d, backend_dir, r'back_([a-z]*)\.so\..*$', 'openldap-backend-%s', 'OpenLDAP %s backend', extra_depends='', allow_links=True) metapkg = "${PN}-backends" - d.setVar('ALLOW_EMPTY_' + metapkg, "1") - d.setVar('FILES_' + metapkg, "") + d.setVar('ALLOW_EMPTY:' + metapkg, "1") + d.setVar('FILES:' + metapkg, "") metapkg_rdepends = [] packages = d.getVar('PACKAGES').split() for pkg in packages[1:]: if pkg.count("openldap-backend-") and not pkg in metapkg_rdepends and not pkg.count("-dev") and not pkg.count("-dbg") and not pkg.count("static") and not pkg.count("locale"): metapkg_rdepends.append(pkg) - d.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends)) - d.setVar('DESCRIPTION_' + metapkg, 'OpenLDAP backends meta package') + d.setVar('RDEPENDS:' + metapkg, ' '.join(metapkg_rdepends)) + d.setVar('DESCRIPTION:' + metapkg, 'OpenLDAP backends meta package') packages.append(metapkg) d.setVar('PACKAGES', ' '.join(packages)) } diff --git a/meta-oe/recipes-support/opensc/opensc/0001-Remove-redundant-logging.patch b/meta-oe/recipes-support/opensc/opensc/0001-Remove-redundant-logging.patch deleted file mode 100644 index 291f1a239a..0000000000 --- a/meta-oe/recipes-support/opensc/opensc/0001-Remove-redundant-logging.patch +++ /dev/null @@ -1,34 +0,0 @@ -From c012f46965b3fe24e31367796e52c2d0b14ca5d9 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 17 Dec 2018 18:44:23 -0800 -Subject: [PATCH] Remove redundant logging - -Same information is printed a few line below in same function, the only -difference is that there it takes care of case when label is NULL pointer -unlike this line - -secondly, every function call to cosm_write_tokeninfo() in this file -passes label=NULL, and then it tries to print a null pointer - -Fixes errors like -src/libopensc/log.h:48:47: error: '%s' directive argument is null -[-Werror=format-overflow=] - -Upstream-Status: Submitted [https://github.com/OpenSC/OpenSC/pull/1557] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/pkcs15init/pkcs15-oberthur.c | 1 - - 1 file changed, 1 deletion(-) - -Index: git/src/pkcs15init/pkcs15-oberthur.c -=================================================================== ---- git.orig/src/pkcs15init/pkcs15-oberthur.c -+++ git/src/pkcs15init/pkcs15-oberthur.c -@@ -70,7 +70,6 @@ cosm_write_tokeninfo (struct sc_pkcs15_c - ctx = p15card->card->ctx; - - SC_FUNC_CALLED(ctx, SC_LOG_DEBUG_VERBOSE); -- sc_debug(ctx, SC_LOG_DEBUG_NORMAL, "cosm_write_tokeninfo() label '%s'; flags 0x%X", label, flags); - if (sc_profile_get_file(profile, COSM_TITLE"-token-info", &file)) { - rv = SC_ERROR_INCONSISTENT_PROFILE; - SC_TEST_GOTO_ERR(ctx, SC_LOG_DEBUG_NORMAL, rv, "Cannot find "COSM_TITLE"-token-info"); diff --git a/meta-oe/recipes-support/opensc/opensc_0.19.0.bb b/meta-oe/recipes-support/opensc/opensc_0.25.1.bb index 006a1b6b29..19fb78092e 100644 --- a/meta-oe/recipes-support/opensc/opensc_0.19.0.bb +++ b/meta-oe/recipes-support/opensc/opensc_0.25.1.bb @@ -6,16 +6,14 @@ keys on the smart card is possible with PKCS\ such as the FINEID (Finnish Electronic IDentity) card. Swedish Posten\ eID cards have also been confirmed to work." -HOMEPAGE = "http://www.opensc-project.org/opensc/" +HOMEPAGE = "https://github.com/OpenSC/OpenSC/wiki" SECTION = "System Environment/Libraries" -LICENSE = "LGPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" - -#v0.19.0 -SRCREV = "f1691fc91fc113191c3a8aaf5facd6983334ec47" -SRC_URI = "git://github.com/OpenSC/OpenSC \ - file://0001-Remove-redundant-logging.patch \ - " +LICENSE = "LGPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=cb8aedd3bced19bd8026d96a8b6876d7" + +#v0.21.0 +SRCREV = "0a4b772d6fdab9bfaaa3123775a48a7cb6c5e7c6" +SRC_URI = "git://github.com/OpenSC/OpenSC;branch=stable-0.25;protocol=https" DEPENDS = "virtual/libiconv openssl" S = "${WORKDIR}/git" @@ -25,6 +23,7 @@ EXTRA_OECONF = " \ --disable-static \ --disable-ctapi \ --disable-doc \ + --disable-strict \ " EXTRA_OEMAKE = "DESTDIR=${D}" @@ -33,14 +32,15 @@ PACKAGECONFIG ??= "pcsc" PACKAGECONFIG[openct] = "--enable-openct,--disable-openct,openct" PACKAGECONFIG[pcsc] = "--enable-pcsc,--disable-pcsc,pcsc-lite,pcsc-lite pcsc-lite-lib" -RDEPENDS_${PN} = "readline" +RDEPENDS:${PN} = "readline" -FILES_${PN} += "\ +FILES:${PN} += "\ ${libdir}/opensc-pkcs11.so \ ${libdir}/onepin-opensc-pkcs11.so \ ${libdir}/pkcs11-spy.so \ " -FILES_${PN}-dev += "\ +FILES:${PN}-dev += "\ + ${libdir}/onepin-opensc-pkcs11.so \ ${libdir}/pkcs11/opensc-pkcs11.so \ ${libdir}/pkcs11/onepin-opensc-pkcs11.so \ ${libdir}/pkcs11/pkcs11-spy.so \ diff --git a/meta-oe/recipes-support/opensync/wbxml2_0.10.8.bb b/meta-oe/recipes-support/opensync/wbxml2_0.10.8.bb index 8c948c5655..1c5a18e863 100644 --- a/meta-oe/recipes-support/opensync/wbxml2_0.10.8.bb +++ b/meta-oe/recipes-support/opensync/wbxml2_0.10.8.bb @@ -1,7 +1,7 @@ SUMMARY = "WBXML parsing and encoding library" HOMEPAGE = "http://libwbxml.opensync.org/" SECTION = "libs" -LICENSE = "LGPLv2.1+" +LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=c1128ee5341ccd5927d8bafe4b6266e1" DEPENDS = "expat" @@ -19,5 +19,5 @@ EXTRA_OECMAKE = "-DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')}" PACKAGES += "${PN}-tools" -FILES_${PN}-tools = "${bindir}" -FILES_${PN} = "${libdir}/*.so.*" +FILES:${PN}-tools = "${bindir}" +FILES:${PN} = "${libdir}/*.so.*" diff --git a/meta-oe/recipes-support/opentelemetry/opentelemetry-cpp_1.15.0.bb b/meta-oe/recipes-support/opentelemetry/opentelemetry-cpp_1.15.0.bb new file mode 100644 index 0000000000..88033e58cc --- /dev/null +++ b/meta-oe/recipes-support/opentelemetry/opentelemetry-cpp_1.15.0.bb @@ -0,0 +1,26 @@ +SUMMARY = "Open Telemetry Library" +DESCRIPTION = "An Observability framework to create and manage telemetry data \ +such as traces, metrics, and logs." +HOMEPAGE = "https://github.com/open-telemetry/opentelemetry-cpp" +SECTION = "libs" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" + +DEPENDS = "nlohmann-json" + +SRC_URI = "git://github.com/open-telemetry/opentelemetry-cpp.git;protocol=https;branch=main;" +SRCREV = "054b0dc207c1f58e290d78cdaac5f314bc328b31" + +S = "${WORKDIR}/git" +inherit cmake pkgconfig lib_package + +PACKAGECONFIG ?= "opentelemety_install otlp_api" + +PACKAGECONFIG[opentelemety_install]="-DOPENTELEMETRY_INSTALL=ON,-DOPENTELEMETRY_INSTALL=OFF" +PACKAGECONFIG[build_package]="-DBUILD_PACKAGE=ON,-DBUILD_PACKAGE=OFF" +PACKAGECONFIG[otlp_api]="-DWITH_OTLP_API=ON,-DWITH_OTLP_API=OFF" +PACKAGECONFIG[otlp_grpc]="-DWITH_OTLP_GRPC=ON,-DWITH_OTLP_GRPC=OFF" +PACKAGECONFIG[otlp_http]="-DWITH_OTLP_HTTP=ON,-DWITH_OTLP_HTTP=OFF" +PACKAGECONFIG[otlp_prometheus]="-DWITH_PROMETHEUS=ON,-DWITH_PROMETHEUS=OFF" +PACKAGECONFIG[benchmark]="-DWITH_BENCHMARK=ON,-DWITH_BENCHMARK=OFF" +PACKAGECONFIG[testing]="-DBUILD_TESTING=ON,-DBUILD_TESTING=OFF" diff --git a/meta-oe/recipes-support/p910nd/p910nd_0.97.bb b/meta-oe/recipes-support/p910nd/p910nd_0.97.bb index 45aa0d4ac1..c6a3079ea2 100644 --- a/meta-oe/recipes-support/p910nd/p910nd_0.97.bb +++ b/meta-oe/recipes-support/p910nd/p910nd_0.97.bb @@ -1,22 +1,28 @@ DESCRIPTION = "A small network printer daemon for embedded situations that passes the job directly to the printer" HOMEPAGE = "http://p910nd.sourceforge.net/" SECTION = "console/utils" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=3d82780e8917b360cbee7b9ec3e40734" -PR = "r2" -SRC_URI = "${SOURCEFORGE_MIRROR}/p910nd/p910nd-${PV}.tar.bz2 \ +# v0.97 +SRCREV = "57ebc07ad8723ea4106090536c58c7f7160743e2" +SRC_URI = "git://github.com/kenyapcomau/p910nd;protocol=https;branch=master \ file://fix-var-lock.patch" -SRC_URI[md5sum] = "69461a6c54dca0b13ecad5b83864b43e" -SRC_URI[sha256sum] = "4ac980a3ae24babae6f70f0a692625ece03a4a92c357fbb10d2e368386c3c26f" +S = "${WORKDIR}/git" + +inherit update-rc.d + +INITSCRIPT_NAME = "p910nd" +INITSCRIPT_PARAMS = "start 90 2 3 4 5 . stop 60 0 1 6 ." do_compile () { - ${CC} ${LDFLAGS} -o p910nd p910nd.c + ${CC} ${CFLAGS} ${LDFLAGS} -o p910nd p910nd.c } do_install () { install -D -m 0755 ${S}/p910nd ${D}${sbindir}/p910nd - install -D -m 0644 ${S}/p910nd.conf ${D}${sysconfdir}/p910nd.conf + install -D -m 0644 ${S}/aux/p910nd.conf ${D}${sysconfdir}/sysconfig/p910nd.conf + install -D -m 0644 ${S}/aux/p910nd.init ${D}${sysconfdir}/init.d/p910nd } diff --git a/meta-oe/recipes-support/pcp/pcp-native_6.0.5.bb b/meta-oe/recipes-support/pcp/pcp-native_6.0.5.bb new file mode 100644 index 0000000000..2f37b099b4 --- /dev/null +++ b/meta-oe/recipes-support/pcp/pcp-native_6.0.5.bb @@ -0,0 +1,48 @@ +require pcp.inc +inherit python3native native +#autotools-brokensep +DEPENDS = "python3-native python3-setuptools-native flex-native bison-native" + +export PCP_DIR = "${D}" +export PCP_TMP_DIR = "${D}/tmp" +export PCP_BIN_DIR = "${D}/usr/bin" + +B = "${S}" + +do_configure:prepend() { + export SED=${TMPDIR}/hosttools/sed + export AR=${TMPDIR}/hosttools/ar +# export PYTHON=python3 + + rm -rf ${S}/include/pcp/configsz.h + rm -rf ${S}/include/pcp/platformsz.h + +} +do_compile:prepend() { + sed -i -e "s,#undef HAVE_64BIT_LONG,,g" \ + -e "s,#undef HAVE_64BIT_PTR,,g" \ + -e "s,#undef PM_SIZEOF_SUSECONDS_T,,g" \ + -e "s,#undef PM_SIZEOF_TIME_T,,g" \ + ${S}/src/include/pcp/config.h.in + + export AR=${TMPDIR}/hosttools/ar +# export PYTHON=python3 +} + +do_compile() { + oe_runmake default_pcp +} + +do_install () { + oe_runmake install \ + PCP_ETC_DIR=${D}/${sysconfdir} \ + PCP_SYSCONF_DIR=${D}/${sysconfdir} \ + PCP_VAR_DIR=${D}/${localstatedir} \ + PCP_SHARE_DIR=${D}/${datadir} \ + PCP_BIN_DIR=${D}/${bindir} \ + PCP_BINADM_DIR=${D}/${libexecdir}/pcp/bin \ + PCP_LIBADM_DIR=${D}/${libdir} \ + PCP_LIB_DIR=${D}/${libdir} \ + PCP_MAN_DIR=${D}/${mandir} \ + PCP_DOC_DIR=${D}/${docdir} +} diff --git a/meta-oe/recipes-support/pcp/pcp.inc b/meta-oe/recipes-support/pcp/pcp.inc new file mode 100644 index 0000000000..4cafa7234b --- /dev/null +++ b/meta-oe/recipes-support/pcp/pcp.inc @@ -0,0 +1,40 @@ +SUMMARY = "System-level performance monitoring and performance management" +HOMEPAGE = "http://www.pcp.io" +SECTION = "Applications/System" + +LICENSE = "GPL-2.0-or-later & LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=37ab75b580d5aad4ada04260efa3702f \ + " +COMPATIBLE_HOST:libc-musl = "null" + +SRC_URI = "https://performancecopilot.jfrog.io/artifactory/pcp-source-release/${BP}.src.tar.gz \ + file://0001-configure-Limit-the-header-search-to-sysroot.patch \ + file://0001-htop-Change-dependency-order-of-header-and-sourcefil.patch \ + file://config.linux \ + " +SRC_URI[sha256sum] = "dacf92ba195f1f2ea8f40bf0c455d2cd2456273a1e30dcc3ee5b5bfd099a99ee" + +inherit setuptools3-base pkgconfig autotools-brokensep + +# Specify any options you want to pass to the configure script using EXTRA_OECONF: +CACHED_CONFIGUREVARS = "PACKAGE_DISTRIBUTION=arch" +EXTRA_OECONF:append = "\ + --with-dstat-symlink=yes \ + --with-infiniband=no \ + --with-python=no \ + --with-perl=no \ + --with-python3=yes \ + --with-pmdajson=no \ + --with-perfevent=no \ + --with-pmdabcc=yes \ + --with-rundir=${localstatedir}/run \ + --with-sysconfigdir=${sysconfdir} \ + --with-logdir=${localstatedir}/log \ + --with-docdir=${docdir} \ + " + +PACKAGECONFIG[qt5] = "--with-qt=yes --with-qt3d=yes,--with-qt=no --with-qt3d=no,qtbase qt3d" + +PACKAGECONFIG ?= "" + +PARALLEL_MAKE = "" diff --git a/meta-oe/recipes-support/pcp/pcp/0001-Remove-unsuitble-part-for-cross-compile.patch b/meta-oe/recipes-support/pcp/pcp/0001-Remove-unsuitble-part-for-cross-compile.patch new file mode 100644 index 0000000000..abf4aee61d --- /dev/null +++ b/meta-oe/recipes-support/pcp/pcp/0001-Remove-unsuitble-part-for-cross-compile.patch @@ -0,0 +1,39 @@ +From db9e6a4b7a48dee62fccb662347dd638a2d286d5 Mon Sep 17 00:00:00 2001 +From: Lei Maohui <leimaohui@fujitsu.com> +Date: Thu, 2 Dec 2021 14:29:06 +0900 +Subject: [PATCH] Remove unsuitble part for cross-compile. + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Lei Maohui <leimaohui@fujitsu.com> +--- + configure.ac | 6 ------ + src/libpcp/src/GNUmakefile | 1 - + 2 files changed, 7 deletions(-) + +--- a/configure.ac ++++ b/configure.ac +@@ -607,12 +607,6 @@ fi + which=$WHICH + AC_SUBST(which) + +-if test -z "$AR"; then +- AC_PATH_PROGS(AR, [gcc-ar ar], /usr/bin/ar) +-fi +-if test ! -x "$AR"; then +- AC_MSG_ERROR([cannot find a valid 'ar' command.]) +-fi + ar=$AR + AC_SUBST(ar) + +--- a/src/libpcp/src/GNUmakefile ++++ b/src/libpcp/src/GNUmakefile +@@ -179,8 +179,6 @@ exports: exports.in mk.exports + # consistent in all placess. + # + check.done: $(OBJECTS) +- ./check-statics +- ./check-errorcodes + touch check.done + + ifneq ($(LIBTARGET),) diff --git a/meta-oe/recipes-support/pcp/pcp/0001-configure-Limit-the-header-search-to-sysroot.patch b/meta-oe/recipes-support/pcp/pcp/0001-configure-Limit-the-header-search-to-sysroot.patch new file mode 100644 index 0000000000..b03c48e581 --- /dev/null +++ b/meta-oe/recipes-support/pcp/pcp/0001-configure-Limit-the-header-search-to-sysroot.patch @@ -0,0 +1,45 @@ +From 1eb68f65fd73443d862ca5f36f3b6041e2b0f13a Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 10 Mar 2022 18:53:13 -0800 +Subject: [PATCH] configure: Limit the header search to sysroot + +Hardcoded paths in configure.ac means it starts to poke at host system +include paths, which is least we want in a cross build, therefore prefix +these paths with STAGING_SYSROOT + +Upstream-Status: Inappropriate [OE Specific] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +--- a/configure.ac ++++ b/configure.ac +@@ -907,7 +907,7 @@ AC_DEFUN([PCP_CHECK_PYTHON_HEADER], + [ PY_MAJOR="$1" + PY_MINOR="$2" + PY_VERSION="python$PY_MAJOR.$PY_MINOR" +- PY_INCLUDE_DIRS="-I/usr/include/${PY_VERSION}m -I/usr/include/${PY_VERSION}" ++ PY_INCLUDE_DIRS="-I${STAGING_INCDIR}/${PY_VERSION}m -I${STAGING_INCDIR}/${PY_VERSION}" + saved_CFLAGS="$CFLAGS" + saved_CPPFLAGS="$CPPFLAGS" + CFLAGS="$CFLAGS $PY_INCLUDE_DIRS" +@@ -1603,7 +1603,7 @@ AC_SUBST(qmake) + + enable_qt3d=false + AS_IF([test "x$do_qt3d" != "xno"], [ +- if test -f /usr/include/Coin3/Inventor/Qt/SoQt.h -o -f /usr/include/Inventor/Qt/SoQt.h ++ if test -f ${STAGING_INCDIR}/Coin3/Inventor/Qt/SoQt.h -o -f ${STAGING_INCDIR}/Inventor/Qt/SoQt.h + then + enable_qt3d=$enable_qt + elif test x"$do_qt3d" = x"yes" +@@ -3699,7 +3699,7 @@ AC_SUBST(enable_decompression) + AC_SUBST(enable_lzma) + + dnl check for array sessions +-if test -f /usr/include/sn/arsess.h ++if test -f ${STAGING_INCDIR}/sn/arsess.h + then + pcp_mpi_dirs=libpcp_mpi\ libpcp_mpiread + else diff --git a/meta-oe/recipes-support/pcp/pcp/0001-htop-Change-dependency-order-of-header-and-sourcefil.patch b/meta-oe/recipes-support/pcp/pcp/0001-htop-Change-dependency-order-of-header-and-sourcefil.patch new file mode 100644 index 0000000000..009dfe2d04 --- /dev/null +++ b/meta-oe/recipes-support/pcp/pcp/0001-htop-Change-dependency-order-of-header-and-sourcefil.patch @@ -0,0 +1,36 @@ +From c123980d6bf1bc2bf93ee0dd0d7f8fee3d4ddc96 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 5 Jul 2023 08:45:14 -0700 +Subject: [PATCH] htop: Change dependency order of header and sourcefiles + +Fixes build race +| pcp/Platform.h:29:10: fatal error: DiskIOMeter.h: No such file or directory +| 29 | #include "DiskIOMeter.h" +| | ^~~~~~~~~~~~~~~ +| compilation terminated. +| make[3]: *** [<builtin>: pcp-htop.o] Error 1 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/pcp/htop/GNUmakefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/pcp/htop/GNUmakefile b/src/pcp/htop/GNUmakefile +index 6b7c0c5..5153c63 100644 +--- a/src/pcp/htop/GNUmakefile ++++ b/src/pcp/htop/GNUmakefile +@@ -186,8 +186,8 @@ CFGMETERS = $(patsubst %,pcp/meters/%,$(METERS)) + CFGCOLUMNS = $(patsubst %,pcp/columns/%,$(COLUMNS)) + + CFGXFILES = $(CFGMETERS) $(CFGCOLUMNS) +-TOPXFILES = $(TOPCFILES) $(TOPHFILES) $(DOCFILES) +-SUBXFILES = $(SUBCFILES) $(SUBHFILES) ++TOPXFILES = $(TOPHFILES) $(TOPCFILES) $(DOCFILES) ++SUBXFILES = $(SUBHFILES) $(SUBCFILES) + CFILES = $(TOPCFILES) $(SUBCFILES) + HFILES = $(TOPHFILES) $(SUBHFILES) + LDIRT = $(TOPXFILES) $(SUBXFILES) $(CFGXFILES) \ +-- +2.41.0 + diff --git a/meta-oe/recipes-support/pcp/pcp/config.linux b/meta-oe/recipes-support/pcp/pcp/config.linux new file mode 100644 index 0000000000..191f87acc6 --- /dev/null +++ b/meta-oe/recipes-support/pcp/pcp/config.linux @@ -0,0 +1,13 @@ +sizeof_int=4 +sizeof_long=4 +sizeof_pointer=8 +sizeof_suseconds_t=8 +sizeof_time_t=8 +bit_field_scheme=2100 +enable_python3='yes' +enable_python3='true' +have_python_OrderedDict="true" +have_python=python3 +printf_p_prefix=0x +printf_fmt_int64=I64d +strtoint64=strtoll diff --git a/meta-oe/recipes-support/pcp/pcp/fix_parallel_make.patch b/meta-oe/recipes-support/pcp/pcp/fix_parallel_make.patch new file mode 100644 index 0000000000..9cb649a594 --- /dev/null +++ b/meta-oe/recipes-support/pcp/pcp/fix_parallel_make.patch @@ -0,0 +1,13 @@ +Upstream-Status: Pending + +--- a/qa/src/GNUlocaldefs ++++ b/qa/src/GNUlocaldefs +@@ -728,7 +728,7 @@ scale.o: localconfig.h + 779246.o: libpcp.h + aggrstore.o: libpcp.h + badmmv.o: libpcp.h +-chkacc1.o: libpcp.h ++chkacc1.o: libpcp.h localconfig.h + chkacc2.o: libpcp.h + chkacc3.o: libpcp.h + chkacc4.o: libpcp.h diff --git a/meta-oe/recipes-support/pcp/pcp/pass-options-to-AR.patch b/meta-oe/recipes-support/pcp/pcp/pass-options-to-AR.patch new file mode 100644 index 0000000000..6fa864cd21 --- /dev/null +++ b/meta-oe/recipes-support/pcp/pcp/pass-options-to-AR.patch @@ -0,0 +1,29 @@ +Do not pass cr option + +These options are already coming from builddefs + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- a/src/include/builddefs.in ++++ b/src/include/builddefs.in +@@ -167,7 +167,7 @@ OBJECTS = $(ASFILES:.s=.o) \ + + #NB: don't override $(MAKE); gnumake sets it well, propagating -j etc. + #MAKE = @make@ +-AR = @ar@ ++AR = @ar@ cqs + CC = @cc@ + CXX = @cxx@ + LD = @ld@ +--- a/src/include/buildrules ++++ b/src/include/buildrules +@@ -93,7 +93,7 @@ $(STATICLIBTARGET) : $(SUBDIRS) $(OBJECT + ifeq ($(TARGET_OS), darwin) + libtool -static -o $(STATICLIBTARGET) $? + else +- $(AR) cr $(STATICLIBTARGET) $? ++ $(AR) $(STATICLIBTARGET) $? + endif + endif + diff --git a/meta-oe/recipes-support/pcp/pcp_6.0.5.bb b/meta-oe/recipes-support/pcp/pcp_6.0.5.bb new file mode 100644 index 0000000000..10545b65ea --- /dev/null +++ b/meta-oe/recipes-support/pcp/pcp_6.0.5.bb @@ -0,0 +1,236 @@ +require pcp.inc +#inherit perlnative + +# NOTE: the following prog dependencies are unknown, ignoring: gtar gzip pkgmk xmlto lzma qshape md5sum pod2man publican git makedepend qmake-qt4 xconfirm true gmake xz dblatex hdiutil rpm bzip2 which mkinstallp dtrace seinfo qmake-qt5 gawk dlltool rpmbuild dpkg makepkg qmake echo +# NOTE: unable to map the following pkg-config dependencies: libmicrohttpd libsystemd-journal +# (this is based on recipes that have previously been built and packaged) +# NOTE: the following library dependencies are unknown, ignoring: nspr gen ibumad regex sasl2 pfm nss papi ibmad +# (this is based on recipes that have previously been built and packaged) +DEPENDS += "perl-native bison-native flex-native python3-native python3-setuptools python3 \ + pcp-native cairo zlib ncurses readline libx11 avahi openssl" + + +SRC_URI += "file://0001-Remove-unsuitble-part-for-cross-compile.patch \ + file://pass-options-to-AR.patch \ + file://fix_parallel_make.patch \ + " + +export PCP_DIR="${RECIPE_SYSROOT_NATIVE}" +#export PCP_RUN_DIR="${RECIPE_SYSROOT_NATIVE}" +EXTRA_OEMAKE = "CC="${CC}" LD="${LD}"" +inherit useradd systemd features_check python3targetconfig + +# Needs libx11 +REQUIRED_DISTRO_FEATURES = "x11" + +SYSTEMD_AUTO_ENABLE:${PN} = "enable" +SYSTEMD_SERVICE:${PN} = "\ + pmie_farm_check.service \ + pmie_farm.service \ + pmfind.service \ + pmlogger_farm_check.service \ + pmcd.service \ + pmie.service \ + pmlogger_daily.service \ + pmlogger.service \ + pmlogger_farm.service \ + pmie_check.service \ + pmproxy.service \ + pmlogger_check.service \ + pmie_daily.service" + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM:${PN} = "--system --home ${localstatedir}/lib/pcp --no-create-home \ + --user-group pcp" + +USERADD_PACKAGES += "${PN}-testsuite" +USERADD_PARAM:${PN}-testsuite = "--system --home ${localstatedir}/lib/pcp/testsuite --no-create-home \ + --user-group pcpqa" + +RDEPENDS:${PN} += "perl" +RDEPENDS:${PN}-testsuite += "${PN} bash perl" +RDEPENDS:python3-${PN} += "${PN} python3" + +do_configure:prepend () { + cp ${UNPACKDIR}/config.linux ${B} + rm -rf ${S}/include/pcp/configsz.h + rm -rf ${S}/include/pcp/platformsz.h + export SED=${TMPDIR}/hosttools/sed + export PYTHON=python3 +} + +do_compile:prepend() { + sed -i -e "s,#undef HAVE_64BIT_LONG,,g" \ + -e "s,#undef HAVE_64BIT_PTR,,g" \ + -e "s,#undef PM_SIZEOF_SUSECONDS_T,,g" \ + -e "s,#undef PM_SIZEOF_TIME_T,,g" \ + ${S}/src/include/pcp/config.h.in + sed -i -e "s,HAVE_PYTHON_ORDEREDDICT = false,HAVE_PYTHON_ORDEREDDICT = true,g" \ + ${S}/src/include/builddefs + sed -i -e "s,TOPDIR)/python3-pcp.list,TOPDIR)/python3-pcp.list --install-lib=${PYTHON_SITEPACKAGES_DIR},g" ${S}/src/python/GNUmakefile + export PYTHON=python3 + #export PYTHON3=${STAGING_BINDIR_NATIVE}/python3-native/python3 +} + +do_compile() { + oe_runmake default_pcp +} + +do_install () { + export NO_CHOWN=true + oe_runmake install DIST_ROOT=${D}\ + install_pcp + + rm -rf ${D}${localstatedir}/log + rm -rf ${D}${localstatedir}/lib/pcp/pmcd + rm -rf ${D}${localstatedir}/lib/pcp/tmp + rm -rf ${D}${localstatedir}/run + mv ${D}${docdir}/C* ${D}${docdir}/pcp-doc/ + mv ${D}${docdir}/I* ${D}${docdir}/pcp-doc/ + mv ${D}${docdir}/R* ${D}${docdir}/pcp-doc/ + mv ${D}${docdir}/V* ${D}${docdir}/pcp-doc/ + sed -i "s#PCP_AWK_PROG=.*#PCP_AWK_PROG=awk#" ${D}/${sysconfdir}/pcp.conf + sed -i "s#PCP_SORT_PROG=.*#PCP_SORT_PROG=sort#" ${D}/${sysconfdir}/pcp.conf + sed -i "s#PCP_ECHO_PROG=.*#PCP_ECHO_PROG=echo#" ${D}/${sysconfdir}/pcp.conf + sed -i "s#PCP_WHICH_PROG=.*#PCP_WHICH_PROG=which#" ${D}/${sysconfdir}/pcp.conf +} + +PACKAGES += " ${PN}-export-zabbix-agent ${PN}-testsuite \ + libpcp-gui2 libpcp-gui2-dev \ + libpcp-import1 libpcp-archive1 \ + libpcp-mmv1 libpcp-mmv1-dev \ + libpcp-pmda3 libpcp-pmda3-dev \ + libpcp-trace2 libpcp-trace2-dev \ + libpcp-web1 libpcp-web1-dev \ + libpcp3 libpcp3-dev python3-${PN}\ +" +FILES:libpcp-gui2 = "${libdir}/libpcp_gui.so.2 \ +" +FILES:libpcp-archive1 = "${libdir}/libpcp_archive.so.1 \ +" +FILES:libpcp-gui2-dev = " \ + ${libdir}/libpcp_gui.so \ + ${libdir}/libpcp_gui.a \ + ${includedir}/pmafm.h \ + ${includedir}/pmtime.h \ +" +FILES:libpcp-mmv1 = " \ + ${libdir}/libpcp_mmv.so.1 \ +" +FILES:libpcp-mmv1-dev = " \ + ${libdir}/libpcp_mmv.a \ + ${libdir}/libpcp_mmv.so \ + ${libdir}/libpcp_mmv.so \ + ${includedir}/mmv_stats.h \ + ${includedir}/mmv_dev.h \ + ${datadir}/man/man3/mmv_* \ + ${datadir}/man/man5/mmv.5.gz \ +" +FILES:libpcp-import1 = " \ + ${libdir}/libpcp_import.so.1 \ +" +FILES:libpcp-pmda3 = " \ + ${libdir}/libpcp_pmda.so.3 \ +" +FILES:libpcp-pmda3-dev = " \ + ${includedir}/pmda.h \ + ${includedir}/pmdaroot.h \ + ${libdir}/libpcp_pmda.a \ + ${libdir}/libpcp_pmda.so \ + ${libdir}/pkgconfig/libpcp_pmda.pc \ + ${datadir}/man/man3/PMDA.3.gz \ + ${datadir}/man/man3/pmda* \ +" +FILES:libpcp-trace2 = " \ + ${libdir}/libpcp_trace.so.2 \ +" +FILES:libpcp-trace2-dev = " \ + ${includedir}/trace.h \ + ${includedir}/trace_dev.h \ + ${libdir}/libpcp_trace.a \ + ${libdir}/libpcp_trace.so \ + ${datadir}/man/man3/pmtrace* \ +" +FILES:libpcp-web1 = " \ + ${libdir}/libpcp_web.so.1 \ +" +FILES:libpcp-web1-dev = " \ + ${includedir}/pmhttp.h \ + ${includedir}/pmjson.h \ + ${libdir}/libpcp_web.a \ + ${libdir}/libpcp_web.so \ + ${datadir}/man/man3/pmhttp* \ + ${datadir}/man/man3/pmjson* \ +" +FILES:libpcp3 = " \ + ${libdir}/libpcp.so.3 \ +" + +FILES:${PN} = " \ + ${sysconfdir}/pcp \ + ${sysconfdir}/cron.d \ + ${sysconfdir}/init.d \ + ${libexecdir} \ + ${bindir} \ + ${datadir}/bash-completion \ + ${datadir}/pcp-gui \ + ${datadir}/zsh \ + ${systemd_system_unitdir}/ \ + ${libdir}/pcp/ \ + ${libdir}/sysusers.d/pcp.conf \ + ${datadir}/pcp \ + ${libdir}/*.sh \ + ${datadir}/man \ + ${libdir}/rc-proc.sh.minimal \ + ${sysconfdir}/p* \ + ${sysconfdir}/s* \ + ${localstatedir}/lib/pcp/config \ + ${localstatedir}/lib/pcp/pmdas/ \ + ${localstatedir}/lib/pcp/pmns \ + ${libdir}/libpcp_fault.so.3 \ +" + +FILES:${PN}-export-zabbix-agent += " \ + ${libdir}/zabbix \ + ${sysconfdir}/zabbix \ + ${mandir}/man3/zbxpcp.3.gz \ + ${libdir}/zabbix \ +" +FILES:${PN}-testsuite = "${localstatedir}/lib/pcp/testsuite/ ${libdir}/sysusers.d/pcp-testsuite.conf" +FILES:python3-${PN} = "${PYTHON_SITEPACKAGES_DIR}" +FILES:${PN}-dev += " \ + ${includedir}/pcp \ + ${libdir}/libpcp.a \ + ${libdir}/libpcp.so \ + ${localstatedir}/lib/pcp/pmdas/*/*.so \ + ${libexecdir}/pcp/bin/install-sh \ + ${libdir}/pkgconfig/libpcp.pc \ + ${libdir}/zabbix/modules/*.so \ + ${datadir}/man/man3/LOGIMPORT.3.gz \ + ${datadir}/man/man3/P* \ + ${datadir}/man/man3/Q* \ + ${datadir}/man/man3/__pm* \ + ${datadir}/man/man3/pmA* \ + ${datadir}/man/man3/pmC* \ + ${datadir}/man/man3/pmD* \ + ${datadir}/man/man3/pmE* \ + ${datadir}/man/man3/pmF* \ + ${datadir}/man/man3/pmG* \ + ${datadir}/man/man3/pmH* \ + ${datadir}/man/man3/pmI* \ + ${datadir}/man/man3/pmL* \ + ${datadir}/man/man3/pmM* \ + ${datadir}/man/man3/pmN* \ + ${datadir}/man/man3/pmO* \ + ${datadir}/man/man3/pmP* \ + ${datadir}/man/man3/pmR* \ + ${datadir}/man/man3/pmS* \ + ${datadir}/man/man3/pmT* \ + ${datadir}/man/man3/pmU* \ + ${datadir}/man/man3/pmW* \ + ${datadir}/man/man3/pmf* \ + ${datadir}/man/man3/pmg* \ + ${datadir}/man/man3/pmi* \ + ${datadir}/man/man3/pms* \ + ${datadir}/man/man3/pmt* \ +" diff --git a/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.25.bb b/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.25.bb deleted file mode 100644 index 6869e2cf9a..0000000000 --- a/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.25.bb +++ /dev/null @@ -1,55 +0,0 @@ -SUMMARY = "PC/SC Lite smart card framework and applications" -HOMEPAGE = "http://pcsclite.alioth.debian.org/" -LICENSE = "BSD & GPLv3+" -LICENSE_${PN} = "BSD" -LICENSE_${PN}-lib = "BSD" -LICENSE_${PN}-doc = "BSD" -LICENSE_${PN}-dev = "BSD" -LICENSE_${PN}-dbg = "BSD & GPLv3+" -LICENSE_${PN}-spy = "GPLv3+" -LICENSE_${PN}-spy-dev = "GPLv3+" -LIC_FILES_CHKSUM = "file://COPYING;md5=628c01ba985ecfa21677f5ee2d5202f6" - -SRC_URI = "https://pcsclite.apdu.fr/files/${BP}.tar.bz2" -SRC_URI[md5sum] = "c20650a36062ab1689f37f3302c988f2" -SRC_URI[sha256sum] = "d76d79edc31cf76e782b9f697420d3defbcc91778c3c650658086a1b748e8792" - -inherit autotools systemd pkgconfig - -EXTRA_OECONF = " \ - --disable-libusb \ - --enable-usbdropdir=${libdir}/pcsc/drivers \ -" - -S = "${WORKDIR}/pcsc-lite-${PV}" - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} udev" -PACKAGECONFIG_class-native ??= "" - -PACKAGECONFIG[systemd] = ",--disable-libsystemd,systemd," -PACKAGECONFIG[udev] = "--enable-libudev,--disable-libudev,udev" - -PACKAGES = "${PN} ${PN}-dbg ${PN}-dev ${PN}-lib ${PN}-doc ${PN}-spy ${PN}-spy-dev" - -RRECOMMENDS_${PN} = "ccid" -RRECOMMENDS_${PN}_class-native = "" - -FILES_${PN} = "${sbindir}/pcscd" -FILES_${PN}-lib = "${libdir}/libpcsclite*${SOLIBS}" -FILES_${PN}-dev = "${includedir} \ - ${libdir}/pkgconfig \ - ${libdir}/libpcsclite.la \ - ${libdir}/libpcsclite.so" - -FILES_${PN}-spy = "${bindir}/pcsc-spy \ - ${libdir}/libpcscspy*${SOLIBS}" -FILES_${PN}-spy-dev = "${libdir}/libpcscspy.la \ - ${libdir}/libpcscspy.so " - -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -RCONFLICTS_${PN} += "${PN}-systemd" -SYSTEMD_SERVICE_${PN} = "pcscd.socket" -RDEPENDS_${PN}-spy +="python" - -BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/pcsc-lite/pcsc-lite_2.0.3.bb b/meta-oe/recipes-support/pcsc-lite/pcsc-lite_2.0.3.bb new file mode 100644 index 0000000000..d5a560a6a0 --- /dev/null +++ b/meta-oe/recipes-support/pcsc-lite/pcsc-lite_2.0.3.bb @@ -0,0 +1,58 @@ +SUMMARY = "PC/SC Lite smart card framework and applications" +HOMEPAGE = "https://pcsclite.apdu.fr/" +LICENSE = "BSD-3-Clause & GPL-3.0-or-later" +LICENSE:${PN} = "BSD-3-Clause" +LICENSE:${PN}-lib = "BSD-3-Clause" +LICENSE:${PN}-doc = "BSD-3-Clause" +LICENSE:${PN}-dev = "BSD-3-Clause" +LICENSE:${PN}-dbg = "BSD-3-Clause & GPL-3.0-or-later" +LICENSE:${PN}-spy = "GPL-3.0-or-later" +LICENSE:${PN}-spy-dev = "GPL-3.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=628c01ba985ecfa21677f5ee2d5202f6" +DEPENDS = "autoconf-archive-native flex-native" + +SRC_URI = "https://pcsclite.apdu.fr/files/${BP}.tar.bz2" +SRC_URI[sha256sum] = "f42ee9efa489e9ff5d328baefa26f9c515be65021856e78d99ad1f0ead9ec85d" + +inherit autotools systemd pkgconfig perlnative + +EXTRA_OECONF = " \ + --disable-libusb \ + --enable-usbdropdir=${libdir}/pcsc/drivers \ +" + +S = "${WORKDIR}/pcsc-lite-${PV}" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd polkit', d)} udev" +PACKAGECONFIG:class-native ??= "" + +PACKAGECONFIG[systemd] = ",--disable-libsystemd,systemd," +PACKAGECONFIG[udev] = "--enable-libudev,--disable-libudev,udev" +PACKAGECONFIG[polkit] = ",--disable-polkit,polkit" + +PACKAGES = "${PN} ${PN}-dbg ${PN}-dev ${PN}-lib ${PN}-doc ${PN}-spy ${PN}-spy-dev" + +RRECOMMENDS:${PN} = "ccid" +RRECOMMENDS:${PN}:class-native = "" +RPROVIDES:${PN}:class-native += "pcsc-lite-lib-native" + +FILES:${PN} = "${sbindir}/pcscd \ + ${datadir}/polkit-1" +FILES:${PN}-lib = "${libdir}/libpcsclite*${SOLIBS}" +FILES:${PN}-dev = "${includedir} \ + ${libdir}/pkgconfig \ + ${libdir}/libpcsclite.la \ + ${libdir}/libpcsclite.so" + +FILES:${PN}-spy = "${bindir}/pcsc-spy \ + ${libdir}/libpcscspy*${SOLIBS}" +FILES:${PN}-spy-dev = "${libdir}/libpcscspy.la \ + ${libdir}/libpcscspy.so " + +RPROVIDES:${PN} += "${PN}-systemd" +RREPLACES:${PN} += "${PN}-systemd" +RCONFLICTS:${PN} += "${PN}-systemd" +SYSTEMD_SERVICE:${PN} = "pcscd.socket" +RDEPENDS:${PN}-spy += "python3-core" + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.7.1.bb b/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.7.1.bb new file mode 100644 index 0000000000..97a94ec973 --- /dev/null +++ b/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.7.1.bb @@ -0,0 +1,25 @@ +SUMMARY = "Some tools to be used with smart cards and PC/SC" +HOMEPAGE = "http://ludovic.rousseau.free.fr/softwares/pcsc-tools" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://LICENCE;md5=94d55d512a9ba36caa9b7df079bae19f" + +SRC_URI = "git://github.com/LudovicRousseau/pcsc-tools;protocol=https;branch=master" + +SRCREV = "53834cd33155ae1f0332102b1baca6ce63660fc5" + +inherit autotools pkgconfig + +S = "${WORKDIR}/git" + +DEPENDS = "pcsc-lite autoconf-archive-native" + +RDEPENDS:${PN} += " \ + ${@bb.utils.contains('DISTRO_FEATURES','systemd','pcsc-lite-systemd', 'pcsc-lite', d)} \ + perl \ + perl-module-getopt-std \ + perl-module-file-stat \ + libpcsc-perl \ +" + +FILES:${PN} += "${datadir}/pcsc/smartcard_list.txt \ + ${datadir}/pcsc/gscriptor.png" diff --git a/meta-oe/recipes-support/picocom/picocom/0001-Fix-building-with-musl.patch b/meta-oe/recipes-support/picocom/picocom/0001-Fix-building-with-musl.patch deleted file mode 100644 index 5b344b9e83..0000000000 --- a/meta-oe/recipes-support/picocom/picocom/0001-Fix-building-with-musl.patch +++ /dev/null @@ -1,118 +0,0 @@ -From 9664809da36bd7bada3e44f50cfc042539fb61ee Mon Sep 17 00:00:00 2001 -From: Paul Eggleton <paul.eggleton@linux.intel.com> -Date: Sun, 14 Jul 2019 19:13:21 -0700 -Subject: [PATCH] Fix building with musl - -Upstream-status: Pending - -Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> ---- - termios2.c | 27 +++++++++++++++++++++++++++ - termios2.h | 5 +++++ - 2 files changed, 32 insertions(+) - -diff --git a/termios2.c b/termios2.c -index 97c3be0..88ff6fc 100644 ---- a/termios2.c -+++ b/termios2.c -@@ -37,6 +37,7 @@ - #include <errno.h> - #include <termios.h> - #include <sys/ioctl.h> -+#include <asm/ioctls.h> - - /* Contains the definition of the termios2 structure and some related - constants that we should normally include from system -@@ -53,6 +54,10 @@ - */ - #define IBAUD0 020000000000 - -+#if !defined(__GLIBC__) -+#define __MAX_BAUD B4000000 -+#endif -+ - int - tc2setattr(int fd, int optional_actions, const struct termios *tios) - { -@@ -79,8 +84,13 @@ tc2setattr(int fd, int optional_actions, const struct termios *tios) - t2.c_cflag = tios->c_cflag; - t2.c_lflag = tios->c_lflag; - t2.c_line = tios->c_line; -+#if !defined(__GLIBC__) -+ t2.c_ispeed = tios->__c_ispeed; -+ t2.c_ospeed = tios->__c_ospeed; -+#else - t2.c_ispeed = tios->c_ispeed; - t2.c_ospeed = tios->c_ospeed; -+#endif - memcpy(&t2.c_cc[0], &tios->c_cc[0], K_NCCS * sizeof (cc_t)); - - return ioctl(fd, cmd, &t2); -@@ -101,8 +111,13 @@ tc2getattr(int fd, struct termios *tios) - tios->c_cflag = t2.c_cflag; - tios->c_lflag = t2.c_lflag; - tios->c_line = t2.c_line; -+#if !defined(__GLIBC__) -+ tios->__c_ispeed = t2.c_ispeed; -+ tios->__c_ospeed = t2.c_ospeed; -+#else - tios->c_ispeed = t2.c_ispeed; - tios->c_ospeed = t2.c_ospeed; -+#endif - memcpy(&tios->c_cc[0], &t2.c_cc[0], K_NCCS * sizeof (cc_t)); - - for (i = K_NCCS; i < NCCS; i++) -@@ -131,7 +146,11 @@ cf2setispeed(struct termios *tios, speed_t speed) - errno = EINVAL; - return -1; - } -+#if !defined(__GLIBC__) -+ tios->__c_ispeed = speed; -+#else - tios->c_ispeed = speed; -+#endif - tios->c_cflag &= ~((CBAUD | CBAUDEX) << IBSHIFT); - tios->c_cflag |= (speed << IBSHIFT); - -@@ -156,7 +175,11 @@ cf2setospeed_custom(struct termios *tios, int speed) - } - tios->c_cflag &= ~(CBAUD | CBAUDEX); - tios->c_cflag |= BOTHER; -+#if !defined(__GLIBC__) -+ tios->__c_ospeed = speed; -+#else - tios->c_ospeed = speed; -+#endif - - return 0; - } -@@ -177,7 +200,11 @@ cf2setispeed_custom(struct termios *tios, int speed) - } else { - tios->c_cflag &= ~((CBAUD | CBAUDEX) << IBSHIFT); - tios->c_cflag |= (BOTHER << IBSHIFT); -+#if !defined(__GLIBC__) -+ tios->__c_ispeed = speed; -+#else - tios->c_ispeed = speed; -+#endif - } - - return 0; -diff --git a/termios2.h b/termios2.h -index e13b0e3..63dd0ce 100644 ---- a/termios2.h -+++ b/termios2.h -@@ -37,8 +37,13 @@ - /* And define these new ones */ - #define cfsetospeed_custom cf2setospeed_custom - #define cfsetispeed_custom cf2setispeed_custom -+#if defined(__linux__) && !defined(__GLIBC__) -+#define cfgetospeed_custom(tiop) ((tiop)->__c_ospeed) -+#define cfgetispeed_custom(tiop) ((tiop)->__c_ispeed) -+#else - #define cfgetospeed_custom(tiop) ((tiop)->c_ospeed) - #define cfgetispeed_custom(tiop) ((tiop)->c_ispeed) -+#endif - - /* Replacements for the standard tcsetattr(3), tcgetattr(3) - * functions. Same user interface, but these use the new termios2 diff --git a/meta-oe/recipes-support/picocom/picocom_git.bb b/meta-oe/recipes-support/picocom/picocom_git.bb index 3d26b9364b..cc0d88faca 100644 --- a/meta-oe/recipes-support/picocom/picocom_git.bb +++ b/meta-oe/recipes-support/picocom/picocom_git.bb @@ -1,16 +1,15 @@ SUMMARY = "Lightweight and minimal dumb-terminal emulation program" SECTION = "console/utils" -LICENSE = "GPLv2+" -HOMEPAGE = "https://github.com/npat-efault/picocom" +LICENSE = "GPL-2.0-or-later" +HOMEPAGE = "https://gitlab.com/wsakernel/picocom" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3000e4830620e310fe65c0eb69df9e8a" -BASEPV = "3.1" -PV = "${BASEPV}+git${SRCPV}" +BASEPV = "2023-04" +PV = "${BASEPV}+git" -SRCREV = "90385aabe2b51f39fa130627d46b377569f82d4a" +SRCREV = "12537df0314767d5af35bddddbbca3694e6a0342" -SRC_URI = "git://github.com/npat-efault/picocom \ - file://0001-Fix-building-with-musl.patch \ +SRC_URI = "git://gitlab.com/wsakernel/picocom;branch=master;protocol=https \ " S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/pidgin/funyahoo-plusplus_git.bb b/meta-oe/recipes-support/pidgin/funyahoo-plusplus_git.bb index 3a437659e7..ad6a7501c5 100644 --- a/meta-oe/recipes-support/pidgin/funyahoo-plusplus_git.bb +++ b/meta-oe/recipes-support/pidgin/funyahoo-plusplus_git.bb @@ -1,13 +1,13 @@ SUMMARY = "Protocol plugin for New Yahoo (2016) for Adium, Pidgin, Miranda and Telepathy IM Framework" SECTION = "webos/services" -LICENSE = "GPLv3.0" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d" DEPENDS = "pidgin json-glib glib-2.0" inherit pkgconfig -SRC_URI = "git://github.com/EionRobb/funyahoo-plusplus;branch=master;protocol=git" +SRC_URI = "git://github.com/EionRobb/funyahoo-plusplus;branch=master;protocol=https" SRCREV = "fbbd9c591100aa00a0487738ec7b6acd3d924b3f" S = "${WORKDIR}/git" @@ -20,6 +20,6 @@ do_install() { oe_runmake DESTDIR="${D}" install; } -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir} \ " diff --git a/meta-oe/recipes-support/pidgin/icyque_git.bb b/meta-oe/recipes-support/pidgin/icyque_git.bb index 0f32dc3a39..ed58c4a76f 100644 --- a/meta-oe/recipes-support/pidgin/icyque_git.bb +++ b/meta-oe/recipes-support/pidgin/icyque_git.bb @@ -1,15 +1,15 @@ SUMMARY = "WIM Protocol plugin for ICQ for Adium, Pidgin, Miranda and Telepathy IM Framework" SECTION = "webos/services" -LICENSE = "GPLv3.0" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=1ebbd3e34237af26da5dc08a4e440464" DEPENDS = "pidgin json-glib" -PV = "0.1+gitr${SRCPV}" +PV = "0.1+git" inherit pkgconfig -SRC_URI = "git://github.com/EionRobb/icyque" +SRC_URI = "git://github.com/EionRobb/icyque;branch=master;protocol=https" SRCREV = "513fc162d5d1a201c2b044e2b42941436d1069d5" S = "${WORKDIR}/git" @@ -22,6 +22,6 @@ do_install() { oe_runmake DESTDIR="${D}" install; } -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir} \ " diff --git a/meta-oe/recipes-support/pidgin/libgnt/0001-meson-import-changes-from-3.0.-version.patch b/meta-oe/recipes-support/pidgin/libgnt/0001-meson-import-changes-from-3.0.-version.patch new file mode 100644 index 0000000000..8bb60b5557 --- /dev/null +++ b/meta-oe/recipes-support/pidgin/libgnt/0001-meson-import-changes-from-3.0.-version.patch @@ -0,0 +1,215 @@ +From 51d66c1c257f7487497f562033ac32ac75f648cb Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Mon, 8 Feb 2021 12:27:51 +0100 +Subject: [PATCH] meson: import changes from 3.0.* version + +* we need to use the meson option to disable introspection and docs + +Upstream-Status: Backport +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + meson.build | 139 ++++++++++++++++++++++++++++------------------ + meson_options.txt | 5 ++ + 2 files changed, 90 insertions(+), 54 deletions(-) + create mode 100644 meson_options.txt + +diff --git a/meson.build b/meson.build +index 1084c82..ed040b4 100644 +--- a/meson.build ++++ b/meson.build +@@ -53,9 +53,9 @@ compiler = meson.get_compiler('c') + pkgconfig = import('pkgconfig') + + # ####################################################################### +-# # Check for GLib 2.16 ++# # Check for GLib 2.44 + # ####################################################################### +-glib = dependency('glib-2.0', version : '>= 2.16.0') ++glib = dependency('glib-2.0', version : '>= 2.44.0') + gobject = dependency('gobject-2.0') + gmodule = dependency('gmodule-2.0') + gnome = import('gnome') +@@ -63,74 +63,88 @@ gnome = import('gnome') + ####################################################################### + # Check for LibXML2 + ####################################################################### +-libxml = dependency('libxml-2.0', version : '>= 2.6.0', required : false) +-gnt_config.set('NO_LIBXML', not libxml.found()) ++libxml = dependency('libxml-2.0', version : '>= 2.6.0') + + ####################################################################### + # Check for ncurses and other things used by it + ####################################################################### + ncurses_available = true +-ncurses_inc = [] +-# The order of this list is important to the condition that follows. +-ncurses_libs = [ +- compiler.find_library('ncursesw', required : false), +- compiler.find_library('panelw', required : false), +- compiler.find_library('tinfow', required : false), +-] +-if not ncurses_libs[0].found() or not ncurses_libs[1].found() +- ncurses_available = false +-endif ++ncurses_widechar = true ++ncurses_header = 'ncurses.h' ++# Some distros put the headers in ncursesw/, some don't. These are ordered to ++# pick the last available as most-specific version. ++ncursesw_header_paths = ['', 'ncursesw/'] + +-if host_machine.system() == 'windows' +- # FIXME: $host ? +- ncurses_sys_prefix = '/usr/$host/sys-root/mingw' ++ncurses = [ ++ dependency('ncursesw', required : false), ++ dependency('panelw', required : false), ++] ++if ncurses[0].found() and ncurses[1].found() ++ foreach location : ncursesw_header_paths ++ f = location + 'ncurses.h' ++ if compiler.has_header_symbol(f, 'get_wch', ++ prefix : '#define _XOPEN_SOURCE_EXTENDED') ++ ncurses_header = f ++ endif ++ endforeach + else +- ncurses_sys_prefix = '/usr' +-endif +- +-ncurses_sys_dirs = [ncurses_sys_prefix + '/include/ncursesw', +- ncurses_sys_prefix + '/include'] +- +-if ncurses_available +- # Some distros put the headers in ncursesw/, some don't +- found_ncurses_h = false +- foreach location : ncurses_sys_dirs +- f = location + '/ncurses.h' +- if not found_ncurses_h ++ ncurses_available = false ++ ncurses_inc = [] ++ ncurses_libs = [ ++ compiler.find_library('ncursesw', required : false), ++ compiler.find_library('panelw', required : false) ++ ] ++ if ncurses_libs[0].found() and ncurses_libs[1].found() ++ foreach location : ncursesw_header_paths ++ f = location + 'ncurses.h' + if compiler.has_header_symbol(f, 'get_wch', + prefix : '#define _XOPEN_SOURCE_EXTENDED') +- if location != '.' +- ncurses_inc += [include_directories(location)] +- endif +- found_ncurses_h = true ++ ncurses_available = true ++ ncurses_header = f + endif +- endif +- endforeach ++ endforeach + +- if not found_ncurses_h +- ncurses_inc = [] +- ncurses_libs = [] +- ncurses_available = false ++ if ncurses_available ++ ncurses = declare_dependency( ++ include_directories : ncurses_inc, ++ dependencies : ncurses_libs ++ ) ++ endif + endif +-else ++endif ++ ++if not ncurses_available + # ncursesw was not found. Look for plain old ncurses +- # The order of this list is important to the condition that follows. +- ncurses_libs = [ +- compiler.find_library('ncurses', required : false), +- compiler.find_library('panel', required : false), +- compiler.find_library('tinfo', required : false), ++ ncurses = [ ++ dependency('ncurses', required : false), ++ dependency('panel', required : false), + ] +- ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found() +- gnt_config.set('NO_WIDECHAR', true) ++ if ncurses[0].found() and ncurses_libs[1].found() ++ ncurses_available = true ++ else ++ ncurses_libs = [ ++ compiler.find_library('ncurses', required : false), ++ compiler.find_library('panel', required : false), ++ ] ++ ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found() ++ ncurses = declare_dependency(dependencies : ncurses_libs) ++ endif ++ ncurses_widechar = false + endif ++ ++if not ncurses_available and host_machine.system() == 'windows' ++ # Try pdcurses too. ++ ncurses_header = 'curses.h' ++ ncurses_libs = compiler.find_library('pdcurses', required : false) ++ ncurses_available = compiler.has_header(ncurses_header) and ncurses_libs.found() ++ ncurses = declare_dependency(dependencies : ncurses_libs) ++endif ++ + if not ncurses_available + error('ncurses could not be found!') + endif +- +-ncurses = declare_dependency( +- include_directories : ncurses_inc, +- dependencies : ncurses_libs +-) ++gnt_config.set('NCURSES_HEADER', ncurses_header) ++gnt_config.set10('NCURSES_WIDECHAR', ncurses_widechar) + + libgnt_SOURCES = [ + 'gntwidget.c', +@@ -191,7 +205,10 @@ libgnt_headers = [ + ] + + # Check for Python headers +-python_dep = dependency('python2', required : false) ++python_dep = dependency('python3-embed', required: false) ++if not python_dep.found() ++ python_dep = dependency('python3', required : false) ++endif + gnt_config.set('USE_PYTHON', python_dep.found()) + + configure_file(output : 'gntconfig.h', +@@ -233,6 +250,20 @@ pkgconfig.generate( + variables : ['plugindir = ${libdir}/gnt'], + ) + ++if get_option('introspection') ++ libgnt_gir = gnome.generate_gir(libgnt, ++ sources : libgnt_headers + [gnt_h], ++ includes : 'GObject-2.0', ++ namespace : 'Gnt', ++ symbol_prefix : 'gnt', ++ identifier_prefix : 'Gnt', ++ nsversion : '@0@.@1@'.format(gnt_major_version, gnt_minor_version), ++ install : true, ++ extra_args : ['-DGNT_COMPILATION', '--quiet']) ++endif ++ + subdir('wms') + subdir('test') +-subdir('doc') ++if get_option('doc') ++ subdir('doc') ++endif +diff --git a/meson_options.txt b/meson_options.txt +new file mode 100644 +index 0000000..f2414e2 +--- /dev/null ++++ b/meson_options.txt +@@ -0,0 +1,5 @@ ++option('doc', type : 'boolean', value : true, yield : true, ++ description : 'build documentation with gtk-doc') ++ ++option('introspection', type : 'boolean', value : true, yield : true, ++ description : 'build introspection data') diff --git a/meta-oe/recipes-support/pidgin/libgnt_2.14.1.bb b/meta-oe/recipes-support/pidgin/libgnt_2.14.1.bb new file mode 100644 index 0000000000..d17a623063 --- /dev/null +++ b/meta-oe/recipes-support/pidgin/libgnt_2.14.1.bb @@ -0,0 +1,20 @@ +SUMMARY = "GNT: The GLib Ncurses Toolkit" + +SECTION = "libs" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=c9a1abacd0166f595a9fbe6afb1f0d5e" +DEPENDS = "glib-2.0 ncurses libxml2 glib-2.0-native" + +inherit meson pkgconfig + +# SRCREV = "0a44b1d01c41" +# SRC_URI = "hg://keep.imfreedom.org/${BPN};module=${BPN} + +SRC_URI = "${SOURCEFORGE_MIRROR}/project/pidgin/${BPN}/${PV}/${BP}.tar.xz \ + file://0001-meson-import-changes-from-3.0.-version.patch \ +" +SRC_URI[sha256sum] = "5ec3e68e18f956e9998d79088b299fa3bca689bcc95c86001bc5da17c1eb4bd8" + +EXTRA_OEMESON = "-Dintrospection=false -Ddoc=false" + +FILES:${PN} += "${libdir}/gnt/s.so ${libdir}/gnt/irssi.so" diff --git a/meta-oe/recipes-support/pidgin/libotr/0001-tests-Include-missing-sys-socket.h-header.patch b/meta-oe/recipes-support/pidgin/libotr/0001-tests-Include-missing-sys-socket.h-header.patch new file mode 100644 index 0000000000..5b2e14b7b9 --- /dev/null +++ b/meta-oe/recipes-support/pidgin/libotr/0001-tests-Include-missing-sys-socket.h-header.patch @@ -0,0 +1,31 @@ +From aa2362e50d54fce8464d85766f5b230bf453c1f0 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 8 Apr 2022 20:15:03 -0700 +Subject: [PATCH] tests: Include missing sys/socket.h header + +Helps define +| ../../../../libotr-4.1.1/tests/regression/client/client.c:979:21: error: use of undeclared identifier 'PF_UNIX' +| ../../../../libotr-4.1.1/tests/regression/client/client.c:979:30: error: use of undeclared identifier 'SOCK_STREAM' +| ../../../../libotr-4.1.1/tests/regression/client/client.c:986:20: error: use of undeclared identifier 'AF_UNIX' + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + tests/regression/client/client.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tests/regression/client/client.c b/tests/regression/client/client.c +index e72b661..e0b3453 100644 +--- a/tests/regression/client/client.c ++++ b/tests/regression/client/client.c +@@ -26,6 +26,7 @@ + #include <stdlib.h> + #include <syscall.h> + #include <sys/epoll.h> ++#include <sys/socket.h> + #include <sys/types.h> + #include <sys/un.h> + #include <unistd.h> +-- +2.35.1 + diff --git a/meta-oe/recipes-support/pidgin/libotr_4.1.1.bb b/meta-oe/recipes-support/pidgin/libotr_4.1.1.bb index c701244219..115a6968eb 100644 --- a/meta-oe/recipes-support/pidgin/libotr_4.1.1.bb +++ b/meta-oe/recipes-support/pidgin/libotr_4.1.1.bb @@ -1,12 +1,13 @@ SUMMARY = "(OTR) Messaging allows you to have private conversations over instant messaging" HOMEPAGE = "http://www.cypherpunks.ca/otr/" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=92fe174bad6da3763f6e9e9eaff6df24" DEPENDS = "libgcrypt libgpg-error" SRC_URI = "http://www.cypherpunks.ca/otr/${BP}.tar.gz \ file://fix_qa-issue_include.patch \ file://sepbuild.patch \ + file://0001-tests-Include-missing-sys-socket.h-header.patch \ " SRC_URI[md5sum] = "dac5a8778a35f674c046ddf5d97e4d81" diff --git a/meta-oe/recipes-support/pidgin/pidgin-otr_4.0.2.bb b/meta-oe/recipes-support/pidgin/pidgin-otr_4.0.2.bb index 04133c1b3d..326c5bfc57 100644 --- a/meta-oe/recipes-support/pidgin/pidgin-otr_4.0.2.bb +++ b/meta-oe/recipes-support/pidgin/pidgin-otr_4.0.2.bb @@ -1,6 +1,6 @@ SUMMARY = "(OTR) Messaging allows you to have private conversations over instant messaging" HOMEPAGE = "https://otr.cypherpunks.ca/" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=92fe174bad6da3763f6e9e9eaff6df24" DEPENDS = "libgcrypt libotr pidgin gtk+ intltool-native glib-2.0 glib-2.0-native" REQUIRED_DISTRO_FEATURES = "x11" @@ -10,6 +10,6 @@ SRC_URI = "https://otr.cypherpunks.ca/${BP}.tar.gz \ SRC_URI[md5sum] = "7ef14e1334a4bc80e5d530f9a3cfc626" SRC_URI[sha256sum] = "f4b59eef4a94b1d29dbe0c106dd00cdc630e47f18619fc754e5afbf5724ebac4" -FILES_${PN} = "${libdir}/pidgin/*" +FILES:${PN} = "${libdir}/pidgin/*" inherit autotools pkgconfig features_check diff --git a/meta-oe/recipes-support/pidgin/pidgin-sipe/0001-Migrate-to-use-g_memdup2.patch b/meta-oe/recipes-support/pidgin/pidgin-sipe/0001-Migrate-to-use-g_memdup2.patch new file mode 100644 index 0000000000..ceb48d21fc --- /dev/null +++ b/meta-oe/recipes-support/pidgin/pidgin-sipe/0001-Migrate-to-use-g_memdup2.patch @@ -0,0 +1,192 @@ +From 51c95a23bff3a024dc19e3127ca751e1458be0f0 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 5 Apr 2021 11:36:50 -0700 +Subject: [PATCH] Migrate to use g_memdup2 + +g_memdup has been deprecated for long and latest glib-2.0 2.68+ has +turned it int an error to use old function. + +The fall-back to g_memdup isn't needed because pidgin provides g_memdup2 +in pidgin-sipe/1.25.0-r0/recipe-sysroot/usr/include/libpurple/glibcompat.h +based on glib-2.0 version: + /* Backport the static inline version of g_memdup2 if we don't have g_memdup2. + * see https://mail.gnome.org/archives/desktop-devel-list/2021-February/msg00000.html + * for more information. + */ + #if !GLIB_CHECK_VERSION(2, 67, 3) + static inline gpointer + g_memdup2(gconstpointer mem, gsize byte_size) { + gpointer new_mem = NULL; + + if(mem && byte_size != 0) { + new_mem = g_malloc (byte_size); + memcpy (new_mem, mem, byte_size); + } + + return new_mem; + } + #endif /* !GLIB_CHECK_VERSION(2, 67, 3) */ + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/api/sipe-common.h | 3 +++ + src/core/sip-sec-gssapi.c | 4 ++-- + src/core/sip-sec-ntlm.c | 12 ++++++------ + src/core/sip-sec-tls-dsk.c | 4 ++-- + src/core/sipe-media.c | 2 +- + src/core/sipe-tls-tester.c | 2 +- + src/core/sipe-tls.c | 4 ++-- + src/telepathy/telepathy-protocol.c | 2 +- + 8 files changed, 18 insertions(+), 15 deletions(-) + +diff --git a/src/api/sipe-common.h b/src/api/sipe-common.h +index c964f15..cab81e0 100644 +--- a/src/api/sipe-common.h ++++ b/src/api/sipe-common.h +@@ -51,3 +51,6 @@ + #ifdef _MSC_VER + typedef long ssize_t; + #endif ++ ++// for g_memdup2 ++#include <libpurple/glibcompat.h> +diff --git a/src/core/sip-sec-gssapi.c b/src/core/sip-sec-gssapi.c +index 873080f..4c63868 100644 +--- a/src/core/sip-sec-gssapi.c ++++ b/src/core/sip-sec-gssapi.c +@@ -602,7 +602,7 @@ sip_sec_init_sec_context__gssapi(SipSecContext context, + + out_buff->length = output_token.length; + if (out_buff->length) +- out_buff->value = g_memdup(output_token.value, output_token.length); ++ out_buff->value = g_memdup2(output_token.value, output_token.length); + else + /* Special case: empty token */ + out_buff->value = (guint8 *) g_strdup(""); +@@ -653,7 +653,7 @@ sip_sec_make_signature__gssapi(SipSecContext context, + return FALSE; + } else { + signature->length = output_token.length; +- signature->value = g_memdup(output_token.value, ++ signature->value = g_memdup2(output_token.value, + output_token.length); + gss_release_buffer(&minor, &output_token); + return TRUE; +diff --git a/src/core/sip-sec-ntlm.c b/src/core/sip-sec-ntlm.c +index 2e2354f..1fa4daa 100644 +--- a/src/core/sip-sec-ntlm.c ++++ b/src/core/sip-sec-ntlm.c +@@ -951,7 +951,7 @@ sip_sec_ntlm_parse_challenge(SipSecBuffer in_buff, + + /* server challenge (nonce) */ + if (server_challenge) { +- *server_challenge = g_memdup(cmsg->nonce, 8); ++ *server_challenge = g_memdup2(cmsg->nonce, 8); + } + + /* flags */ +@@ -984,7 +984,7 @@ sip_sec_ntlm_parse_challenge(SipSecBuffer in_buff, + *target_info_len = len; + } + if (target_info) { +- *target_info = g_memdup(content, len); ++ *target_info = g_memdup2(content, len); + } + } + } +@@ -1117,13 +1117,13 @@ sip_sec_ntlm_gen_authenticate(guchar **client_sign_key, + Set ServerSigningKey to SIGNKEY(ExportedSessionKey, "Server") + */ + SIGNKEY(exported_session_key, TRUE, key); +- *client_sign_key = g_memdup(key, 16); ++ *client_sign_key = g_memdup2(key, 16); + SIGNKEY(exported_session_key, FALSE, key); +- *server_sign_key = g_memdup(key, 16); ++ *server_sign_key = g_memdup2(key, 16); + SEALKEY(neg_flags, exported_session_key, TRUE, key); +- *client_seal_key = g_memdup(key, 16); ++ *client_seal_key = g_memdup2(key, 16); + SEALKEY(neg_flags, exported_session_key, FALSE, key); +- *server_seal_key = g_memdup(key, 16); ++ *server_seal_key = g_memdup2(key, 16); + } + + /* @TODO: */ +diff --git a/src/core/sip-sec-tls-dsk.c b/src/core/sip-sec-tls-dsk.c +index 70433ea..2d3f2db 100644 +--- a/src/core/sip-sec-tls-dsk.c ++++ b/src/core/sip-sec-tls-dsk.c +@@ -88,9 +88,9 @@ sip_sec_init_sec_context__tls_dsk(SipSecContext context, + /* copy key pair */ + ctx->algorithm = state->algorithm; + ctx->key_length = state->key_length; +- ctx->client_key = g_memdup(state->client_key, ++ ctx->client_key = g_memdup2(state->client_key, + state->key_length); +- ctx->server_key = g_memdup(state->server_key, ++ ctx->server_key = g_memdup2(state->server_key, + state->key_length); + + /* extract certicate expiration time */ +diff --git a/src/core/sipe-media.c b/src/core/sipe-media.c +index e9c4b8a..936e31c 100644 +--- a/src/core/sipe-media.c ++++ b/src/core/sipe-media.c +@@ -578,7 +578,7 @@ media_stream_to_sdpmedia(struct sipe_media_call_private *call_private, + // Set our key if encryption is enabled. + if (stream_private->encryption_key && + encryption_policy != SIPE_ENCRYPTION_POLICY_REJECTED) { +- sdpmedia->encryption_key = g_memdup(stream_private->encryption_key, ++ sdpmedia->encryption_key = g_memdup2(stream_private->encryption_key, + SIPE_SRTP_KEY_LEN); + sdpmedia->encryption_key_id = stream_private->encryption_key_id; + } +diff --git a/src/core/sipe-tls-tester.c b/src/core/sipe-tls-tester.c +index e80d715..5fbb5f8 100644 +--- a/src/core/sipe-tls-tester.c ++++ b/src/core/sipe-tls-tester.c +@@ -155,7 +155,7 @@ static guchar *read_tls_record(int fd, + printf("received %d bytes from server\n", result); + record = g_new0(struct record, 1); + record->length = result; +- record->msg = g_memdup(buffer, result); ++ record->msg = g_memdup2(buffer, result); + length += result; + fragments = g_slist_append(fragments, record); + } +diff --git a/src/core/sipe-tls.c b/src/core/sipe-tls.c +index b0235d5..020aedb 100644 +--- a/src/core/sipe-tls.c ++++ b/src/core/sipe-tls.c +@@ -427,7 +427,7 @@ static guchar *sipe_tls_prf(SIPE_UNUSED_PARAMETER struct tls_internal_state *sta + gsize half = (secret_length + 1) / 2; + gsize newseed_length = label_length + seed_length; + /* secret: used as S1; secret2: last half of original secret (S2) */ +- guchar *secret2 = g_memdup(secret + secret_length - half, half); ++ guchar *secret2 = g_memdup2(secret + secret_length - half, half); + guchar *newseed = g_malloc(newseed_length); + guchar *md5, *dest; + guchar *sha1, *src; +@@ -1525,7 +1525,7 @@ static struct tls_compiled_message *tls_client_key_exchange(struct tls_internal_ + + /* found all the required fields */ + state->server_random.length = server_random->length; +- state->server_random.buffer = g_memdup(server_random->data, ++ state->server_random.buffer = g_memdup2(server_random->data, + server_random->length); + tls_calculate_secrets(state); + +diff --git a/src/telepathy/telepathy-protocol.c b/src/telepathy/telepathy-protocol.c +index f6e5337..1dde579 100644 +--- a/src/telepathy/telepathy-protocol.c ++++ b/src/telepathy/telepathy-protocol.c +@@ -237,7 +237,7 @@ static void get_connection_details(SIPE_UNUSED_PARAMETER TpBaseProtocol *self, + SIPE_TYPE_SEARCH_MANAGER, + G_TYPE_INVALID + }; +- *channel_managers = g_memdup(types, sizeof(types)); ++ *channel_managers = g_memdup2(types, sizeof(types)); + } + if (icon_name) + *icon_name = g_strdup("im-" SIPE_TELEPATHY_DOMAIN); diff --git a/meta-oe/recipes-support/pidgin/pidgin-sipe/0001-configure-Do-not-add-native-paths-to-pkgconfig-searc.patch b/meta-oe/recipes-support/pidgin/pidgin-sipe/0001-configure-Do-not-add-native-paths-to-pkgconfig-searc.patch new file mode 100644 index 0000000000..1dc7ca3f17 --- /dev/null +++ b/meta-oe/recipes-support/pidgin/pidgin-sipe/0001-configure-Do-not-add-native-paths-to-pkgconfig-searc.patch @@ -0,0 +1,36 @@ +From fedef3c0b1772cee97d7288bee7d5d50805a5964 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 12 Dec 2020 08:56:04 -0800 +Subject: [PATCH] configure: Do not add native paths to pkgconfig search + +This does not work in cross environments, secondly in OE we already +point pkkconfig into recipe sysroot where it will find all the +dependencies therefore this setting is not needed + +Upstream-Status: Inappropriate [ OE-Specific ] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 0df85b0..2481153 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -70,12 +70,6 @@ AC_CHECK_HEADERS([]) + dnl checks for library functions + AC_CHECK_FUNCS([]) + +-dnl tell pkgconfig to look in the same prefix where we're installing this to, +-dnl as that is likely where libpurple will be found if it is not in the default +-dnl pkgconfig path +-PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:${libdir}/pkgconfig" +-export PKG_CONFIG_PATH +- + dnl debug mode + AC_ARG_ENABLE(debug, + [AS_HELP_STRING([--enable-debug], +-- +2.29.2 + diff --git a/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb b/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb index 99fcf3c6d0..6ce42ec187 100644 --- a/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb +++ b/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb @@ -1,6 +1,6 @@ SUMMARY = "Protocol plugin for Office 365/Lync/OCS for Adium, Pidgin, Miranda and Telepathy IM Framework" SECTION = "webos/services" -LICENSE = "GPLv2.0" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" DEPENDS = "pidgin gmime intltool-native glib-2.0-native" @@ -10,6 +10,8 @@ inherit autotools gettext pkgconfig SRC_URI = "${SOURCEFORGE_MIRROR}/sipe/pidgin-sipe-${PV}.tar.xz \ file://0001-sipe-consider-64bit-time_t-when-printing.patch \ file://0001-Align-structs-casts-with-time_t-elements-to-8byte-bo.patch \ + file://0001-configure-Do-not-add-native-paths-to-pkgconfig-searc.patch \ + file://0001-Migrate-to-use-g_memdup2.patch \ " SRC_URI[md5sum] = "0e742f021dc8c3f17435aea05c3e0314" @@ -23,12 +25,14 @@ PACKAGECONFIG[krb5] = "--with-krb5=yes,--with-krb5=no,krb5" PACKAGECONFIG[telepathy] = "--enable-telepathy=yes,--enable-telepathy=no,telepathy-glib" #PACKAGECONFIG[gssapi_only] = "--enable-gssapi-only=yes,--enable-gssapi-only=no,krb5" PACKAGECONFIG[debug] = "--enable-debug=yes,--enable-debug=no,valgrind" +# disable Werror by default, useful for dev mode +PACKAGECONFIG[quality] = "--enable-quality-check=yes,--enable-quality-check=no," -FILES_${PN}-dev += " \ +FILES:${PN}-dev += " \ ${libdir}/purple-2/*.la \ " -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/purple-2/libsipe.so \ ${datadir}/appdata \ ${datadir}/metainfo \ diff --git a/meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch b/meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch deleted file mode 100644 index 312fc8593f..0000000000 --- a/meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 855cc20bafa30597ae7a62f7672d42654b25cde0 Mon Sep 17 00:00:00 2001 -From: Herrie <github.com@herrie.org> -Date: Mon, 24 Jul 2017 21:30:16 +0200 -Subject: [PATCH] Use pkg-config instead of ${PYTHON}-config to find python - ---- - configure.ac | 21 ++++++++------------- - 1 file changed, 8 insertions(+), 13 deletions(-) - -diff --git a/configure.ac b/configure.ac -index d20a18e..c741829 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1567,20 +1567,15 @@ AM_CONDITIONAL(ENABLE_DBUS, test "x$enable_dbus" = "xyes") - dnl Check for Python headers (currently useful only for libgnt) - dnl (Thanks to XChat) - if test "x$enable_consoleui" = "xyes" -a ! -z "$PYTHON" -a x"$PYTHON" != x"no" ; then -- AC_MSG_CHECKING(for Python compile flags) -- if test -f ${PYTHON}-config; then -- PY_CFLAGS=`${PYTHON}-config --includes` -- PY_LIBS=`${PYTHON}-config --libs` -- AC_DEFINE(USE_PYTHON, [1], [Define if python headers are available.]) -- AC_MSG_RESULT(ok) -- else -- AC_MSG_RESULT([Cannot find ${PYTHON}-config]) -- PY_CFLAGS="" -- PY_LIBS="" -- fi -+ AC_MSG_CHECKING(for Python compile flags) -+ PKG_CHECK_MODULES(PY, python, [ -+ AC_SUBST(PY_CFLAGS) -+ AC_SUBST(PY_LIBS) -+ ], [ -+ AC_MSG_RESULT(no) -+ AC_MSG_ERROR([Can't find python]) -+ ]) - fi --AC_SUBST(PY_CFLAGS) --AC_SUBST(PY_LIBS) - - dnl ####################################################################### - dnl # Check for Mono support diff --git a/meta-oe/recipes-support/pidgin/pidgin/purple-OE-branding-25.patch b/meta-oe/recipes-support/pidgin/pidgin/purple-OE-branding-25.patch index 0a1baa9183..1c4daa9f67 100644 --- a/meta-oe/recipes-support/pidgin/pidgin/purple-OE-branding-25.patch +++ b/meta-oe/recipes-support/pidgin/pidgin/purple-OE-branding-25.patch @@ -3,6 +3,8 @@ From: Herrie <github.com@herrie.org> Date: Mon, 24 Jul 2017 21:30:16 +0200 --- +Upstream-Status: Pending + libpurple/protocols/irc/irc.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/pidgin/pidgin/sanitize-configure.ac.patch b/meta-oe/recipes-support/pidgin/pidgin/sanitize-configure.ac.patch index 84dbcdc276..cf6207423d 100644 --- a/meta-oe/recipes-support/pidgin/pidgin/sanitize-configure.ac.patch +++ b/meta-oe/recipes-support/pidgin/pidgin/sanitize-configure.ac.patch @@ -3,6 +3,8 @@ From: Herrie <github.com@herrie.org> Date: Mon, 24 Jul 2017 21:30:16 +0200 --- +Upstream-Status: Pending + configure.ac | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/meta-oe/recipes-support/pidgin/pidgin/use_py3.patch b/meta-oe/recipes-support/pidgin/pidgin/use_py3.patch deleted file mode 100644 index c7b4163cb5..0000000000 --- a/meta-oe/recipes-support/pidgin/pidgin/use_py3.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -1488,7 +1488,7 @@ AC_ARG_WITH([python], - - if test "x$enable_dbus" = "xyes" || test "x$enable_consoleui" = "xyes" ; then - if test -z "$PYTHON" -o "x$PYTHON" = "xyes"; then -- AC_PATH_PROG([PYTHON], [python], [no]) -+ AC_PATH_PROG([PYTHON], [python3], [no]) - fi - - if test x"$PYTHON" = x"no" ; then -@@ -1568,7 +1568,7 @@ dnl Check for Python headers (currently - dnl (Thanks to XChat) - if test "x$enable_consoleui" = "xyes" -a ! -z "$PYTHON" -a x"$PYTHON" != x"no" ; then - AC_MSG_CHECKING(for Python compile flags) -- PKG_CHECK_MODULES(PY, python, [ -+ PKG_CHECK_MODULES(PY, python3, [ - AC_SUBST(PY_CFLAGS) - AC_SUBST(PY_LIBS) - ], [ diff --git a/meta-oe/recipes-support/pidgin/pidgin_2.13.0.bb b/meta-oe/recipes-support/pidgin/pidgin_2.14.2.bb index fdc79e81b2..ae251b5a08 100644 --- a/meta-oe/recipes-support/pidgin/pidgin_2.13.0.bb +++ b/meta-oe/recipes-support/pidgin/pidgin_2.14.2.bb @@ -1,6 +1,7 @@ SUMMARY = "multi-protocol instant messaging client" + SECTION = "x11/network" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" DEPENDS = "python3 virtual/libintl intltool-native libxml2 gconf glib-2.0-native" @@ -10,12 +11,12 @@ SRC_URI = "\ ${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \ file://sanitize-configure.ac.patch \ file://purple-OE-branding-25.patch \ - file://pidgin-cross-python-265.patch \ - file://use_py3.patch \ " -SRC_URI[md5sum] = "423403494fe1951e47cc75231f743bb0" -SRC_URI[sha256sum] = "2747150c6f711146bddd333c496870bfd55058bab22ffb7e4eb784018ec46d8f" +SRC_URI[sha256sum] = "19654ad276b149646371fbdac21bc7620742f2975f7399fed0ffc1a18fbaf603" + +CVE_STATUS[CVE-2010-1624] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions." +CVE_STATUS[CVE-2011-3594] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions." PACKAGECONFIG ??= "gnutls consoleui avahi dbus idn nss \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 gtk startup-notification', '', d)} \ @@ -34,11 +35,12 @@ PACKAGECONFIG[idn] = "--enable-idn,--disable-idn,libidn" PACKAGECONFIG[gtk] = "--enable-gtkui,--disable-gtkui,gtk+" PACKAGECONFIG[x11] = "--with-x=yes --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR},--with-x=no,virtual/libx11" PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification" -PACKAGECONFIG[consoleui] = "--enable-consoleui --with-ncurses-headers=${STAGING_INCDIR},--disable-consoleui,ncurses" +PACKAGECONFIG[consoleui] = "--enable-consoleui --with-ncurses-headers=${STAGING_INCDIR},--disable-consoleui,libgnt" PACKAGECONFIG[gnutls] = "--enable-gnutls --with-gnutls-includes=${STAGING_INCDIR} --with-gnutls-libs=${STAGING_LIBDIR},--disable-gnutls,gnutls,libpurple-plugin-ssl-gnutls" PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus dbus-glib" PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi" PACKAGECONFIG[nss] = "--enable-nss,--disable-nss,nss nspr,libpurple-plugin-ssl-nss" +PACKAGECONFIG[cyrus-sasl] = "--enable-cyrus-sasl,--disable-cyrus-sasl,cyrus-sasl" EXTRA_OECONF = " \ --disable-perl \ @@ -51,67 +53,60 @@ EXTRA_OECONF = " \ --disable-screensaver \ " -do_configure_prepend() { - touch ${S}/po/Makefile - sed -i "s#PY_VERSION=`$PYTHON -c 'import sys ; print sys.version[0:3]'`#PY_VERSION=${PYTHON_BASEVERSION}#g" ${S}/configure.ac -} - OE_LT_RPATH_ALLOW=":${libdir}/purple-2:" OE_LT_RPATH_ALLOW[export]="1" -PACKAGES =+ "libpurple-dev libpurple libgnt libgnt-dev finch finch-dev ${PN}-data" +PACKAGES =+ "libpurple-dev libpurple finch finch-dev ${PN}-data" -RPROVIDES_${PN}-dbg += "libpurple-dbg libgnt-dbg finch-dbg" +RPROVIDES:${PN}-dbg += "libpurple-dbg finch-dbg" LEAD_SONAME = "libpurple.so.0" -FILES_libpurple = "${libdir}/libpurple*.so.* ${libdir}/purple-2 ${bindir}/purple-* ${sysconfdir}/gconf/schemas/purple* ${datadir}/purple/ca-certs" -FILES_libpurple-dev = "${libdir}/libpurple*.la \ +FILES:libpurple = "${libdir}/libpurple*.so.* ${libdir}/purple-2 ${bindir}/purple-* ${sysconfdir}/gconf/schemas/purple* ${datadir}/purple/ca-certs" +FILES:libpurple-dev = "${libdir}/libpurple*.la \ ${libdir}/libpurple*.so \ ${libdir}/purple-2/*.la \ ${libdir}/purple-2/libjabber.so \ ${libdir}/purple-2/liboscar.so \ ${libdir}/purple-2/libymsg.so \ ${datadir}/aclocal" -FILES_libgnt = "${libdir}/libgnt.so.* ${libdir}/gnt/*.so" -FILES_libgnt-dev = "${libdir}/gnt/*.la" -FILES_finch = "${bindir}/finch" -FILES_finch-dev = "${libdir}/finch/*.la" +FILES:finch = "${bindir}/finch" +FILES:finch-dev = "${libdir}/finch/*.la" -FILES_${PN} = "${bindir} ${datadir}/${PN} ${libdir}/${PN}/*.so \ +FILES:${PN} = "${bindir} ${datadir}/${PN} ${libdir}/${PN}/*.so \ ${datadir}/applications" -RRECOMMENDS_${PN} = "${PN}-data libpurple-protocol-irc libpurple-protocol-xmpp" +RRECOMMENDS:${PN} = "${PN}-data libpurple-protocol-irc libpurple-protocol-xmpp" -FILES_${PN}-data = "${datadir}/pixmaps ${datadir}/sounds ${datadir}/icons ${datadir}/appdata" -FILES_${PN}-dev += "${libdir}/${PN}/*.la" +FILES:${PN}-data = "${datadir}/pixmaps ${datadir}/sounds ${datadir}/icons ${datadir}/appdata" +FILES:${PN}-dev += "${libdir}/${PN}/*.la" PACKAGES_DYNAMIC += "^libpurple-protocol-.* ^libpurple-plugin-.* ^pidgin-plugin-.* ^finch-plugin-.*" -python populate_packages_prepend () { +python populate_packages:prepend () { pidgroot = d.expand('${libdir}/pidgin') purple = d.expand('${libdir}/purple-2') finch = d.expand('${libdir}/finch') - do_split_packages(d, pidgroot, '^([^l][^i][^b].*)\.so$', + do_split_packages(d, pidgroot, r'^([^l][^i][^b].*)\.so$', output_pattern='pidgin-plugin-%s', description='Pidgin plugin %s', prepend=True, extra_depends='') - do_split_packages(d, purple, '^lib(.*)\.so$', + do_split_packages(d, purple, r'^lib(.*)\.so$', output_pattern='libpurple-protocol-%s', description='Libpurple protocol plugin for %s', prepend=True, extra_depends='') - do_split_packages(d, purple, '^(ssl-.*)\.so$', + do_split_packages(d, purple, r'^(ssl-.*)\.so$', output_pattern='libpurple-plugin-%s', description='libpurple plugin %s', prepend=True, extra_depends='libpurple-plugin-ssl') - do_split_packages(d, purple, '^([^l][^i][^b].*)\.so$', + do_split_packages(d, purple, r'^([^l][^i][^b].*)\.so$', output_pattern='libpurple-plugin-%s', description='libpurple plugin %s', prepend=True, extra_depends='') - do_split_packages(d, finch, '^([^l][^i][^b].*)\.so$', + do_split_packages(d, finch, r'^([^l][^i][^b].*)\.so$', output_pattern='finch-plugin-%s', description='Finch plugin %s', prepend=True, extra_depends='') diff --git a/meta-oe/recipes-support/pidgin/purple-skypeweb_git.bb b/meta-oe/recipes-support/pidgin/purple-skypeweb_git.bb index 092e6059b8..1981f1ee9c 100644 --- a/meta-oe/recipes-support/pidgin/purple-skypeweb_git.bb +++ b/meta-oe/recipes-support/pidgin/purple-skypeweb_git.bb @@ -1,17 +1,17 @@ SUMMARY = "Skype protocol plug-in for libpurple" SECTION = "webos/services" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://skypeweb/gpl3.txt;md5=d90260d32cef39f3c8d6c0f05d3adb8e" DEPENDS = "pidgin json-glib glib-2.0 zlib" inherit pkgconfig -SRC_URI = "git://github.com/EionRobb/skype4pidgin;branch=master;protocol=git" -SRCREV = "14f1b69b6292bbdc98cca484b050ec8359394c4e" +SRC_URI = "git://github.com/EionRobb/skype4pidgin;branch=master;protocol=https" +SRCREV = "b226d1c457d73900ae89b8a7469247fbe33677a6" S = "${WORKDIR}/git" -PV = "1.5+git${SRCPV}" +PV = "1.7+git" do_compile() { oe_runmake -C skypeweb; @@ -21,6 +21,6 @@ do_install() { oe_runmake -C skypeweb DESTDIR="${D}" install; } -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir} \ " diff --git a/meta-oe/recipes-support/pkcs11-provider/pkcs11-provider_0.3.bb b/meta-oe/recipes-support/pkcs11-provider/pkcs11-provider_0.3.bb new file mode 100644 index 0000000000..816ee967c1 --- /dev/null +++ b/meta-oe/recipes-support/pkcs11-provider/pkcs11-provider_0.3.bb @@ -0,0 +1,27 @@ +SUMMARY = "An OpenSSL provider that allows direct interfacing with pkcs11 drivers" +DESCRIPTION = "\ +This is an Openssl 3.x provider to access Hardware or Software Tokens using \ +the PKCS#11 Cryptographic Token Interface\ +\ +This code targets version 3.1 of the interface but should be backwards \ +compatible to previous versions as well.\ +" +HOMEPAGE = "https://github.com/latchset/pkcs11-provider" +SECTION = "libs" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=b53b787444a60266932bd270d1cf2d45" +DEPENDS = "\ + autoconf-archive \ + openssl \ + p11-kit \ +" + +SRCREV = "58040b4e32975cc1d7f39e424ee7b0097cd11311" + +SRC_URI = "git://github.com/latchset/${BPN}.git;branch=main;protocol=https" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig + +FILES:${PN} += "${libdir}/ossl-modules/pkcs11.so" diff --git a/meta-oe/recipes-support/pngcheck/pngcheck/0001-make-Respect-variables-from-environement.patch b/meta-oe/recipes-support/pngcheck/pngcheck/0001-make-Respect-variables-from-environement.patch index 2d0ea0252c..12333cc1f1 100644 --- a/meta-oe/recipes-support/pngcheck/pngcheck/0001-make-Respect-variables-from-environement.patch +++ b/meta-oe/recipes-support/pngcheck/pngcheck/0001-make-Respect-variables-from-environement.patch @@ -7,6 +7,8 @@ link with shared zlib Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + Makefile.unx | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/meta-oe/recipes-support/pngcheck/pngcheck/0001-png-fix-IDAT-windowsize-Fix-format-string-errors-in-.patch b/meta-oe/recipes-support/pngcheck/pngcheck/0001-png-fix-IDAT-windowsize-Fix-format-string-errors-in-.patch index 6d4465fbed..0fc5a8e0d2 100644 --- a/meta-oe/recipes-support/pngcheck/pngcheck/0001-png-fix-IDAT-windowsize-Fix-format-string-errors-in-.patch +++ b/meta-oe/recipes-support/pngcheck/pngcheck/0001-png-fix-IDAT-windowsize-Fix-format-string-errors-in-.patch @@ -6,6 +6,8 @@ Subject: [PATCH 1/2] png-fix-IDAT-windowsize: Fix format string errors in Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + gpl/png-fix-IDAT-windowsize.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/pngcheck/pngcheck/10-pngsplit-format-strings.patch b/meta-oe/recipes-support/pngcheck/pngcheck/10-pngsplit-format-strings.patch index f2c86689ec..2ff6d664c0 100644 --- a/meta-oe/recipes-support/pngcheck/pngcheck/10-pngsplit-format-strings.patch +++ b/meta-oe/recipes-support/pngcheck/pngcheck/10-pngsplit-format-strings.patch @@ -2,6 +2,8 @@ From: Jari Aalto <jari.aalto@cante.net> Subject: Correct fomat strings fro hardened build flags --- +Upstream-Status: Pending + gpl/pngsplit.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meta-oe/recipes-support/pngcheck/pngcheck_2.3.0.bb b/meta-oe/recipes-support/pngcheck/pngcheck_2.3.0.bb index 9f617ecda5..19da947d04 100644 --- a/meta-oe/recipes-support/pngcheck/pngcheck_2.3.0.bb +++ b/meta-oe/recipes-support/pngcheck/pngcheck_2.3.0.bb @@ -1,6 +1,6 @@ SUMMARY = "pngcheck verifies the integrity of PNG, JNG and MNG files" HOMEPAGE = "http://www.libpng.org/pub/png/apps/pngcheck.html" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://gpl/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "zlib libpng" diff --git a/meta-oe/recipes-support/poco/poco/0001-Don-t-try-to-install-non-existing-Encodings-testsuit.patch b/meta-oe/recipes-support/poco/poco/0001-Don-t-try-to-install-non-existing-Encodings-testsuit.patch deleted file mode 100644 index f4a358f47f..0000000000 --- a/meta-oe/recipes-support/poco/poco/0001-Don-t-try-to-install-non-existing-Encodings-testsuit.patch +++ /dev/null @@ -1,31 +0,0 @@ -From fa079dfc5e1d22ea35762bf4c5b09999bdc5e731 Mon Sep 17 00:00:00 2001 -From: Jochen Sprickerhof <git@jochen.sprickerhof.de> -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 - diff --git a/meta-oe/recipes-support/poco/poco/0001-Use-std-atomic-int-instead-of-std-atomic-bool.patch b/meta-oe/recipes-support/poco/poco/0001-Use-std-atomic-int-instead-of-std-atomic-bool.patch new file mode 100644 index 0000000000..b06135222a --- /dev/null +++ b/meta-oe/recipes-support/poco/poco/0001-Use-std-atomic-int-instead-of-std-atomic-bool.patch @@ -0,0 +1,60 @@ +From 4cbb225811205b51b65371d0d8abc2d2af8233b6 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 26 Jan 2023 14:56:36 -0800 +Subject: [PATCH] Use std::atomic<int> instead of std::atomic<bool> + +GCC on RISCV does not yet support inline subword atomics [1] +Therefore avoid them until fixed + +Upstream-Status: Pending + +[1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104338 + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Foundation/include/Poco/AsyncChannel.h | 2 +- + Foundation/src/AsyncChannel.cpp | 5 ++--- + 2 files changed, 3 insertions(+), 4 deletions(-) + +diff --git a/Foundation/include/Poco/AsyncChannel.h b/Foundation/include/Poco/AsyncChannel.h +index 190bae7dd..d73ea6c72 100644 +--- a/Foundation/include/Poco/AsyncChannel.h ++++ b/Foundation/include/Poco/AsyncChannel.h +@@ -111,7 +111,7 @@ private: + NotificationQueue _queue; + std::size_t _queueSize = 0; + std::size_t _dropCount = 0; +- std::atomic<bool> _closed; ++ std::atomic<int> _closed; + }; + + +diff --git a/Foundation/src/AsyncChannel.cpp b/Foundation/src/AsyncChannel.cpp +index 37cdec477..e829b180c 100644 +--- a/Foundation/src/AsyncChannel.cpp ++++ b/Foundation/src/AsyncChannel.cpp +@@ -48,11 +48,10 @@ private: + Message _msg; + }; + +- + AsyncChannel::AsyncChannel(Channel::Ptr pChannel, Thread::Priority prio): + _pChannel(pChannel), + _thread("AsyncChannel"), +- _closed(false) ++ _closed(0) + { + _thread.setPriority(prio); + } +@@ -95,7 +94,7 @@ void AsyncChannel::open() + + void AsyncChannel::close() + { +- if (!_closed.exchange(true)) ++ if (!_closed.exchange(1)) + { + if (_thread.isRunning()) + { +-- +2.39.1 + diff --git a/meta-oe/recipes-support/poco/poco/0001-cppignore.lnx-Ignore-PKCS12-and-testLaunch-test.patch b/meta-oe/recipes-support/poco/poco/0001-cppignore.lnx-Ignore-PKCS12-and-testLaunch-test.patch new file mode 100644 index 0000000000..f70e8bcc74 --- /dev/null +++ b/meta-oe/recipes-support/poco/poco/0001-cppignore.lnx-Ignore-PKCS12-and-testLaunch-test.patch @@ -0,0 +1,66 @@ +From 879ddb725823c78c9510cfd39786adb16f3726c8 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 16 Sep 2023 19:52:56 -0700 +Subject: [PATCH] cppignore.lnx: Ignore PKCS12 and testLaunch test +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +These tests fail on Linux + +There were 4 failures: + 1: N7CppUnit10TestCallerI11ProcessTestEE.testLaunch + "rc == 3" + in "/usr/src/debug/poco/1.12.4-r0/Foundation/testsuite/src/ProcessTest.cpp", line 79 + 2: N7CppUnit10TestCallerI11ProcessTestEE.testLaunchRedirectIn + "rc == 100" + in "/usr/src/debug/poco/1.12.4-r0/Foundation/testsuite/src/ProcessTest.cpp", line 106 + 3: N7CppUnit10TestCallerI11ProcessTestEE.testLaunchRedirectOut + "s == "Hello, world!"" + in "/usr/src/debug/poco/1.12.4-r0/Foundation/testsuite/src/ProcessTest.cpp", line 134 + 4: N7CppUnit10TestCallerI11ProcessTestEE.testLaunchEnv + "s == "test"" + in "/usr/src/debug/poco/1.12.4-r0/Foundation/testsuite/src/ProcessTest.cpp", line 166 + + There were 4 errors:- + 1: N7CppUnit10TestCallerI7EVPTestEE.testRSAEVPKeyFromPKCS12 + │ │ "N4Poco17NotFoundExceptionE: + Not found: POCO_BASE" + │ │ in "<unknown>", line -1 + 2: N7CppUnit10TestCallerI19PKCS12ContainerTestEE.testFullPKCS12 + │ │ "N4Poco17NotFoundExceptionE: + Not found: POCO_BASE" + │ │ in "<unknown>", line -1 + 3: N7CppUnit10TestCallerI19PKCS12ContainerTestEE.testCertsOnlyPKCS12 + │ │ "N4Poco17NotFoundExceptionE: + Not found: POCO_BASE" + │ │ in "<unknown>", line -1 + 4: N7CppUnit10TestCallerI19PKCS12ContainerTestEE.testPEMReadWrite + │ │ "N4Poco17NotFoundExceptionE: + Not found: POCO_BASE" + │ │ in "<unknown>", line -1 + +Upstream-Status: Inappropriate [OE specific] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Signed-off-by: Patrick Wicki <patrick.wicki@siemens.com> +--- + cppignore.lnx | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/cppignore.lnx b/cppignore.lnx +index 2c2376526..65df4af08 100644 +--- a/cppignore.lnx ++++ b/cppignore.lnx +@@ -28,3 +28,12 @@ CppUnit::TestCaller<HTTPSClientSessionTest>.testProxy + CppUnit::TestCaller<HTTPSStreamFactoryTest>.testProxy + CppUnit::TestCaller<DNSTest>.testHostByAddress + CppUnit::TestCaller<DNSTest>.testHostByName ++CppUnit::TestCaller<ProcessTest>.testLaunch ++CppUnit::TestCaller<ProcessTest>.testLaunchRedirectIn ++CppUnit::TestCaller<ProcessTest>.testLaunchRedirectOut ++CppUnit::TestCaller<ProcessTest>.testLaunchEnv ++CppUnit::TestCaller<EVPTest>.testRSAEVPKeyFromPKCS12 ++CppUnit::TestCaller<PKCS12ContainerTest>.testFullPKCS12 ++CppUnit::TestCaller<PKCS12ContainerTest>.testCertsOnlyPKCS12 ++CppUnit::TestCaller<PKCS12ContainerTest>.testPEMReadWrite ++CppUnit::TestCaller<MongoDBTest>.testArray diff --git a/meta-oe/recipes-support/poco/poco/0001-riscv-Enable-double-operations-when-using-double-flo.patch b/meta-oe/recipes-support/poco/poco/0001-riscv-Enable-double-operations-when-using-double-flo.patch deleted file mode 100644 index c0de32dafe..0000000000 --- a/meta-oe/recipes-support/poco/poco/0001-riscv-Enable-double-operations-when-using-double-flo.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 589a5442a841b156a1890bc2d26e7a5103e2f672 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 1 Nov 2019 17:53:50 -0700 -Subject: [PATCH] riscv: Enable double operations when using double float abi - -Upstream-Status: Submitted [https://github.com/pocoproject/poco/pull/2825] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - Foundation/src/utils.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/Foundation/src/utils.h b/Foundation/src/utils.h -index 69cea1aca..ff7a5c9ce 100644 ---- a/Foundation/src/utils.h -+++ b/Foundation/src/utils.h -@@ -63,7 +63,8 @@ - defined(__SH4__) || defined(__alpha__) || \ - defined(_MIPS_ARCH_MIPS32R2) || \ - defined(__AARCH64EL__) || \ -- defined(nios2) || defined(__nios2) || defined(__nios2__) -+ defined(nios2) || defined(__nios2) || defined(__nios2__) || \ -+ (defined(__riscv) && defined(__riscv_float_abi_double)) - #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 - #elif defined(_M_IX86) || defined(__i386__) || defined(__i386) - #if defined(_WIN32) --- -2.23.0 - diff --git a/meta-oe/recipes-support/poco/poco/0002-fix-build-Install-cmake-files-with-resolved-ENABLE_J.patch b/meta-oe/recipes-support/poco/poco/0002-fix-build-Install-cmake-files-with-resolved-ENABLE_J.patch new file mode 100644 index 0000000000..427cb9723a --- /dev/null +++ b/meta-oe/recipes-support/poco/poco/0002-fix-build-Install-cmake-files-with-resolved-ENABLE_J.patch @@ -0,0 +1,32 @@ +From e54478c936493c0ed87e875f04127bd13642de44 Mon Sep 17 00:00:00 2001 +From: tyler92 <tyler92@inbox.ru> +Date: Tue, 21 Nov 2023 05:07:24 +0300 +Subject: [PATCH] fix(build): Install cmake files with resolved ENABLE_JSON and + ENABLE_XML (#4227) + +Upstream-Status: Backport [https://github.com/pocoproject/poco/pull/4227] +Signed-off-by: Adrian Freihofer <adrian.freihofer@siemens.com> + +--- + Util/cmake/PocoUtilConfig.cmake | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Util/cmake/PocoUtilConfig.cmake b/Util/cmake/PocoUtilConfig.cmake +index 90c1eab1c..8186435e1 100644 +--- a/Util/cmake/PocoUtilConfig.cmake ++++ b/Util/cmake/PocoUtilConfig.cmake +@@ -1,9 +1,9 @@ + include(CMakeFindDependencyMacro) + find_dependency(PocoFoundation) +-if(ENABLE_XML) ++if(@ENABLE_XML@) + find_dependency(PocoXML) + endif() +-if(ENABLE_JSON) ++if(@ENABLE_JSON@) + find_dependency(PocoJSON) + endif() + include("${CMAKE_CURRENT_LIST_DIR}/PocoUtilTargets.cmake") +-- +2.43.0 + diff --git a/meta-oe/recipes-support/poco/poco/run-ptest b/meta-oe/recipes-support/poco/poco/run-ptest index c479f7ac10..c8e50fc967 100644 --- a/meta-oe/recipes-support/poco/poco/run-ptest +++ b/meta-oe/recipes-support/poco/poco/run-ptest @@ -1,9 +1,21 @@ #!/bin/sh +export POCO_BASE=/usr/lib/poco/ptest +export LD_LIBRARY_PATH=${POCO_BASE}/bin:${LD_LIBRARY_PATH} +i=0 while read runner; do - pushd . >/dev/null + oldpath=`pwd` >/dev/null cd bin echo Testing $runner - ./$runner-testrunner -all - popd >/dev/null + ./$runner -ignore $oldpath/cppignore.lnx -all + export res$((i++))=$? + cd $oldpath >/dev/null +done < testrunners +i=0 +while read runner; do + eval assign=\$res$((i++)) + if [ $assign -ne 0 ]; then + echo "FAIL: $runner" + else + echo "PASS: $runner" + fi done < testrunners - diff --git a/meta-oe/recipes-support/poco/poco_1.9.4.bb b/meta-oe/recipes-support/poco/poco_1.12.5p2.bb index c854481de3..a0bb0b5d96 100644 --- a/meta-oe/recipes-support/poco/poco_1.9.4.bb +++ b/meta-oe/recipes-support/poco/poco_1.12.5p2.bb @@ -6,15 +6,17 @@ LICENSE = "BSL-1.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=4267f48fc738f50380cbeeb76f95cebc" # These dependencies are required by Foundation -DEPENDS = "libpcre zlib" +DEPENDS = "libpcre2 zlib" -SRC_URI = " \ - git://github.com/pocoproject/poco.git;branch=poco-${PV} \ - file://0001-Don-t-try-to-install-non-existing-Encodings-testsuit.patch \ - file://0001-riscv-Enable-double-operations-when-using-double-flo.patch \ - file://run-ptest \ - " -SRCREV = "b95393dcc3640807838e8323b4e600e54d2e8116" +SRC_URI = "git://github.com/pocoproject/poco.git;branch=master;protocol=https \ + file://0001-Use-std-atomic-int-instead-of-std-atomic-bool.patch \ + file://0001-cppignore.lnx-Ignore-PKCS12-and-testLaunch-test.patch \ + file://run-ptest \ + file://0002-fix-build-Install-cmake-files-with-resolved-ENABLE_J.patch \ + " +SRCREV = "1d6fb3e1383e559cacbada5e3f861c0dafaf5d30" + +UPSTREAM_CHECK_GITTAGREGEX = "poco-(?P<pver>\d+(\.\d+)+)" S = "${WORKDIR}/git" @@ -23,21 +25,29 @@ inherit cmake ptest # By default the most commonly used poco components are built # Foundation is built anyway and doesn't need to be listed explicitly # these don't have dependencies outside oe-core -PACKAGECONFIG ??= "XML JSON MongoDB PDF Util Net NetSSL Crypto Data DataSQLite Zip Encodings Redis" - -PACKAGECONFIG[XML] = "-DENABLE_XML=ON -DEXPAT_LIBRARY:STRING=expat,-DENABLE_XML=OFF,expat" +PACKAGECONFIG ??= "XML JSON PDF Util Net NetSSL Crypto JWT Data DataSQLite Zip Encodings Redis Prometheus" +# MongoDB does not build for all architectures yet keep in sync with COMPATIBLE_HOST list in mongodb recipe +# and mongodb needs meta-python enabled as well +PACKAGECONFIG:remove:riscv32 = "MongoDB" +PACKAGECONFIG:remove:riscv64 = "MongoDB" +PACKAGECONFIG:remove:mipsarch = "MongoDB" +PACKAGECONFIG:remove:powerpc = "MongoDB" + +PACKAGECONFIG[XML] = "-DENABLE_XML=ON,-DENABLE_XML=OFF,expat" PACKAGECONFIG[JSON] = "-DENABLE_JSON=ON,-DENABLE_JSON=OFF" PACKAGECONFIG[MongoDB] = "-DENABLE_MONGODB=ON,-DENABLE_MONGODB=OFF" PACKAGECONFIG[PDF] = "-DENABLE_PDF=ON,-DENABLE_PDF=OFF,zlib" PACKAGECONFIG[Util] = "-DENABLE_UTIL=ON,-DENABLE_UTIL=OFF" PACKAGECONFIG[Net] = "-DENABLE_NET=ON,-DENABLE_NET=OFF" -PACKAGECONFIG[NetSSL] = "-DENABLE_NETSSL=ON -DOPENSSL_SSL_LIBRARY:STRING=ssl -DOPENSSL_CRYPTO_LIBRARY:STRING=crypto,-DENABLE_NETSSL=OFF,openssl" -PACKAGECONFIG[Crypto] = "-DENABLE_CRYPTO=ON -DOPENSSL_SSL_LIBRARY:STRING=ssl -DOPENSSL_CRYPTO_LIBRARY:STRING=crypto,-DENABLE_CRYPTO=OFF,openssl" +PACKAGECONFIG[NetSSL] = "-DENABLE_NETSSL=ON,-DENABLE_NETSSL=OFF,openssl" +PACKAGECONFIG[Crypto] = "-DENABLE_CRYPTO=ON,-DENABLE_CRYPTO=OFF,openssl" +PACKAGECONFIG[JWT] = "-DENABLE_JWT=ON,-DENABLE_JWT=OFF,openssl" PACKAGECONFIG[Data] = "-DENABLE_DATA=ON,-DENABLE_DATA=OFF" PACKAGECONFIG[DataSQLite] = "-DENABLE_DATA_SQLITE=ON -DSQLITE3_LIBRARY:STRING=sqlite3,-DENABLE_DATA_SQLITE=OFF,sqlite3" PACKAGECONFIG[Zip] = "-DENABLE_ZIP=ON,-DENABLE_ZIP=OFF" PACKAGECONFIG[Encodings] = "-DENABLE_ENCODINGS=ON,-DENABLE_ENCODINGS=OFF" PACKAGECONFIG[Redis] = "-DENABLE_REDIS=ON,-DENABLE_REDIS=OFF" +PACKAGECONFIG[Prometheus] = "-DENABLE_PROMETHEUS=ON,-DENABLE_PROMETHEUS=OFF" # Additional components not build by default, # they might have dependencies not included in oe-core @@ -46,35 +56,38 @@ PACKAGECONFIG[mod_poco] = "-DENABLE_APACHECONNECTOR=ON,-DENABLE_APACHECONNECTOR= PACKAGECONFIG[CppParser] = "-DENABLE_CPPPARSER=ON,-DENABLE_CPPPARSER=OFF" PACKAGECONFIG[DataMySQL] = "-DENABLE_DATA_MYSQL=ON -DMYSQL_LIB:STRING=mysqlclient_r,-DENABLE_DATA_MYSQL=OFF,mariadb" PACKAGECONFIG[DataODBC] = "-DENABLE_DATA_ODBC=ON,-DENABLE_DATA_ODBC=OFF,libiodbc" +PACKAGECONFIG[ActiveRecord] = "-DENABLE_ACTIVERECORD=ON,-DENABLE_ACTIVERECORD=OFF" +PACKAGECONFIG[ActiveRecordCompiler] = "-DENABLE_ACTIVERECORD_COMPILER=ON,-DENABLE_ACTIVERECORD_COMPILER=OFF" PACKAGECONFIG[PageCompiler] = "-DENABLE_PAGECOMPILER=ON,-DENABLE_PAGECOMPILER=OFF" PACKAGECONFIG[PageCompilerFile2Page] = "-DENABLE_PAGECOMPILER_FILE2PAGE=ON,-DENABLE_PAGECOMPILER_FILE2PAGE=OFF" PACKAGECONFIG[SevenZip] = "-DENABLE_SEVENZIP=ON,-DENABLE_SEVENZIP=OFF" EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=RelWithDebInfo -DPOCO_UNBUNDLED=ON \ - -DZLIB_LIBRARY_RELEASE:STRING=z -DPCRE_LIBRARY:STRING=pcre \ + -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ ${@bb.utils.contains('PTEST_ENABLED', '1', '-DENABLE_TESTS=ON ', '', d)}" # For the native build we want to use the bundled version -EXTRA_OECMAKE_append_class-native = " -DPOCO_UNBUNDLED=OFF" +EXTRA_OECMAKE:append:class-native = " -DPOCO_UNBUNDLED=OFF" # do not use rpath -EXTRA_OECMAKE_append = " -DCMAKE_SKIP_RPATH=ON" +EXTRA_OECMAKE:append = " -DCMAKE_SKIP_RPATH=ON" + +LDFLAGS:append:riscv32 = "${@bb.utils.contains('PACKAGECONFIG', 'Prometheus', ' -Wl,--no-as-needed -latomic -Wl,--as-needed', '', d)}" +LDFLAGS:append:mips = "${@bb.utils.contains('PACKAGECONFIG', 'Prometheus', ' -Wl,--no-as-needed -latomic -Wl,--as-needed', '', d)}" +LDFLAGS:append:powerpc = "${@bb.utils.contains('PACKAGECONFIG', 'Prometheus', ' -Wl,--no-as-needed -latomic -Wl,--as-needed', '', d)}" -python populate_packages_prepend () { +python populate_packages:prepend () { poco_libdir = d.expand('${libdir}') pn = d.getVar("PN") packages = [] - testrunners = [] def hook(f, pkg, file_regex, output_pattern, modulename): packages.append(pkg) - testrunners.append(modulename) - do_split_packages(d, poco_libdir, '^libPoco(.*)\.so\..*$', + do_split_packages(d, poco_libdir, r'^libPoco(.*)\.so\..*$', 'poco-%s', 'Poco %s component', extra_depends='', prepend=True, hook=hook) - d.setVar("RRECOMMENDS_%s" % pn, " ".join(packages)) - d.setVar("POCO_TESTRUNNERS", "\n".join(testrunners)) + d.setVar("RRECOMMENDS:%s" % pn, " ".join(packages)) } do_install_ptest () { @@ -82,19 +95,25 @@ do_install_ptest () { cp -f ${B}/lib/libCppUnit.so* ${D}${libdir} cp -rf ${B}/*/testsuite/data ${D}${PTEST_PATH}/bin/ find "${D}${PTEST_PATH}" -executable -exec chrpath -d {} \; - echo "${POCO_TESTRUNNERS}" > "${D}${PTEST_PATH}/testrunners" + rm -f ${D}${PTEST_PATH}/testrunners + for f in ${D}${PTEST_PATH}/bin/*-testrunner; do + echo `basename $f` >> ${D}${PTEST_PATH}/testrunners + done + install -Dm 0644 ${S}/cppignore.lnx ${D}${PTEST_PATH}/cppignore.lnx } PACKAGES_DYNAMIC = "poco-.*" # "poco" is a metapackage which pulls in all Poco components -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" # cppunit is only built if tests are enabled PACKAGES =+ "${PN}-cppunit" -FILES_${PN}-cppunit += "${libdir}/libCppUnit.so*" -ALLOW_EMPTY_${PN}-cppunit = "1" +FILES:${PN}-cppunit += "${libdir}/libCppUnit.so*" +ALLOW_EMPTY:${PN}-cppunit = "1" -RDEPENDS_${PN}-ptest += "${PN}-cppunit" +RDEPENDS:${PN}-ptest += "${PN}-cppunit" +RDEPENDS:${PN}-ptest += "${@bb.utils.contains('PACKAGECONFIG', 'MongoDB', 'mongodb', '', d)}" +RDEPENDS:${PN}-ptest += "${@bb.utils.contains('PACKAGECONFIG', 'Redis', 'redis', '', d)}" BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/poppler/poppler-data_0.4.9.bb b/meta-oe/recipes-support/poppler/poppler-data_0.4.12.bb index b2af097154..5433659af4 100644 --- a/meta-oe/recipes-support/poppler/poppler-data_0.4.9.bb +++ b/meta-oe/recipes-support/poppler/poppler-data_0.4.12.bb @@ -1,9 +1,10 @@ SUMMARY = "Encoding files for Poppler" DESCRIPTION = "Encoding files for use with poppler that enable poppler to \ correctly render CJK and Cyrrilic." -LICENSE = "BSD & GPLv2 & GPLv3+" -LIC_FILES_CHKSUM = "file://COPYING;md5=4870b98343f0bbb25fa43b9d2ba59448 \ - file://COPYING.adobe;md5=63c6a8a9df204c00461fa5f163d8a663 \ +HOMEPAGE = "https://poppler.freedesktop.org/" +LICENSE = "BSD-3-Clause & GPL-2.0-only & GPL-3.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=96287d49ec274d9c3222b5f966c132fd \ + file://COPYING.adobe;md5=a790726a74164c30b5de1ef93fd69e99 \ file://COPYING.gpl2;md5=751419260aa954499f7abaabaa882bbe \ " @@ -17,8 +18,7 @@ SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.gz \ ${CMAP_RESOURCES_BASE}/Identity-H;name=idh \ ${CMAP_RESOURCES_BASE}/Identity-V;name=idv" -SRC_URI[md5sum] = "35cc7beba00aa174631466f06732be40" -SRC_URI[sha256sum] = "1f9c7e7de9ecd0db6ab287349e31bf815ca108a5a175cf906a90163bdbe32012" +SRC_URI[sha256sum] = "c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74" SRC_URI[idh.md5sum] = "009c93cf0141ab7bd6acb7eea14306cc" SRC_URI[idh.sha256sum] = "ae702c203a82ea124e9b96590f821db6fbf8754e2c4547a9dba0e82f94739e95" SRC_URI[idv.md5sum] = "2f32a45d43d001c26eeac6b878855fbf" @@ -30,7 +30,7 @@ do_compile() { do_install() { oe_runmake install DESTDIR=${D} prefix=${prefix} datadir=${datadir} install -d ${D}${datadir}/poppler/cMap - install -m644 ${WORKDIR}/Identity-* ${D}${datadir}/poppler/cMap/ + install -m644 ${UNPACKDIR}/Identity-* ${D}${datadir}/poppler/cMap/ } -FILES_${PN} += "${datadir}" +FILES:${PN} += "${datadir}" diff --git a/meta-oe/recipes-support/poppler/poppler/0001-Do-not-overwrite-all-our-build-flags.patch b/meta-oe/recipes-support/poppler/poppler/0001-Do-not-overwrite-all-our-build-flags.patch index 05e0abede6..e07da387b2 100644 --- a/meta-oe/recipes-support/poppler/poppler/0001-Do-not-overwrite-all-our-build-flags.patch +++ b/meta-oe/recipes-support/poppler/poppler/0001-Do-not-overwrite-all-our-build-flags.patch @@ -10,43 +10,46 @@ Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> --- - cmake/modules/PopplerMacros.cmake | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + cmake/modules/PopplerMacros.cmake | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) +diff --git a/cmake/modules/PopplerMacros.cmake b/cmake/modules/PopplerMacros.cmake +index 2aed028..3c30f3f 100644 --- a/cmake/modules/PopplerMacros.cmake +++ b/cmake/modules/PopplerMacros.cmake -@@ -123,14 +123,14 @@ if(CMAKE_COMPILER_IS_GNUCXX) +@@ -117,13 +117,13 @@ if(CMAKE_COMPILER_IS_GNUCXX) + set(DEFAULT_COMPILE_WARNINGS "${_warn}") set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}") - set(_save_cxxflags "${CMAKE_CXX_FLAGS}") -- set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE") -+ set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE ${_save_cxxflags}") - set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}") - set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cxxflags}") - set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cxxflags}") - set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline ${_save_cxxflags}") - set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}") - set(_save_cflags "${CMAKE_C_FLAGS}") +- set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE") ++ set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE ${_save_cxxflags}") + set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g") + set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG") + set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline") + set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline") + set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs") - set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE") + set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE ${_save_cflags}") - set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cflags}") - set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cflags}") - set(CMAKE_C_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cflags}") -@@ -167,7 +167,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL + set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g") + set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG") + set(CMAKE_C_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline") +@@ -161,14 +161,14 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") + set(DEFAULT_COMPILE_WARNINGS "${_warn}") set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}") - set(_save_cxxflags "${CMAKE_CXX_FLAGS}") - set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE") + set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE ${_save_cxxflags}") - set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}") - set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cxxflags}") + set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g") + set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG") # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2 -@@ -175,7 +175,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL - set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline ${_save_cxxflags}") - set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}") - set(_save_cflags "${CMAKE_C_FLAGS}") + set(CMAKE_CXX_FLAGS_DEBUG "-g") + set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline") + set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs") - set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE") + set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE ${_save_cflags}") - set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cflags}") - set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cflags}") + set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g") + set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG") # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2 +-- +2.25.1 + diff --git a/meta-oe/recipes-support/poppler/poppler/0001-cmake-Do-not-use-isystem.patch b/meta-oe/recipes-support/poppler/poppler/0001-cmake-Do-not-use-isystem.patch new file mode 100644 index 0000000000..adbe82263f --- /dev/null +++ b/meta-oe/recipes-support/poppler/poppler/0001-cmake-Do-not-use-isystem.patch @@ -0,0 +1,192 @@ +From 04686340c4cd375a17d60d31bf6943367cc33214 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 21 Jan 2023 03:09:08 -0800 +Subject: [PATCH] cmake: Do not use -isystem + +isystem dirs are searched before the regular system dirs +this exposes an interesting include ordering problem when using +clang + libc++, when including C++ headers like <cstdlib> + +cstdlib includes stdlib.h and in case of libc++, this should be coming +from libc++ as well, which is then eventually including system stdlib.h + +libc++ has added a check for checking this order recently, which means +if cstlib ends up including system stdlib.h before libc++ provided +stdlib.h it errors out + +/mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/thrift/0.17.0-r0/recipe-sysroot/usr/include/c++/v1/cstdlib:90:5: error: <cstdlib> tried including <stdlib.h> but didn't find libc++'s <stdlib.h> header. This usually means that your header search paths are not configured properly. The header search paths should contain the C++ Standard Library headers before any C Standard Library, and you are probably using compiler flags that make that not be the case. + ^ + +The reason is that include_directories with SYSTEM property adds the +directory via -system and some of these directories point to sysroot +e.g. OPENSSL_INCLUDE_DIR which ends up adding -isystem +<sysroot>/usr/include and causes the system stdlib.h to included before +libc++ stdlib.h + +A fix is to use -idirafter which preserved the effects of system headers +but instead of prepending, it will append to system headers and the +issue is addressed + +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- +Upstream-Status: Pending + + CMakeLists.txt | 4 ++-- + glib/CMakeLists.txt | 4 ++-- + qt5/src/CMakeLists.txt | 4 ++-- + qt6/src/CMakeLists.txt | 4 ++-- + test/CMakeLists.txt | 6 +++--- + utils/CMakeLists.txt | 10 +++++----- + 6 files changed, 16 insertions(+), 16 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c6c757c..5f1c540 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -603,10 +603,10 @@ add_library(poppler ${poppler_SRCS}) + if (OpenJPEG_FOUND) + # check if we can remove this when we depend on newer openjpeg versions, 2.5 seems fixed + # target openjp2 may lack interface include directories +- target_include_directories(poppler SYSTEM PRIVATE ${OPENJPEG_INCLUDE_DIRS}) ++ target_include_directories(poppler PRIVATE ${OPENJPEG_INCLUDE_DIRS}) + endif() + if(USE_CMS) +- target_include_directories(poppler SYSTEM PRIVATE ${LCMS2_INCLUDE_DIR}) ++ target_include_directories(poppler PRIVATE ${LCMS2_INCLUDE_DIR}) + endif() + generate_export_header(poppler BASE_NAME poppler-private EXPORT_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/poppler_private_export.h") + set_target_properties(poppler PROPERTIES VERSION 127.0.0 SOVERSION 127) +diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt +index 52e8687..08ab39a 100644 +--- a/glib/CMakeLists.txt ++++ b/glib/CMakeLists.txt +@@ -4,7 +4,7 @@ include_directories( + ) + + include_directories( +- SYSTEM ++ + ${GLIB2_INCLUDE_DIRS} + ${CAIRO_INCLUDE_DIRS} + ) +@@ -96,7 +96,7 @@ if(MINGW AND BUILD_SHARED_LIBS) + set_target_properties(poppler-glib PROPERTIES SUFFIX "-${POPPLER_GLIB_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}") + endif() + target_link_libraries(poppler-glib poppler PkgConfig::GLIB2 ${CAIRO_LIBRARIES} Freetype::Freetype) +-target_include_directories(poppler-glib SYSTEM PRIVATE ${CAIRO_INCLUDE_DIRS}) ++target_include_directories(poppler-glib PRIVATE ${CAIRO_INCLUDE_DIRS}) + install(TARGETS poppler-glib RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + + install(FILES +diff --git a/qt5/src/CMakeLists.txt b/qt5/src/CMakeLists.txt +index 5db3a6c..f242d29 100644 +--- a/qt5/src/CMakeLists.txt ++++ b/qt5/src/CMakeLists.txt +@@ -45,11 +45,11 @@ if(MINGW AND BUILD_SHARED_LIBS) + endif() + target_link_libraries(poppler-qt5 poppler Qt5::Core Qt5::Gui Qt5::Xml Freetype::Freetype) + if (ENABLE_NSS3) +- target_include_directories(poppler-qt5 SYSTEM PRIVATE ${NSS3_INCLUDE_DIRS}) ++ target_include_directories(poppler-qt5 PRIVATE ${NSS3_INCLUDE_DIRS}) + endif() + if(USE_CMS) + target_link_libraries(poppler-qt5 poppler ${LCMS2_LIBRARIES}) +- target_include_directories(poppler-qt5 SYSTEM PRIVATE ${LCMS2_INCLUDE_DIR}) ++ target_include_directories(poppler-qt5 PRIVATE ${LCMS2_INCLUDE_DIR}) + endif() + install(TARGETS poppler-qt5 RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + +diff --git a/qt6/src/CMakeLists.txt b/qt6/src/CMakeLists.txt +index cd91975..6c42e12 100644 +--- a/qt6/src/CMakeLists.txt ++++ b/qt6/src/CMakeLists.txt +@@ -45,11 +45,11 @@ if(MINGW AND BUILD_SHARED_LIBS) + endif() + target_link_libraries(poppler-qt6 poppler Qt6::Core Qt6::Gui Freetype::Freetype) + if (ENABLE_NSS3) +- target_include_directories(poppler-qt6 SYSTEM PRIVATE ${NSS3_INCLUDE_DIRS}) ++ target_include_directories(poppler-qt6 PRIVATE ${NSS3_INCLUDE_DIRS}) + endif() + if(USE_CMS) + target_link_libraries(poppler-qt6 poppler ${LCMS2_LIBRARIES}) +- target_include_directories(poppler-qt6 SYSTEM PRIVATE ${LCMS2_INCLUDE_DIR}) ++ target_include_directories(poppler-qt6 PRIVATE ${LCMS2_INCLUDE_DIR}) + endif() + install(TARGETS poppler-qt6 RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + +diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt +index afa1352..9bd3b9a 100644 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -23,7 +23,7 @@ if (GTK_FOUND) + ) + poppler_add_test(gtk-test BUILD_GTK_TESTS ${gtk_splash_test_SRCS}) + target_link_libraries(gtk-test ${CAIRO_LIBRARIES} poppler-glib PkgConfig::GTK3) +- target_include_directories(gtk-test SYSTEM PRIVATE ${CAIRO_INCLUDE_DIRS}) ++ target_include_directories(gtk-test PRIVATE ${CAIRO_INCLUDE_DIRS}) + + if (HAVE_CAIRO) + +@@ -35,7 +35,7 @@ if (GTK_FOUND) + ) + poppler_add_test(pdf-inspector BUILD_GTK_TESTS ${pdf_inspector_SRCS}) + target_link_libraries(pdf-inspector ${CAIRO_LIBRARIES} Freetype::Freetype ${common_libs} PkgConfig::GTK3 poppler) +- target_include_directories(pdf-inspector SYSTEM PRIVATE ${CAIRO_INCLUDE_DIRS}) ++ target_include_directories(pdf-inspector PRIVATE ${CAIRO_INCLUDE_DIRS}) + target_compile_definitions(pdf-inspector PRIVATE -DSRC_DIR="${CMAKE_CURRENT_SOURCE_DIR}") + endif () + +@@ -59,7 +59,7 @@ if (HAVE_CAIRO) + ) + add_executable(cairo-thread-test ${cairo_thread_test_SRCS}) + target_link_libraries(cairo-thread-test ${CAIRO_LIBRARIES} Freetype::Freetype Threads::Threads poppler) +- target_include_directories(cairo-thread-test SYSTEM PRIVATE ${CAIRO_INCLUDE_DIRS}) ++ target_include_directories(cairo-thread-test PRIVATE ${CAIRO_INCLUDE_DIRS}) + endif () + endif () + +diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt +index 1c3ebcb..bc1840a 100644 +--- a/utils/CMakeLists.txt ++++ b/utils/CMakeLists.txt +@@ -16,7 +16,7 @@ add_executable(pdftoppm ${pdftoppm_SOURCES}) + target_link_libraries(pdftoppm ${common_libs}) + if(LCMS2_FOUND) + target_link_libraries(pdftoppm ${LCMS2_LIBRARIES}) +- target_include_directories(pdftoppm SYSTEM PRIVATE ${LCMS2_INCLUDE_DIR}) ++ target_include_directories(pdftoppm PRIVATE ${LCMS2_INCLUDE_DIR}) + endif() + install(TARGETS pdftoppm DESTINATION bin) + install(FILES pdftoppm.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) +@@ -37,10 +37,10 @@ if (HAVE_CAIRO) + add_definitions(${CAIRO_CFLAGS}) + add_executable(pdftocairo ${pdftocairo_SOURCES}) + target_link_libraries(pdftocairo ${CAIRO_LIBRARIES} Freetype::Freetype ${common_libs}) +- target_include_directories(pdftocairo SYSTEM PRIVATE ${CAIRO_INCLUDE_DIRS}) ++ target_include_directories(pdftocairo PRIVATE ${CAIRO_INCLUDE_DIRS}) + if(LCMS2_FOUND) + target_link_libraries(pdftocairo ${LCMS2_LIBRARIES}) +- target_include_directories(pdftocairo SYSTEM PRIVATE ${LCMS2_INCLUDE_DIR}) ++ target_include_directories(pdftocairo PRIVATE ${LCMS2_INCLUDE_DIR}) + endif() + install(TARGETS pdftocairo DESTINATION bin) + install(FILES pdftocairo.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) +@@ -99,7 +99,7 @@ if (ENABLE_NSS3) + pdfsig.cc + ) + add_executable(pdfsig ${pdfsig_SOURCES}) +- target_include_directories(pdfsig SYSTEM PRIVATE ${NSS3_INCLUDE_DIRS}) ++ target_include_directories(pdfsig PRIVATE ${NSS3_INCLUDE_DIRS}) + target_link_libraries(pdfsig ${common_libs}) + install(TARGETS pdfsig DESTINATION bin) + install(FILES pdfsig.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) +@@ -114,7 +114,7 @@ add_executable(pdftops ${pdftops_SOURCES}) + target_link_libraries(pdftops ${common_libs}) + if(LCMS2_FOUND) + target_link_libraries(pdftops ${LCMS2_LIBRARIES}) +- target_include_directories(pdftops SYSTEM PRIVATE ${LCMS2_INCLUDE_DIR}) ++ target_include_directories(pdftops PRIVATE ${LCMS2_INCLUDE_DIR}) + endif() + install(TARGETS pdftops DESTINATION bin) + install(FILES pdftops.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) diff --git a/meta-oe/recipes-support/poppler/poppler/CVE-2023-34872.patch b/meta-oe/recipes-support/poppler/poppler/CVE-2023-34872.patch new file mode 100644 index 0000000000..cc942fad77 --- /dev/null +++ b/meta-oe/recipes-support/poppler/poppler/CVE-2023-34872.patch @@ -0,0 +1,46 @@ +From 591235c8b6c65a2eee88991b9ae73490fd9afdfe Mon Sep 17 00:00:00 2001 +From: Albert Astals Cid <aacid@kde.org> +Date: Fri, 18 Aug 2023 11:36:06 +0000 +Subject: [PATCH] OutlineItem::open: Fix crash on malformed files + +Fixes #1399 + +CVE: CVE-2023-34872 + +Upstream-Status: Backport [https://gitlab.freedesktop.org/poppler/poppler/-/commit/591235c8b6c65a2eee88991b9ae73490fd9afdfe] + +Signed-off-by: Yogita Urade <yogita.urade@windriver.com> +--- + poppler/Outline.cc | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/poppler/Outline.cc b/poppler/Outline.cc +index cbb6cb4..4c68be9 100644 +--- a/poppler/Outline.cc ++++ b/poppler/Outline.cc +@@ -14,7 +14,7 @@ + // under GPL version 2 or later + // + // Copyright (C) 2005 Marco Pesenti Gritti <mpg@redhat.com> +-// Copyright (C) 2008, 2016-2019, 2021 Albert Astals Cid <aacid@kde.org> ++// Copyright (C) 2008, 2016-2019, 2021, 2023 Albert Astals Cid <aacid@kde.org> + // Copyright (C) 2009 Nick Jones <nick.jones@network-box.com> + // Copyright (C) 2016 Jason Crain <jason@aquaticape.us> + // Copyright (C) 2017 Adrian Johnson <ajohnson@redneon.com> +@@ -483,8 +483,12 @@ void OutlineItem::open() + { + if (!kids) { + Object itemDict = xref->fetch(ref); +- const Object &firstRef = itemDict.dictLookupNF("First"); +- kids = readItemList(this, &firstRef, xref, doc); ++ if (itemDict.isDict()) { ++ const Object &firstRef = itemDict.dictLookupNF("First"); ++ kids = readItemList(this, &firstRef, xref, doc); ++ } else { ++ kids = new std::vector<OutlineItem *>(); ++ } + } + } + +-- +2.35.5 diff --git a/meta-oe/recipes-support/poppler/poppler/basename-include.patch b/meta-oe/recipes-support/poppler/poppler/basename-include.patch index c18a5f5c0e..4a18ba3504 100644 --- a/meta-oe/recipes-support/poppler/poppler/basename-include.patch +++ b/meta-oe/recipes-support/poppler/poppler/basename-include.patch @@ -5,6 +5,9 @@ Subject: [PATCH 3/3] Minic GNU basename() API for non-glibc library e.g. musl Upstream-Status: Pending +Rework for poppler 0.90.1 +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> + Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com> --- @@ -12,20 +15,20 @@ Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com> 1 file changed, 4 insertions(+) diff --git a/goo/gbasename.cc b/goo/gbasename.cc -index 830c1c80..e93eb368 100644 +index 69236d8..3858415 100644 --- a/goo/gbasename.cc +++ b/goo/gbasename.cc @@ -46,6 +46,10 @@ - #include <stdlib.h> - #include <string.h> + #include <cstdlib> + #include <cstring> +#if !defined(__GLIBC__) +#define basename(src) (strrchr(src,'/') ? strrchr(src,'/')+1 : src) +#endif + - std::string gbasename(const char* filename) + std::string gbasename(const char *filename) { #ifdef _MSC_VER -- -2.17.0 +2.21.3 diff --git a/meta-oe/recipes-support/poppler/poppler/jpeg-stdio.patch b/meta-oe/recipes-support/poppler/poppler/jpeg-stdio.patch new file mode 100644 index 0000000000..70ba1cf123 --- /dev/null +++ b/meta-oe/recipes-support/poppler/poppler/jpeg-stdio.patch @@ -0,0 +1,41 @@ +From 2986f06c7cc9d64a506ebe861b8bf38f73386e86 Mon Sep 17 00:00:00 2001 +From: Jordan Abrahams-Whitehead <ajordanr@google.com> +Date: Tue, 16 May 2023 18:52:19 +0000 +Subject: [PATCH] Add missing #include <cstdio> prior to jpeglib.h + +Fixes #1398 + +Upstream-Status: Backport +Signed-off-by: Ross Burton <ross.burton@arm.com> +--- + goo/JpegWriter.cc | 2 +- + poppler/ImageEmbeddingUtils.cc | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/goo/JpegWriter.cc b/goo/JpegWriter.cc +index ca69fd055..566ee38f8 100644 +--- a/goo/JpegWriter.cc ++++ b/goo/JpegWriter.cc +@@ -23,7 +23,7 @@ + #ifdef ENABLE_LIBJPEG + + # include "poppler/Error.h" +- ++# include <cstdio> + extern "C" { + # include <jpeglib.h> + } +diff --git a/poppler/ImageEmbeddingUtils.cc b/poppler/ImageEmbeddingUtils.cc +index 0c13fe968..07b9dfb62 100644 +--- a/poppler/ImageEmbeddingUtils.cc ++++ b/poppler/ImageEmbeddingUtils.cc +@@ -14,6 +14,7 @@ + + #include <memory> + #ifdef ENABLE_LIBJPEG ++# include <cstdio> + extern "C" { + # include <jpeglib.h> + } +-- +GitLab diff --git a/meta-oe/recipes-support/poppler/poppler_0.82.0.bb b/meta-oe/recipes-support/poppler/poppler_23.04.0.bb index 37f859353d..f4411e1163 100644 --- a/meta-oe/recipes-support/poppler/poppler_0.82.0.bb +++ b/meta-oe/recipes-support/poppler/poppler_23.04.0.bb @@ -1,19 +1,22 @@ SUMMARY = "Poppler is a PDF rendering library based on the xpdf-3.0 code base" -LICENSE = "GPLv2" +HOMEPAGE = "https://poppler.freedesktop.org/" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \ file://0001-Do-not-overwrite-all-our-build-flags.patch \ file://basename-include.patch \ + file://0001-cmake-Do-not-use-isystem.patch \ + file://jpeg-stdio.patch \ + file://CVE-2023-34872.patch \ " -SRC_URI[md5sum] = "4d6106c2382c5e66072e0b355acc3640" -SRC_URI[sha256sum] = "234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df" +SRC_URI[sha256sum] = "b6d893dc7dcd4138b9e9df59a13c59695e50e80dc5c2cacee0674670693951a1" -DEPENDS = "fontconfig zlib cairo lcms glib-2.0" +DEPENDS = "fontconfig zlib cairo lcms glib-2.0 glib-2.0-native" inherit cmake pkgconfig gobject-introspection -PACKAGECONFIG ??= "jpeg openjpeg png tiff nss ${@bb.utils.contains('BBFILE_COLLECTIONS', 'qt5-layer', 'qt5', '', d)}" +PACKAGECONFIG ??= "jpeg openjpeg png tiff nss splash" PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON -DENABLE_DCTDECODER=libjpeg,-DWITH_JPEG=OFF -DENABLE_DCTDECODER=none,jpeg" PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng" PACKAGECONFIG[tiff] = "-DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff" @@ -21,6 +24,7 @@ PACKAGECONFIG[curl] = "-DENABLE_LIBCURL=ON,-DENABLE_LIBCURL=OFF,curl" PACKAGECONFIG[openjpeg] = "-DENABLE_LIBOPENJPEG=openjpeg2,-DENABLE_LIBOPENJPEG=none,openjpeg" PACKAGECONFIG[qt5] = "-DENABLE_QT5=ON,-DENABLE_QT5=OFF,qtbase qttools-native" PACKAGECONFIG[nss] = "-DWITH_NSS3=ON,-DWITH_NSS3=OFF,nss" +PACKAGECONFIG[splash] = "-DENABLE_SPLASH=ON -DENABLE_BOOST=ON,-DENABLE_SPLASH=OFF -DENABLE_BOOST=OFF,boost" # surprise - did not expect this to work :) inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'cmake_qt5', '', d)} @@ -32,11 +36,13 @@ EXTRA_OECMAKE += " \ -DENABLE_UNSTABLE_API_ABI_HEADERS=ON \ -DBUILD_GTK_TESTS=OFF \ -DENABLE_ZLIB=ON \ + -DRUN_GPERF_IF_PRESENT=OFF \ -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES:PATH='${STAGING_INCDIR}' \ ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_GOBJECT_INTROSPECTION=ON', '-DENABLE_GOBJECT_INTROSPECTION=OFF', d)} \ " +EXTRA_OECMAKE:append:class-native = " -DENABLE_CPP=OFF" -do_configure_append() { +do_configure:append() { # poppler macro uses pkg-config to check for g-ir runtimes. Something # makes them point to /usr/bin. Align them to sysroot - that's where the # gir-wrappers are: @@ -44,7 +50,9 @@ do_configure_append() { } PACKAGES =+ "libpoppler libpoppler-glib" -FILES_libpoppler = "${libdir}/libpoppler.so.*" -FILES_libpoppler-glib = "${libdir}/libpoppler-glib.so.*" +FILES:libpoppler = "${libdir}/libpoppler.so.*" +FILES:libpoppler-glib = "${libdir}/libpoppler-glib.so.*" -RDEPENDS_libpoppler = "poppler-data" +RDEPENDS:libpoppler = "poppler-data" + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/portaudio/files/ldflags.patch b/meta-oe/recipes-support/portaudio/files/ldflags.patch deleted file mode 100644 index aca93a51f2..0000000000 --- a/meta-oe/recipes-support/portaudio/files/ldflags.patch +++ /dev/null @@ -1,51 +0,0 @@ -Upstream forgot to pass LDFLAGS to everything apart from the main library. - -Upstream-Status: Pending -Signed-off-by: Ross Burton <ross.burton@intel.com> - -diff --git a/Makefile.in b/Makefile.in -index 5e1a764..61ecdd1 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -171,20 +171,20 @@ lib/$(PALIB): lib-stamp $(LTOBJS) $(MAKEFILE) $(PAINC) - @WITH_ASIO_TRUE@ $(LIBTOOL) --mode=link --tag=CXX $(CXX) $(PA_LDFLAGS) -o lib/$(PALIB) $(LTOBJS) $(DLL_LIBS) - - $(ALL_TESTS): bin/%: lib/$(PALIB) $(MAKEFILE) $(PAINC) test/%.c -- @WITH_ASIO_FALSE@ $(LIBTOOL) --mode=link $(CC) -o $@ $(CFLAGS) $(top_srcdir)/test/$*.c lib/$(PALIB) $(LIBS) -- @WITH_ASIO_TRUE@ $(LIBTOOL) --mode=link --tag=CXX $(CXX) -o $@ $(CXXFLAGS) $(top_srcdir)/test/$*.c lib/$(PALIB) $(LIBS) -+ @WITH_ASIO_FALSE@ $(LIBTOOL) --mode=link $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(top_srcdir)/test/$*.c lib/$(PALIB) $(LIBS) -+ @WITH_ASIO_TRUE@ $(LIBTOOL) --mode=link --tag=CXX $(CXX) -o $@ $(CXXFLAGS) $(LDFLAGS) $(top_srcdir)/test/$*.c lib/$(PALIB) $(LIBS) - - $(EXAMPLES): bin/%: lib/$(PALIB) $(MAKEFILE) $(PAINC) examples/%.c -- @WITH_ASIO_FALSE@ $(LIBTOOL) --mode=link $(CC) -o $@ $(CFLAGS) $(top_srcdir)/examples/$*.c lib/$(PALIB) $(LIBS) -- @WITH_ASIO_TRUE@ $(LIBTOOL) --mode=link --tag=CXX $(CXX) -o $@ $(CXXFLAGS) $(top_srcdir)/examples/$*.c lib/$(PALIB) $(LIBS) -+ @WITH_ASIO_FALSE@ $(LIBTOOL) --mode=link $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(top_srcdir)/examples/$*.c lib/$(PALIB) $(LIBS) -+ @WITH_ASIO_TRUE@ $(LIBTOOL) --mode=link --tag=CXX $(CXX) -o $@ $(CXXFLAGS) $(LDFLAGS) $(top_srcdir)/examples/$*.c lib/$(PALIB) $(LIBS) - - $(SELFTESTS): bin/%: lib/$(PALIB) $(MAKEFILE) $(PAINC) qa/%.c -- @WITH_ASIO_FALSE@ $(LIBTOOL) --mode=link $(CC) -o $@ $(CFLAGS) $(top_srcdir)/qa/$*.c lib/$(PALIB) $(LIBS) -- @WITH_ASIO_TRUE@ $(LIBTOOL) --mode=link --tag=CXX $(CXX) -o $@ $(CXXFLAGS) $(top_srcdir)/qa/$*.c lib/$(PALIB) $(LIBS) -+ @WITH_ASIO_FALSE@ $(LIBTOOL) --mode=link $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(top_srcdir)/qa/$*.c lib/$(PALIB) $(LIBS) -+ @WITH_ASIO_TRUE@ $(LIBTOOL) --mode=link --tag=CXX $(CXX) -o $@ $(CXXFLAGS) $(LDFLAGS) $(top_srcdir)/qa/$*.c lib/$(PALIB) $(LIBS) - - bin/paloopback: lib/$(PALIB) $(MAKEFILE) $(PAINC) $(LOOPBACK_OBJS) -- @WITH_ASIO_FALSE@ $(LIBTOOL) --mode=link $(CC) -o $@ $(CFLAGS) $(LOOPBACK_OBJS) lib/$(PALIB) $(LIBS) -- @WITH_ASIO_TRUE@ $(LIBTOOL) --mode=link --tag=CXX $(CXX) -o $@ $(CXXFLAGS) $(LOOPBACK_OBJS) lib/$(PALIB) $(LIBS) -+ @WITH_ASIO_FALSE@ $(LIBTOOL) --mode=link $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(LOOPBACK_OBJS) lib/$(PALIB) $(LIBS) -+ @WITH_ASIO_TRUE@ $(LIBTOOL) --mode=link --tag=CXX $(CXX) -o $@ $(CXXFLAGS) $(LDFLAGS) $(LOOPBACK_OBJS) lib/$(PALIB) $(LIBS) - - install: lib/$(PALIB) portaudio-2.0.pc - $(INSTALL) -d $(DESTDIR)$(libdir) -@@ -224,10 +224,10 @@ distclean: clean - $(CC) -c $(CFLAGS) $< -o $@ - - %.lo: %.c $(MAKEFILE) $(PAINC) -- $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $< -o $@ -+ $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $(LDFLAGS) $< -o $@ - - %.lo: %.cpp $(MAKEFILE) $(PAINC) -- $(LIBTOOL) --mode=compile --tag=CXX $(CXX) -c $(CXXFLAGS) $< -o $@ -+ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) -c $(CXXFLAGS) $(LDFLAGS) $< -o $@ - - %.o: %.cpp $(MAKEFILE) $(PAINC) - $(CXX) -c $(CXXFLAGS) $< -o $@ diff --git a/meta-oe/recipes-support/portaudio/portaudio-v19_19.7.0.bb b/meta-oe/recipes-support/portaudio/portaudio-v19_19.7.0.bb new file mode 100644 index 0000000000..2bf4d0a449 --- /dev/null +++ b/meta-oe/recipes-support/portaudio/portaudio-v19_19.7.0.bb @@ -0,0 +1,29 @@ +SUMMARY = "A portable audio library" +SECTION = "libs/multimedia" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=26107732c2ab637c5710446fcfaf02df" + +PV .= "+git" + +SRC_URI = "git://github.com/PortAudio/portaudio.git;branch=master;protocol=https" +SRCREV = "929e2e8f7af281c5eb4fa07758930d542ec43d97" + +S = "${WORKDIR}/git" + +inherit cmake pkgconfig + +EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON" + +PACKAGECONFIG ??= "alsa jack" +PACKAGECONFIG[alsa] = ",,alsa-lib" +PACKAGECONFIG[jack] = ",,jack" +PACKAGECONFIG[examples] = "-DPA_BUILD_EXAMPLES=ON,-DPA_BUILD_EXAMPLES=OFF" + +do_install:append() { + if [ -d ${B}/examples ]; then + install -d ${D}${bindir} + for example in ${B}/examples/pa*; do + install -m755 $example ${D}${bindir}/ + done + fi +} diff --git a/meta-oe/recipes-support/portaudio/portaudio-v19_20161030.bb b/meta-oe/recipes-support/portaudio/portaudio-v19_20161030.bb deleted file mode 100644 index 489f8ad9e2..0000000000 --- a/meta-oe/recipes-support/portaudio/portaudio-v19_20161030.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "A portable audio library" -SECTION = "libs/multimedia" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=26107732c2ab637c5710446fcfaf02df" - -PV = "v190600" - -SRC_URI = "http://www.portaudio.com/archives/pa_stable_v190600_20161030.tgz \ - file://ldflags.patch" -SRC_URI[md5sum] = "4df8224e047529ca9ad42f0521bf81a8" -SRC_URI[sha256sum] = "f5a21d7dcd6ee84397446fa1fa1a0675bb2e8a4a6dceb4305a8404698d8d1513" - -S = "${WORKDIR}/portaudio" - -inherit autotools pkgconfig - -PACKAGECONFIG ??= "alsa jack" -PACKAGECONFIG[alsa] = "--with-alsa, --without-alsa, alsa-lib," -PACKAGECONFIG[jack] = "--with-jack, --without-jack, jack," - -EXTRA_OECONF = "--without-oss --without-asihpi" - -do_install_append() { - mkdir --parents ${D}${bindir} - for b in ${B}/bin/pa*; do - # Bit nasty, should always work - ${B}/*-libtool --mode install install $b ${D}${bindir} - done -} - -PACKAGES += "portaudio-examples" -FILES_portaudio-examples = "${bindir}" diff --git a/meta-oe/recipes-support/pps-tools/pps-tools_1.0.2.bb b/meta-oe/recipes-support/pps-tools/pps-tools_1.0.3.bb index c8baa5d9ca..65c06c1bd5 100644 --- a/meta-oe/recipes-support/pps-tools/pps-tools_1.0.2.bb +++ b/meta-oe/recipes-support/pps-tools/pps-tools_1.0.3.bb @@ -1,15 +1,15 @@ SUMMARY = "User-space tools for LinuxPPS" HOMEPAGE = "http://linuxpps.org" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -SRCREV = "cb48b7ecf7079ceba7081c78d4e61e507b0e8d2d" -SRC_URI = "git://github.com/ago/pps-tools.git" +SRCREV = "c50cb7183e252b47308fa22f420e0a877277aa29" +SRC_URI = "git://github.com/ago/pps-tools.git;branch=master;protocol=https" S = "${WORKDIR}/git" -RDEPENDS_${PN} = "bash" +RDEPENDS:${PN} = "bash" do_install() { install -d ${D}${bindir} ${D}${includedir} \ diff --git a/meta-oe/recipes-support/procmail/procmail/from-debian-to-fix-compile-errors.patch b/meta-oe/recipes-support/procmail/procmail/from-debian-to-fix-compile-errors.patch index 8341a8ecde..c1f9ce7eca 100644 --- a/meta-oe/recipes-support/procmail/procmail/from-debian-to-fix-compile-errors.patch +++ b/meta-oe/recipes-support/procmail/procmail/from-debian-to-fix-compile-errors.patch @@ -5,6 +5,8 @@ Subject: [PATCH 1/3] From debian to fix compile errors Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> --- +Upstream-Status: Pending + src/Makefile.0 | 7 +++---- src/autoconf | 64 +++++++++++++------------------------------------------- src/comsat.c | 65 +++++++++++++++++++-------------------------------------- diff --git a/meta-oe/recipes-support/procmail/procmail/from-debian-to-fix-man-file.patch b/meta-oe/recipes-support/procmail/procmail/from-debian-to-fix-man-file.patch index 7b3c643b2b..78ac6241d0 100644 --- a/meta-oe/recipes-support/procmail/procmail/from-debian-to-fix-man-file.patch +++ b/meta-oe/recipes-support/procmail/procmail/from-debian-to-fix-man-file.patch @@ -5,6 +5,8 @@ Subject: [PATCH 2/3] From debian to fix man file Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> --- +Upstream-Status: Pending + man/procmail.man | 24 +++++++++++++++++------- man/procmailrc.man | 2 +- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/meta-oe/recipes-support/procmail/procmail/from-debian-to-modify-parameters.patch b/meta-oe/recipes-support/procmail/procmail/from-debian-to-modify-parameters.patch index a94e436703..2bebccc0b2 100644 --- a/meta-oe/recipes-support/procmail/procmail/from-debian-to-modify-parameters.patch +++ b/meta-oe/recipes-support/procmail/procmail/from-debian-to-modify-parameters.patch @@ -5,6 +5,8 @@ Subject: [PATCH 3/3] From debian to modify parameters Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> --- +Upstream-Status: Pending + Makefile | 16 ++++++++-------- config.h | 13 +++++++------ 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/meta-oe/recipes-support/procmail/procmail/man-file-mailstat.1-from-debian.patch b/meta-oe/recipes-support/procmail/procmail/man-file-mailstat.1-from-debian.patch index 46d973e060..72fa27a834 100644 --- a/meta-oe/recipes-support/procmail/procmail/man-file-mailstat.1-from-debian.patch +++ b/meta-oe/recipes-support/procmail/procmail/man-file-mailstat.1-from-debian.patch @@ -5,6 +5,8 @@ Subject: [PATCH] man file mailstat.1 from debian Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> --- +Upstream-Status: Pending + debian/mailstat.1 | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 debian/mailstat.1 diff --git a/meta-oe/recipes-support/procmail/procmail_3.22.bb b/meta-oe/recipes-support/procmail/procmail_3.22.bb index 6160733b3d..16917666a4 100644 --- a/meta-oe/recipes-support/procmail/procmail_3.22.bb +++ b/meta-oe/recipes-support/procmail/procmail_3.22.bb @@ -16,7 +16,7 @@ SRC_URI = "http://www.ring.gr.jp/archives/net/mail/${BPN}/${BP}.tar.gz \ SRC_URI[md5sum] = "1678ea99b973eb77eda4ecf6acae53f1" SRC_URI[sha256sum] = "087c75b34dd33d8b9df5afe9e42801c9395f4bf373a784d9bc97153b0062e117" -LICENSE = "GPL-2.0 & Artistic-1.0" +LICENSE = "GPL-2.0-only & Artistic-1.0" LIC_FILES_CHKSUM = "file://COPYING;md5=a71e50e197a992c862379e576e669757 \ file://Artistic;md5=505e00d03c3428cde21b17b2a386590e" @@ -43,3 +43,5 @@ do_install() { oe_runmake -i BASENAME=${D}/usr MANDIR=${D}${mandir} install install -m 0644 debian/mailstat.1 ${D}${mandir}/man1 } + +CVE_STATUS[CVE-1999-0475] = "fixed-version: No action required. The current version (3.22) is not affected by the CVE." diff --git a/meta-oe/recipes-support/psutils/psutils_2.10.bb b/meta-oe/recipes-support/psutils/psutils_2.10.bb new file mode 100644 index 0000000000..1f1894a5f2 --- /dev/null +++ b/meta-oe/recipes-support/psutils/psutils_2.10.bb @@ -0,0 +1,24 @@ +LICENSE = "GPL-3.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=87212b5f1ae096371049a12f80034f32" + +SRC_URI = "https://github.com/rrthomas/psutils/releases/download/v${PV}/psutils-${PV}.tar.gz" +SRC_URI[sha256sum] = "6f8339fd5322df5c782bfb355d9f89e513353220fca0700a5a28775404d7e98b" + +inherit perlnative autotools + +export PERL="/usr/bin/env perl" + +DEPENDS += "libpaper-native" + +do_install:append() { + sed -i -e 's|${STAGING_BINDIR_NATIVE}/perl-native/|/usr/bin/env |g' ${D}${bindir}/pstops + for f in psbook psresize psnup psselect; do + grep -v '${B}' ${D}${bindir}/$f > ${D}${bindir}/$f.temp + install -m 0755 ${D}${bindir}/$f.temp ${D}${bindir}/$f + rm -f ${D}${bindir}/$f.temp + done +} + +BBCLASSEXTEND += "native" +# /usr/bin/pstops contained in package psutils requires perl +RDEPENDS:${PN} += "perl" diff --git a/meta-oe/recipes-support/pv/pv/0001-pv-display-handle-error-of-tcgetpgrp-in-pv_in_foregr.patch b/meta-oe/recipes-support/pv/pv/0001-pv-display-handle-error-of-tcgetpgrp-in-pv_in_foregr.patch new file mode 100644 index 0000000000..c51fb1cfdb --- /dev/null +++ b/meta-oe/recipes-support/pv/pv/0001-pv-display-handle-error-of-tcgetpgrp-in-pv_in_foregr.patch @@ -0,0 +1,40 @@ +From c5cd932fb08e7ce90cdbf9ae6c5cc7e65ac0738e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Michael=20Wei=C3=9F?= <michael.weiss@aisec.fraunhofer.de> +Date: Tue, 9 May 2023 20:00:26 +0200 +Subject: [PATCH] pv/display: handle error of tcgetpgrp() in pv_in_foreground() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Show pv progress bar even if no terminal is set, e.g., in a busybox +init script. The description of pv_in_forground() states it will +return true "if we aren't outputting to a terminal". However, this +is not the case since tcgetpgrg() will return an error and set ERRNO +to ENOTTY if the output fd is not an tty. We now handle this error +correctly and pv_in_foreground() returns also true in that case. + +Signed-off-by: Michael Weiß <michael.weiss@aisec.fraunhofer.de> +--- +Upstream-Status: Pending + + src/pv/display.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/pv/display.c b/src/pv/display.c +index aff643b..8d1f4c9 100644 +--- a/src/pv/display.c ++++ b/src/pv/display.c +@@ -48,6 +48,10 @@ bool pv_in_foreground(void) + + our_process_group = getpgrp(); + tty_process_group = tcgetpgrp(STDERR_FILENO); ++ ++ if (tty_process_group == -1 && errno == ENOTTY) ++ return true; ++ + if (our_process_group == tty_process_group) + return true; + +-- +2.30.2 + diff --git a/meta-oe/recipes-support/pv/pv/run-ptest b/meta-oe/recipes-support/pv/pv/run-ptest new file mode 100644 index 0000000000..3f5956f4c0 --- /dev/null +++ b/meta-oe/recipes-support/pv/pv/run-ptest @@ -0,0 +1,7 @@ +#!/bin/sh + +rm -rf tests.log +sh -e run-test.sh pv . > tests.log 2>&1 +sed -e 's|\(.*\):.*OK|PASS: \1|' \ + -e 's|\(.*\):.*FAILED|FAIL: \1|' \ + tests.log diff --git a/meta-oe/recipes-support/pv/pv_1.6.20.bb b/meta-oe/recipes-support/pv/pv_1.6.20.bb new file mode 100644 index 0000000000..6a739af927 --- /dev/null +++ b/meta-oe/recipes-support/pv/pv_1.6.20.bb @@ -0,0 +1,28 @@ +SUMMARY = "Terminal-based tool for monitoring the progress of data through a pipeline" +HOMEPAGE = "http://www.ivarch.com/programs/pv.shtml" + +LICENSE = "Artistic-2.0" +LIC_FILES_CHKSUM = "file://doc/COPYING;md5=9c50db2589ee3ef10a9b7b2e50ce1d02" + +SRC_URI = "https://www.ivarch.com/programs/sources/${BP}.tar.bz2 \ + file://0001-pv-display-handle-error-of-tcgetpgrp-in-pv_in_foregr.patch \ + file://run-ptest \ +" +SRC_URI[sha256sum] = "e831951eff0718fba9b1ef286128773b9d0e723e1fbfae88d5a3188814fdc603" + +UPSTREAM_CHECK_URI = "http://www.ivarch.com/programs/pv.shtml" +UPSTREAM_CHECK_REGEX = "pv-(?P<pver>\d+(\.\d+)+).tar.bz2" + +inherit autotools ptest + +LDEMULATION:mipsarchn32 = "${@bb.utils.contains('TUNE_FEATURES', 'bigendian', 'elf32btsmipn32', 'elf32ltsmipn32', d)}" +export LDEMULATION + +RDEPENDS:${PN}-ptest += "coreutils ${PN}" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -r ${S}/tests/* ${D}${PTEST_PATH}/tests + cp -r ${S}/autoconf/scripts/run-test.sh ${D}${PTEST_PATH} + # sed -i -e 's@\$SRCDIR/@./@g' ${D}${PTEST_PATH}/run-ptest +} diff --git a/meta-oe/recipes-support/pv/pv_1.6.6.bb b/meta-oe/recipes-support/pv/pv_1.6.6.bb deleted file mode 100644 index 9649555b8e..0000000000 --- a/meta-oe/recipes-support/pv/pv_1.6.6.bb +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "Terminal-based tool for monitoring the progress of data through a pipeline" - -LICENSE = "Artistic-2.0" -LIC_FILES_CHKSUM = "file://doc/COPYING;md5=9c50db2589ee3ef10a9b7b2e50ce1d02" - -SRC_URI = "http://www.ivarch.com/programs/sources/${BP}.tar.bz2" -SRC_URI[md5sum] = "ff3564fddcc2b9bd4a9c1d143aba4b4c" -SRC_URI[sha256sum] = "608ef935f7a377e1439c181c4fc188d247da10d51a19ef79bcdee5043b0973f1" - -inherit autotools - -LDEMULATION_mipsarchn32 = "${@bb.utils.contains('TUNE_FEATURES', 'bigendian', 'elf32btsmipn32', 'elf32ltsmipn32', d)}" -export LDEMULATION diff --git a/meta-oe/recipes-support/pxaregs/pxaregs-1.14/i2c.patch b/meta-oe/recipes-support/pxaregs/pxaregs-1.14/i2c.patch index 36983ec479..2b5b5caa6f 100644 --- a/meta-oe/recipes-support/pxaregs/pxaregs-1.14/i2c.patch +++ b/meta-oe/recipes-support/pxaregs/pxaregs-1.14/i2c.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Index: pxaregs-1.14/pxaregs.c =================================================================== --- pxaregs-1.14.orig/pxaregs.c diff --git a/meta-oe/recipes-support/pxaregs/pxaregs-1.14/munmap.patch b/meta-oe/recipes-support/pxaregs/pxaregs-1.14/munmap.patch index a9c4b95cf0..c0f81725d9 100644 --- a/meta-oe/recipes-support/pxaregs/pxaregs-1.14/munmap.patch +++ b/meta-oe/recipes-support/pxaregs/pxaregs-1.14/munmap.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Index: pxaregs-1.14/pxaregs.c =================================================================== --- pxaregs-1.14.orig/pxaregs.c diff --git a/meta-oe/recipes-support/pxaregs/pxaregs-1.14/serial.patch b/meta-oe/recipes-support/pxaregs/pxaregs-1.14/serial.patch index 06853851d0..fba2e7f513 100644 --- a/meta-oe/recipes-support/pxaregs/pxaregs-1.14/serial.patch +++ b/meta-oe/recipes-support/pxaregs/pxaregs-1.14/serial.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Index: pxaregs-1.14/pxaregs.c =================================================================== --- pxaregs-1.14.orig/pxaregs.c diff --git a/meta-oe/recipes-support/pxaregs/pxaregs-1.14/usb.patch b/meta-oe/recipes-support/pxaregs/pxaregs-1.14/usb.patch index 59f21fe3c1..91ca0a7742 100644 --- a/meta-oe/recipes-support/pxaregs/pxaregs-1.14/usb.patch +++ b/meta-oe/recipes-support/pxaregs/pxaregs-1.14/usb.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Index: pxaregs-1.14/pxaregs.c =================================================================== --- pxaregs-1.14.orig/pxaregs.c diff --git a/meta-oe/recipes-support/pxaregs/pxaregs_1.14.bb b/meta-oe/recipes-support/pxaregs/pxaregs_1.14.bb index 30c41fffbe..09534c44fd 100644 --- a/meta-oe/recipes-support/pxaregs/pxaregs_1.14.bb +++ b/meta-oe/recipes-support/pxaregs/pxaregs_1.14.bb @@ -1,7 +1,6 @@ SUMMARY = "Tool to display and modify PXA registers at runtime" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://pxaregs.c;endline=12;md5=668d061b7637acc68cb8071c9be372e6" -AUTHOR = "Holger Schurig <hs4233@mail.mn-solutions.de>" HOMEPAGE = "http://www.mn-logistik.de/unsupported/pxa250/" SRC_URI = "file://pxaregs.c \ @@ -10,7 +9,8 @@ SRC_URI = "file://pxaregs.c \ file://serial.patch \ file://usb.patch " -S = "${WORKDIR}" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" do_compile() { ${CC} pxaregs.c -o pxaregs ${CFLAGS} ${LDFLAGS} diff --git a/meta-oe/recipes-support/python3-looseversion/python3-looseversion_1.3.0.bb b/meta-oe/recipes-support/python3-looseversion/python3-looseversion_1.3.0.bb new file mode 100644 index 0000000000..323ddb4157 --- /dev/null +++ b/meta-oe/recipes-support/python3-looseversion/python3-looseversion_1.3.0.bb @@ -0,0 +1,14 @@ +# Copyright (C) 2024 Khem Raj <raj.khem@gmail.com> +# Released under the MIT license (see COPYING.MIT for the terms) + +SUMMARY = "Version numbering for anarchists and software realists" +HOMEPAGE = "https://github.com/effigies/looseversion" +LICENSE = "PSF-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d5605fc335ce1bab614032468d0a1e00" + +DEPENDS = "python3-hatchling-native" +SRC_URI[sha256sum] = "ebde65f3f6bb9531a81016c6fef3eb95a61181adc47b7f949e9c0ea47911669e" + +inherit pypi python_hatchling + +PYPI_PACKAGE = "looseversion" diff --git a/meta-oe/recipes-support/raptor2/files/0001-configure.ac-do-additional-checks-on-libxml2-also-wh.patch b/meta-oe/recipes-support/raptor2/files/0001-configure.ac-do-additional-checks-on-libxml2-also-wh.patch deleted file mode 100644 index 7faeb130a7..0000000000 --- a/meta-oe/recipes-support/raptor2/files/0001-configure.ac-do-additional-checks-on-libxml2-also-wh.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 3f97aac5a1f43ef57b02fb9ccdcadd41a6b69fa9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Tue, 27 Oct 2015 10:21:24 +0100 -Subject: [PATCH] configure.ac: do additional checks on libxml2 also when - detected by pkg-config -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Applied [1] - -[1] https://github.com/dajobe/raptor/pull/33 - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 10ff870..35fa08e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -601,7 +601,7 @@ have_libxml=0 - need_libxml=0 - - oCPPFLAGS="$CPPFLAGS" --if test "X$XML_CONFIG" != X; then -+if test "X$libxml_source" != X; then - CPPFLAGS="$LIBXML_CFLAGS $CPPFLAGS" - LIBS="$LIBS $LIBXML_LIBS" - AC_CHECK_FUNC(xmlCreatePushParserCtxt, have_xmlCreatePushParserCtxt=yes, have_xmlCreatePushParserCtxt=no) --- -2.1.0 - diff --git a/meta-oe/recipes-support/raptor2/raptor2/0001-Remove-the-access-to-entities-checked-private-symbol.patch b/meta-oe/recipes-support/raptor2/raptor2/0001-Remove-the-access-to-entities-checked-private-symbol.patch new file mode 100644 index 0000000000..e709616797 --- /dev/null +++ b/meta-oe/recipes-support/raptor2/raptor2/0001-Remove-the-access-to-entities-checked-private-symbol.patch @@ -0,0 +1,34 @@ +From da171e12d961b41b89196627ef5e5baae1e637ce Mon Sep 17 00:00:00 2001 +From: David Anes <david.anes@suse.com> +Date: Thu, 4 May 2023 11:54:02 +0200 +Subject: [PATCH] Remove the access to entities 'checked' private symbol for + libxml2 2.11.0 + +Since version 2.11.0, some private symbols that were never intended +as public API/ABI have been removed from libxml2, therefore the field +'checked' is no longer present and raptor fails to build in this +scenario. + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +Upstream-Status: Backport [https://github.com/dajobe/raptor/commit/ac914399b9013c54572833d4818e6ce008136dc9] +--- + src/raptor_libxml.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/raptor_libxml.c b/src/raptor_libxml.c +index 538c2c8..8bcee13 100644 +--- a/src/raptor_libxml.c ++++ b/src/raptor_libxml.c +@@ -246,10 +246,11 @@ raptor_libxml_getEntity(void* user_data, const xmlChar *name) + + ret->owner = 1; + +-#if LIBXML_VERSION >= 20627 ++#if LIBXML_VERSION >= 20627 && LIBXML_VERSION < 21100 + /* Checked field was released in 2.6.27 on 2006-10-25 + * http://git.gnome.org/browse/libxml2/commit/?id=a37a6ad91a61d168ecc4b29263def3363fff4da6 + * ++ * and was later removed in version 2.11.0 + */ + + /* Mark this entity as having been checked - never do this again */ diff --git a/meta-oe/recipes-support/raptor2/raptor2_2.0.15.bb b/meta-oe/recipes-support/raptor2/raptor2_2.0.16.bb index dd00c14f72..85012bcfb3 100644 --- a/meta-oe/recipes-support/raptor2/raptor2_2.0.15.bb +++ b/meta-oe/recipes-support/raptor2/raptor2_2.0.16.bb @@ -1,7 +1,7 @@ SUMMARY = "Library for parsing and serializing RDF syntaxes" -LICENSE = "GPLv2 | LGPLv2.1 | Apache-2.0" +LICENSE = "GPL-2.0-only | LGPL-2.1-only | Apache-2.0" LIC_FILES_CHKSUM = " \ - file://LICENSE.txt;md5=b840e5ae3aeb897f45b473341348cd9c \ + file://LICENSE.txt;md5=f7fed8b6ab9289b77f5c14f3f79572cc \ file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ file://LICENSE-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \ @@ -11,12 +11,11 @@ DEPENDS = "libxml2 libxslt curl yajl" SRC_URI = " \ http://download.librdf.org/source/${BPN}-${PV}.tar.gz \ - file://0001-configure.ac-do-additional-checks-on-libxml2-also-wh.patch \ + file://0001-Remove-the-access-to-entities-checked-private-symbol.patch \ " -SRC_URI[md5sum] = "a39f6c07ddb20d7dd2ff1f95fa21e2cd" -SRC_URI[sha256sum] = "ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed" +SRC_URI[sha256sum] = "089db78d7ac982354bdbf39d973baf09581e6904ac4c92a98c5caadb3de44680" -inherit autotools pkgconfig +inherit autotools pkgconfig gtk-doc EXTRA_OECONF = " \ --without-xml2-config \ diff --git a/meta-oe/recipes-support/rdfind/rdfind_1.4.1.bb b/meta-oe/recipes-support/rdfind/rdfind_1.6.0.bb index 42f2064fd4..3a15fe6c9a 100644 --- a/meta-oe/recipes-support/rdfind/rdfind_1.4.1.bb +++ b/meta-oe/recipes-support/rdfind/rdfind_1.6.0.bb @@ -1,15 +1,12 @@ SUMMARY = "Rdfind is a program that finds duplicate files" HOMEPAGE = "https://rdfind.pauldreik.se/" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=fa22e16ebbe6638b2bd253338fbded9f" DEPENDS = "nettle autoconf-archive" -SRC_URI = "https://rdfind.pauldreik.se/${BP}.tar.gz \ -" - -SRC_URI[md5sum] = "180418c863b861d1df221bc486a07ce7" -SRC_URI[sha256sum] = "30c613ec26eba48b188d2520cfbe64244f3b1a541e60909ce9ed2efb381f5e8c" +SRC_URI = "https://rdfind.pauldreik.se/${BP}.tar.gz" +SRC_URI[sha256sum] = "7a406e8ef1886a5869655604618dd98f672f12c6a6be4926d053be65070f3279" inherit autotools diff --git a/meta-oe/recipes-support/re2/re2/run-ptest b/meta-oe/recipes-support/re2/re2/run-ptest new file mode 100644 index 0000000000..8bd5fd1efb --- /dev/null +++ b/meta-oe/recipes-support/re2/re2/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +ctest --force-new-ctest-process | sed -u 's/\*\*\*/ /g' | awk '/Test +#/{gsub(/Passed/,"PASS"); gsub(/Failed/,"FAIL"); gsub(/Skipped/,"SKIP"); print $6": "$4; fflush();}' diff --git a/meta-oe/recipes-support/re2/re2_2024.03.01.bb b/meta-oe/recipes-support/re2/re2_2024.03.01.bb new file mode 100644 index 0000000000..6e5b32a945 --- /dev/null +++ b/meta-oe/recipes-support/re2/re2_2024.03.01.bb @@ -0,0 +1,41 @@ +DESCRIPTION = "A regular expression library" +HOMEPAGE = "https://github.com/google/re2/" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b5c31eb512bdf3cb11ffd5713963760" + +# tag 2024-03-01 +SRCREV = "2d866a3d0753f4f4fce93cccc6c59c4b052d7db4" + +SRC_URI = "git://github.com/google/re2.git;branch=main;protocol=https \ + ${@bb.utils.contains('PTEST_ENABLED', '1', 'file://run-ptest', '', d)} \ + " + +S = "${WORKDIR}/git" + +DEPENDS = "abseil-cpp ${@bb.utils.contains('PTEST_ENABLED', '1', 'gtest googlebenchmark', '', d)}" + +inherit cmake ptest +RDEPENDS:${PN}-ptest += "cmake sed" + +EXTRA_OECMAKE += " \ + -DBUILD_SHARED_LIBS=ON \ + ${@bb.utils.contains('PTEST_ENABLED', '1', '-DRE2_BUILD_TESTING=ON', '-DRE2_BUILD_TESTING=OFF', d)} \ +" + +do_install_ptest () { + cp -r ${B}/*_test ${D}${PTEST_PATH} + cp -r ${B}/CTestTestfile.cmake ${D}${PTEST_PATH} + sed -i -e 's#${B}#${PTEST_PATH}#g' `find ${D}${PTEST_PATH} -name CTestTestfile.cmake` + sed -i -e 's#${S}#${PTEST_PATH}#g' `find ${D}${PTEST_PATH} -name CTestTestfile.cmake` + # ERROR: re2-2024.03.01-r0 do_package_qa: QA Issue: /usr/lib64/re2/ptest/string_generator_test contained in package re2-ptest requires libtesting.so()(64bit), but no providers found in RDEPENDS:re2-ptest? [file-rdeps] + cp -r ${B}/libtesting.so ${D}${PTEST_PATH} +} + +# ignore .so in /usr/lib64 +FILES:${PN} = "${libdir}" +INSANE_SKIP:${PN} += "dev-so" + +# Don't include so files in dev package +FILES:${PN}-dev = "${includedir} ${libdir}/cmake ${libdir}/pkgconfig" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/read-edid/read-edid/0001-get-edid-define-quiet-once.patch b/meta-oe/recipes-support/read-edid/read-edid/0001-get-edid-define-quiet-once.patch new file mode 100644 index 0000000000..5147f17c3a --- /dev/null +++ b/meta-oe/recipes-support/read-edid/read-edid/0001-get-edid-define-quiet-once.patch @@ -0,0 +1,44 @@ +From 9da8eb6663d0ba046bc0570172c549d421de043a Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 12 Aug 2020 23:39:32 -0700 +Subject: [PATCH] get-edid: define quiet once + +Fixes build with gcc 10 + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + get-edid/classic.c | 2 +- + get-edid/i2c.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/get-edid/classic.c b/get-edid/classic.c +index 9cc8ee3..b13f5f0 100644 +--- a/get-edid/classic.c ++++ b/get-edid/classic.c +@@ -26,7 +26,7 @@ typedef byte* real_ptr; + #define dosmemput(buffer,length,offset) memcpy(offset,buffer,length) + + #define display(...) if (quiet == 0) { fprintf(stderr, __VA_ARGS__); } +-int quiet; ++extern int quiet; + + real_ptr far_ptr_to_real_ptr( uint32 farptr ) + { +diff --git a/get-edid/i2c.c b/get-edid/i2c.c +index 625d7cb..0929e98 100644 +--- a/get-edid/i2c.c ++++ b/get-edid/i2c.c +@@ -15,7 +15,7 @@ + + //Ideas (but not too much actual code) taken from i2c-tools. Thanks guys. + +-int quiet; ++extern int quiet; + + #define display(...) if (quiet == 0) { fprintf(stderr, __VA_ARGS__); } + +-- +2.28.0 + diff --git a/meta-oe/recipes-support/read-edid/read-edid_3.0.2.bb b/meta-oe/recipes-support/read-edid/read-edid_3.0.2.bb index e4c2cadc2d..28da51a21c 100644 --- a/meta-oe/recipes-support/read-edid/read-edid_3.0.2.bb +++ b/meta-oe/recipes-support/read-edid/read-edid_3.0.2.bb @@ -3,7 +3,6 @@ DESCRIPTION = "read-edid is a set of two tools - get-edid, which gets the raw \ EDID information from the monitor, and parse-edid, which turns \ the raw binary information into a xorg.conf-compatible monitor \ section." -AUTHOR = "Stefan Wiehler <stefan.wiehler@missinglinkelectronics.com>" HOMEPAGE = "http://www.polypux.org/projects/read-edid/" SECTION = "console/utils" LICENSE = "read-edid" @@ -11,6 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=292c42e2aedc4af636636bf7af0e2b26" SRC_URI = "http://polypux.org/projects/read-edid/read-edid-${PV}.tar.gz \ file://0001-Do-not-install-license-file.patch \ + file://0001-get-edid-define-quiet-once.patch \ " SRC_URI[md5sum] = "016546e438bf6c98739ff74061df9854" SRC_URI[sha256sum] = "c7c6d8440f5b90f98e276829271ccea5b2ff5a3413df8a0f87ec09f834af186f" diff --git a/meta-oe/recipes-support/reboot-mode/reboot-mode_git.bb b/meta-oe/recipes-support/reboot-mode/reboot-mode_git.bb new file mode 100644 index 0000000000..c038966ba8 --- /dev/null +++ b/meta-oe/recipes-support/reboot-mode/reboot-mode_git.bb @@ -0,0 +1,17 @@ +SUMMARY = "Reboot the device to a specific mode." + +LICENSE = "GPL-3.0-or-later" +LIC_FILES_CHKSUM = "file://LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d" + +SRC_URI = "git://gitlab.com/postmarketOS/reboot-mode.git;protocol=http;branch=master" +SRCREV = "84831b20512abd9033414ca5f5a023f333525335" + +S = "${WORKDIR}/git" + +do_compile() { + ${CC} ${CFLAGS} ${LDFLAGS} ${S}/reboot-mode.c -o ${B}/reboot-mode +} + +do_install() { + install -D -m 0755 ${B}/reboot-mode ${D}${bindir}/reboot-mode +} diff --git a/meta-oe/recipes-support/remmina/remmina_1.3.6.bb b/meta-oe/recipes-support/remmina/remmina_1.3.6.bb deleted file mode 100644 index 14fbc94b21..0000000000 --- a/meta-oe/recipes-support/remmina/remmina_1.3.6.bb +++ /dev/null @@ -1,41 +0,0 @@ -DESCRIPTION = "A feature rich Remote Desktop Application written in GTK+" -HOMEPAGE = "https://remmina.org" -SECTION = "Support" -LICENSE = "GPLv2 & openssl" -LIC_FILES_CHKSUM = "file://LICENSE;md5=dab7215512044d49037272ce1ac4ea8f file://LICENSE.OpenSSL;md5=c1eb3cee0a4dea27503c531267a69769" -DEPENDS += "openssl freerdp gtk+3 gdk-pixbuf atk libgcrypt avahi-ui libsodium libssh vte json-glib libsoup-2.4 libvncserver libsecret" - -DEPENDS_append_x86 = " spice spice-protocol" -DEPENDS_append_x86-64 = " spice spice-protocol" - -DEPENDS_append_libc-musl = " libexecinfo" -LDFLAGS_append_libc-musl = " -lexecinfo" - -SRC_URI = "https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/Remmina-v${PV}.tar.bz2 \ -" -SRC_URI[md5sum] = "6da599c3a5cab2df37a70f8fba2f5438" -SRC_URI[sha256sum] = "fbed745438bb0c21467b60cbd67c8148a9289b5ebc7482d06db443bea556af1a" - -S = "${WORKDIR}/Remmina-v${PV}" - -inherit cmake features_check - -# depends on avahi-ui with this restriction -ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" - -EXTRA_OECMAKE += "-DWITH_APPINDICATOR=OFF -DWITH_GETTEXT=OFF -DWITH_TRANSLATIONS=OFF -DWITH_SPICE=OFF" - -EXTRA_OECMAKE_append_x86 = " -DWITH_SPICE=ON" -EXTRA_OECMAKE_append_x86-64 = " -DWITH_SPICE=ON" - - -do_install_append(){ - # We dont need the extra stuff form other desktop environments - rm -rf ${D}/${datadir}/xsessions - rm -rf ${D}/${datadir}/metainfo - rm -rf ${D}/${datadir}/gnome-session -} - -RDEPENDS_${PN} = "bash" - -FILES_${PN}_append = " ${datadir}/icons/hicolor/*" diff --git a/meta-oe/recipes-support/remmina/remmina_1.4.34.bb b/meta-oe/recipes-support/remmina/remmina_1.4.34.bb new file mode 100644 index 0000000000..921d34d9fd --- /dev/null +++ b/meta-oe/recipes-support/remmina/remmina_1.4.34.bb @@ -0,0 +1,50 @@ +DESCRIPTION = "A feature rich Remote Desktop Application written in GTK+" +HOMEPAGE = "https://remmina.org" +SECTION = "Support" +LICENSE = "GPL-2.0-only & OpenSSL" +LIC_FILES_CHKSUM = "file://LICENSE;md5=dab7215512044d49037272ce1ac4ea8f file://LICENSE.OpenSSL;md5=c1eb3cee0a4dea27503c531267a69769" + +DEPENDS = " \ + glib-2.0-native \ + openssl \ + freerdp \ + gtk+3 \ + gdk-pixbuf \ + atk \ + libgcrypt \ + libsodium \ + libssh \ + vte \ + json-glib \ + libsoup-3.0 \ + libvncserver \ + libsecret \ + libxkbfile \ +" + +DEPENDS:append:libc-musl = " libexecinfo" +LDFLAGS:append:libc-musl = " -lexecinfo" + +SRCREV = "75a0bdb795d99e052690178ae0d81ebdbd2cbdd3" +SRC_URI = "git://gitlab.com/Remmina/Remmina;protocol=https;branch=master" +S = "${WORKDIR}/git" + +inherit cmake features_check mime mime-xdg gtk-icon-cache pkgconfig +REQUIRED_DISTRO_FEATURES = "x11" + +EXTRA_OECMAKE += "-DWITH_APPINDICATOR=OFF -DWITH_GETTEXT=OFF -DWITH_TRANSLATIONS=OFF -DHAVE_LIBAPPINDICATOR=OFF -DWITH_WEBKIT2GTK=OFF" + +PACKAGECONFIG[spice] = "-DWITH_SPICE=ON, -DWITH_SPICE=OFF, spice spice-protocol" +# Switch on gtk support in avahi recipe if you want to enable avahi support +PACKAGECONFIG[avahi] = "-DWITH_AVAHI=ON, -DWITH_AVAHI=OFF, avahi" + +do_configure:append() { + sed -i -e 's|${WORKDIR}|<WORKDIR>|g' ${B}/generated/buildflags.h +} + +RDEPENDS:${PN} = "bash" + +FILES:${PN}+= " \ + ${datadir}/metainfo \ + ${datadir}/mime \ +" diff --git a/meta-oe/recipes-support/reptyr/reptyr_0.10.0.bb b/meta-oe/recipes-support/reptyr/reptyr_0.10.0.bb new file mode 100644 index 0000000000..57b31a78d9 --- /dev/null +++ b/meta-oe/recipes-support/reptyr/reptyr_0.10.0.bb @@ -0,0 +1,29 @@ +SUMMARY = "Reparent a running program to a new terminal" +DESCRIPTION = "reptyr is a utility for taking an existing running program and \ +attaching it to a new terminal. Started a long-running process over ssh, but \ +have to leave and don't want to interrupt it? Just start a screen, use reptyr \ +to grab it, and then kill the ssh session and head on home." +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=25a0555028c71837623fa6dfa4cc45c0" + +SRC_URI = "git://github.com/nelhage/reptyr.git;protocol=https;branch=master" +SRCREV = "1238097fc2cd15db058d2185cc4985daa87bcd41" + +S = "${WORKDIR}/git" + +inherit bash-completion github-releases manpages pkgconfig + +GITHUB_BASE_URI = "https://github.com/nelhage/${BPN}/releases/" + +PACKAGECONFIG ?= "" +PACKAGECONFIG[manpages] = "" + +EXTRA_OEMAKE = "'BINDIR=${bindir}' 'MANDIR=${mandir}' 'PKG_CONFIG=${STAGING_BINDIR_NATIVE}/pkg-config'" + +do_compile () { + oe_runmake +} + +do_install () { + oe_runmake install 'DESTDIR=${D}' +} diff --git a/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb b/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb index aefe3627eb..3cbd04bd5c 100644 --- a/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb +++ b/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb @@ -3,33 +3,35 @@ HOMEPAGE = "http://www.rsnapshot.org" BUGTRACKER = "https://sourceforge.net/projects/rsnapshot/" SECTION = "console/network" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a" -RDEPENDS_${PN} = "rsync \ +RDEPENDS:${PN} = "rsync \ perl \ perl-module-dirhandle \ perl-module-cwd \ perl-module-getopt-std \ perl-module-file-path \ perl-module-file-stat \ + perl-module-file-spec \ perl-module-posix \ perl-module-fcntl \ perl-module-io-file \ perl-module-constant \ perl-module-overloading \ + perl-module-ipc-open3 \ " -SRCREV = "27209563f924a22f510698ea225f53ea52f07cb4" -PV = "1.4.2+git${SRCPV}" +SRCREV = "1b943dbc7695d62fac5c0f9549ec696a538be19c" +PV = "1.4.5" -SRC_URI = "git://github.com/DrHyde/${BPN};branch=master;protocol=git \ +SRC_URI = "git://github.com/DrHyde/${BPN};branch=master;protocol=https \ file://configure-fix-cmd_rsync.patch \ " S = "${WORKDIR}/git" -inherit autotools +inherit autotools perlnative # Fix rsnapshot.conf.default: # don't inject the host path into target configs. @@ -46,7 +48,7 @@ EXTRA_OECONF += "--without-cp \ # Create 't/include.ac' before starting the autoreconf to fix configure # error: configure.ac:302: file 't/include.ac' does not exist -do_configure_prepend(){ +do_configure:prepend(){ saved_dir=`pwd` cd ${S}; ./autogen.sh cd ${saved_dir} diff --git a/meta-oe/recipes-support/rtc-tools/rtc-tools_2022.02.bb b/meta-oe/recipes-support/rtc-tools/rtc-tools_2022.02.bb new file mode 100644 index 0000000000..d65f5da859 --- /dev/null +++ b/meta-oe/recipes-support/rtc-tools/rtc-tools_2022.02.bb @@ -0,0 +1,14 @@ +SUMMARY = "Useful programs to test rtc drivers" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=74274e8a218423e49eefdea80bc55038" + +SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/${BPN}.git;protocol=https;branch=master" +SRCREV = "61839777afedcc7bdb68ea4628c5ce5ca72c2ac8" + +S = "${WORKDIR}/git" + +EXTRA_OEMAKE = "DESTDIR=${D}" + +do_install() { + oe_runmake install +} diff --git a/meta-oe/recipes-support/rtkit/rtkit_0.13.bb b/meta-oe/recipes-support/rtkit/rtkit_0.13.bb new file mode 100644 index 0000000000..4f06e55e8e --- /dev/null +++ b/meta-oe/recipes-support/rtkit/rtkit_0.13.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "REALTIMEKIT Realtime Policy and Watchdog Daemon" +LICENSE = "GPL-3.0-only & BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a8e768468b658b3ed44971b53d4a6716" + +SRC_URI = "git://github.com/heftig/rtkit.git;protocol=https;branch=master" + +SRCREV = "b9169402fe5e82d20efb754509eb0b191f214599" +S = "${WORKDIR}/git" + +inherit meson pkgconfig features_check useradd + +REQUIRED_DISTRO_FEATURES = "polkit" + +DEPENDS = "dbus libcap polkit xxd-native" + +PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG[systemd] = ",,systemd" + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM:${PN} = "--system --no-create-home --user-group --shell /bin/nologin rtkit" + +FILES:${PN} += "${libdir} ${datadir} ${systemd_system_unitdir}" + diff --git a/meta-oe/recipes-support/samsung-soc-utils/files/0001-ppt.c-Do-not-include-sys-io.h.patch b/meta-oe/recipes-support/samsung-soc-utils/files/0001-ppt.c-Do-not-include-sys-io.h.patch deleted file mode 100644 index 4e6c250415..0000000000 --- a/meta-oe/recipes-support/samsung-soc-utils/files/0001-ppt.c-Do-not-include-sys-io.h.patch +++ /dev/null @@ -1,28 +0,0 @@ -From fd244ae648789591f0fb79e74d2b8f6c5b15d6e8 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 6 Aug 2019 00:47:14 +0000 -Subject: [PATCH] ppt.c: Do not include sys/io.h - -newer versions of glibc has removed it - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - ppt.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/ppt.c b/ppt.c -index 0bae2d0..0ef279f 100644 ---- a/ppt.c -+++ b/ppt.c -@@ -5,7 +5,6 @@ - #else
- #include <unistd.h>
- #include <stdlib.h>
--#include <sys/io.h>
- #include <linux/parport.h>
- #include <linux/ppdev.h>
- #include <sys/ioctl.h>
--- -2.17.1 - diff --git a/meta-oe/recipes-support/samsung-soc-utils/s3c24xx-gpio_svn.bb b/meta-oe/recipes-support/samsung-soc-utils/s3c24xx-gpio_svn.bb deleted file mode 100644 index 255754d5d1..0000000000 --- a/meta-oe/recipes-support/samsung-soc-utils/s3c24xx-gpio_svn.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "A user-space tool to show and modify the state of GPIOs on the S3c24xx platform" -SECTION = "console/utils" -AUTHOR = "Werner Almesberger <werner@openmoko.org>" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://gpio.c;endline=12;md5=cfb91c686857b2e60852b4925d90a3e1" -SRCREV = "4949" -PV = "1.0+svnr${SRCPV}" -PR = "r2" - -SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gpio;protocol=http" -S = "${WORKDIR}/gpio" - -CLEANBROKEN = "1" - -do_compile() { - ${CC} ${CFLAGS} ${LDFLAGS} -o ${PN} gpio.c -} - -do_install() { - install -d ${D}${sbindir} - install -m 0755 ${PN} ${D}${sbindir} -} diff --git a/meta-oe/recipes-support/samsung-soc-utils/s3c64xx-gpio_svn.bb b/meta-oe/recipes-support/samsung-soc-utils/s3c64xx-gpio_svn.bb deleted file mode 100644 index 976a4f15ec..0000000000 --- a/meta-oe/recipes-support/samsung-soc-utils/s3c64xx-gpio_svn.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "A user-space tool to show and modify the state of GPIOs on the S3c64xx platform" -SECTION = "console/utils" -AUTHOR = "Werner Almesberger <werner@openmoko.org>" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://gpio-s3c6410.c;endline=12;md5=060cda1be945ad9194593f11d56d55c7" -SRCREV = "4949" -PV = "1.0+svnr${SRCPV}" - -SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gpio;protocol=http" -S = "${WORKDIR}/gpio" - -CLEANBROKEN = "1" - -do_compile() { - ${CC} ${CFLAGS} ${LDFLAGS} -o ${PN} gpio-s3c6410.c -} - -do_install() { - install -d ${D}${sbindir} - install -m 0755 ${PN} ${D}${sbindir} -} diff --git a/meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_svn.bb b/meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_svn.bb deleted file mode 100644 index 9e609c4dd8..0000000000 --- a/meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_svn.bb +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "JTAG utility to interface w/ a S3C2410 device" -SECTION = "devel" -AUTHOR = "Harald Welte <laforge@openmoko.org>" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://parport.c;endline=19;md5=b5681091b0fd8c5f7068835c441bf0c8" -SRCREV = "4268" -PV = "0.1+svnr${SRCPV}" -PR = "r1" - -SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=sjf2410-linux;protocol=http \ - file://0001-ppt.c-Do-not-include-sys-io.h.patch \ - " -S = "${WORKDIR}/sjf2410-linux" - -inherit native deploy -do_deploy[sstate-outputdirs] = "${DEPLOY_DIR_TOOLS}" - -CFLAGS += "-DLINUX_PPDEV" - -do_compile() { - oe_runmake -} - -do_install() { - install -d ${D}/${bindir} - install -m 0755 sjf2410 ${D}/${bindir} -} - -do_deploy() { - install -m 0755 sjf2410 ${DEPLOYDIR}/sjf2410-${PV} -} - -addtask deploy before do_build after do_install diff --git a/meta-oe/recipes-support/sass/libsass_3.6.1.bb b/meta-oe/recipes-support/sass/libsass_git.bb index 480e984fc4..f0824944b9 100644 --- a/meta-oe/recipes-support/sass/libsass_3.6.1.bb +++ b/meta-oe/recipes-support/sass/libsass_git.bb @@ -5,8 +5,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8f34396ca205f5e119ee77aae91fa27d" inherit autotools -SRC_URI = "git://github.com/sass/libsass.git;branch=master" -SRCREV = "4d229af5500be1023883c38c4a675f0ed919839d" +SRC_URI = "git://github.com/sass/libsass.git;branch=master;protocol=https" +SRCREV = "7037f03fabeb2b18b5efa84403f5a6d7a990f460" +PV = "3.6.6" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/sass/sassc_git.bb b/meta-oe/recipes-support/sass/sassc_git.bb index 044c0c7fcb..9bb8c76e87 100644 --- a/meta-oe/recipes-support/sass/sassc_git.bb +++ b/meta-oe/recipes-support/sass/sassc_git.bb @@ -6,9 +6,9 @@ DEPENDS = "libsass" inherit autotools pkgconfig -SRC_URI = "git://github.com/sass/sassc.git" -SRCREV = "aa6d5c635ea8faf44d542a23aaf85d27e5777d48" +SRC_URI = "git://github.com/sass/sassc.git;branch=master;protocol=https" +SRCREV = "66f0ef37e7f0ad3a65d2f481eff09d09408f42d0" S = "${WORKDIR}/git" -PV = "3.5.0" +PV = "3.6.2" BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/satyr/files/0002-fix-compile-failure-against-musl-C-library.patch b/meta-oe/recipes-support/satyr/files/0002-fix-compile-failure-against-musl-C-library.patch index b6c32c4bd5..24efc13560 100644 --- a/meta-oe/recipes-support/satyr/files/0002-fix-compile-failure-against-musl-C-library.patch +++ b/meta-oe/recipes-support/satyr/files/0002-fix-compile-failure-against-musl-C-library.patch @@ -10,19 +10,17 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> lib/rpm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/lib/rpm.c b/lib/rpm.c -index 920e145..58140bf 100644 --- a/lib/rpm.c +++ b/lib/rpm.c -@@ -191,7 +191,7 @@ sr_rpm_package_sort(struct sr_rpm_package *packages) - } +@@ -34,6 +34,11 @@ + #include <assert.h> + #include <string.h> - /* Sort the array. */ -- qsort(array, count, sizeof(struct sr_rpm_package*), (comparison_fn_t)cmp_nevra_qsort_wrapper); -+ qsort(array, count, sizeof(struct sr_rpm_package*), cmp_nevra_qsort_wrapper); - - /* Create a linked list from the sorted array. */ - for (size_t loop = 0; loop < count; ++loop) --- -2.8.1 - ++#if !defined(__GLIBC__) ++typedef int (*__compar_fn_t) (const void*, const void*); ++typedef __compar_fn_t comparison_fn_t; ++#endif ++ + struct sr_rpm_package * + sr_rpm_package_new() + { diff --git a/meta-oe/recipes-support/satyr/satyr_0.28.bb b/meta-oe/recipes-support/satyr/satyr_0.43.bb index fbf018d7f5..9e6d701c7f 100644 --- a/meta-oe/recipes-support/satyr/satyr_0.28.bb +++ b/meta-oe/recipes-support/satyr/satyr_0.43.bb @@ -3,29 +3,33 @@ failure processing, analysis, and reporting supporting kernel space, user \ space, Python, and Java programs" HOMEPAGE = "https://github.com/abrt/satyr" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" -inherit autotools-brokensep python3native pkgconfig +inherit autotools-brokensep python3native python3targetconfig pkgconfig -SRC_URI = "git://github.com/abrt/satyr.git \ +SRC_URI = "git://github.com/abrt/satyr.git;branch=master;protocol=https \ file://0002-fix-compile-failure-against-musl-C-library.patch \ -" -SRCREV = "8b5547b89b712b39a59f1d8b366e7de0f5f46108" + " +SRCREV = "5891618d6a95afc4cde6757374485adf9bf0e9a5" S = "${WORKDIR}/git" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" DEPENDS += " \ gdb \ + gperf-native \ + json-c \ + nettle \ + glib-2.0 \ " PACKAGES += "python3-${BPN}" -FILES_python3-${BPN} = "${PYTHON_SITEPACKAGES_DIR}/${BPN}" +FILES:python3-${BPN} = "${PYTHON_SITEPACKAGES_DIR}/${BPN}" PACKAGECONFIG ??= "python3 rpm" PACKAGECONFIG[python3] = "--with-python3, --without-python3,,python3" PACKAGECONFIG[rpm] = "--with-rpm, --without-rpm, rpm" -do_configure_prepend() { +do_configure:prepend() { ${S}/gen-version } diff --git a/meta-oe/recipes-support/sdmon/sdmon_git.bb b/meta-oe/recipes-support/sdmon/sdmon_git.bb new file mode 100644 index 0000000000..522539a67b --- /dev/null +++ b/meta-oe/recipes-support/sdmon/sdmon_git.bb @@ -0,0 +1,20 @@ +SUMMARY = "Get SD card health data" +HOMEPAGE = "https://github.com/Ognian/sdmon" + +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRC_URI = "git://github.com/Ognian/sdmon;protocol=https;branch=master" + +PV = "0.8.1+git" +SRCREV = "ef1aec457f04a50721f0259651cca9c946f11390" + +S = "${WORKDIR}/git" + +do_compile() { + oe_runmake -C ${S}/src CC="${CC}" CFLAGS="${CFLAGS} -D_REENTRANT -DVERSION=\"\\\"${PV}\\\"\"" LDFLAGS="${LDFLAGS}" +} + +do_install() { + install -Dm 0755 ${S}/src/sdmon ${D}${bindir}/sdmon +} diff --git a/meta-oe/recipes-support/sdparm/files/make-sysroot-work.patch b/meta-oe/recipes-support/sdparm/files/make-sysroot-work.patch index 3fd85d9e25..f58091ad7f 100644 --- a/meta-oe/recipes-support/sdparm/files/make-sysroot-work.patch +++ b/meta-oe/recipes-support/sdparm/files/make-sysroot-work.patch @@ -17,13 +17,13 @@ diff --git a/src/Makefile.am b/src/Makefile.am index 61dd9f8..42c911f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -41,7 +41,7 @@ sglib_SOURCES = ../lib/sg_lib.c \ +@@ -53,7 +53,7 @@ sglib_SOURCES = ../lib/sg_lib.c \ ../lib/sg_pt_common.c if HAVE_SGUTILS -INCLUDES = -I/scsi +INCLUDES = -I=@includedir@/scsi - sdparm_LDADD = @GETOPT_O_FILES@ @os_libs@ @SGUTILS_LIBS@ + sdparm_LDADD = @GETOPT_O_FILES@ @SGUTILS_LIBS@ sdparm_DEPENDENCIES = @GETOPT_O_FILES@ else -- diff --git a/meta-oe/recipes-support/sdparm/sdparm_1.10.bb b/meta-oe/recipes-support/sdparm/sdparm_1.12.bb index c09b495be6..a5f98e6723 100644 --- a/meta-oe/recipes-support/sdparm/sdparm_1.10.bb +++ b/meta-oe/recipes-support/sdparm/sdparm_1.12.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://sg.danny.cz/sg/sdparm.html" SECTION = "console/utils" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=ecab6c36b7ba82c675581dd0afde36f7 \ - file://lib/BSD_LICENSE;md5=1d52f4a66f1e0ed96776bf354ab7a2ed" + file://lib/BSD_LICENSE;md5=12cde17a04c30dece2752f36b7192c64" DEPENDS="sg3-utils" SRC_URI = "http://sg.danny.cz/sg/p/${BPN}-${PV}.tgz \ file://make-sysroot-work.patch \ @@ -15,12 +15,12 @@ MIRRORS += "http://sg.danny.cz/sg/p https://fossies.org/linux/misc" UPSTREAM_CHECK_REGEX = "sdparm-(?P<pver>\d+(\.\d+)+)\.tgz" PACKAGES =+ "${PN}-scripts" -RDEPENDS_${PN}-scripts += "bash ${PN}" +RDEPENDS:${PN}-scripts += "bash ${PN}" -SRC_URI[md5sum] = "bdae64375376ce8fe4bf9521c1db858f" -SRC_URI[sha256sum] = "1ea1ed1bb1ee2aef62392618fa42da9ed027d5e655f174525c39235778292ab3" +SRC_URI[md5sum] = "2902fd29e6834fd62c16bb5d1ac53c7e" +SRC_URI[sha256sum] = "e7f84247069da9a0c293963948d8aba8e5897a13e35e5476c8258acb7ca3a124" inherit autotools # Put the bash scripts to ${PN}-scripts -FILES_${PN}-scripts = "${bindir}/sas_disk_blink ${bindir}/scsi_ch_swp" +FILES:${PN}-scripts = "${bindir}/sas_disk_blink ${bindir}/scsi_ch_swp" diff --git a/meta-oe/recipes-support/serial-utils/pty-forward-native.bb b/meta-oe/recipes-support/serial-utils/pty-forward-native.bb index 7f59b3ecad..82994331ee 100644 --- a/meta-oe/recipes-support/serial-utils/pty-forward-native.bb +++ b/meta-oe/recipes-support/serial-utils/pty-forward-native.bb @@ -1,12 +1,11 @@ SUMMARY = "Receive a forwarded serial from serial-forward and provide a PTY" -AUTHOR = "Holger 'Zecke' Freyther" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=ebb5c50ab7cab4baeffba14977030c07" SECTION = "console/network" SRCREV = "00dbec2636ae0385ad028587e20e446272ff97ec" -PV = "1.1+gitr${SRCPV}" +PV = "1.1+git" -SRC_URI = "git://github.com/freesmartphone/cornucopia.git;protocol=https" +SRC_URI = "git://github.com/freesmartphone/cornucopia.git;protocol=https;branch=master" S = "${WORKDIR}/git/tools/serial_forward" inherit autotools native diff --git a/meta-oe/recipes-support/serial-utils/serial-forward/0001-correct-the-typo-in-include-file-name-string.h.patch b/meta-oe/recipes-support/serial-utils/serial-forward/0001-correct-the-typo-in-include-file-name-string.h.patch new file mode 100644 index 0000000000..f65d2c4bbf --- /dev/null +++ b/meta-oe/recipes-support/serial-utils/serial-forward/0001-correct-the-typo-in-include-file-name-string.h.patch @@ -0,0 +1,27 @@ +From 2897794c337625d1951eb0b402cd8840ae2182a8 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 31 Aug 2022 10:33:57 -0700 +Subject: [PATCH] correct the typo in include file name string.h + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + tools/serial_forward/src/forward.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/serial_forward/src/forward.c b/tools/serial_forward/src/forward.c +index 9fad6f9b..4c0dd9df 100644 +--- a/tools/serial_forward/src/forward.c ++++ b/tools/serial_forward/src/forward.c +@@ -20,7 +20,7 @@ + #include <stdlib.h> + #include <unistd.h> + #include <termios.h> +-#include <strings.h> ++#include <string.h> + #include <getopt.h> + + #include "forward.h" +-- +2.37.3 + diff --git a/meta-oe/recipes-support/serial-utils/serial-forward/0001-serial_forward-Disable-default-static-linking.patch b/meta-oe/recipes-support/serial-utils/serial-forward/0001-serial_forward-Disable-default-static-linking.patch index 7dcc67d114..a3fb678965 100644 --- a/meta-oe/recipes-support/serial-utils/serial-forward/0001-serial_forward-Disable-default-static-linking.patch +++ b/meta-oe/recipes-support/serial-utils/serial-forward/0001-serial_forward-Disable-default-static-linking.patch @@ -7,6 +7,8 @@ This does not work with ssp turned on with hardening flags on musl Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + tools/serial_forward/src/Makefile.am | 3 --- 1 file changed, 3 deletions(-) diff --git a/meta-oe/recipes-support/serial-utils/serial-forward_git.bb b/meta-oe/recipes-support/serial-utils/serial-forward_git.bb index 0ef829856c..541ae84a93 100644 --- a/meta-oe/recipes-support/serial-utils/serial-forward_git.bb +++ b/meta-oe/recipes-support/serial-utils/serial-forward_git.bb @@ -1,13 +1,13 @@ SUMMARY = "Forward a serial using TCP/IP" -AUTHOR = "Holger 'Zecke' Freyther'" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=ebb5c50ab7cab4baeffba14977030c07" SECTION = "console/devel" SRCREV = "07c6fdede0870edc37a8d51d033b6e7e29aa7c91" -PV = "1.1+gitr${SRCPV}" +PV = "1.1+git" -SRC_URI = "git://github.com/freesmartphone/cornucopia.git \ +SRC_URI = "git://github.com/freesmartphone/cornucopia.git;branch=master;protocol=https \ file://0001-serial_forward-Disable-default-static-linking.patch;striplevel=3 \ + file://0001-correct-the-typo-in-include-file-name-string.h.patch;striplevel=3 \ " S = "${WORKDIR}/git/tools/serial_forward" diff --git a/meta-oe/recipes-support/serial/serial/0001-Add-SOVERSION-for-shared-lib-and-comment-example.patch b/meta-oe/recipes-support/serial/serial/0001-Add-SOVERSION-for-shared-lib-and-comment-example.patch new file mode 100644 index 0000000000..5f4a81a72c --- /dev/null +++ b/meta-oe/recipes-support/serial/serial/0001-Add-SOVERSION-for-shared-lib-and-comment-example.patch @@ -0,0 +1,46 @@ +From 23ae981ba46f6d5af03b12083ad32de9c1f148b2 Mon Sep 17 00:00:00 2001 +From: magicWenli <48174882+magicwenli@users.noreply.github.com> +Date: Fri, 12 Apr 2024 07:52:53 +0000 +Subject: [PATCH] Add SOVERSION for shared lib, and comment example by default + +Upstream-Status: Pending +--- + CMakeLists.txt | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,5 +1,8 @@ + cmake_minimum_required(VERSION 2.8.3) + project(serial) ++set (SERIAL_VERSION_MAJOR 1) ++set (SERIAL_VERSION_MINOR 2) ++set (SERIAL_VERSION_PATCH 1) + + # Find catkin + find_package(catkin REQUIRED) +@@ -45,7 +48,7 @@ else() + endif() + + ## Add serial library +-add_library(${PROJECT_NAME} ${serial_SRCS}) ++add_library(${PROJECT_NAME} SHARED ${serial_SRCS}) + if(APPLE) + target_link_libraries(${PROJECT_NAME} ${FOUNDATION_LIBRARY} ${IOKIT_LIBRARY}) + elseif(UNIX) +@@ -55,9 +58,12 @@ else() + endif() + + ## Uncomment for example +-add_executable(serial_example examples/serial_example.cc) +-add_dependencies(serial_example ${PROJECT_NAME}) +-target_link_libraries(serial_example ${PROJECT_NAME}) ++# add_executable(serial_example examples/serial_example.cc) ++# add_dependencies(serial_example ${PROJECT_NAME}) ++# target_link_libraries(serial_example ${PROJECT_NAME}) ++ ++set (SERIAL_VERSION_STRING ${SERIAL_VERSION_MAJOR}.${SERIAL_VERSION_MINOR}.${SERIAL_VERSION_PATCH}) ++set_target_properties (${PROJECT_NAME} PROPERTIES VERSION ${SERIAL_VERSION_STRING} SOVERSION ${SERIAL_VERSION_MAJOR}) + + ## Include headers + include_directories(include) diff --git a/meta-oe/recipes-support/serial/serial/Findcatkin.cmake b/meta-oe/recipes-support/serial/serial/Findcatkin.cmake new file mode 100644 index 0000000000..2f93564be3 --- /dev/null +++ b/meta-oe/recipes-support/serial/serial/Findcatkin.cmake @@ -0,0 +1,5 @@ +# Work-around for https://github.com/wjwwood/serial/issues/135 + +function(catkin_package) +endfunction() + diff --git a/meta-oe/recipes-support/serial/serial_1.2.1.bb b/meta-oe/recipes-support/serial/serial_1.2.1.bb new file mode 100644 index 0000000000..c3f13d1af5 --- /dev/null +++ b/meta-oe/recipes-support/serial/serial_1.2.1.bb @@ -0,0 +1,29 @@ +SUMMARY = "Cross-platform library for interfacing with rs-232 serial like ports" +HOMEPAGE = "http://wjwwood.io/serial/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://README.md;beginline=53;endline=62;md5=049c68d559533f90250404746e6a1045" + +SRC_URI = " \ + git://github.com/wjwwood/${BPN}.git;protocol=https;branch=main \ + file://Findcatkin.cmake \ + file://0001-Add-SOVERSION-for-shared-lib-and-comment-example.patch \ +" +SRCREV = "10ac4e1c25c2cda1dc0a32a8e12b87fd89f3bb4f" +SRC_URI[sha256sum] = "c8cd235dda2ef7d977ba06dfcb35c35e42f45cfd9149ba3ad257756123d8ff96" + +S = "${WORKDIR}/git" + +inherit cmake + +# Work-around for https://github.com/wjwwood/serial/issues/135 +EXTRA_OECMAKE = " \ + -DCMAKE_MODULE_PATH=${UNPACKDIR} \ + -DCATKIN_PACKAGE_LIB_DESTINATION=${libdir} \ + -DCATKIN_PACKAGE_BIN_DESTINATION=${bindir} \ + -DCATKIN_GLOBAL_INCLUDE_DESTINATION=${includedir} \ + -DCATKIN_ENABLE_TESTING=OFF \ +" + +# Do not depend on the main package since it will be empty +RDEPENDS:${PN}-dev = "" + diff --git a/meta-oe/recipes-support/sg3-utils/sg3-utils_1.44.bb b/meta-oe/recipes-support/sg3-utils/sg3-utils_1.48.bb index 4909035b3a..6c3d813983 100644 --- a/meta-oe/recipes-support/sg3-utils/sg3-utils_1.44.bb +++ b/meta-oe/recipes-support/sg3-utils/sg3-utils_1.48.bb @@ -5,20 +5,18 @@ DESCRIPTION = "This package contains low level utilities for devices that use th HOMEPAGE = "http://sg.danny.cz/sg/sg3_utils.html" SECTION = "console/admin" -LICENSE = "GPLv2+ & BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=f90da7fc52172599dbf082d7620f18ca" +LICENSE = "GPL-2.0-or-later & BSD-2-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=f685699d3ac82f108aa880043fa3feb7" -SRC_URI = "http://sg.danny.cz/sg/p/sg3_utils-${PV}.tgz \ -" +SRC_URI = "http://sg.danny.cz/sg/p/sg3_utils-${PV}.tgz" MIRRORS += "http://sg.danny.cz/sg/p https://fossies.org/linux/misc" UPSTREAM_CHECK_REGEX = "sg3_utils-(?P<pver>\d+(\.\d+)+)\.tgz" -SRC_URI[md5sum] = "c11d2b3ca4cc2fd01796473e5330afed" -SRC_URI[sha256sum] = "8dae684d22e71b11353a48b16c95597af90f0cbe9bbd57f98d7f5544da5cae7b" +SRC_URI[sha256sum] = "d62b6c3cf20390fa7357044390084166d25f1d932a1135c450b69fe5c283d773" inherit autotools-brokensep S = "${WORKDIR}/sg3_utils-${PV}" -RDEPENDS_${PN} += "bash" +RDEPENDS:${PN} += "bash" diff --git a/meta-oe/recipes-support/sharutils/sharutils/0001-Fix-build-with-clang.patch b/meta-oe/recipes-support/sharutils/sharutils/0001-Fix-build-with-clang.patch index 7b627c16dd..583fe33ece 100644 --- a/meta-oe/recipes-support/sharutils/sharutils/0001-Fix-build-with-clang.patch +++ b/meta-oe/recipes-support/sharutils/sharutils/0001-Fix-build-with-clang.patch @@ -8,6 +8,8 @@ whereas it does support format attribute, we hard code it Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + src/shar-opts.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/sharutils/sharutils/0001-Fix-build-with-recent-gettext.patch b/meta-oe/recipes-support/sharutils/sharutils/0001-Fix-build-with-recent-gettext.patch new file mode 100644 index 0000000000..7924fa55e2 --- /dev/null +++ b/meta-oe/recipes-support/sharutils/sharutils/0001-Fix-build-with-recent-gettext.patch @@ -0,0 +1,22 @@ +From 7a2fe915dded27630a345762628cdd542ea5d58a Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Fri, 20 Dec 2019 13:56:16 +0100 +Subject: [PATCH] Fix build with recent gettext + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 03d1131..65609e7 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -17,5 +17,5 @@ + ## Process this file with automake to produce Makefile.in. + + EXTRA_DIST = config.rpath m4 $(DIST_ALPHA) +-SUBDIRS = intl lib libopts src doc po tests ++SUBDIRS = lib libopts src doc po tests + ACLOCAL_AMFLAGS = -I m4 diff --git a/meta-oe/recipes-support/sharutils/sharutils/0001-Fix-building-with-GCC-10.patch b/meta-oe/recipes-support/sharutils/sharutils/0001-Fix-building-with-GCC-10.patch new file mode 100644 index 0000000000..0d9978a214 --- /dev/null +++ b/meta-oe/recipes-support/sharutils/sharutils/0001-Fix-building-with-GCC-10.patch @@ -0,0 +1,100 @@ +From b7dd97708b9d0ed09d8d7ac435f8b25eadbf6487 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=83=C2=ADsa=C3=85=E2=84=A2?= <address@hidden> +Date: Thu, 13 Aug 2020 11:20:38 -0700 +Subject: [PATCH 1/2] Fix building with GCC 10 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +GCC 10 defaults to -fno-common that results into errors on multiple +global variable definitions: + +/usr/lib64/gcc/x86_64-suse-linux/9/../../../../x86_64-suse-linux/bin/ld: +shar-opts.o:(.data.rel.ro.local+0x0): multiple definition of +`program_name'; shar.o:(.rodata+0x10): first defined here + +This patch fixes it by changing the definitions in header files into extern +declarations. + +<https://lists.gnu.org/archive/html/bug-gnu-utils/2020-01/msg00001.html> + +Signed-off-by: Petr PÃÂsaÃ…â„¢ <address@hidden> +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + src/shar-opts.h | 2 +- + src/shar-std.def | 2 +- + src/unshar-opts.h | 2 +- + src/uudecode-opts.h | 2 +- + src/uuencode-opts.h | 2 +- + 5 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/shar-opts.h b/src/shar-opts.h +index 172676f..f6e4e79 100644 +--- a/src/shar-opts.h ++++ b/src/shar-opts.h +@@ -352,7 +352,7 @@ extern "C" { + * global exported definitions + */ + #include "local.h" +-char const * const program_name; ++extern char const * const program_name; + + extern bool initialization_done; + extern int optidx; +diff --git a/src/shar-std.def b/src/shar-std.def +index ed06b77..a28f61c 100644 +--- a/src/shar-std.def ++++ b/src/shar-std.def +@@ -41,7 +41,7 @@ no-misuse-usage; + usage-message; + die-code; + +-export = '#include "local.h"'"\nchar const * const program_name;"; ++export = '#include "local.h"'"\nextern char const * const program_name;"; + + #shell + echo "include = 'char const * const program_name = \"${progname}\";';" +diff --git a/src/unshar-opts.h b/src/unshar-opts.h +index 568ffca..aa85833 100644 +--- a/src/unshar-opts.h ++++ b/src/unshar-opts.h +@@ -192,7 +192,7 @@ extern "C" { + extern size_t separator_str_len; + + #include "local.h" +-char const * const program_name; ++extern char const * const program_name; + + + /* * * * * * +diff --git a/src/uudecode-opts.h b/src/uudecode-opts.h +index 5b74419..289a366 100644 +--- a/src/uudecode-opts.h ++++ b/src/uudecode-opts.h +@@ -170,7 +170,7 @@ extern "C" { + * global exported definitions + */ + #include "local.h" +-char const * const program_name; ++extern char const * const program_name; + + + /* * * * * * +diff --git a/src/uuencode-opts.h b/src/uuencode-opts.h +index 1a5b7bc..f2df0a8 100644 +--- a/src/uuencode-opts.h ++++ b/src/uuencode-opts.h +@@ -166,7 +166,7 @@ extern "C" { + * global exported definitions + */ + #include "local.h" +-char const * const program_name; ++extern char const * const program_name; + + + /* * * * * * +-- +2.28.0 + diff --git a/meta-oe/recipes-support/sharutils/sharutils/0001-configure.ac-Check-and-define-intmax_t-type.patch b/meta-oe/recipes-support/sharutils/sharutils/0001-configure.ac-Check-and-define-intmax_t-type.patch new file mode 100644 index 0000000000..32562a08bc --- /dev/null +++ b/meta-oe/recipes-support/sharutils/sharutils/0001-configure.ac-Check-and-define-intmax_t-type.patch @@ -0,0 +1,32 @@ +From ea6f7a4c22f1b6f28cf426566cccd65eb9a0e9de Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 10 Sep 2023 13:52:31 -0700 +Subject: [PATCH] configure.ac: Check and define intmax_t type + +If stdint.h or inttypes.h defines the type intmax_t, define HAVE_INTMAX_T. +Otherwise, define intmax_t to the widest signed integer type. + +intmax_t is defined in lib/system.h if system is not providing it but it +needs to be checked by configure for existence first. + +Upstream-Status: Submitted [https://savannah.gnu.org/bugs/index.php?64653] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configure.ac b/configure.ac +index 1242cb7..2ccaac9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -72,6 +72,7 @@ AC_HEADER_STAT + AC_HEADER_STDC + AC_STRUCT_TIMEZONE + AC_TYPE_SIZE_T ++AC_TYPE_INTMAX_T + AC_CHECK_FUNCS([fchmod isascii strchr]) + AC_FUNC_CLOSEDIR_VOID + AC_FUNC_FSEEKO +-- +2.42.0 + diff --git a/meta-oe/recipes-support/sharutils/sharutils/0002-Do-not-include-lib-md5.c-into-src-shar.c.patch b/meta-oe/recipes-support/sharutils/sharutils/0002-Do-not-include-lib-md5.c-into-src-shar.c.patch new file mode 100644 index 0000000000..5932ddf1c0 --- /dev/null +++ b/meta-oe/recipes-support/sharutils/sharutils/0002-Do-not-include-lib-md5.c-into-src-shar.c.patch @@ -0,0 +1,42 @@ +From ab981e1a973e83edb6ea19e6e84102f43ded0dcb Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 13 Aug 2020 11:22:40 -0700 +Subject: [PATCH 2/2] Do not include lib/md5.c into src/shar.c +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +ib/md5.o is part of libgnu.a that is linked to shar. There is no +point in linking md5.o twice into shar executable. Moreover SuSE +reports that this triggers a linking error with GCC 10: + +/usr/lib64/gcc/x86_64-suse-linux/9/../../../../x86_64-suse-linux/bin/ld: +../lib/libgnu.a(md5.o): in function `md5_stream': +[ 30s] md5.c:(.text+0x15d): multiple definition of `md5_stream'; +shar.o:shar.c:(.text+0x28): first defined here + +<https://lists.gnu.org/archive/html/bug-gnu-utils/2020-01/msg00001.html> + +Signed-off-by: Petr PÃÂsaÃ…â„¢ <address@hidden> +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + src/shar.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/shar.c b/src/shar.c +index 11cbada..6d7ed1d 100644 +--- a/src/shar.c ++++ b/src/shar.c +@@ -53,7 +53,6 @@ static const char cright_years_z[] = + + #include "inttostr.h" + #include "liballoca.h" +-#include "md5.c" + #include "md5.h" + #include "quotearg.h" + #include "xalloc.h" +-- +2.28.0 + diff --git a/meta-oe/recipes-support/sharutils/sharutils/CVE-2018-1000097.patch b/meta-oe/recipes-support/sharutils/sharutils/CVE-2018-1000097.patch index 99dc4e3046..47eb9cfd64 100644 --- a/meta-oe/recipes-support/sharutils/sharutils/CVE-2018-1000097.patch +++ b/meta-oe/recipes-support/sharutils/sharutils/CVE-2018-1000097.patch @@ -36,7 +36,7 @@ This was reported in <http://lists.gnu.org/archive/html/bug-gnu-utils/2018-02/msg00004.html>. CVE: CVE-2018-1000097 -Upstream-Status: no upstream [http://lists.gnu.org/archive/html/bug-gnu-utils/2018-02/msg00004.html] +Upstream-Status: Inappropriate [no upstream] Signed-off-by: Petr PÃsaÅ™ <ppisar@redhat.com> Signed-off-by: Sinan Kaya <okaya@kernel.org> --- diff --git a/meta-oe/recipes-support/sharutils/sharutils_4.15.2.bb b/meta-oe/recipes-support/sharutils/sharutils_4.15.2.bb index 8f39fde821..2a16b18288 100644 --- a/meta-oe/recipes-support/sharutils/sharutils_4.15.2.bb +++ b/meta-oe/recipes-support/sharutils/sharutils_4.15.2.bb @@ -1,19 +1,23 @@ SUMMARY = "This is the set of GNU shar utilities." HOMEPAGE = "http://www.gnu.org/software/sharutils/" SECTION = "console/utils" -LICENSE="GPLv3+" +LICENSE="GPL-3.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -inherit gettext autotools +inherit gettext autotools update-alternatives SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz \ file://0001-Fix-build-with-clang.patch \ file://CVE-2018-1000097.patch \ -" + file://0001-Fix-build-with-recent-gettext.patch \ + file://0001-Fix-building-with-GCC-10.patch \ + file://0002-Do-not-include-lib-md5.c-into-src-shar.c.patch \ + file://0001-configure.ac-Check-and-define-intmax_t-type.patch \ + " SRC_URI[md5sum] = "32a51b23e25ad5e6af4b89f228be1800" SRC_URI[sha256sum] = "ee336e68549664e7a19b117adf02edfdeac6307f22e5ba78baca457116914637" -do_install_append() { +do_install:append() { if [ -e ${D}${libdir}/charset.alias ] then rm -rf ${D}${libdir}/charset.alias @@ -22,3 +26,7 @@ do_install_append() { } BBCLASSEXTEND = "native nativesdk" + +ALTERNATIVE:${PN} = "uudecode uuencode" +ALTERNATIVE_LINK_NAME[uudecode] = "${bindir}/uudecode" +ALTERNATIVE_LINK_NAME[uuencode] = "${bindir}/uuencode" diff --git a/meta-oe/recipes-support/smarty/smarty_4.4.1.bb b/meta-oe/recipes-support/smarty/smarty_4.4.1.bb new file mode 100644 index 0000000000..1caa4cd1bb --- /dev/null +++ b/meta-oe/recipes-support/smarty/smarty_4.4.1.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "the compiling PHP template engine" +SECTION = "console/network" +HOMEPAGE = "https://www.smarty.net/" + +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=2c0f216b2120ffc367e20f2b56df51b3" + +DEPENDS += "php" + +SRC_URI = "git://github.com/smarty-php/smarty.git;protocol=https;branch=support/4.3" + +SRCREV = "f4152e9b814ae2369b6e4935c05e1e0c3654318d" + +S = "${WORKDIR}/git" + +do_install() { + install -d ${D}${datadir}/php/smarty3/libs/ + install -m 0644 ${S}/libs/*.php ${D}${datadir}/php/smarty3/libs/ + + install -d ${D}${datadir}/php/smarty3/libs/plugins + install -m 0644 ${S}/libs/plugins/*.php ${D}${datadir}/php/smarty3/libs/plugins/ + + install -d ${D}${datadir}/php/smarty3/libs/sysplugins + install -m 0644 ${S}/libs/sysplugins/*.php ${D}${datadir}/php/smarty3/libs/sysplugins/ +} +FILES:${PN} = "${datadir}/php/smarty3/" diff --git a/meta-oe/recipes-support/smem/smem_1.4.bb b/meta-oe/recipes-support/smem/smem_1.4.bb deleted file mode 100644 index 702217a33d..0000000000 --- a/meta-oe/recipes-support/smem/smem_1.4.bb +++ /dev/null @@ -1,31 +0,0 @@ -SUMMARY = "Report application memory usage in a meaningful way" -DESCRIPTION = "smem is a tool that can give numerous reports on memory usage on Linux \ -systems. Unlike existing tools, smem can report proportional set size (PSS), \ -which is a more meaningful representation of the amount of memory used by \ -libraries and applications in a virtual memory system." -HOMEPAGE = "http://www.selenic.com/smem/" -SECTION = "Applications/System" - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -SRC_URI = "http://www.selenic.com/${BPN}/download/${BP}.tar.gz" -SRC_URI[md5sum] = "fe79435c3930389bfdb560255c802162" -SRC_URI[sha256sum] = "2ea9f878f4cf3c276774c3f7e2a41977a1f2d64f98d2dcb6a15f1f3d84df61ec" - -do_compile() { - ${CC} ${CFLAGS} ${LDFLAGS} smemcap.c -o smemcap -} - -do_install() { - install -d ${D}/${bindir}/ - install -d ${D}/${mandir}/man8 - install -m 0755 ${S}/smem ${D}${bindir}/ - install -m 0755 ${S}/smemcap ${D}${bindir}/ - install -m 0644 ${S}/smem.8 ${D}/${mandir}/man8/ -} -RDEPENDS_${PN} += "python-textutils python-compression python-shell python-codecs" - -PACKAGES =+ "smemcap" - -FILES_smemcap = "${bindir}/smemcap" diff --git a/meta-oe/recipes-support/span-lite/span-lite_0.11.0.bb b/meta-oe/recipes-support/span-lite/span-lite_0.11.0.bb new file mode 100644 index 0000000000..9dc393fd08 --- /dev/null +++ b/meta-oe/recipes-support/span-lite/span-lite_0.11.0.bb @@ -0,0 +1,11 @@ +SUMMARY = "single-file header-only version of a C++20-like span for C++98, C++11 and later" +HOMEPAGE = "https://github.com/martinmoene/span-lite" +LICENSE = "BSL-1.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c" + +SRC_URI += "git://github.com/martinmoene/span-lite;branch=master;protocol=https" +SRCREV = "50f55c59d1b66910837313c40d11328d03447a41" + +S = "${WORKDIR}/git" + +inherit cmake diff --git a/meta-oe/recipes-support/spdlog/spdlog_1.14.1.bb b/meta-oe/recipes-support/spdlog/spdlog_1.14.1.bb new file mode 100644 index 0000000000..19bac0be89 --- /dev/null +++ b/meta-oe/recipes-support/spdlog/spdlog_1.14.1.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Very fast, header only, C++ logging library." +HOMEPAGE = "https://github.com/gabime/spdlog/wiki" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=9573510928429ad0cbe5ba4de77546e9" + +SRCREV = "27cb4c76708608465c413f6d0e6b8d99a4d84302" +SRC_URI = "git://github.com/gabime/spdlog.git;protocol=https;branch=v1.x" + +DEPENDS = "fmt" + +S = "${WORKDIR}/git" + +inherit cmake + +# no need to build example & tests & benchmarks on pure yocto +EXTRA_OECMAKE += "-DSPDLOG_INSTALL=on -DSPDLOG_BUILD_SHARED=on -DSPDLOG_BUILD_EXAMPLE=off -DSPDLOG_FMT_EXTERNAL=on" + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/spdlog/spdlog_1.3.1.bb b/meta-oe/recipes-support/spdlog/spdlog_1.3.1.bb deleted file mode 100644 index 91e3f67c2b..0000000000 --- a/meta-oe/recipes-support/spdlog/spdlog_1.3.1.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "Very fast, header only, C++ logging library." -HOMEPAGE = "https://github.com/gabime/spdlog/wiki" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" - -SRCREV = "a7148b718ea2fabb8387cb90aee9bf448da63e65" -SRC_URI = "git://github.com/gabime/spdlog.git;protocol=git;branch=v1.x;" - -S = "${WORKDIR}/git" - -BBCLASSEXTEND = "native" -# no need to build example&text&benchmarks on pure yocto -EXTRA_OECMAKE += "-DSPDLOG_INSTALL=on -DSPDLOG_BUILD_EXAMPLES=off -DSPDLOG_BUILD_TESTS=off -DSPDLOG_BUILD_BENCH=off" - -inherit cmake - -# Header-only library -RDEPENDS_${PN}-dev = "" -RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" diff --git a/meta-oe/recipes-support/spitools/spitools_git.bb b/meta-oe/recipes-support/spitools/spitools_git.bb index af1cd6001c..1e3d6beaf4 100644 --- a/meta-oe/recipes-support/spitools/spitools_git.bb +++ b/meta-oe/recipes-support/spitools/spitools_git.bb @@ -1,16 +1,14 @@ DESCRIPTION = "This package contains some simple command line tools to help using Linux spidev devices" HOMEPAGE = "https://github.com/cpb-/spi-tools" -AUTHOR = "Christophe BLAESS" -LICENSE="GPLv2" +LICENSE="GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=8c16666ae6c159876a0ba63099614381" -BPV = "0.8.3" -PV = "${BPV}" -SRCREV = "a3f1f68a048d0d2321ee562b3744dd1162cad22f" +PV = "1.0.2" +SRCREV = "1748e092425a4a0ff693aa347062a57fc1ffdd00" S = "${WORKDIR}/git" -SRC_URI = "git://github.com/cpb-/spi-tools.git;protocol=git" +SRC_URI = "git://github.com/cpb-/spi-tools.git;protocol=https;branch=master" inherit autotools diff --git a/meta-oe/recipes-support/srecord/files/0001-Disable-doxygen.patch b/meta-oe/recipes-support/srecord/files/0001-Disable-doxygen.patch new file mode 100644 index 0000000000..0ed9e87771 --- /dev/null +++ b/meta-oe/recipes-support/srecord/files/0001-Disable-doxygen.patch @@ -0,0 +1,85 @@ +From d75193671c235e4b3bd02417b40516f3bfeb55b6 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 30 Apr 2023 14:09:21 -0700 +Subject: [PATCH] Disable doxygen + +doxygen (dot) detect does not work in cross environment here with cmake + +Upstream-Status: Inappropriate [Cross-compile specific] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + etc/configure.cmake | 2 +- + srecord/CMakeLists.txt | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +--- a/etc/configure.cmake ++++ b/etc/configure.cmake +@@ -103,32 +103,3 @@ option(_TANDEM_SOURCE ON) + # Enable general extensions on Solaris. + option(__EXTENSIONS__ ON) + +-# Doxygen configuration +-find_package(Doxygen REQUIRED doxygen dot) +- +-set(DOXYGEN_DOT_GRAPH_MAX_NODES 150) +-set(DOXYGEN_ALPHABETICAL_INDEX NO) +-set(DOXYGEN_BUILTIN_STL_SUPPORT YES) +-set(DOXYGEN_CASE_SENSE_NAMES NO) +-set(DOXYGEN_CLASS_DIAGRAMS YES) +-set(DOXYGEN_DISTRIBUTE_GROUP_DOC YES) +-set(DOXYGEN_EXCLUDE bin) +-set(DOXYGEN_EXTRACT_ALL YES) +-set(DOXYGEN_EXTRACT_LOCAL_CLASSES NO) +-set(DOXYGEN_FILE_PATTERNS *.h) +-set(DOXYGEN_GENERATE_TREEVIEW YES) +-set(DOXYGEN_HIDE_FRIEND_COMPOUNDS YES) +-set(DOXYGEN_HIDE_IN_BODY_DOCS YES) +-set(DOXYGEN_HIDE_UNDOC_CLASSES YES) +-set(DOXYGEN_HIDE_UNDOC_MEMBERS YES) +-set(DOXYGEN_JAVADOC_AUTOBRIEF YES) +-set(DOXYGEN_QT_AUTOBRIEF YES) +-set(DOXYGEN_QUIET YES) +-set(DOXYGEN_RECURSIVE YES) +-set(DOXYGEN_REFERENCED_BY_RELATION YES) +-set(DOXYGEN_REFERENCES_RELATION YES) +-set(DOXYGEN_SORT_BY_SCOPE_NAME YES) +-set(DOXYGEN_SORT_MEMBER_DOCS NO) +-set(DOXYGEN_SOURCE_BROWSER YES) +-set(DOXYGEN_STRIP_CODE_COMMENTS NO) +-set(DOXYGEN_GENERATE_HTML YES) +--- a/srecord/CMakeLists.txt ++++ b/srecord/CMakeLists.txt +@@ -34,9 +34,9 @@ install(DIRECTORY ${CMAKE_CURRENT_SOURCE + FILES_MATCHING PATTERN "*.h") + + # Install the Doxygen output for the website +-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html +- DESTINATION ${CMAKE_INSTALL_DOCDIR}/htdocs/srecord +- COMPONENT website) ++#install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html ++# DESTINATION ${CMAKE_INSTALL_DOCDIR}/htdocs/srecord ++# COMPONENT website) + + # Generate config.h to suit local environment + configure_file(config.h.in config.h @ONLY) +@@ -44,6 +44,6 @@ configure_file(patchlevel.h.in patchleve + include_directories(${CMAKE_CURRENT_BINARY_DIR}) + + # Generate doxygen content +-doxygen_add_docs(doxygen +- ${LIB_SRECORD_HDR} +- ALL) ++#doxygen_add_docs(doxygen ++# ${LIB_SRECORD_HDR} ++# ALL) +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -55,7 +55,7 @@ enable_testing() + add_subdirectory(test) + + # Documentation & Man Pages +-add_subdirectory(doc) ++# add_subdirectory(doc) + + # Package SRecord + include(CPack) diff --git a/meta-oe/recipes-support/srecord/files/0001-cmake-Do-not-try-to-compute-library-dependencies-dur.patch b/meta-oe/recipes-support/srecord/files/0001-cmake-Do-not-try-to-compute-library-dependencies-dur.patch new file mode 100644 index 0000000000..524dc74611 --- /dev/null +++ b/meta-oe/recipes-support/srecord/files/0001-cmake-Do-not-try-to-compute-library-dependencies-dur.patch @@ -0,0 +1,45 @@ +From 756169511ed13e4c7adc06c7c108d365ac66b9f8 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 30 Apr 2023 22:58:47 -0700 +Subject: [PATCH] cmake: Do not try to compute library dependencies during + install + +Since we are cross-building the dependencies are not in final install +location but in a staging area in recipe specific sysroot and it wont be +able to resolve the libraries all the time + +Fixes +| CMake Error at srec_cat/cmake_install.cmake:66 (file): +| file Could not resolve runtime dependencies: +| +| libc++.so.1 +| libc.so +| Call Stack (most recent call first): +| cmake_install.cmake:52 (include) + +Upstream-Status: Inappropriate [OE-specific] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + etc/packaging.cmake | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/etc/packaging.cmake b/etc/packaging.cmake +index ee2a32c..9804fd8 100644 +--- a/etc/packaging.cmake ++++ b/etc/packaging.cmake +@@ -45,12 +45,6 @@ FUNCTION(INSTALL_SRECORD_EXECUTABLE_TARGET target) + + install(IMPORTED_RUNTIME_ARTIFACTS ${target} + RUNTIME_DEPENDENCY_SET ${PROJECT_NAME}_dlls COMPONENT ${target}) +- install(RUNTIME_DEPENDENCY_SET ${PROJECT_NAME}_dlls +- PRE_EXCLUDE_REGEXES "api-ms-" "ext-ms-" +- POST_EXCLUDE_REGEXES ".*system32/.*\\.dll" +- DIRECTORIES ${DLL_SEARCH_DIRS} +- COMPONENT ${target} +- ) + ENDFUNCTION() + + # Packaging +-- +2.40.1 + diff --git a/meta-oe/recipes-support/srecord/files/0001-cmake-respect-explicit-install-prefix.patch b/meta-oe/recipes-support/srecord/files/0001-cmake-respect-explicit-install-prefix.patch new file mode 100644 index 0000000000..64584656fa --- /dev/null +++ b/meta-oe/recipes-support/srecord/files/0001-cmake-respect-explicit-install-prefix.patch @@ -0,0 +1,31 @@ +From 4aa8cf8c93e1fa6ffeb40fc3473f32b1b83af141 Mon Sep 17 00:00:00 2001 +From: "Ilya A. Kriveshko" <iillyyaa@gmail.com> +Date: Tue, 2 Jan 2024 15:37:10 -0500 +Subject: [PATCH] cmake: respect explicit install prefix + +If CMAKE_INSTALL_PREFIX was supplied externally, use it. This follows +the pattern suggested by cmake documentation in: +https://cmake.org/cmake/help/latest/variable/CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT.html + +Upstream-Status: Submitted [https://github.com/sierrafoxtrot/srecord/pull/68] +--- + CMakeLists.txt | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 74b8108c..ac9f464e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -30,9 +30,9 @@ include(InstallRequiredSystemLibraries) + include(GNUInstallDirs) + + # FHS compliant paths for Linux installation +-if(NOT WIN32 AND CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) +-# set(CMAKE_INSTALL_PREFIX "/opt/${PROJECT_NAME}") +- set(CMAKE_INSTALL_PREFIX "/usr") ++if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT ++ AND NOT WIN32 AND CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) ++ set(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "Install prefix" FORCE) + endif() + + # Pull in the rest of the pieces diff --git a/meta-oe/recipes-support/srecord/files/add-option-to-remove-docs.patch b/meta-oe/recipes-support/srecord/files/add-option-to-remove-docs.patch deleted file mode 100644 index 9b2bd99795..0000000000 --- a/meta-oe/recipes-support/srecord/files/add-option-to-remove-docs.patch +++ /dev/null @@ -1,57 +0,0 @@ -Add option to build this utility without a documentation. - -For full documentation building are necessary utilities like -groff and ps2pdf. Full documentation can takes a lot of space. -So it can be disabled by overloading makefile variable WITHOUT_DOC. - -Upstream-Status: Inappropriate [Other] -Workaround specific to our build system. - -Signed-off-by: Andrej Valek <andrej.valek@siemens.com> - -diff --git a/Makefile.in b/Makefile.in -index 9bdd8f1..a2b5494 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -141,6 +141,14 @@ GROFF = @GROFF@ - # - SOELIM = @SOELIM@ - -+# Option to build this utility without building and installing the documentation. -+WITHOUT_DOC ?= 0 -+ifeq ($(WITHOUT_DOC),0) -+ BUILD_DOC = all-doc -+ INST_DOC = install-doc -+ CLR_DOC = clean-doc -+endif -+ - # --------------------------------------------------------- - # You should not need to change anything below this line. - -@@ -4090,7 +4098,7 @@ bin/test_url_decode: $(test_url_decode_obj) .bin srecord/libsrecord.la - $(LIBTOOL) --mode=link --tag=CXX $(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ \ - $(test_url_decode_obj) srecord/libsrecord.la $(LDFLAGS) $(LIBS) - --all: all-bin all-doc -+all: all-bin $(BUILD_DOC) - - all-bin: bin/srec_cat bin/srec_cmp bin/srec_info bin/test_arglex_ambiguous \ - bin/test_crc16 bin/test_fletcher16 bin/test_gecos \ -@@ -4156,7 +4164,7 @@ test_files = t0001a t0002a t0003a t0004a t0005a t0006a t0007a t0008a t0009a \ - sure: $(test_files) - @echo Passed All Tests - --clean: clean-bin clean-doc clean-misc clean-obj -+clean: clean-bin $(CLR_DOC) clean-misc clean-obj - - clean-bin: - rm -f bin/srec_cat bin/srec_cmp bin/srec_info bin/test_arglex_ambiguous -@@ -4443,7 +4451,7 @@ distclean-directories: - rm -rf test/fletcher16/.libs test/gecos/.libs test/hyphen/.libs - rm -rf test/url_decode/.libs - --install: install-bin install-doc install-include install-libdir install-man -+install: install-bin $(INST_DOC) install-include install-libdir install-man - - install-bin: $(bindir)/srec_cat $(bindir)/srec_cmp $(bindir)/srec_info - diff --git a/meta-oe/recipes-support/srecord/srecord_1.64.bb b/meta-oe/recipes-support/srecord/srecord_1.64.bb deleted file mode 100644 index d3488df2cf..0000000000 --- a/meta-oe/recipes-support/srecord/srecord_1.64.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "A collection of powerful tools for manipulating EPROM load files." -SECTION = "devel" -LICENSE = "GPLv3+ & LGPLv3+" -LIC_FILES_CHKSUM = "file://LICENSE;md5=8dfcbf2f0a144b97f0931b6394debea7" - -SRC_URI = " \ - http://srecord.sourceforge.net/srecord-${PV}.tar.gz \ - file://add-option-to-remove-docs.patch \ -" - -SRC_URI[md5sum] = "4de4a7497472d7972645c2af91313769" -SRC_URI[sha256sum] = "49a4418733c508c03ad79a29e95acec9a2fbc4c7306131d2a8f5ef32012e67e2" - -DEPENDS = "libtool-native boost groff-native" - -inherit autotools-brokensep - -EXTRA_OECONF = "--without-gcrypt LIBTOOL=${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool" - -# Set variable WITHOUT_DOC=0 to enable documentation generation -EXTRA_OEMAKE = "WITHOUT_DOC=1" - -BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/srecord/srecord_1.65.0.bb b/meta-oe/recipes-support/srecord/srecord_1.65.0.bb new file mode 100644 index 0000000000..3e8a87d07f --- /dev/null +++ b/meta-oe/recipes-support/srecord/srecord_1.65.0.bb @@ -0,0 +1,20 @@ +SUMMARY = "A collection of powerful tools for manipulating EPROM load files." +SECTION = "devel" +LICENSE = "GPL-3.0-or-later & LGPL-3.0-or-later" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504" + +SRC_URI = " \ + https://sourceforge.net/projects/${BPN}/files/srecord/${@oe.utils.trim_version('${PV}', 2)}/${BP}-Source.tar.gz \ + file://0001-Disable-doxygen.patch \ + file://0001-cmake-Do-not-try-to-compute-library-dependencies-dur.patch \ + file://0001-cmake-respect-explicit-install-prefix.patch" +SRC_URI[sha256sum] = "81c3d07cf15ce50441f43a82cefd0ac32767c535b5291bcc41bd2311d1337644" +S = "${WORKDIR}/${BP}-Source" + +UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/srecord/files/releases" + +DEPENDS = "boost libgcrypt" + +inherit cmake + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/ssiapi/ssiapi/0001-Don-t-use-__GNUC_PREREQ.patch b/meta-oe/recipes-support/ssiapi/ssiapi/0001-Don-t-use-__GNUC_PREREQ.patch index d9190e5bdf..5842ff1f36 100644 --- a/meta-oe/recipes-support/ssiapi/ssiapi/0001-Don-t-use-__GNUC_PREREQ.patch +++ b/meta-oe/recipes-support/ssiapi/ssiapi/0001-Don-t-use-__GNUC_PREREQ.patch @@ -10,6 +10,8 @@ availability first Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + lib/efi/efi.h | 4 ++-- lib/engine/pragma.h | 4 ++-- lib/log/log.h | 4 ++-- diff --git a/meta-oe/recipes-support/ssiapi/ssiapi/0001-Include-libgen.h.patch b/meta-oe/recipes-support/ssiapi/ssiapi/0001-Include-libgen.h.patch index fd44571b69..b522146602 100644 --- a/meta-oe/recipes-support/ssiapi/ssiapi/0001-Include-libgen.h.patch +++ b/meta-oe/recipes-support/ssiapi/ssiapi/0001-Include-libgen.h.patch @@ -9,6 +9,8 @@ would be upstreams choice to make Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + tools/ssieventmonitor.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/ssiapi/ssiapi/0001-log-Avoid-shadowing-functions-from-std-lib.patch b/meta-oe/recipes-support/ssiapi/ssiapi/0001-log-Avoid-shadowing-functions-from-std-lib.patch index 8fdbf3e60e..c01c7e5ccd 100644 --- a/meta-oe/recipes-support/ssiapi/ssiapi/0001-log-Avoid-shadowing-functions-from-std-lib.patch +++ b/meta-oe/recipes-support/ssiapi/ssiapi/0001-log-Avoid-shadowing-functions-from-std-lib.patch @@ -5,6 +5,8 @@ Subject: [PATCH 1/4] log: Avoid shadowing functions from std lib Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + lib/log/log.c | 2 +- lib/log/log.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/meta-oe/recipes-support/ssiapi/ssiapi/0002-Use-stangard-int-types.patch b/meta-oe/recipes-support/ssiapi/ssiapi/0002-Use-stangard-int-types.patch index acc718d23d..390faeb77b 100644 --- a/meta-oe/recipes-support/ssiapi/ssiapi/0002-Use-stangard-int-types.patch +++ b/meta-oe/recipes-support/ssiapi/ssiapi/0002-Use-stangard-int-types.patch @@ -10,6 +10,8 @@ error: unknown type name '__uint8_t' Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + lib/engine/end_device.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/meta-oe/recipes-support/ssiapi/ssiapi/0002-boost-Backport-clang-support.patch b/meta-oe/recipes-support/ssiapi/ssiapi/0002-boost-Backport-clang-support.patch index 2eeab54e53..aabbc04e57 100644 --- a/meta-oe/recipes-support/ssiapi/ssiapi/0002-boost-Backport-clang-support.patch +++ b/meta-oe/recipes-support/ssiapi/ssiapi/0002-boost-Backport-clang-support.patch @@ -7,6 +7,8 @@ backport headers from boost 1.59 Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + lib/boost/config/compiler/clang.hpp | 272 +++++++++ lib/boost/config/stdlib/libcpp.hpp | 80 +++ lib/boost/cstdint.hpp | 542 ++++++++++++++++++ diff --git a/meta-oe/recipes-support/ssiapi/ssiapi/0003-engine-Define-discover-const-String-path-in-base-cla.patch b/meta-oe/recipes-support/ssiapi/ssiapi/0003-engine-Define-discover-const-String-path-in-base-cla.patch index 261358459e..e5e257b49a 100644 --- a/meta-oe/recipes-support/ssiapi/ssiapi/0003-engine-Define-discover-const-String-path-in-base-cla.patch +++ b/meta-oe/recipes-support/ssiapi/ssiapi/0003-engine-Define-discover-const-String-path-in-base-cla.patch @@ -11,6 +11,8 @@ Remove ununsed orom_vmd Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + lib/engine/storage_object.h | 3 +++ lib/engine/vmd_raid_info.h | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/ssiapi/ssiapi/0003-replace-canonicalize_file_name-with-realpath.patch b/meta-oe/recipes-support/ssiapi/ssiapi/0003-replace-canonicalize_file_name-with-realpath.patch index 848d38b223..d70be51ee6 100644 --- a/meta-oe/recipes-support/ssiapi/ssiapi/0003-replace-canonicalize_file_name-with-realpath.patch +++ b/meta-oe/recipes-support/ssiapi/ssiapi/0003-replace-canonicalize_file_name-with-realpath.patch @@ -11,6 +11,8 @@ error: use of undeclared identifier 'canonicalize_file_name' Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + lib/engine/filesystem.cpp | 2 +- tools/ssieventmonitor.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/ssiapi/ssiapi/0004-Do-not-override-flags-coming-from-build-environment.patch b/meta-oe/recipes-support/ssiapi/ssiapi/0004-Do-not-override-flags-coming-from-build-environment.patch index ca2ffc56b1..56e3c658a4 100644 --- a/meta-oe/recipes-support/ssiapi/ssiapi/0004-Do-not-override-flags-coming-from-build-environment.patch +++ b/meta-oe/recipes-support/ssiapi/ssiapi/0004-Do-not-override-flags-coming-from-build-environment.patch @@ -8,6 +8,8 @@ without this change, the build would fail Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + configure.ac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-oe/recipes-support/ssiapi/ssiapi/0004-include-limits.h.patch b/meta-oe/recipes-support/ssiapi/ssiapi/0004-include-limits.h.patch index d63eb50619..005a35e5a4 100644 --- a/meta-oe/recipes-support/ssiapi/ssiapi/0004-include-limits.h.patch +++ b/meta-oe/recipes-support/ssiapi/ssiapi/0004-include-limits.h.patch @@ -8,6 +8,8 @@ error: use of undeclared identifier 'PATH_MAX' Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + tools/ssieventmonitor.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-support/ssiapi/ssiapi/0005-enable-out-of-source-tree-builds.patch b/meta-oe/recipes-support/ssiapi/ssiapi/0005-enable-out-of-source-tree-builds.patch index c516f65252..6dd7fc735e 100644 --- a/meta-oe/recipes-support/ssiapi/ssiapi/0005-enable-out-of-source-tree-builds.patch +++ b/meta-oe/recipes-support/ssiapi/ssiapi/0005-enable-out-of-source-tree-builds.patch @@ -5,6 +5,8 @@ Subject: [PATCH] enable out of source tree builds Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + lib/efi/Makefile.am | 2 +- lib/engine/Makefile.am | 2 +- lib/orom/Makefile.am | 2 +- diff --git a/meta-oe/recipes-support/ssiapi/ssiapi_1.3.0.bb b/meta-oe/recipes-support/ssiapi/ssiapi_1.3.0.bb index eb086817ef..bf9de31f84 100644 --- a/meta-oe/recipes-support/ssiapi/ssiapi_1.3.0.bb +++ b/meta-oe/recipes-support/ssiapi/ssiapi_1.3.0.bb @@ -29,8 +29,13 @@ S ="${WORKDIR}/${BPN}.${PV}" inherit autotools -do_configure_prepend(){ +CXXFLAGS += "-std=gnu++14" + +do_configure:prepend(){ ${S}/autogen.sh } -RDEPENDS_${PN} += "mdadm" +RDEPENDS:${PN} += "mdadm" + +COMPATIBLE_HOST:powerpc = 'null' +COMPATIBLE_HOST:powerpc64le = 'null' diff --git a/meta-oe/recipes-support/stm32flash/stm32flash_0.5.bb b/meta-oe/recipes-support/stm32flash/stm32flash_0.7.bb index 854df06cb7..0998aa6778 100644 --- a/meta-oe/recipes-support/stm32flash/stm32flash_0.5.bb +++ b/meta-oe/recipes-support/stm32flash/stm32flash_0.7.bb @@ -1,16 +1,13 @@ SUMMARY = "Open source flash program for STM32 using the ST serial bootloader" HOMEPAGE = "https://sourceforge.net/projects/stm32flash/" BUGTRACKER = "https://sourceforge.net/p/stm32flash/tickets/" -LICENSE = "GPL-2.0+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263" -S = "${WORKDIR}/${BPN}" - SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz" do_install() { oe_runmake install DESTDIR=${D} PREFIX=${prefix} } -SRC_URI[md5sum] = "40f673502949f3bb655d2bcc539d7b6a" -SRC_URI[sha256sum] = "97aa9422ef02e82f7da9039329e21a437decf972cb3919ad817f70ac9a49e306" +SRC_URI[sha256sum] = "c4c9cd8bec79da63b111d15713ef5cc2cd947deca411d35d6e3065e227dc414a" diff --git a/meta-oe/recipes-support/switchtec-user/switchtec-user_4.2.bb b/meta-oe/recipes-support/switchtec-user/switchtec-user_4.2.bb new file mode 100644 index 0000000000..17f54dcf4c --- /dev/null +++ b/meta-oe/recipes-support/switchtec-user/switchtec-user_4.2.bb @@ -0,0 +1,21 @@ +SUMMARY = "Easy to use CLI and C library for communicating with Microsemi's Switchtec management interface" +HOMEPAGE = "https://github.com/Microsemi/switchtec-user" +SECTION = "console/utils" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3d6b07c89629cff2990d2e8e1f4c2382" + +DEPENDS = "ncurses openssl" + +SRCREV = "e7c351c6c722336b3c79b79cd002c7c2986eefb0" +SRC_URI = "git://github.com/Microsemi/switchtec-user.git;protocol=https;branch=master" +SRC_URI[sha256sum] = "a715e46d8498418dbb8a2519318ba0714ee148151d7e4a7fa5e27770a2f6888f" + +S = "${WORKDIR}/git" + +inherit autotools-brokensep pkgconfig + +EXTRA_OEMAKE = "DESTDIR='${D}' PREFIX='${prefix}' LDCONFIG='true' LIBDIR='${D}${libdir}'" + +do_install () { + oe_runmake install +} diff --git a/meta-oe/recipes-support/synergy/synergy_git.bb b/meta-oe/recipes-support/synergy/synergy_git.bb index dba89d181c..fb767942fe 100644 --- a/meta-oe/recipes-support/synergy/synergy_git.bb +++ b/meta-oe/recipes-support/synergy/synergy_git.bb @@ -13,7 +13,7 @@ SRC_URI = "git://github.com/symless/synergy-core;protocol=https;nobranch=1" # Version 1.10.1-stable SRCREV ?= "1b4c076127687aceac931d269e898beaac1cad9f" -PV = "1.10.1+git${SRCPV}" +PV = "1.10.1+git" S = "${WORKDIR}/git" @@ -21,4 +21,4 @@ inherit cmake features_check EXTRA_OECMAKE += "-DSYNERGY_BUILD_LEGACY_GUI=OFF" -FILES_${PN} += "${datadir}/icons/hicolor" +FILES:${PN} += "${datadir}/icons/hicolor" diff --git a/meta-oe/recipes-support/syslog-ng/files/0001-Fix-buildpaths-warning.patch b/meta-oe/recipes-support/syslog-ng/files/0001-Fix-buildpaths-warning.patch new file mode 100644 index 0000000000..c7bb4a64d9 --- /dev/null +++ b/meta-oe/recipes-support/syslog-ng/files/0001-Fix-buildpaths-warning.patch @@ -0,0 +1,55 @@ +From d85a7a3ae2bb9f5267b2af43784633ae8f011f21 Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Mon, 13 Mar 2023 09:50:15 +0800 +Subject: [PATCH] Fix buildpaths warning + +Fix buildpath warning: +WARNING: syslog-ng-4.0.1-r0 do_package_qa: QA Issue: File /usr/include/syslog-ng/syslog-ng-config-64.h in package syslog-ng-dev contains reference to TMPDIR [buildpaths] +WARNING: syslog-ng-4.0.1-r0 do_package_qa: QA Issue: File /usr/bin/syslog-ng-update-virtualenv in package syslog-ng contains reference to TMPDIR +File /usr/bin/pdbtool in package syslog-ng contains reference to TMPDIR [buildpaths] +WARNING: syslog-ng-4.0.1-r0 do_package_qa: QA Issue: File /usr/lib/syslog-ng/libdbparser.so in package syslog-ng-libs contains reference to TMPDIR [buildpaths] + +* SYSLOG_NG_PATH_TOPSRC_DIR is /yocto/build/tmp/work/core2-64-poky-linux/syslog-ng/4.0.1-r0, + which is used to get xsd dir in build SYSLOG_NG_PATH_TOPSRC_DIR/doc/xsd, + which is not suitable for target, set it to "/source" for fixing this buildpath warning + +* SYSTEM_PYTHON is /yocto/build/tmp/hosttools/python3, set to python3 + for target. + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + configure.ac | 2 +- + scripts/syslog-ng-update-virtualenv.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 79a1502..1ad6508 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1930,7 +1930,7 @@ AC_DEFINE_UNQUOTED(PYTHON_SYSCONF_MODULE_DIR, "$python_sysconf_moduledir", [Pyth + AC_DEFINE_UNQUOTED(PATH_LOGGENPLUGINDIR, "$loggenplugindir", [loggenplugin installation directory]) + AC_DEFINE_UNQUOTED(MODULE_PATH, "$module_path", [module search path]) + AC_DEFINE_UNQUOTED(JAVA_MODULE_PATH, "$java_module_path", [java module search path]) +-AC_DEFINE_UNQUOTED(PATH_TOPSRC_DIR, "$abs_topsrcdir", [self-defined top_srcdir path]) ++AC_DEFINE_UNQUOTED(PATH_TOPSRC_DIR, "/source", [self-defined top_srcdir path]) + AC_DEFINE_UNQUOTED(PACKAGE_NAME, "$PACKAGE_NAME", [package name]) + + +diff --git a/scripts/syslog-ng-update-virtualenv.in b/scripts/syslog-ng-update-virtualenv.in +index ed85baf..b1a9e34 100755 +--- a/scripts/syslog-ng-update-virtualenv.in ++++ b/scripts/syslog-ng-update-virtualenv.in +@@ -62,7 +62,7 @@ done + set -e + + REQUIREMENTS_FILE=${python_moduledir}/requirements.txt +-SYSTEM_PYTHON=@PYTHON@ ++SYSTEM_PYTHON=python3 + VENV_PYTHON=${python_venvdir}/bin/python + + if [ "$display_prompt" -ne 0 ]; then +-- +2.25.1 + diff --git a/meta-oe/recipes-support/syslog-ng/files/0001-macros-guard-ipv6-code-with-SYSLOG_NG_ENABLE_IPV6.patch b/meta-oe/recipes-support/syslog-ng/files/0001-macros-guard-ipv6-code-with-SYSLOG_NG_ENABLE_IPV6.patch new file mode 100644 index 0000000000..f21ad5d70f --- /dev/null +++ b/meta-oe/recipes-support/syslog-ng/files/0001-macros-guard-ipv6-code-with-SYSLOG_NG_ENABLE_IPV6.patch @@ -0,0 +1,40 @@ +From 896d77dd949b52d6ea5798e5a038ba97d6b802be Mon Sep 17 00:00:00 2001 +From: Peter Marko <peter.marko@siemens.com> +Date: Thu, 4 Apr 2024 15:44:18 +0200 +Subject: [PATCH] macros: guard ipv6 code with SYSLOG_NG_ENABLE_IPV6 + +With ipv6 disabled, there are linking errors currently. +This fixes it by not using the symbols when IPv6 is disabled. + +Solves #4810 with my config options +https://github.com/openembedded/meta-openembedded/blob/2487e65ee3842b6ae0c7a2628985be6189ed9ebf/meta-oe/recipes-support/syslog-ng/syslog-ng_4.6.0.bb + +Upstream-Status: Submitted [https://github.com/syslog-ng/syslog-ng/pull/4880] + +Signed-off-by: Peter Marko <peter.marko@siemens.com> +--- + lib/template/macros.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/lib/template/macros.c b/lib/template/macros.c +index 54142706c..fcb83637f 100644 +--- a/lib/template/macros.c ++++ b/lib/template/macros.c +@@ -277,12 +277,14 @@ _get_originating_ip_protocol(const LogMessage *msg) + return 0; + if (g_sockaddr_inet_check(msg->saddr)) + return 4; ++#if SYSLOG_NG_ENABLE_IPV6 + if (g_sockaddr_inet6_check(msg->saddr)) + { + if (g_sockaddr_inet6_is_v4_mapped(msg->saddr)) + return 4; + return 6; + } ++#endif + return 0; + } + +-- +2.30.2 + diff --git a/meta-oe/recipes-support/syslog-ng/files/0001-plugin.c-workaround-powerpc64le-segfaults-error.patch b/meta-oe/recipes-support/syslog-ng/files/0001-plugin.c-workaround-powerpc64le-segfaults-error.patch new file mode 100644 index 0000000000..343e6fdade --- /dev/null +++ b/meta-oe/recipes-support/syslog-ng/files/0001-plugin.c-workaround-powerpc64le-segfaults-error.patch @@ -0,0 +1,46 @@ +From 616446afab61ab98b28c81605e2efd4a689f37d1 Mon Sep 17 00:00:00 2001 +From: Chen Qi <Qi.Chen@windriver.com> +Date: Fri, 20 Jan 2023 14:59:14 +0800 +Subject: [PATCH] plugin.c: workaround powerpc64le segfaults error + +syslog-ng segfaults on powerpc64le, workaround this error. +See https://github.com/syslog-ng/syslog-ng/issues/4285 and +https://sourceware.org/bugzilla/show_bug.cgi?id=30062 for more details. +This patch should be dropped once the above issues are fixed. + +Upstream-Status: Inappropriate [OE Specific] + +Signed-off-by: Chen Qi <Qi.Chen@windriver.com> +--- + lib/plugin.c | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +diff --git a/lib/plugin.c b/lib/plugin.c +index fbbfb92..3a03617 100644 +--- a/lib/plugin.c ++++ b/lib/plugin.c +@@ -528,10 +528,7 @@ plugin_discover_candidate_modules(PluginContext *context) + } + } + g_free(module_name); +- if (mod) +- g_module_close(mod); +- else +- mod = NULL; ++ mod = NULL; + } + } + g_dir_close(dir); +@@ -663,8 +660,7 @@ plugin_list_modules(FILE *out, gboolean verbose) + first = FALSE; + } + g_free(module_name); +- if (mod) +- g_module_close(mod); ++ mod = NULL; + } + } + g_dir_close(dir); +-- +2.17.1 + diff --git a/meta-oe/recipes-support/syslog-ng/files/0001-syslog-ng-fix-segment-fault-during-service-start.patch b/meta-oe/recipes-support/syslog-ng/files/0001-syslog-ng-fix-segment-fault-during-service-start.patch deleted file mode 100644 index b5bfcd025a..0000000000 --- a/meta-oe/recipes-support/syslog-ng/files/0001-syslog-ng-fix-segment-fault-during-service-start.patch +++ /dev/null @@ -1,74 +0,0 @@ -Subject: [PATCH] syslog-ng: fix segment fault during service start on arm64 - -service start failed since segment fault on arch arm64, -syslog-ng have a submodule ivykis, from ivykis V0.42, -it use pthread_atfork, but for arm64, this symbol is -not included by libpthread, so cause segment fault. - -refer systemd, replace pthread_atfork with __register_atfork -to fix this problem. - -I have create an issue, and this proposal to upstream. -https://github.com/buytenh/ivykis/issues/15 - -Upstream-Status: Pending - -Signed-off-by: Changqing Li <changqing.li@windriver.com> - -Update for 3.24.1. -Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> ---- - lib/ivykis/src/pthr.h | 23 ++++++++++++----------- - 1 file changed, 12 insertions(+), 11 deletions(-) - -diff --git a/lib/ivykis/src/pthr.h b/lib/ivykis/src/pthr.h -index 29e4be7..5d29096 100644 ---- a/lib/ivykis/src/pthr.h -+++ b/lib/ivykis/src/pthr.h -@@ -24,6 +24,16 @@ - #include <pthread.h> - #include <signal.h> - -+#ifdef __GLIBC__ -+/* We use glibc __register_atfork() + __dso_handle directly here, as they are not included in the glibc -+ * headers. __register_atfork() is mostly equivalent to pthread_atfork(), but doesn't require us to link against -+ * libpthread, as it is part of glibc anyway. */ -+extern int __register_atfork(void (*prepare) (void), void (*parent) (void), void (*child) (void), void * __dso_handle); -+extern void* __dso_handle __attribute__ ((__weak__)); -+#else -+#define __register_atfork(prepare,parent,child,dso) pthread_atfork(prepare,parent,child) -+#endif -+ - #ifdef HAVE_PRAGMA_WEAK - #pragma weak pthread_create - #endif -@@ -36,16 +46,7 @@ static inline int pthreads_available(void) - - #ifdef HAVE_PRAGMA_WEAK - --/* -- * On Linux, pthread_atfork() is defined in libc_nonshared.a (for -- * glibc >= 2.28) or libpthread_nonshared.a (for glibc <= 2.27), and -- * we want to avoid "#pragma weak" for that symbol because that causes -- * it to be undefined even if you link lib*_nonshared.a in explicitly. -- */ --#if !defined(HAVE_LIBC_NONSHARED) && !defined(HAVE_LIBPTHREAD_NONSHARED) --#pragma weak pthread_atfork --#endif -- -+#pragma weak __register_atfork - #pragma weak pthread_create - #pragma weak pthread_detach - #pragma weak pthread_getspecific -@@ -73,7 +74,7 @@ static inline int - pthr_atfork(void (*prepare)(void), void (*parent)(void), void (*child)(void)) - { - if (pthreads_available()) -- return pthread_atfork(prepare, parent, child); -+ return __register_atfork(prepare, parent, child, __dso_handle); - - return ENOSYS; - } --- -2.7.4 - diff --git a/meta-oe/recipes-support/syslog-ng/files/configure.ac-add-option-enable-thread-tls-to-manage-.patch b/meta-oe/recipes-support/syslog-ng/files/configure.ac-add-option-enable-thread-tls-to-manage-.patch deleted file mode 100644 index 4f8a3d0775..0000000000 --- a/meta-oe/recipes-support/syslog-ng/files/configure.ac-add-option-enable-thread-tls-to-manage-.patch +++ /dev/null @@ -1,47 +0,0 @@ -configure.ac: add option --enable-thread-tls to manage thread ssl support - -Add option --enable-thread-tls to manage the including of thread -local storage, so we could explicitly disable it. - -Upstream-Status: Pending - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - configure.ac | 17 +++++++++++------ - 1 file changed, 11 insertions(+), 6 deletions(-) - -Index: syslog-ng-3.15.1/configure.ac -=================================================================== ---- syslog-ng-3.15.1.orig/configure.ac -+++ syslog-ng-3.15.1/configure.ac -@@ -190,6 +190,9 @@ AC_ARG_ENABLE(gprof, - AC_ARG_ENABLE(memtrace, - [ --enable-memtrace Enable alternative leak debugging code.]) - -+AC_ARG_ENABLE(thread-tls, -+ [ --enable-thread-tls Enable Thread Local Storage support.],,enable_thread_tls="no") -+ - AC_ARG_ENABLE(dynamic-linking, - [ --enable-dynamic-linking Link everything dynamically.],,enable_dynamic_linking="auto") - -@@ -591,12 +594,14 @@ dnl *************************************************************************** - dnl Is the __thread keyword available? - dnl *************************************************************************** - --AC_LINK_IFELSE([AC_LANG_PROGRAM( --[[#include <pthread.h> --__thread int a; --]], --[a=0;])], --[ac_cv_have_tls=yes; AC_DEFINE_UNQUOTED(HAVE_THREAD_KEYWORD, 1, "Whether Thread Local Storage is supported by the system")]) -+if test "x$enable_thread_tls" != "xno"; then -+ AC_LINK_IFELSE([AC_LANG_PROGRAM( -+ [[#include <pthread.h> -+ __thread int a; -+ ]], -+ [a=0;])], -+ [ac_cv_have_tls=yes; AC_DEFINE_UNQUOTED(HAVE_THREAD_KEYWORD, 1, "Whether Thread Local Storage is supported by the system")]) -+fi - - dnl *************************************************************************** - dnl How to do static linking? diff --git a/meta-oe/recipes-support/syslog-ng/files/fix-config-libnet.patch b/meta-oe/recipes-support/syslog-ng/files/fix-config-libnet.patch deleted file mode 100644 index 4ad0afa954..0000000000 --- a/meta-oe/recipes-support/syslog-ng/files/fix-config-libnet.patch +++ /dev/null @@ -1,65 +0,0 @@ -Subject: [PATCH] add libnet enable option - -Upstream-Status: Pending - -This would avoid a implicit auto-detecting result. - -Signed-off-by: Ming Liu <ming.liu@windriver.com> -Signed-off-by: Jackie Huang <jackie.huang@windriver.com> - -Update for 3.24.1. -Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> ---- - configure.ac | 28 ++++++++++++++++------------ - 1 file changed, 16 insertions(+), 12 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 00eb566..e7d5ac1 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -143,6 +143,9 @@ AC_CONFIG_HEADERS(config.h) - dnl *************************************************************************** - dnl Arguments - -+AC_ARG_ENABLE(libnet, -+ [ --enable-libnet Enable libnet support.],, enable_libnet="no") -+ - AC_ARG_WITH(libnet, - [ --with-libnet=path use path to libnet-config script], - , -@@ -1047,19 +1050,20 @@ dnl *************************************************************************** - dnl libnet headers/libraries - dnl *************************************************************************** - AC_MSG_CHECKING(for LIBNET) --if test "x$with_libnet" = "x"; then -- LIBNET_CONFIG="`which libnet-config`" --else -- LIBNET_CONFIG="$with_libnet/libnet-config" --fi -+if test "x$enable_libnet" = xyes; then -+ if test "x$with_libnet" = "x"; then -+ LIBNET_CONFIG="`which libnet-config`" -+ else -+ LIBNET_CONFIG="$with_libnet/libnet-config" -+ fi - --if test -n "$LIBNET_CONFIG" -a -x "$LIBNET_CONFIG"; then -- LIBNET_CFLAGS="`$LIBNET_CONFIG --defines`" -- LIBNET_LIBS="`$LIBNET_CONFIG --libs`" -- AC_MSG_RESULT(yes) --dnl libnet-config does not provide the _DEFAULT_SOURCE define, that can cause warning during build --dnl as upstream libnet-config does uses _DEFAULT_SOURCE this is just a fix till -- LIBNET_CFLAGS="$LIBNET_CFLAGS -D_DEFAULT_SOURCE" -+ if test -n "$LIBNET_CONFIG" -a -x "$LIBNET_CONFIG"; then -+ LIBNET_CFLAGS="`$LIBNET_CONFIG --defines`" -+ LIBNET_LIBS="`$LIBNET_CONFIG --libs`" -+ AC_MSG_RESULT(yes) -+ else -+ AC_MSG_ERROR([Could not find libnet, and libnet support was explicitly enabled.]) -+ fi - - else - LIBNET_LIBS= --- -2.7.4 - diff --git a/meta-oe/recipes-support/syslog-ng/files/fix-invalid-ownership.patch b/meta-oe/recipes-support/syslog-ng/files/fix-invalid-ownership.patch deleted file mode 100644 index 54ecce57e3..0000000000 --- a/meta-oe/recipes-support/syslog-ng/files/fix-invalid-ownership.patch +++ /dev/null @@ -1,25 +0,0 @@ -syslog-ng: fix wrong ownership issue - -Upstream-Status: Pending - -The ownership of build user is preserved for some target files, fixed it by -adding --no-same-owner option to tar when extracting files. - -Signed-off-by: Ming Liu <ming.liu@windriver.com> ---- - scl/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -Index: syslog-ng-3.8.1/scl/Makefile.am -=================================================================== ---- syslog-ng-3.8.1.orig/scl/Makefile.am -+++ syslog-ng-3.8.1/scl/Makefile.am -@@ -27,7 +27,7 @@ scl-install-data-local: - fi; \ - done - $(mkinstalldirs) $(DESTDIR)/$(scldir) -- (cd $(srcdir)/scl; tar cf - $(SCL_SUBDIRS)) | (cd $(DESTDIR)/$(scldir) && tar xf -) -+ (cd $(srcdir)/scl; tar cf - $(SCL_SUBDIRS)) | (cd $(DESTDIR)/$(scldir) && tar xf - --no-same-owner) - chmod -R u+rwX $(DESTDIR)/$(scldir) - - scl-uninstall-local: diff --git a/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.systemd b/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.systemd index 965abf7224..851bf252b7 100644 --- a/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.systemd +++ b/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.systemd @@ -1,4 +1,4 @@ -@version: 3.19 +@version: 3.36 # # Syslog-ng configuration file, compatible with default Debian syslogd # installation. Originally written by anonymous (I can't find his name) diff --git a/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.sysvinit b/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.sysvinit index 2b39b8c1fe..70afd0da84 100644 --- a/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.sysvinit +++ b/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.sysvinit @@ -1,4 +1,4 @@ -@version: 3.19 +@version: 3.36 # # Syslog-ng configuration file, compatible with default Debian syslogd # installation. Originally written by anonymous (I can't find his name) diff --git a/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch b/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch index 0e1d09492b..c80e91244f 100644 --- a/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch +++ b/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch @@ -1,7 +1,7 @@ Subject: [PATCH] syslog-ng.service: the syslog-ng service can not start successfully,so modify it. -Upstream-Status: pending +Upstream-Status: Pending Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> Updated-by: Andrej Valek <andrej.valek@siemens.com> @@ -38,7 +38,7 @@ index 0ccc2b9..7f08c0e 100644 -CONTROL_FILE=/var/run/syslog-ng.ctl -PID_FILE=/var/run/syslog-ng.pid +PERSIST_FILE=@LOCALSTATEDIR@/lib/syslog-ng/syslog-ng.persist -+CONTROL_FILE=@LOCALSTATEDIR@/lib/syslog-ng/syslog-ng.ctl ++CONTROL_FILE=@LOCALSTATEDIR@/run/syslog-ng/syslog-ng.ctl +PID_FILE=@LOCALSTATEDIR@/run/syslog-ng.pid OTHER_OPTIONS="--enable-core" -- diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng_3.24.1.bb b/meta-oe/recipes-support/syslog-ng/syslog-ng_3.24.1.bb deleted file mode 100644 index 01ed76765c..0000000000 --- a/meta-oe/recipes-support/syslog-ng/syslog-ng_3.24.1.bb +++ /dev/null @@ -1,14 +0,0 @@ -require syslog-ng.inc - -# We only want to add stuff we need to the defaults provided in syslog-ng.inc. -# -SRC_URI += " \ - file://fix-config-libnet.patch \ - file://fix-invalid-ownership.patch \ - file://syslog-ng.service-the-syslog-ng-service.patch \ - file://0001-syslog-ng-fix-segment-fault-during-service-start.patch \ - file://syslog-ng-tmp.conf \ - " - -SRC_URI[md5sum] = "ef9de066793f7358af7312b964ac0450" -SRC_URI[sha256sum] = "d4d0a0357b452be96b69d6f741129275530d8f0451e35adc408ad5635059fa3d" diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc b/meta-oe/recipes-support/syslog-ng/syslog-ng_4.6.0.bb index 8e53689538..ab4a8d1825 100644 --- a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc +++ b/meta-oe/recipes-support/syslog-ng/syslog-ng_4.6.0.bb @@ -9,24 +9,30 @@ ideal for firewalled environments. \ " HOMEPAGE = "http://www.balabit.com/network-security/syslog-ng/opensource-logging-system" -LICENSE = "GPLv2 & LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=24c0c5cb2c83d9f2ab725481e4df5240" +LICENSE = "GPL-2.0-only & LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=924958cefc9f7de3e0b818832b8a1cec" # util-linux added to get libuuid -DEPENDS = "libpcre flex glib-2.0 openssl util-linux" +DEPENDS = "libpcre flex glib-2.0 openssl util-linux bison-native curl" -# We expect the recipe to add anything specific for that version to these defaults. -# SRC_URI = "https://github.com/balabit/syslog-ng/releases/download/${BP}/${BP}.tar.gz \ file://syslog-ng.conf.systemd \ file://syslog-ng.conf.sysvinit \ file://initscript \ file://volatiles.03_syslog-ng \ - file://configure.ac-add-option-enable-thread-tls-to-manage-.patch \ + file://syslog-ng-tmp.conf \ + file://syslog-ng.service-the-syslog-ng-service.patch \ + file://0001-Fix-buildpaths-warning.patch \ + file://0001-macros-guard-ipv6-code-with-SYSLOG_NG_ENABLE_IPV6.patch \ " +SRC_URI:append:powerpc64le = " file://0001-plugin.c-workaround-powerpc64le-segfaults-error.patch" + +SRC_URI[sha256sum] = "b69e3360dfb96a754a4e1cbead4daef37128b1152a23572356db4ab64a475d4f" UPSTREAM_CHECK_URI = "https://github.com/balabit/syslog-ng/releases" +CVE_STATUS[CVE-2022-38725] = "cpe-incorrect: cve-check wrongly matches cpe:2.3:a:oneidentity:syslog-ng:*:*:*:*:premium:*:*:* < 7.0.32" + inherit autotools gettext systemd pkgconfig update-rc.d multilib_header EXTRA_OECONF = " \ @@ -42,12 +48,8 @@ EXTRA_OECONF = " \ --disable-python \ --disable-java --disable-java-modules \ --with-pidfile-dir=${localstatedir}/run/${BPN} \ - ${CONFIG_TLS} \ " -CONFIG_TLS = "--enable-thread-tls" -CONFIG_TLS_arm = "${@oe.utils.conditional( "DEBUG_BUILD", "1", " --disable-thread-tls", " --enable-thread-tls", d )}" - PACKAGECONFIG ??= " \ ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 systemd', d)} \ " @@ -55,7 +57,7 @@ PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,," PACKAGECONFIG[systemd] = "--enable-systemd --with-systemdsystemunitdir=${systemd_unitdir}/system/,--disable-systemd --without-systemdsystemunitdir,systemd," PACKAGECONFIG[linux-caps] = "--enable-linux-caps,--disable-linux-caps,libcap," PACKAGECONFIG[dbi] = "--enable-sql,--disable-sql,libdbi," -PACKAGECONFIG[libnet] = "--enable-libnet --with-libnet=${STAGING_BINDIR_CROSS},--disable-libnet,libnet," +PACKAGECONFIG[spoof-source] = "--enable-spoof-source --with-libnet=${STAGING_BINDIR_CROSS},--disable-spoof-source,libnet," PACKAGECONFIG[http] = "--enable-http,--disable-http,curl," PACKAGECONFIG[smtp] = "--enable-smtp --with-libesmtp=${STAGING_LIBDIR},--disable-smtp,libesmtp," PACKAGECONFIG[json] = "--enable-json,--disable-json,json-c," @@ -63,7 +65,7 @@ PACKAGECONFIG[tcp-wrapper] = "--enable-tcp-wrapper,--disable-tcp-wrapper,tcp-wra PACKAGECONFIG[geoip] = "--enable-geoip,--disable-geoip,geoip," PACKAGECONFIG[native] = "--enable-native,--disable-native,," -do_configure_prepend() { +do_configure:prepend() { olddir=$(pwd) cd ${AUTOTOOLS_SCRIPT_PATH} @@ -72,27 +74,31 @@ do_configure_prepend() { cd $olddir } -do_install_append() { - install -d ${D}/${sysconfdir}/${BPN} - install -d ${D}/${sysconfdir}/init.d - install -m 755 ${WORKDIR}/initscript ${D}/${sysconfdir}/init.d/syslog +do_install:append() { + install -d ${D}${sysconfdir}/${BPN} + install -d ${D}${sysconfdir}/init.d + install -m 755 ${UNPACKDIR}/initscript ${D}${sysconfdir}/init.d/syslog - install -d ${D}/${sysconfdir}/default/volatiles/ - install -m 755 ${WORKDIR}/volatiles.03_syslog-ng ${D}/${sysconfdir}/default/volatiles/03_syslog-ng - install -d ${D}/${sysconfdir}/tmpfiles.d/ - install -m 755 ${WORKDIR}/syslog-ng-tmp.conf ${D}/${sysconfdir}/tmpfiles.d/syslog-ng.conf + install -d ${D}${sysconfdir}/default/volatiles/ + install -m 644 ${UNPACKDIR}/volatiles.03_syslog-ng ${D}${sysconfdir}/default/volatiles/03_syslog-ng + install -d ${D}${sysconfdir}/tmpfiles.d/ + install -m 644 ${UNPACKDIR}/syslog-ng-tmp.conf ${D}${sysconfdir}/tmpfiles.d/syslog-ng.conf - install -d ${D}/${localstatedir}/lib/${BPN} + install -d ${D}${localstatedir}/lib/${BPN} # Remove /var/run as it is created on startup rm -rf ${D}${localstatedir}/run + # it causes install conflict when multilib enabled + # since python support is disabled, not deliver it + rm -f ${D}${bindir}/syslog-ng-update-virtualenv + # support for systemd if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install ${WORKDIR}/syslog-ng.conf.systemd ${D}${sysconfdir}/${BPN}/${BPN}.conf + install -m 644 ${UNPACKDIR}/syslog-ng.conf.systemd ${D}${sysconfdir}/${BPN}/${BPN}.conf install -d ${D}${systemd_unitdir}/system/ - install -m 0644 ${S}/contrib/systemd/${BPN}@.service ${D}${systemd_unitdir}/system/${BPN}@.service - install -m 0644 ${S}/contrib/systemd/${BPN}@default ${D}${sysconfdir}/default/${BPN}@default + install -m 644 ${S}/contrib/systemd/${BPN}@.service ${D}${systemd_unitdir}/system/${BPN}@.service + install -m 644 ${S}/contrib/systemd/${BPN}@default ${D}${sysconfdir}/default/${BPN}@default sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/${BPN}@.service ${D}${sysconfdir}/default/${BPN}@default sed -i -e 's,@LOCALSTATEDIR@,${localstatedir},g' ${D}${systemd_unitdir}/system/${BPN}@.service ${D}${sysconfdir}/default/${BPN}@default @@ -101,16 +107,16 @@ do_install_append() { install -d ${D}${systemd_unitdir}/system/multi-user.target.wants ln -sf ../${BPN}@.service ${D}${systemd_unitdir}/system/multi-user.target.wants/${BPN}@default.service else - install ${WORKDIR}/syslog-ng.conf.sysvinit ${D}${sysconfdir}/${BPN}/${BPN}.conf + install -m 644 ${UNPACKDIR}/syslog-ng.conf.sysvinit ${D}${sysconfdir}/${BPN}/${BPN}.conf fi oe_multilib_header syslog-ng/syslog-ng-config.h } -FILES_${PN} += "${datadir}/include/scl/ ${datadir}/xsd ${datadir}/tools ${systemd_unitdir}/system/multi-user.target.wants/*" -RDEPENDS_${PN} += "gawk ${@bb.utils.contains('PACKAGECONFIG','json','${PN}-jconf','',d)}" +FILES:${PN} += "${datadir}/include/scl/ ${datadir}/xsd ${datadir}/tools ${systemd_unitdir}/system/multi-user.target.wants/*" +RDEPENDS:${PN} += "gawk ${@bb.utils.contains('PACKAGECONFIG','json','${PN}-jconf','',d)}" -FILES_${PN}-jconf += " \ +FILES:${PN}-jconf += " \ ${datadir}/${BPN}/include/scl/cim \ ${datadir}/${BPN}/include/scl/elasticsearch \ ${datadir}/${BPN}/include/scl/ewmm \ @@ -121,27 +127,31 @@ ${datadir}/${BPN}/include/scl/logmatic \ # This overcomes the syslog-ng rdepends on syslog-ng-dev QA Error PACKAGES =+ "${PN}-jconf ${PN}-libs ${PN}-libs-dev" -RPROVIDES_${PN}-dbg += "${PN}-libs-dbg" -FILES_${PN}-libs = "${libdir}/${BPN}/*.so ${libdir}/libsyslog-ng-*.so*" -FILES_${PN}-libs-dev = "${libdir}/${BPN}/lib*.la" -FILES_${PN}-staticdev += "${libdir}/${BPN}/libtest/*.a" -FILES_${PN} += "${systemd_unitdir}/system/*.service" -INSANE_SKIP_${PN}-libs = "dev-so" -RDEPENDS_${PN} += "${PN}-libs" - -CONFFILES_${PN} = "${sysconfdir}/${BPN}.conf ${sysconfdir}/scl.conf" +RPROVIDES:${PN}-dbg += "${PN}-libs-dbg" +FILES:${PN}-libs = "${libdir}/${BPN}/*.so ${libdir}/libsyslog-ng-*.so*" +FILES:${PN}-libs-dev = "${libdir}/${BPN}/lib*.la" +FILES:${PN}-staticdev += "${libdir}/${BPN}/libtest/*.a" +FILES:${PN} += "${systemd_unitdir}/system/*.service" +INSANE_SKIP:${PN}-libs = "dev-so" +RDEPENDS:${PN} += "${PN}-libs" -# syslog initscript is handled explicitly because order of -# update-rc.d and update-alternatives is important -RDEPENDS_${PN} += " ${@oe.utils.conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "update-rc.d", d)}" +CONFFILES:${PN} = "${sysconfdir}/${BPN}.conf ${sysconfdir}/scl.conf" -RCONFLICTS_${PN} = "busybox-syslog sysklogd rsyslog" -RCONFLICTS_${PN}-libs = "busybox-syslog sysklogd rsyslog" +RCONFLICTS:${PN} = "busybox-syslog sysklogd rsyslog" +RCONFLICTS:${PN}-libs = "busybox-syslog sysklogd rsyslog" -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -RCONFLICTS_${PN} += "${PN}-systemd" -SYSTEMD_SERVICE_${PN} = "${BPN}@.service" +RPROVIDES:${PN} += "${PN}-systemd" +RREPLACES:${PN} += "${PN}-systemd" +RCONFLICTS:${PN} += "${PN}-systemd" +SYSTEMD_SERVICE:${PN} = "${BPN}@.service" INITSCRIPT_NAME = "syslog" INITSCRIPT_PARAMS = "start 20 2 3 4 5 . stop 90 0 1 6 ." + +# Fails only with 32bit MACHINEs +# http://errors.yoctoproject.org/Errors/Details/766956/ +# syslog-ng-4.6.0/modules/secure-logging/slog.c:937:63: error: passing argument 4 of 'g_io_channel_write_chars' from incompatible pointer type [-Wincompatible-pointer-types] +# syslog-ng-4.6.0/modules/secure-logging/slog.c:955:99: error: passing argument 5 of 'cmac' from incompatible pointer type [-Wincompatible-pointer-types] +# syslog-ng-4.6.0/modules/secure-logging/slog.c:959:74: error: passing argument 4 of 'g_io_channel_write_chars' from incompatible pointer type [-Wincompatible-pointer-types] +# syslog-ng-4.6.0/modules/secure-logging/slog.c:975:107: error: passing argument 4 of 'g_io_channel_write_chars' from incompatible pointer type [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-oe/recipes-support/system-config-keyboard/system-config-keyboard_1.4.0.bb b/meta-oe/recipes-support/system-config-keyboard/system-config-keyboard_1.4.0.bb index 26b4412f52..db4c395c56 100644 --- a/meta-oe/recipes-support/system-config-keyboard/system-config-keyboard_1.4.0.bb +++ b/meta-oe/recipes-support/system-config-keyboard/system-config-keyboard_1.4.0.bb @@ -1,12 +1,12 @@ DESCRIPTION = "a graphical user interface that allows the user to \ change the default keyboard of the system" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "https://fedorahosted.org/releases/s/y/${BPN}/${BP}.tar.bz2" SRC_URI[md5sum] = "c267db0ee7a2131ba418399dc17f9e72" SRC_URI[sha256sum] = "218c883e4e2bfcc82bfe07e785707b5c2ece28df772f2155fd044b9bb1614284" -inherit python-dir gettext +inherit python3-dir gettext DEPENDS += "intltool-native gettext-native" EXTRA_OEMAKE = " \ @@ -17,11 +17,11 @@ do_install() { oe_runmake 'DESTDIR=${D}' install } -do_install_append_class-native() { +do_install:append:class-native() { rm -rf ${D}/usr } -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/python${PYTHON_BASEVERSION}/* \ ${datadir}/* \ " diff --git a/meta-oe/recipes-support/tbb/tbb.bb b/meta-oe/recipes-support/tbb/tbb.bb deleted file mode 100644 index f870104015..0000000000 --- a/meta-oe/recipes-support/tbb/tbb.bb +++ /dev/null @@ -1,45 +0,0 @@ -DESCRIPTION = "Parallelism library for C++ - runtime files \ - TBB is a library that helps you leverage multi-core processor \ - performance without having to be a threading expert. It represents a \ - higher-level, task-based parallelism that abstracts platform details \ - and threading mechanism for performance and scalability." -HOMEPAGE = "http://threadingbuildingblocks.org/" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -PRDATE = "20170412" -BRANCH = "tbb_2017" -SRCREV = "a2cfdfe946933cbe38bffe1d8086ae36f06691a3" -PV = "${PRDATE}+${SRCPV}" -SRC_URI = "git://github.com/01org/tbb;branch=${BRANCH} \ - file://cross-compile.patch \ - file://0001-mallinfo-is-glibc-specific-API-mark-it-so.patch \ - file://0002-linux-Fix-gcc-version-check.patch \ - file://tbb.pc \ -" - -S = "${WORKDIR}/git" - -COMPILER ?= "gcc" -COMPILER_toolchain-clang = "clang" - -do_compile() { - oe_runmake compiler=${COMPILER} arch=${HOST_ARCH} runtime=cc4 -} - -do_install() { - install -d ${D}${includedir} ${D}${libdir}/pkgconfig - rm ${S}/include/tbb/index.html -f - cp -R --no-dereference --preserve=mode,links -v ${S}/include/tbb ${D}${includedir} - install -m 0755 ${B}/build/linux_*_release/lib*.so* ${D}${libdir} - install -m 0644 ${WORKDIR}/tbb.pc ${D}${libdir}/pkgconfig -} - -# fails with thumb enabled: -# | arm-oe-linux-gnueabi-g++ -march=armv7-a -mthumb -mthumb-interwork -mfloat-abi=softfp -mfpu=neon -mtune=cortex-a9 -mcpu=cortex-a9 -D__ARM__ -D__LINUX_ARM_ARCH__=7 -funwind-tables -mvectorize-with-neon-quad -rdynamic --sysroot=/OE/sysroots/m14tv -c -MMD -DTBB_USE_DEBUG -g -O0 -DUSE_PTHREAD -fPIC -D__TBB_BUILD=1 -Wall -Wno-parentheses -Wno-non-virtual-dtor -O2 -pipe -g -feliminate-unused-debug-types -fpermissive -fvisibility-inlines-hidden -I../../src -I../../src/rml/include -I../../include ../../src/tbb/concurrent_queue.cpp -# | {standard input}: Assembler messages: -# | {standard input}:250: Error: thumb conditional instruction should be in IT block -- `strexeq r2,r3,[r4]' -# ... -# | make[1]: *** [concurrent_queue.o] Error 1 -ARM_INSTRUCTION_SET = "arm" -SECURITY_CFLAGS_append = " -fPIC" - diff --git a/meta-oe/recipes-support/tbb/tbb/0001-hwloc_detection.cmake-remove-cross-compiation-check.patch b/meta-oe/recipes-support/tbb/tbb/0001-hwloc_detection.cmake-remove-cross-compiation-check.patch new file mode 100644 index 0000000000..640b131703 --- /dev/null +++ b/meta-oe/recipes-support/tbb/tbb/0001-hwloc_detection.cmake-remove-cross-compiation-check.patch @@ -0,0 +1,33 @@ +From 7ffc1eba8596544d6e3af0fd5f4004fff6d56f84 Mon Sep 17 00:00:00 2001 +From: Naveen Saini <naveen.kumar.saini@intel.com> +Date: Wed, 29 Nov 2023 15:48:57 +0800 +Subject: [PATCH] hwloc_detection.cmake: remove cross-compiation check + +This check is preventing pkgconfig to +search for hwloc under cross-compilation. + +pkgconfig able to find hwloc pkg from sysroot. + +Upstream-Status: Inappropriate + +Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> +--- + cmake/hwloc_detection.cmake | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/cmake/hwloc_detection.cmake b/cmake/hwloc_detection.cmake +index 47233b17..5a7e84c3 100644 +--- a/cmake/hwloc_detection.cmake ++++ b/cmake/hwloc_detection.cmake +@@ -46,8 +46,6 @@ endforeach() + unset(HWLOC_TARGET_NAME) + + if (NOT HWLOC_TARGET_EXPLICITLY_DEFINED AND +- # No hwloc auto detection for cross compilation +- NOT CMAKE_CROSSCOMPILING AND + NOT TBB_DISABLE_HWLOC_AUTOMATIC_SEARCH + ) + find_package(PkgConfig QUIET) +-- +2.37.3 + diff --git a/meta-oe/recipes-support/tbb/tbb/0001-mallinfo-is-glibc-specific-API-mark-it-so.patch b/meta-oe/recipes-support/tbb/tbb/0001-mallinfo-is-glibc-specific-API-mark-it-so.patch deleted file mode 100644 index 7e66945fa2..0000000000 --- a/meta-oe/recipes-support/tbb/tbb/0001-mallinfo-is-glibc-specific-API-mark-it-so.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 6b2b136caa68912d77ffe26143cd3da768b9ef80 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 3 Jun 2017 08:39:37 -0700 -Subject: [PATCH] mallinfo() is glibc specific API mark it so - -Helps compiling with musl - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending - - src/tbbmalloc/proxy.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/tbbmalloc/proxy.cpp b/src/tbbmalloc/proxy.cpp -index 5ef279d..06c4872 100644 ---- a/src/tbbmalloc/proxy.cpp -+++ b/src/tbbmalloc/proxy.cpp -@@ -185,6 +185,7 @@ int mallopt(int /*param*/, int /*value*/) __THROW - return 1; - } - -+#ifdef __GLIBC__ - struct mallinfo mallinfo() __THROW - { - struct mallinfo m; -@@ -192,6 +193,7 @@ struct mallinfo mallinfo() __THROW - - return m; - } -+#endif - - #if __ANDROID__ - // Android doesn't have malloc_usable_size, provide it to be compatible --- -2.13.0 - diff --git a/meta-oe/recipes-support/tbb/tbb/0002-linux-Fix-gcc-version-check.patch b/meta-oe/recipes-support/tbb/tbb/0002-linux-Fix-gcc-version-check.patch deleted file mode 100644 index 9824b61e91..0000000000 --- a/meta-oe/recipes-support/tbb/tbb/0002-linux-Fix-gcc-version-check.patch +++ /dev/null @@ -1,57 +0,0 @@ -From aee098f1bf0511c6b5544de3170a9e8b51673b60 Mon Sep 17 00:00:00 2001 -From: Pierre Le Magourou <plemagourou@softbankrobotics.com> -Date: Tue, 23 Jan 2018 15:25:50 +0100 -Subject: [PATCH] linux.gcc: Fix cross compilation error. - -When cross compiling on linux with gcc, the host gcc was used instead of -the cross gcc to set compilation flags according to gcc version. - -When the cross gcc was in version 5.X and the host gcc in version 7.X, -tbb was compiled with the -flifetime-dse=1 flag that does not exist on -gcc 5.X. ---- - build/linux.gcc.inc | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/build/linux.gcc.inc b/build/linux.gcc.inc -index 5c1889c..a4d6698 100644 ---- a/build/linux.gcc.inc -+++ b/build/linux.gcc.inc -@@ -41,29 +41,29 @@ LINK_FLAGS = -Wl,-rpath-link=. -rdynamic - C_FLAGS = $(CPLUS_FLAGS) - - # gcc 4.2 and higher support OpenMP --ifneq (,$(shell gcc -dumpversion | egrep "^(4\.[2-9]|[5-9])")) -+ifneq (,$(shell $(CC) -dumpversion | egrep "^(4\.[2-9]|[5-9])")) - OPENMP_FLAG = -fopenmp - endif - - # gcc 4.8 and later support RTM intrinsics, but require command line switch to enable them --ifneq (,$(shell gcc -dumpversion | egrep "^(4\.[8-9]|[5-9])")) -+ifneq (,$(shell $(CC) -dumpversion | egrep "^(4\.[8-9]|[5-9])")) - RTM_KEY = -mrtm - endif - - # gcc 4.0 and later have -Wextra that is used by some our customers. --ifneq (,$(shell gcc -dumpversion | egrep "^([4-9])")) -+ifneq (,$(shell $(CC) -dumpversion | egrep "^([4-9])")) - TEST_WARNING_KEY += -Wextra - endif - - # gcc 5.0 and later have -Wsuggest-override option - # enable it via a pre-included header in order to limit to C++11 and above --ifneq (,$(shell gcc -dumpversion | egrep "^([5-9])")) -+ifneq (,$(shell $(CC) -dumpversion | egrep "^([5-9])")) - INCLUDE_TEST_HEADERS = -include $(tbb_root)/src/test/harness_preload.h - endif - - # gcc 6.0 and later have -flifetime-dse option that controls - # elimination of stores done outside the object lifetime --ifneq (,$(shell gcc -dumpversion | egrep "^([6-9])")) -+ifneq (,$(shell $(CC) -dumpversion | egrep "^([6-9])")) - # keep pre-contruction stores for zero initialization - DSE_KEY = -flifetime-dse=1 - endif --- -2.15.1 - diff --git a/meta-oe/recipes-support/tbb/tbb/cross-compile.patch b/meta-oe/recipes-support/tbb/tbb/cross-compile.patch deleted file mode 100644 index d54b307ee9..0000000000 --- a/meta-oe/recipes-support/tbb/tbb/cross-compile.patch +++ /dev/null @@ -1,39 +0,0 @@ -Author: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> - -Upstream-Status: unsuitable ---- - build/linux.gcc.inc | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -Index: tbb2017_20170118oss/build/linux.gcc.inc -=================================================================== ---- tbb2017_20170118oss.orig/build/linux.gcc.inc -+++ tbb2017_20170118oss/build/linux.gcc.inc -@@ -32,8 +32,9 @@ DYLIB_KEY = -shared - EXPORT_KEY = -Wl,--version-script, - LIBDL = -ldl - --CPLUS = g++ --CONLY = gcc -+CPLUS = $(CXX) -+CONLY = $(CC) -+CPLUS_FLAGS = $(CXXFLAGS) - LIB_LINK_FLAGS = $(DYLIB_KEY) -Wl,-soname=$(BUILDING_LIBRARY) - LIBS += -lpthread -lrt - LINK_FLAGS = -Wl,-rpath-link=. -rdynamic -Index: tbb2017_20170118oss/build/linux.clang.inc -=================================================================== ---- tbb2017_20170118oss.orig/build/linux.clang.inc -+++ tbb2017_20170118oss/build/linux.clang.inc -@@ -31,8 +31,9 @@ DYLIB_KEY = -shared - EXPORT_KEY = -Wl,--version-script, - LIBDL = -ldl - --CPLUS = clang++ --CONLY = clang -+CPLUS = $(CXX) -+CONLY = $(CC) -+CPLUS_FLAGS = $(CXXFLAGS) - LIB_LINK_FLAGS = $(DYLIB_KEY) -Wl,-soname=$(BUILDING_LIBRARY) - LIBS += -lpthread -lrt - LINK_FLAGS = -Wl,-rpath-link=. -rdynamic diff --git a/meta-oe/recipes-support/tbb/tbb/tbb.pc b/meta-oe/recipes-support/tbb/tbb/tbb.pc deleted file mode 100644 index 644b64fbf4..0000000000 --- a/meta-oe/recipes-support/tbb/tbb/tbb.pc +++ /dev/null @@ -1,11 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: Threading Building Blocks -Description: Intel's parallelism library for C++ -URL: http://www.threadingbuildingblocks.org/ -Version: 3.0+r018 -Libs: -L${libdir} -ltbb -Cflags: -I${includedir} diff --git a/meta-oe/recipes-support/tbb/tbb_2021.11.0.bb b/meta-oe/recipes-support/tbb/tbb_2021.11.0.bb new file mode 100644 index 0000000000..f834726bd6 --- /dev/null +++ b/meta-oe/recipes-support/tbb/tbb_2021.11.0.bb @@ -0,0 +1,62 @@ +DESCRIPTION = "Parallelism library for C++ - runtime files \ + TBB is a library that helps you leverage multi-core processor \ + performance without having to be a threading expert. It represents a \ + higher-level, task-based parallelism that abstracts platform details \ + and threading mechanism for performance and scalability." +HOMEPAGE = "https://software.intel.com/en-us/tbb" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=86d3f3a95c324c9479bd8986968f4327" + +DEPENDS:append:libc-musl = " libucontext" +DEPENDS:append:class-target = " hwloc" + +PE = "1" + +BRANCH = "onetbb_2021" +SRCREV = "8b829acc65569019edb896c5150d427f288e8aba" +SRC_URI = "git://github.com/oneapi-src/oneTBB.git;protocol=https;branch=${BRANCH} \ + file://0001-hwloc_detection.cmake-remove-cross-compiation-check.patch \ +" +S = "${WORKDIR}/git" + +inherit cmake pkgconfig + +# test build fails, error: 'mallinfo mallinfo()' is deprecated +EXTRA_OECMAKE += " \ + -DTBB_TEST=OFF \ + -DCMAKE_BUILD_TYPE=Release \ + " + +# Hard-float 'd' ABI can't be used for a target that doesn't support the D instruction set extension (ignoring target-abi) +# tmp-glibc/work/riscv64-oe-linux/tbb/1_2021.7.0-r0/recipe-sysroot-native/usr/bin/riscv64-oe-linux/riscv64-oe-linux-ld: /tmp/lto-llvm-264bc2.o: can't link soft-float modules with double-float modules +# tmp-glibc/work/riscv64-oe-linux/tbb/1_2021.7.0-r0/recipe-sysroot-native/usr/bin/riscv64-oe-linux/riscv64-oe-linux-ld: failed to merge target specific data of file /tmp/lto-llvm-264bc2.o +EXTRA_OECMAKE:append:riscv32:toolchain-clang = " -DTBB_ENABLE_IPO=OFF " +EXTRA_OECMAKE:append:riscv64:toolchain-clang = " -DTBB_ENABLE_IPO=OFF " + +# fails with thumb enabled: +# | arm-oe-linux-gnueabi-g++ -march=armv7-a -mthumb -mthumb-interwork -mfloat-abi=softfp -mfpu=neon -mtune=cortex-a9 -mcpu=cortex-a9 -D__ARM__ -D__LINUX_ARM_ARCH__=7 -funwind-tables -mvectorize-with-neon-quad -rdynamic --sysroot=/OE/sysroots/m14tv -c -MMD -DTBB_USE_DEBUG -g -O0 -DUSE_PTHREAD -fPIC -D__TBB_BUILD=1 -Wall -Wno-parentheses -Wno-non-virtual-dtor -O2 -pipe -g -feliminate-unused-debug-types -fpermissive -fvisibility-inlines-hidden -I../../src -I../../src/rml/include -I../../include ../../src/tbb/concurrent_queue.cpp +# | {standard input}: Assembler messages: +# | {standard input}:250: Error: thumb conditional instruction should be in IT block -- `strexeq r2,r3,[r4]' +# ... +# | make[1]: *** [concurrent_queue.o] Error 1 +ARM_INSTRUCTION_SET = "arm" + +ASNEEDED = "" + +LDFLAGS:append:mips = " -latomic" +LDFLAGS:append:mipsel = " -latomic" +LDFLAGS:append:riscv32:toolchain-clang = " -latomic" + +LDFLAGS:append:libc-musl = " -lucontext" + +# The latest version of oneTBB does not support PPC +COMPATIBLE_MACHINE:powerpc = "(!.*ppc).*" + + +do_install:append:class-target() { + # fix for qa check buildpaths + sed -i "s#${RECIPE_SYSROOT}##g" ${D}${libdir}/cmake/TBB/TBBTargets.cmake +} + + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/thin-provisioning-tools/files/0001-do-not-strip-pdata_tools-at-do_install.patch b/meta-oe/recipes-support/thin-provisioning-tools/files/0001-do-not-strip-pdata_tools-at-do_install.patch deleted file mode 100644 index 547949dd60..0000000000 --- a/meta-oe/recipes-support/thin-provisioning-tools/files/0001-do-not-strip-pdata_tools-at-do_install.patch +++ /dev/null @@ -1,33 +0,0 @@ -From de869ad2cb19d81257a159770ebe27593a71593c Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Tue, 31 Jul 2018 11:29:51 +0800 -Subject: [PATCH] do not strip pdata_tools at do_install - -It caused QA Issue: --------------- -|ERROR: QA Issue: File '/usr/sbin/pdata_tools' from thin-provisioning-tools -was already stripped, this will prevent future debugging! [already-stripped] --------------- - -Upstream-Status: Inappropriate [oe specific] - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - Makefile.in | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/Makefile.in b/Makefile.in -index 02b75dd..df590b4 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -267,7 +267,6 @@ MANPAGES:=$(patsubst %,man8/%.8,$(TOOLS)) - install: bin/pdata_tools $(MANPAGES) - $(INSTALL_DIR) $(BINDIR) - $(INSTALL_PROGRAM) bin/pdata_tools $(BINDIR) -- $(STRIP) $(BINDIR)/pdata_tools - ln -s -f pdata_tools $(BINDIR)/cache_check - ln -s -f pdata_tools $(BINDIR)/cache_dump - ln -s -f pdata_tools $(BINDIR)/cache_metadata_size --- -2.7.4 - diff --git a/meta-oe/recipes-support/thin-provisioning-tools/files/use-sh-on-path.patch b/meta-oe/recipes-support/thin-provisioning-tools/files/use-sh-on-path.patch deleted file mode 100644 index de934c19a8..0000000000 --- a/meta-oe/recipes-support/thin-provisioning-tools/files/use-sh-on-path.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 38397b42e2c3450c2aee20e6fb92f362db4e35ef Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Tue, 2 Jul 2019 13:20:39 +0800 -Subject: [PATCH] thin-provisioning-tools: use sh on path when invoking txt2man - -txt2man contains a test which might try to use ksh to run the script, so we -avoid running /bin/sh. - -Upstream-Status: Inappropriate [oe specific] - -Signed-off-by: joe.slater <joe.slater@windriver.com> - -Rebase to 0.8.5 -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.in b/Makefile.in -index 7c867b2..5303994 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -223,7 +223,7 @@ endif - %.8: %.txt bin/txt2man - @echo " [txt2man] $<" - @mkdir -p $(dir $@) -- $(V) bin/txt2man -p -t $(basename $(notdir $<)) $< > $@ -+ $(V) sh bin/txt2man -p -t $(basename $(notdir $<)) $< > $@ - - #---------------------------------------------------------------- - --- -2.7.4 - diff --git a/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools-crates.inc b/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools-crates.inc new file mode 100644 index 0000000000..d71aa442fa --- /dev/null +++ b/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools-crates.inc @@ -0,0 +1,214 @@ +# Autogenerated with 'bitbake -c update_crates thin-provisioning-tools' + +# from Cargo.lock +SRC_URI += " \ + crate://crates.io/adler/1.0.2 \ + crate://crates.io/aho-corasick/1.1.2 \ + crate://crates.io/anstyle/1.0.6 \ + crate://crates.io/anyhow/1.0.80 \ + crate://crates.io/atty/0.2.14 \ + crate://crates.io/autocfg/1.1.0 \ + crate://crates.io/base64/0.21.7 \ + crate://crates.io/bitflags/1.3.2 \ + crate://crates.io/bitflags/2.4.2 \ + crate://crates.io/bytemuck/1.14.3 \ + crate://crates.io/byteorder/1.5.0 \ + crate://crates.io/cassowary/0.3.0 \ + crate://crates.io/cfg-if/1.0.0 \ + crate://crates.io/clap/4.5.1 \ + crate://crates.io/clap_builder/4.5.1 \ + crate://crates.io/clap_lex/0.7.0 \ + crate://crates.io/console/0.15.8 \ + crate://crates.io/crc32c/0.6.5 \ + crate://crates.io/crc32fast/1.4.0 \ + crate://crates.io/data-encoding/2.5.0 \ + crate://crates.io/downcast/0.11.0 \ + crate://crates.io/duct/0.13.7 \ + crate://crates.io/encode_unicode/0.3.6 \ + crate://crates.io/env_logger/0.8.4 \ + crate://crates.io/errno/0.3.8 \ + crate://crates.io/exitcode/1.1.2 \ + crate://crates.io/fastrand/2.0.1 \ + crate://crates.io/fixedbitset/0.4.2 \ + crate://crates.io/flate2/1.0.28 \ + crate://crates.io/fragile/2.0.0 \ + crate://crates.io/getrandom/0.2.12 \ + crate://crates.io/hermit-abi/0.1.19 \ + crate://crates.io/hermit-abi/0.3.6 \ + crate://crates.io/indicatif/0.17.8 \ + crate://crates.io/instant/0.1.12 \ + crate://crates.io/iovec/0.1.4 \ + crate://crates.io/lazy_static/1.4.0 \ + crate://crates.io/libc/0.2.153 \ + crate://crates.io/linux-raw-sys/0.4.13 \ + crate://crates.io/log/0.4.20 \ + crate://crates.io/memchr/2.7.1 \ + crate://crates.io/minimal-lexical/0.2.1 \ + crate://crates.io/miniz_oxide/0.7.2 \ + crate://crates.io/mockall/0.12.1 \ + crate://crates.io/mockall_derive/0.12.1 \ + crate://crates.io/nom/7.1.3 \ + crate://crates.io/num-derive/0.4.2 \ + crate://crates.io/num-traits/0.2.18 \ + crate://crates.io/num_cpus/1.16.0 \ + crate://crates.io/number_prefix/0.4.0 \ + crate://crates.io/numtoa/0.1.0 \ + crate://crates.io/once_cell/1.19.0 \ + crate://crates.io/os_pipe/1.1.5 \ + crate://crates.io/portable-atomic/1.6.0 \ + crate://crates.io/ppv-lite86/0.2.17 \ + crate://crates.io/predicates/3.1.0 \ + crate://crates.io/predicates-core/1.0.6 \ + crate://crates.io/predicates-tree/1.0.9 \ + crate://crates.io/proc-macro2/1.0.78 \ + crate://crates.io/quick-xml/0.31.0 \ + crate://crates.io/quickcheck/1.0.3 \ + crate://crates.io/quickcheck_macros/1.0.0 \ + crate://crates.io/quote/1.0.35 \ + crate://crates.io/rand/0.8.5 \ + crate://crates.io/rand_chacha/0.3.1 \ + crate://crates.io/rand_core/0.6.4 \ + crate://crates.io/rangemap/1.5.0 \ + crate://crates.io/redox_syscall/0.2.16 \ + crate://crates.io/redox_termios/0.1.3 \ + crate://crates.io/regex/1.10.3 \ + crate://crates.io/regex-automata/0.4.5 \ + crate://crates.io/regex-syntax/0.8.2 \ + crate://crates.io/roaring/0.10.3 \ + crate://crates.io/rustc_version/0.4.0 \ + crate://crates.io/rustix/0.38.31 \ + crate://crates.io/safemem/0.3.3 \ + crate://crates.io/semver/1.0.22 \ + crate://crates.io/shared_child/1.0.0 \ + crate://crates.io/strsim/0.11.0 \ + crate://crates.io/syn/1.0.109 \ + crate://crates.io/syn/2.0.50 \ + crate://crates.io/tempfile/3.10.0 \ + crate://crates.io/termion/1.5.6 \ + crate://crates.io/termtree/0.4.1 \ + crate://crates.io/thiserror/1.0.57 \ + crate://crates.io/thiserror-impl/1.0.57 \ + crate://crates.io/threadpool/1.8.1 \ + crate://crates.io/tui/0.19.0 \ + crate://crates.io/unicode-ident/1.0.12 \ + crate://crates.io/unicode-segmentation/1.11.0 \ + crate://crates.io/unicode-width/0.1.11 \ + crate://crates.io/wasi/0.11.0+wasi-snapshot-preview1 \ + crate://crates.io/winapi/0.3.9 \ + crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \ + crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \ + crate://crates.io/windows-sys/0.52.0 \ + crate://crates.io/windows-targets/0.52.3 \ + crate://crates.io/windows_aarch64_gnullvm/0.52.3 \ + crate://crates.io/windows_aarch64_msvc/0.52.3 \ + crate://crates.io/windows_i686_gnu/0.52.3 \ + crate://crates.io/windows_i686_msvc/0.52.3 \ + crate://crates.io/windows_x86_64_gnu/0.52.3 \ + crate://crates.io/windows_x86_64_gnullvm/0.52.3 \ + crate://crates.io/windows_x86_64_msvc/0.52.3 \ +" + +SRC_URI[adler-1.0.2.sha256sum] = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +SRC_URI[aho-corasick-1.1.2.sha256sum] = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +SRC_URI[anstyle-1.0.6.sha256sum] = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" +SRC_URI[anyhow-1.0.80.sha256sum] = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" +SRC_URI[atty-0.2.14.sha256sum] = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +SRC_URI[autocfg-1.1.0.sha256sum] = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +SRC_URI[base64-0.21.7.sha256sum] = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +SRC_URI[bitflags-1.3.2.sha256sum] = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +SRC_URI[bitflags-2.4.2.sha256sum] = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +SRC_URI[bytemuck-1.14.3.sha256sum] = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f" +SRC_URI[byteorder-1.5.0.sha256sum] = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" +SRC_URI[cassowary-0.3.0.sha256sum] = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" +SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +SRC_URI[clap-4.5.1.sha256sum] = "c918d541ef2913577a0f9566e9ce27cb35b6df072075769e0b26cb5a554520da" +SRC_URI[clap_builder-4.5.1.sha256sum] = "9f3e7391dad68afb0c2ede1bf619f579a3dc9c2ec67f089baa397123a2f3d1eb" +SRC_URI[clap_lex-0.7.0.sha256sum] = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" +SRC_URI[console-0.15.8.sha256sum] = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" +SRC_URI[crc32c-0.6.5.sha256sum] = "89254598aa9b9fa608de44b3ae54c810f0f06d755e24c50177f1f8f31ff50ce2" +SRC_URI[crc32fast-1.4.0.sha256sum] = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +SRC_URI[data-encoding-2.5.0.sha256sum] = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" +SRC_URI[downcast-0.11.0.sha256sum] = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1" +SRC_URI[duct-0.13.7.sha256sum] = "e4ab5718d1224b63252cd0c6f74f6480f9ffeb117438a2e0f5cf6d9a4798929c" +SRC_URI[encode_unicode-0.3.6.sha256sum] = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" +SRC_URI[env_logger-0.8.4.sha256sum] = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" +SRC_URI[errno-0.3.8.sha256sum] = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +SRC_URI[exitcode-1.1.2.sha256sum] = "de853764b47027c2e862a995c34978ffa63c1501f2e15f987ba11bd4f9bba193" +SRC_URI[fastrand-2.0.1.sha256sum] = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +SRC_URI[fixedbitset-0.4.2.sha256sum] = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" +SRC_URI[flate2-1.0.28.sha256sum] = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +SRC_URI[fragile-2.0.0.sha256sum] = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" +SRC_URI[getrandom-0.2.12.sha256sum] = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +SRC_URI[hermit-abi-0.1.19.sha256sum] = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +SRC_URI[hermit-abi-0.3.6.sha256sum] = "bd5256b483761cd23699d0da46cc6fd2ee3be420bbe6d020ae4a091e70b7e9fd" +SRC_URI[indicatif-0.17.8.sha256sum] = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3" +SRC_URI[instant-0.1.12.sha256sum] = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +SRC_URI[iovec-0.1.4.sha256sum] = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" +SRC_URI[lazy_static-1.4.0.sha256sum] = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +SRC_URI[libc-0.2.153.sha256sum] = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +SRC_URI[linux-raw-sys-0.4.13.sha256sum] = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +SRC_URI[log-0.4.20.sha256sum] = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +SRC_URI[memchr-2.7.1.sha256sum] = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +SRC_URI[minimal-lexical-0.2.1.sha256sum] = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" +SRC_URI[miniz_oxide-0.7.2.sha256sum] = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +SRC_URI[mockall-0.12.1.sha256sum] = "43766c2b5203b10de348ffe19f7e54564b64f3d6018ff7648d1e2d6d3a0f0a48" +SRC_URI[mockall_derive-0.12.1.sha256sum] = "af7cbce79ec385a1d4f54baa90a76401eb15d9cab93685f62e7e9f942aa00ae2" +SRC_URI[nom-7.1.3.sha256sum] = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +SRC_URI[num-derive-0.4.2.sha256sum] = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" +SRC_URI[num-traits-0.2.18.sha256sum] = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +SRC_URI[num_cpus-1.16.0.sha256sum] = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +SRC_URI[number_prefix-0.4.0.sha256sum] = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" +SRC_URI[numtoa-0.1.0.sha256sum] = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef" +SRC_URI[once_cell-1.19.0.sha256sum] = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +SRC_URI[os_pipe-1.1.5.sha256sum] = "57119c3b893986491ec9aa85056780d3a0f3cf4da7cc09dd3650dbd6c6738fb9" +SRC_URI[portable-atomic-1.6.0.sha256sum] = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" +SRC_URI[ppv-lite86-0.2.17.sha256sum] = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +SRC_URI[predicates-3.1.0.sha256sum] = "68b87bfd4605926cdfefc1c3b5f8fe560e3feca9d5552cf68c466d3d8236c7e8" +SRC_URI[predicates-core-1.0.6.sha256sum] = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" +SRC_URI[predicates-tree-1.0.9.sha256sum] = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" +SRC_URI[proc-macro2-1.0.78.sha256sum] = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +SRC_URI[quick-xml-0.31.0.sha256sum] = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +SRC_URI[quickcheck-1.0.3.sha256sum] = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6" +SRC_URI[quickcheck_macros-1.0.0.sha256sum] = "b22a693222d716a9587786f37ac3f6b4faedb5b80c23914e7303ff5a1d8016e9" +SRC_URI[quote-1.0.35.sha256sum] = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +SRC_URI[rand-0.8.5.sha256sum] = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +SRC_URI[rand_chacha-0.3.1.sha256sum] = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +SRC_URI[rand_core-0.6.4.sha256sum] = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +SRC_URI[rangemap-1.5.0.sha256sum] = "795915a3930a5d6bafd9053d37602fea3e61be2e5d4d788983a8ba9654c1c6f2" +SRC_URI[redox_syscall-0.2.16.sha256sum] = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +SRC_URI[redox_termios-0.1.3.sha256sum] = "20145670ba436b55d91fc92d25e71160fbfbdd57831631c8d7d36377a476f1cb" +SRC_URI[regex-1.10.3.sha256sum] = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +SRC_URI[regex-automata-0.4.5.sha256sum] = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" +SRC_URI[regex-syntax-0.8.2.sha256sum] = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +SRC_URI[roaring-0.10.3.sha256sum] = "a1c77081a55300e016cb86f2864415b7518741879db925b8d488a0ee0d2da6bf" +SRC_URI[rustc_version-0.4.0.sha256sum] = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +SRC_URI[rustix-0.38.31.sha256sum] = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +SRC_URI[safemem-0.3.3.sha256sum] = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" +SRC_URI[semver-1.0.22.sha256sum] = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" +SRC_URI[shared_child-1.0.0.sha256sum] = "b0d94659ad3c2137fef23ae75b03d5241d633f8acded53d672decfa0e6e0caef" +SRC_URI[strsim-0.11.0.sha256sum] = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" +SRC_URI[syn-1.0.109.sha256sum] = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +SRC_URI[syn-2.0.50.sha256sum] = "74f1bdc9872430ce9b75da68329d1c1746faf50ffac5f19e02b71e37ff881ffb" +SRC_URI[tempfile-3.10.0.sha256sum] = "a365e8cd18e44762ef95d87f284f4b5cd04107fec2ff3052bd6a3e6069669e67" +SRC_URI[termion-1.5.6.sha256sum] = "077185e2eac69c3f8379a4298e1e07cd36beb962290d4a51199acf0fdc10607e" +SRC_URI[termtree-0.4.1.sha256sum] = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" +SRC_URI[thiserror-1.0.57.sha256sum] = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" +SRC_URI[thiserror-impl-1.0.57.sha256sum] = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" +SRC_URI[threadpool-1.8.1.sha256sum] = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" +SRC_URI[tui-0.19.0.sha256sum] = "ccdd26cbd674007e649a272da4475fb666d3aa0ad0531da7136db6fab0e5bad1" +SRC_URI[unicode-ident-1.0.12.sha256sum] = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +SRC_URI[unicode-segmentation-1.11.0.sha256sum] = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" +SRC_URI[unicode-width-0.1.11.sha256sum] = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +SRC_URI[wasi-0.11.0+wasi-snapshot-preview1.sha256sum] = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +SRC_URI[winapi-0.3.9.sha256sum] = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +SRC_URI[winapi-i686-pc-windows-gnu-0.4.0.sha256sum] = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +SRC_URI[winapi-x86_64-pc-windows-gnu-0.4.0.sha256sum] = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +SRC_URI[windows-sys-0.52.0.sha256sum] = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +SRC_URI[windows-targets-0.52.3.sha256sum] = "d380ba1dc7187569a8a9e91ed34b8ccfc33123bbacb8c0aed2d1ad7f3ef2dc5f" +SRC_URI[windows_aarch64_gnullvm-0.52.3.sha256sum] = "68e5dcfb9413f53afd9c8f86e56a7b4d86d9a2fa26090ea2dc9e40fba56c6ec6" +SRC_URI[windows_aarch64_msvc-0.52.3.sha256sum] = "8dab469ebbc45798319e69eebf92308e541ce46760b49b18c6b3fe5e8965b30f" +SRC_URI[windows_i686_gnu-0.52.3.sha256sum] = "2a4e9b6a7cac734a8b4138a4e1044eac3404d8326b6c0f939276560687a033fb" +SRC_URI[windows_i686_msvc-0.52.3.sha256sum] = "28b0ec9c422ca95ff34a78755cfa6ad4a51371da2a5ace67500cf7ca5f232c58" +SRC_URI[windows_x86_64_gnu-0.52.3.sha256sum] = "704131571ba93e89d7cd43482277d6632589b18ecf4468f591fbae0a8b101614" +SRC_URI[windows_x86_64_gnullvm-0.52.3.sha256sum] = "42079295511643151e98d61c38c0acc444e52dd42ab456f7ccfd5152e8ecf21c" +SRC_URI[windows_x86_64_msvc-0.52.3.sha256sum] = "0770833d60a970638e989b3fa9fd2bb1aaadcf88963d1659fd7d9990196ed2d6" diff --git a/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools-git-crates.inc b/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools-git-crates.inc new file mode 100644 index 0000000000..ceea67c364 --- /dev/null +++ b/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools-git-crates.inc @@ -0,0 +1,6 @@ +SRC_URI += "\ + git://github.com/jthornber/rio;protocol=https;nobranch=1;name=rio;destsuffix=rio;type=git-dependency \ +" + +SRCREV_FORMAT .= "_rio" +SRCREV_rio = "2979a720f671e836302c01546f9cc9f7988610c8" diff --git a/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_0.8.5.bb b/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_0.8.5.bb deleted file mode 100644 index 9f89bac22a..0000000000 --- a/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_0.8.5.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "Tools of dm-thin device-mapper" -DESCRIPTION = "A suite of tools for manipulating the metadata of the dm-thin device-mapper target." -HOMEPAGE = "https://github.com/jthornber/thin-provisioning-tools" -LICENSE = "GPLv3" -SECTION = "devel" - -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -S = "${WORKDIR}/git" - -SRC_URI = "git://github.com/jthornber/thin-provisioning-tools \ - file://0001-do-not-strip-pdata_tools-at-do_install.patch \ - file://use-sh-on-path.patch \ -" - -SRCREV = "5e5409f48b5403d2c6dffd9919b35ad77d6fb7b4" - -UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" - -DEPENDS += "expat libaio boost" - -inherit autotools-brokensep diff --git a/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_1.0.12.bb b/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_1.0.12.bb new file mode 100644 index 0000000000..09b91f6b37 --- /dev/null +++ b/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_1.0.12.bb @@ -0,0 +1,50 @@ +SUMMARY = "Tools of dm-thin device-mapper" +DESCRIPTION = "A suite of tools for manipulating the metadata of the dm-thin device-mapper target." +HOMEPAGE = "https://github.com/jthornber/thin-provisioning-tools" +LICENSE = "GPL-3.0-only" +SECTION = "devel" + +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" +S = "${WORKDIR}/git" + +SRC_URI = " \ + git://github.com/jthornber/thin-provisioning-tools;branch=main;protocol=https \ + " + +SRCREV = "b2d57dad4c3378544d7b36f3fc61e60989c5c092" +UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" + +inherit cargo cargo-update-recipe-crates + +require ${BPN}-crates.inc +require ${BPN}-git-crates.inc + +do_install:append() { + install -d ${D}${sbindir} + mv ${D}${bindir}/pdata_tools ${D}${sbindir}/pdata_tools + rmdir --ignore-fail-on-non-empty ${D}${bindir} + + for tool in cache_check \ + cache_dump \ + cache_metadata_size \ + cache_repair \ + cache_restore \ + cache_writeback \ + thin_check \ + thin_delta \ + thin_dump \ + thin_ls \ + thin_repair \ + thin_restore \ + thin_rmap \ + thin_metadata_size \ + thin_metadata_pack \ + thin_metadata_unpack \ + thin_trim \ + era_check \ + era_dump \ + era_invalidate \ + era_restore; do + ln -sf pdata_tools ${D}${sbindir}/$tool + done +} diff --git a/meta-oe/recipes-support/tio/tio_2.7.bb b/meta-oe/recipes-support/tio/tio_2.7.bb new file mode 100644 index 0000000000..59c772b5d0 --- /dev/null +++ b/meta-oe/recipes-support/tio/tio_2.7.bb @@ -0,0 +1,19 @@ +SUMMARY = "tio - a simple serial device I/O tool" +DESCRIPTION = "tio is a simple serial device tool which features a \ + straightforward command-line and configuration file interface to easily \ + connect to serial TTY devices for basic I/O operations." + +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://LICENSE;md5=0e1a95b7892d3015ecd6d0016f601f2c" + +SRC_URI = "git://github.com/tio/tio;protocol=https;branch=master" +SRCREV = "1c32555c2a4f26b60f94757656825fc6684d6892" + +S = "${WORKDIR}/git" + +inherit meson pkgconfig + +DEPENDS += " libinih" +RDEPENDS:${PN} += " libinih" + +FILES:${PN} += " /usr/share/bash-completion/completions/tio " diff --git a/meta-oe/recipes-support/tokyocabinet/tokyocabinet/0001-configure-Fix-check-functions-for-AC_CHECK_LIB-test.patch b/meta-oe/recipes-support/tokyocabinet/tokyocabinet/0001-configure-Fix-check-functions-for-AC_CHECK_LIB-test.patch new file mode 100644 index 0000000000..001fa9dd75 --- /dev/null +++ b/meta-oe/recipes-support/tokyocabinet/tokyocabinet/0001-configure-Fix-check-functions-for-AC_CHECK_LIB-test.patch @@ -0,0 +1,58 @@ +From e192da006dd9b0ecbbef540a3e86b65ff88e89e2 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 1 Sep 2022 13:28:29 -0700 +Subject: [PATCH] configure: Fix check functions for AC_CHECK_LIB test + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.in | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/configure.in b/configure.in +index 5b24947..0542490 100644 +--- a/configure.in ++++ b/configure.in +@@ -247,30 +247,30 @@ test -n "$LDFLAGS" && MYLDFLAGS="$LDFLAGS $MYLDFLAGS" + AC_C_BIGENDIAN(MYCPPFLAGS="$MYCPPFLAGS -D_MYBIGEND") + + # Underlying libraries +-AC_CHECK_LIB(c, main) +-AC_CHECK_LIB(m, main) ++AC_CHECK_LIB(c, printf) ++AC_CHECK_LIB(m, pow) + if test "$enable_pthread" != "no" + then +- AC_CHECK_LIB(pthread, main) +- AC_CHECK_LIB(rt, main) ++ AC_CHECK_LIB(pthread, pthread_create) ++ AC_CHECK_LIB(rt, clock_gettime) + fi + if test "$enable_zlib" != "no" + then +- AC_CHECK_LIB(z, main) ++ AC_CHECK_LIB(z, inflate) + fi + if test "$enable_bzip" != "no" + then +- AC_CHECK_LIB(bz2, main) ++ AC_CHECK_LIB(bz2, BZ2_bzCompressInit) + fi + if test "$enable_exlzma" = "yes" + then +- AC_CHECK_LIB(lzma, main) ++ AC_CHECK_LIB(lzma, lzma_easy_buffer_encode) + fi + if test "$enable_exlzo" = "yes" + then +- AC_CHECK_LIB(lzo2, main) ++ AC_CHECK_LIB(lzo2, lzo1x_1_compress) + fi +-AC_CHECK_LIB(tokyocabinet, main, AC_MSG_WARN([old version of Tokyo Cabinet was detected])) ++AC_CHECK_LIB(tokyocabinet, tcbdbopen, AC_MSG_WARN([old version of Tokyo Cabinet was detected])) + + # Necessary headers + AC_CHECK_HEADER(stdlib.h, true, AC_MSG_ERROR([stdlib.h is required])) +-- +2.37.3 + diff --git a/meta-oe/recipes-support/tokyocabinet/tokyocabinet_1.4.48.bb b/meta-oe/recipes-support/tokyocabinet/tokyocabinet_1.4.48.bb index 9f75cf047d..ae00ff4e55 100644 --- a/meta-oe/recipes-support/tokyocabinet/tokyocabinet_1.4.48.bb +++ b/meta-oe/recipes-support/tokyocabinet/tokyocabinet_1.4.48.bb @@ -12,11 +12,12 @@ Records are organized in hash table, B+ tree, or fixed-length array." HOMEPAGE = "http://fallabs.com/tokyocabinet/" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" SRC_URI = "http://fallabs.com/tokyocabinet/${BP}.tar.gz \ file://remove-hard-coded-include-and-lib-paths.patch \ + file://0001-configure-Fix-check-functions-for-AC_CHECK_LIB-test.patch \ " SRC_URI[md5sum] = "fd03df6965f8f56dd5b8518ca43b4f5e" diff --git a/meta-oe/recipes-support/toscoterm/toscoterm_git.bb b/meta-oe/recipes-support/toscoterm/toscoterm_git.bb deleted file mode 100644 index aba485e1a4..0000000000 --- a/meta-oe/recipes-support/toscoterm/toscoterm_git.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "A very small and simple terminal emulator" -SECTION = "x11/applications" -DEPENDS = "vte9" - -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://main.c;start_line=5;end_line=16;md5=9ae4bf20caf291afa94530026bd15229" - -# 0.2 version -SRCREV = "8586d617aed19fc75f5ae1e07270752c1b2f9a30" -SRC_URI = "git://github.com/OSSystems/toscoterm.git" - -S = "${WORKDIR}/git" - -inherit features_check gitpkgv pkgconfig - -REQUIRED_DISTRO_FEATURES = "x11" - -do_compile() { - oe_runmake \ - CC="${CC}" \ - CFLAGS="`pkg-config --cflags vte`${CFLAGS}" \ - LDFLAGS="`pkg-config --libs vte` ${LDFLAGS}" -} - -do_install() { - oe_runmake PREFIX="${prefix}" DESTDIR="${D}" install -} - -RDEPENDS_${PN}_append_libc-glibc = " glibc-gconv-ibm437" diff --git a/meta-oe/recipes-support/tree/tree_1.8.0.bb b/meta-oe/recipes-support/tree/tree_2.1.1.bb index 01b1ac384c..0b61149609 100644 --- a/meta-oe/recipes-support/tree/tree_1.8.0.bb +++ b/meta-oe/recipes-support/tree/tree_2.1.1.bb @@ -1,12 +1,11 @@ SUMMARY = "A recursive directory listing command" HOMEPAGE = "http://mama.indstate.edu/users/ice/tree/" SECTION = "console/utils" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=393a5ca445f6965873eca0259a17f833" SRC_URI = "http://mama.indstate.edu/users/ice/tree/src/${BP}.tgz" -SRC_URI[md5sum] = "715191c7f369be377fc7cc8ce0ccd835" -SRC_URI[sha256sum] = "715d5d4b434321ce74706d0dd067505bb60c5ea83b5f0b3655dae40aa6f9b7c2" +SRC_URI[sha256sum] = "d3c3d55f403af7c76556546325aa1eca90b918cbaaf6d3ab60a49d8367ab90d5" # tree's default CFLAGS for Linux CFLAGS += "-Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" diff --git a/meta-oe/recipes-support/uchardet/uchardet_0.0.8.bb b/meta-oe/recipes-support/uchardet/uchardet_0.0.8.bb new file mode 100644 index 0000000000..3e164cc26f --- /dev/null +++ b/meta-oe/recipes-support/uchardet/uchardet_0.0.8.bb @@ -0,0 +1,8 @@ +SUMMARY = "uchardet is an encoding detector library" +LICENSE = "MPL-1.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=6ecda54f6f525388d71d6b3cd92f7474" + +inherit cmake + +SRC_URI = "https://www.freedesktop.org/software/uchardet/releases/uchardet-0.0.8.tar.xz" +SRC_URI[sha256sum] = "e97a60cfc00a1c147a674b097bb1422abd9fa78a2d9ce3f3fdcc2e78a34ac5f0" diff --git a/meta-oe/recipes-support/udisks/udisks2/0001-Makefile.am-Dont-include-buildpath.patch b/meta-oe/recipes-support/udisks/udisks2/0001-Makefile.am-Dont-include-buildpath.patch new file mode 100644 index 0000000000..727c5a32fc --- /dev/null +++ b/meta-oe/recipes-support/udisks/udisks2/0001-Makefile.am-Dont-include-buildpath.patch @@ -0,0 +1,47 @@ +From b1b58f122a3e05b5689358fdd3203ba110cca567 Mon Sep 17 00:00:00 2001 +From: Markus Volk <f_l_k@t-online.de> +Date: Sun, 24 Sep 2023 22:20:42 +0200 +Subject: [PATCH] Reproducibility fix + +This fixes: +WARNING: udisks2-2.10.1-r0 do_package_qa: QA Issue: File /usr/lib/udisks2/modules/libudisks2_btrfs.so in package udisks2 contains reference to TMPDIR +File /usr/lib/udisks2/modules/libudisks2_lvm2.so in package udisks2 contains reference to TMPDIR +File /usr/libexec/udisks2/udisksd in package udisks2 contains reference to TMPDIR [buildpaths] + +Upstream-Status: Inappropriate [oe-specific] + +Signed-off-by: Markus Volk <f_l_k@t-online.de> +--- + modules/lvm2/Makefile.am | 2 +- + src/Makefile.am | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/modules/lvm2/Makefile.am b/modules/lvm2/Makefile.am +index 67b8aa6b3..e4ae462e7 100644 +--- a/modules/lvm2/Makefile.am ++++ b/modules/lvm2/Makefile.am +@@ -16,7 +16,7 @@ CPPFLAGS = \ + -DLVM_HELPER_DIR=\""$(prefix)/lib/udisks2/"\" \ + -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \ + -DUDISKS_COMPILATION \ +- -DBUILD_DIR=\"$(abs_top_builddir)/\" \ ++ -DBUILD_DIR=\"/usr/src/\" \ + $(POLKIT_GOBJECT_1_CFLAGS) \ + $(GLIB_CFLAGS) \ + $(GIO_CFLAGS) \ +diff --git a/src/Makefile.am b/src/Makefile.am +index 5a174d1ab..0da3a497b 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -20,7 +20,7 @@ CPPFLAGS = \ + -DUDISKS_MODULE_DIR=\"$(libdir)/udisks2/modules\" \ + -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \ + -DUDISKS_COMPILATION \ +- -DBUILD_DIR=\"$(abs_top_builddir)/\" \ ++ -DBUILD_DIR=\"/usr/src/\" \ + $(POLKIT_GOBJECT_1_CFLAGS) \ + $(GUDEV_CFLAGS) \ + $(GLIB_CFLAGS) \ +-- +2.42.0 + diff --git a/meta-oe/recipes-support/udisks/udisks2/non-gnu-libc.patch b/meta-oe/recipes-support/udisks/udisks2/non-gnu-libc.patch deleted file mode 100644 index 98e6c75f24..0000000000 --- a/meta-oe/recipes-support/udisks/udisks2/non-gnu-libc.patch +++ /dev/null @@ -1,26 +0,0 @@ -musl does not define __GNUC_PREREQ therefore check for C library being glibc -if not then define the macro - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Index: udisks-2.1.7/udisks/udisksclient.c -=================================================================== ---- udisks-2.1.7.orig/udisks/udisksclient.c -+++ udisks-2.1.7/udisks/udisksclient.c -@@ -27,8 +27,15 @@ - #include "udisksobjectinfo.h" - - /* For __GNUC_PREREQ usage below */ --#ifdef __GNUC__ -+#ifdef __GLIBC__ - # include <features.h> -+#else -+#if defined(__GNUC__) -+#define __GNUC_PREREQ(__maj, __min) \ -+ (__GNUC__ > (__maj) || __GNUC__ == (__maj) && __GNUC_MINOR__ >= (__min)) -+#else -+#define __GNUC_PREREQ(__maj, __min) 0 -+#endif - #endif - - /** diff --git a/meta-oe/recipes-support/udisks/udisks2_git.bb b/meta-oe/recipes-support/udisks/udisks2_2.10.1.bb index 21851666ee..cb1cbe670d 100644 --- a/meta-oe/recipes-support/udisks/udisks2_git.bb +++ b/meta-oe/recipes-support/udisks/udisks2_2.10.1.bb @@ -1,47 +1,54 @@ SUMMARY = "udisks provides dbus interfaces for disks and storage devices" -LICENSE = "GPLv2+ & LGPLv2+" +LICENSE = "GPL-2.0-or-later & LGPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=dd79f6dbbffdbc8e86b086a8f0c0ef43" DEPENDS = " \ + glib-2.0-native \ + libxslt-native \ acl \ libatasmart \ polkit \ libgudev \ - dbus-glib \ glib-2.0 \ + dbus-glib \ libblockdev \ - libxslt-native \ " DEPENDS += "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" -RDEPENDS_${PN} = "acl" +RDEPENDS:${PN} = "acl" SRC_URI = " \ - git://github.com/storaged-project/udisks.git;branch=master \ - file://non-gnu-libc.patch \ + git://github.com/storaged-project/udisks.git;branch=2.10.x-branch;protocol=https \ + file://0001-Makefile.am-Dont-include-buildpath.patch \ " -PV = "2.8.4" -SRCREV = "f333e13de8d32f2b82237ccd180c3458d71e78b8" +SRCREV = "18c9faf089e306ad6f3f51f5cb887a6b9aa08350" S = "${WORKDIR}/git" CVE_PRODUCT = "udisks" -inherit autotools systemd gtk-doc gobject-introspection gettext features_check +inherit autotools-brokensep systemd gtk-doc gobject-introspection gettext features_check REQUIRED_DISTRO_FEATURES = "polkit" EXTRA_OECONF = "--disable-man --disable-gtk-doc" -do_configure_prepend() { +do_configure:prepend() { # | configure.ac:656: error: required file 'build-aux/config.rpath' not found mkdir -p ${S}/build-aux touch ${S}/build-aux/config.rpath } -FILES_${PN} += " \ +PACKAGECONFIG ?= "" + +PACKAGECONFIG[lvm2] = "--enable-lvm2,--disable-lvm2,lvm2" +PACKAGECONFIG[btrfs] = "--enable-btrfs,--disable-btrfs,,btrfs-tools" +PACKAGECONFIG[lsm] = "--enable-lsm,--disable-lsm,libstoragemgmt" + +FILES:${PN} += " \ ${datadir}/dbus-1/ \ ${datadir}/polkit-1 \ ${datadir}/bash-completion \ + ${datadir}/zsh \ ${libdir}/polkit-1/extensions/*.so \ ${nonarch_base_libdir}/udev/* \ ${exec_prefix}${nonarch_base_libdir}/udisks2/* \ @@ -49,8 +56,8 @@ FILES_${PN} += " \ " PACKAGES =+ "${PN}-libs" -FILES_${PN}-libs = "${libdir}/lib*${SOLIBS}" -FILES_${PN} += "${nonarch_libdir}/tmpfiles.d" +FILES:${PN}-libs = "${libdir}/lib*${SOLIBS}" +FILES:${PN} += "${nonarch_libdir}/tmpfiles.d" -SYSTEMD_SERVICE_${PN} = "${BPN}.service" +SYSTEMD_SERVICE:${PN} = "${BPN}.service" SYSTEMD_AUTO_ENABLE = "disable" diff --git a/meta-oe/recipes-support/uhubctl/uhubctl_2.1.0.bb b/meta-oe/recipes-support/uhubctl/uhubctl_2.5.0.bb index b294d77bad..8b334dbdec 100644 --- a/meta-oe/recipes-support/uhubctl/uhubctl_2.1.0.bb +++ b/meta-oe/recipes-support/uhubctl/uhubctl_2.5.0.bb @@ -3,16 +3,16 @@ HOMEPAGE = "https://github.com/mvp/uhubctl" BUGTRACKER = "https://github.com/mvp/uhubctl/issues" DEPENDS = "libusb1" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRCREV = "c9fa3c68a1b2c9790c731602b8bae2b513e80605" -SRC_URI = "git://github.com/mvp/${BPN}" +SRCREV = "20276ad5ced147d018e2b3fccedabd94597aa25e" +SRC_URI = "git://github.com/mvp/${BPN};branch=master;protocol=https" S = "${WORKDIR}/git" # uhubctl gets its program version from "git describe". As we use the source # archive do reduce download size replace the call with our hardcoded version. -do_configure_append() { +do_configure:append() { sed -i "s/^\(GIT_VERSION :=\).*$/\1 ${PV}/g" ${S}/Makefile } diff --git a/meta-oe/recipes-support/uim/uim/0001-Fix-to-set-libedit-path-from-configure-option-proper.patch b/meta-oe/recipes-support/uim/uim/0001-Fix-to-set-libedit-path-from-configure-option-proper.patch deleted file mode 100644 index 34a1ea0fa2..0000000000 --- a/meta-oe/recipes-support/uim/uim/0001-Fix-to-set-libedit-path-from-configure-option-proper.patch +++ /dev/null @@ -1,29 +0,0 @@ -From f828a89cc1e956d56498422ec158d284fc97de3f Mon Sep 17 00:00:00 2001 -From: OBATA Akio <obache@outlook.com> -Date: Fri, 10 Aug 2018 18:38:18 +0900 -Subject: [PATCH] Fix to set libedit path from configure option properly - -Upstream-Status: Backport [https://github.com/uim/uim/pull/134] -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 00d1b02..9c0a5ec 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1311,8 +1311,8 @@ if test "x$with_libedit" != xno; then - if test "x$with_libedit" = xyes; then - libedit_path=/usr - else -- with_libedit=yes - libedit_path="$with_libedit" -+ with_libedit=yes - fi - - saved_CPPFLAGS=$CPPFLAGS --- -2.23.0 - diff --git a/meta-oe/recipes-support/uim/uim/uim-module-manager.patch b/meta-oe/recipes-support/uim/uim/uim-module-manager.patch index 0fafc8533e..0e2fb687b6 100644 --- a/meta-oe/recipes-support/uim/uim/uim-module-manager.patch +++ b/meta-oe/recipes-support/uim/uim/uim-module-manager.patch @@ -3,6 +3,8 @@ From: Bian Naimeng <biannm@cn.fujitsu.com> Date: Fri, 26 Jun 2015 12:57:48 +0900 --- +Upstream-Status: Pending + scm/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/uim/uim_1.8.8.bb b/meta-oe/recipes-support/uim/uim_1.8.9.bb index c1136cd998..f78c82f18a 100644 --- a/meta-oe/recipes-support/uim/uim_1.8.8.bb +++ b/meta-oe/recipes-support/uim/uim_1.8.9.bb @@ -1,29 +1,28 @@ DESCRIPTION = "A multilingual user input method library" HOMEPAGE = "http://uim.freedesktop.org/" -LICENSE = "BSD-3-Clause & LGPLv2+" +LICENSE = "BSD-3-Clause & LGPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=ab2826b41ca0ff4030d38cc39791d1c8" SECTION = "inputmethods" -SRC_URI = "https://github.com/uim/uim/releases/download/${PV}/uim-${PV}.tar.bz2 \ - file://0001-Fix-to-set-libedit-path-from-configure-option-proper.patch \ -" -SRC_URI_append_class-target = "\ +SRC_URI = "https://github.com/uim/uim/releases/download/${PV}/uim-${PV}.tar.bz2" +SRC_URI:append:class-target = "\ file://uim-module-manager.patch \ " -SRC_URI[md5sum] = "01c7bd5d0d4f3a9f6f5befe6f57a470b" -SRC_URI[sha256sum] = "34599bbcc4e5ab87832370763e38be5100984a64237555e9234a1ea225a0fadc" +SRC_URI[sha256sum] = "dbbd983768bf748449551644f330dbebe859bfeb6f024fea6697ac75131c7aa4" + +UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" DEPENDS = "anthy fontconfig libxft libxt glib-2.0 ncurses intltool libedit" -DEPENDS_append_class-target = " intltool-native gtk+ gtk+3 uim-native takao-fonts" +DEPENDS:append:class-target = " intltool-native gtk+ gtk+3 uim-native" -RDEPENDS_uim = "libuim0 libedit" -RDEPENDS_uim-anthy = "takao-fonts anthy libanthy0" -RDEPENDS_uim-anthy_append_libc-glibc = " glibc-utils glibc-gconv-euc-jp" +RDEPENDS:uim = "libuim0 libedit" +RDEPENDS:uim-anthy = "anthy libanthy0" +RDEPENDS:uim-anthy:append:libc-glibc = " glibc-utils glibc-gconv-euc-jp" LEAD_SONAME = "libuim.so.1" -COMPATIBLE_HOST_riscv64 = "null" -COMPATIBLE_HOST_riscv32 = "null" +COMPATIBLE_HOST:riscv64 = "null" +COMPATIBLE_HOST:riscv32 = "null" inherit features_check autotools pkgconfig gettext qemu gtk-immodules-cache @@ -41,82 +40,85 @@ EXTRA_OECONF += "--disable-emacs \ --without-eb \ " -CONFIGUREOPTS_remove_class-target = "--disable-silent-rules" +CONFIGUREOPTS:remove:class-target = "--disable-silent-rules" # https://github.com/uim/uim/issues/44 PARALLEL_MAKE = "" #Because m4 file's find maxdepth=2, so copy the m4 files of the deep depth. -do_configure_prepend () { +do_configure:prepend () { + rm -rf ${S}/m4.generated/lt*.m4 ${S}/m4.generated/libtool.m4 + rm -rf ${S}/sigscheme/libgcroots/m4/lt*.m4 ${S}/sigscheme/libgcroots/m4/libtool.m4 + rm -rf ${S}/sigscheme/m4/lt*.m4 ${S}/sigscheme/m4/libtool.m4 cp ${S}/sigscheme/m4/* ${S}/m4/ } -do_install_append() { +do_install:append() { rm -rf ${D}/${datadir}/applications } PACKAGES =+ "uim-xim uim-utils uim-skk uim-gtk2.0 uim-gtk3 uim-fep uim-anthy uim-common libuim0 libuim-dev" -FILES_${PN} = "${bindir}/uim-help \ +FILES:${PN} = "${bindir}/uim-help \ ${libdir}/uim/plugin/libuim-* \ ${libdir}/libuim-scm* \ ${libdir}/libgcroots* \ ${libdir}/uim/plugin/libuim-* \ " -FILES_libuim0 = "${libdir}/uim/plugin/libuim-custom-enabler.* \ +FILES:libuim0 = "${libdir}/uim/plugin/libuim-custom-enabler.* \ ${libdir}/libuim-custom.so.* \ ${datadir}/locale/ja/LC_MESSAGES/uim.mo \ ${datadir}/locale/fr/LC_MESSAGES/uim.mo \ ${datadir}/locale/ko/LC_MESSAGES/uim.mo \ ${libdir}/libuim.so.* \ " -FILES_libuim-dev = "${libdir}/libuim*.a \ +FILES:libuim-dev = "${libdir}/libuim*.a \ ${libdir}/libuim*.la \ ${libdir}/libuim*.so \ ${includedir}/uim \ ${libdir}/pkgconfig/uim.pc \ " -FILES_uim-anthy = "${libdir}/uim/plugin/libuim-anthy.* \ +FILES:uim-anthy = "${libdir}/uim/plugin/libuim-anthy.* \ ${datadir}/uim/anthy*.scm \ " -FILES_${PN}-dbg += "${libdir}/*/*/*/.debug ${libdir}/*/*/.debug" -FILES_${PN}-dev += "${libdir}/uim/plugin/*.la" +FILES:${PN}-dbg += "${libdir}/*/*/*/.debug ${libdir}/*/*/.debug" +FILES:${PN}-dev += "${libdir}/uim/plugin/*.la" -FILES_uim-utils = "${bindir}/uim-sh \ +FILES:uim-utils = "${bindir}/uim-sh \ ${bindir}/uim-module-manager \ ${libexecdir}/uim-helper-server \ " -FILES_uim-xim = "${bindir}/uim-xim \ +FILES:uim-xim = "${bindir}/uim-xim \ ${libexecdir}/uim-candwin-*gtk \ ${libexecdir}/uim-candwin-*gtk3 \ ${datadir}/man/man1/uim-xim.1 \ ${sysconfdir}/X11/xinit/xinput.d/uim* \ " -FILES_uim-common = "${datadir}/uim/pixmaps/*.png \ +FILES:uim-common = "${datadir}/uim/pixmaps/*.png \ ${datadir}/uim \ " -FILES_uim-fep = "${bindir}/uim-fep*" +FILES:uim-fep = "${bindir}/uim-fep*" -FILES_uim-gtk2.0 = "${libdir}/gtk-2.0 \ +FILES:uim-gtk2.0 = "${libdir}/gtk-2.0 \ ${bindir}/uim-toolbar-gtk \ ${bindir}/uim-toolbar-gtk-systray \ ${bindir}/uim-*-gtk \ ${bindir}/uim-input-pad-ja \ ${libdir}/uim/uim-*-gtk \ " -FILES_uim-gtk3 = "${libdir}/gtk-3.0 \ +FILES:uim-gtk3 = "${libdir}/gtk-3.0 \ ${bindir}/uim-toolbar-gtk3 \ ${bindir}/uim-toolbar-gtk3-systray \ ${bindir}/uim-*-gtk3 \ ${libdir}/uim/uim-*-gtk3 \ " -FILES_uim-skk = "${libdir}/uim/plugin/libuim-skk.* \ +FILES:uim-skk = "${libdir}/uim/plugin/libuim-skk.* \ ${datadir}/uim/skk*.scm \ " PACKAGE_WRITE_DEPS += "qemu-native" -pkg_postinst_uim-anthy() { +pkg_postinst:uim-anthy() { if test -n "$D"; then ${@qemu_run_binary(d, '$D', '${bindir}/uim-module-manager')} --register anthy --path $D${datadir}/uim else @@ -124,7 +126,7 @@ pkg_postinst_uim-anthy() { fi } -pkg_prerm_uim-anthy() { +pkg_prerm:uim-anthy() { if test -n "$D"; then ${@qemu_run_binary(d, '$D', '${bindir}/uim-module-manager')} --path $D${datadir}/uim --unregister anthy else @@ -132,7 +134,7 @@ pkg_prerm_uim-anthy() { fi } -pkg_postinst_uim-skk() { +pkg_postinst:uim-skk() { if test -n "$D"; then ${@qemu_run_binary(d, '$D', '${bindir}/uim-module-manager')} --register skk --path $D${datadir}/uim else @@ -140,7 +142,7 @@ pkg_postinst_uim-skk() { fi } -pkg_postrm_uim-skk() { +pkg_postrm:uim-skk() { if test -n "$D"; then ${@qemu_run_binary(d, '$D', '${bindir}/uim-module-manager')} --path $D${datadir}/uim --unregister skk else diff --git a/meta-oe/recipes-support/unicode-ucd/unicode-ucd_12.1.0.bb b/meta-oe/recipes-support/unicode-ucd/unicode-ucd_12.1.0.bb deleted file mode 100644 index 89ab565ce5..0000000000 --- a/meta-oe/recipes-support/unicode-ucd/unicode-ucd_12.1.0.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "Unicode Character Database" -HOMEPAGE = "https://unicode.org/ucd/" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://unicode.org.license.html;beginline=42;endline=85;md5=67619d0c52706853c0256514e7fd04cd" - -SRC_URI = " \ - https://www.unicode.org/Public/zipped/${PV}/UCD.zip;name=ucd;subdir=ucd \ - https://www.unicode.org/license.html;name=license;subdir=${BP};downloadfilename=unicode.org.license.html \ -" -SRC_URI[ucd.md5sum] = "430cbdac2615451571dd69a976dd08f6" -SRC_URI[ucd.sha256sum] = "25ba51a0d4c6fa41047b7a5e5733068d4a734588f055f61e85f450097834a0a6" - -SRC_URI[license.md5sum] = "f03bafb623258f85ff2032c1ce567b7c" -SRC_URI[license.sha256sum] = "983225207de8a707d0903a8d70fb7a4b28c5e0f64f2366e84a6192a2d618fed4" - -inherit allarch - -do_configure[noexec] = "1" - -do_install() { - install -d ${D}${datadir}/unicode - cp -rf ${WORKDIR}/ucd ${D}${datadir}/unicode -} - -FILES_${PN} = "${datadir}/unicode/ucd" diff --git a/meta-oe/recipes-support/unicode-ucd/unicode-ucd_14.0.0.bb b/meta-oe/recipes-support/unicode-ucd/unicode-ucd_14.0.0.bb new file mode 100644 index 0000000000..026d4ffe02 --- /dev/null +++ b/meta-oe/recipes-support/unicode-ucd/unicode-ucd_14.0.0.bb @@ -0,0 +1,25 @@ +SUMMARY = "Unicode Character Database" +HOMEPAGE = "https://unicode.org/ucd/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${UNPACKDIR}/license.txt;md5=4b11b5cbb0a24df9f4e7db63db98f22f" + +SRC_URI = " \ + https://www.unicode.org/Public/zipped/${PV}/UCD.zip;name=ucd;subdir=ucd;downloadfilename=unicode-ucd-${PV}.zip \ + https://www.unicode.org/license.txt;name=ucd-license \ +" +SRC_URI[ucd.sha256sum] = "033a5276b5d7af8844589f8e3482f3977a8385e71d107d375055465178c23600" +SRC_URI[ucd-license.sha256sum] = "f7830d126f59d83842565d3dddedc79db4ca978ed52aee0ebcc040ea76a85519" + +inherit allarch + +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + +do_configure[noexec] = "1" + +do_install() { + install -d ${D}${datadir}/unicode + cp -rf ${UNPACKDIR}/ucd ${D}${datadir}/unicode +} + +FILES:${PN} = "${datadir}/unicode/ucd" diff --git a/meta-oe/recipes-support/unixodbc/files/0001-exe-Makefile.am-add-CROSS_LAUNCHER-to-run-odbc_confi.patch b/meta-oe/recipes-support/unixodbc/files/0001-exe-Makefile.am-add-CROSS_LAUNCHER-to-run-odbc_confi.patch new file mode 100644 index 0000000000..c763a9feb6 --- /dev/null +++ b/meta-oe/recipes-support/unixodbc/files/0001-exe-Makefile.am-add-CROSS_LAUNCHER-to-run-odbc_confi.patch @@ -0,0 +1,54 @@ +From e886222c70d4b251f0785f670477b7aee938e5af Mon Sep 17 00:00:00 2001 +From: Chen Qi <Qi.Chen@windriver.com> +Date: Wed, 21 Feb 2024 13:55:41 +0800 +Subject: [PATCH] exe/Makefile.am: add CROSS_LAUNCHER to run odbc_config + +In case of cross compilation, the odbc_config cannot run, the error message +would be like below: + + /bin/bash: line 1: ../exe/odbc_config: cannot execute binary file: Exec format error + +Add CROSS_LAUNCHER to allow the possibility of running odbc_config correctly in +case of cross compilation. + +For example, here's a possible value for it (Yocto project environment, aarch64 target). + export CROSS_LAUNCHER="PSEUDO_UNLOAD=1 qemu-aarch64 -r 5.15 \ + -L /PATH/TO/unixodbc/2.3.11/recipe-sysroot \ + -E LD_LIBRARY_PATH=/PATH/TO/unixodbc/2.3.11/recipe-sysroot//usr/lib:/PATH/TO/unixodbc/2.3.11/recipe-sysroot//usr/lib " + +Other projects can use the launcher they like to allow correct generation of +the odbc.pc file in cross compilation environment. + +Upstream-Status: Submitted [Personal Email, nick.gorham@easysoft.com] + +As said in the official website, https://www.unixodbc.org/, the way to report bug and send +out patch is via personal email. So there's a public link above. + +Signed-off-by: Chen Qi <Qi.Chen@windriver.com> +--- + exe/Makefile.am | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/exe/Makefile.am b/exe/Makefile.am +index 03f3d5a..5f33cf2 100644 +--- a/exe/Makefile.am ++++ b/exe/Makefile.am +@@ -59,11 +59,13 @@ slencheck_SOURCES = slencheck.c + dltest_DEPENDENCIES = $(LTDLDEPS) + dltest_LDADD = $(LIBLTDL) + ++CROSS_LAUNCHER ?= "" ++ + all-am: +- @sed "s![@]ODBC_ULEN[@]!`$(top_builddir)/exe/odbc_config$(EXEEXT) --ulen`!" \ ++ @sed "s![@]ODBC_ULEN[@]!`$(CROSS_LAUNCHER)$(top_builddir)/exe/odbc_config$(EXEEXT) --ulen`!" \ + $(top_builddir)/DriverManager/odbc.pc > $(top_builddir)/exe/odbc.pc.tmp + @mv -f $(top_builddir)/exe/odbc.pc.tmp $(top_builddir)/DriverManager/odbc.pc +- @sed "s![@]ODBC_CFLAGS[@]!`$(top_builddir)/exe/odbc_config$(EXEEXT) --cflags | sed 's/ -I.*//'`!" \ ++ @sed "s![@]ODBC_CFLAGS[@]!`$(CROSS_LAUNCHER)$(top_builddir)/exe/odbc_config$(EXEEXT) --cflags | sed 's/ -I.*//'`!" \ + $(top_builddir)/DriverManager/odbc.pc > $(top_builddir)/exe/odbc.pc.tmp + @mv -f $(top_builddir)/exe/odbc.pc.tmp $(top_builddir)/DriverManager/odbc.pc + +-- +2.34.1 + diff --git a/meta-oe/recipes-support/unixodbc/unixodbc_2.3.12.bb b/meta-oe/recipes-support/unixodbc/unixodbc_2.3.12.bb new file mode 100644 index 0000000000..7819387c39 --- /dev/null +++ b/meta-oe/recipes-support/unixodbc/unixodbc_2.3.12.bb @@ -0,0 +1,48 @@ +SUMMARY = "An Open Source ODBC sub-system" +DESCRIPTION = "unixODBC is an Open Source ODBC sub-system and an ODBC SDK \ +for Linux, Mac OSX, and UNIX." + +HOMEPAGE = "http://www.unixodbc.org/" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=d7b37bf80a3df5a65b355433ae36d206" + +DEPENDS = "libtool readline" + +SRC_URI = "https://www.unixodbc.org/unixODBC-${PV}.tar.gz \ + file://do-not-use-libltdl-source-directory.patch \ + file://0001-exe-Makefile.am-add-CROSS_LAUNCHER-to-run-odbc_confi.patch \ +" +SRC_URI[sha256sum] = "f210501445ce21bf607ba51ef8c125e10e22dffdffec377646462df5f01915ec" + +UPSTREAM_CHECK_REGEX = "unixODBC-(?P<pver>\d+(\.\d+)+)\.tar" + +inherit autotools-brokensep multilib_header qemu + +S = "${WORKDIR}/unixODBC-${PV}" + +EXTRA_OEMAKE += "LIBS=-lltdl" +EXTRA_OECONF += "--enable-utf8ini" +DEPENDS:append:class-target = "${@' qemu-native' if bb.utils.contains('MACHINE_FEATURES', 'qemu-usermode', True, False, d) else ''}" +QEMU_WRAPPER = "${@qemu_wrapper_cmdline(d, '${STAGING_DIR_HOST}', ['${STAGING_DIR_HOST}/${libdir}','${STAGING_DIR_HOST}/${base_libdir}'])}" + +do_configure:prepend() { + # old m4 files will cause libtool version don't match + rm -rf m4/* + rm -fr libltdl +} + +do_compile:prepend() { + if ${@bb.utils.contains('MACHINE_FEATURES', 'qemu-usermode', 'true', 'false', d)}; then + export CROSS_LAUNCHER="${QEMU_WRAPPER} " + fi +} + +do_install:prepend() { + if ${@bb.utils.contains('MACHINE_FEATURES', 'qemu-usermode', 'true', 'false', d)}; then + export CROSS_LAUNCHER="${QEMU_WRAPPER} " + fi +} + +do_install:append() { + oe_multilib_header unixodbc.h unixODBC/unixodbc_conf.h +} diff --git a/meta-oe/recipes-support/unixodbc/unixodbc_2.3.7.bb b/meta-oe/recipes-support/unixodbc/unixodbc_2.3.7.bb deleted file mode 100644 index 61378fec29..0000000000 --- a/meta-oe/recipes-support/unixodbc/unixodbc_2.3.7.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "An Open Source ODBC sub-system" -DESCRIPTION = "unixODBC is an Open Source ODBC sub-system and an ODBC SDK \ -for Linux, Mac OSX, and UNIX." - -HOMEPAGE = "http://www.unixodbc.org/" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=d7b37bf80a3df5a65b355433ae36d206" - -DEPENDS = "libtool readline" - -SRC_URI = "http://ftp.unixodbc.org/unixODBC-${PV}.tar.gz \ - file://do-not-use-libltdl-source-directory.patch \ -" -SRC_URI[md5sum] = "274a711b0c77394e052db6493840c6f9" -SRC_URI[sha256sum] = "45f169ba1f454a72b8fcbb82abd832630a3bf93baa84731cf2949f449e1e3e77" - -UPSTREAM_CHECK_REGEX = "unixODBC-(?P<pver>\d+(\.\d+)+)\.tar" - -inherit autotools-brokensep - -S = "${WORKDIR}/unixODBC-${PV}" - -EXTRA_OEMAKE += "LIBS=-lltdl" - -do_configure_prepend() { - # old m4 files will cause libtool version don't match - rm -rf m4/* - rm -fr libltdl -} diff --git a/meta-oe/recipes-support/upower/upower_0.99.11.bb b/meta-oe/recipes-support/upower/upower_0.99.11.bb deleted file mode 100644 index 6408417920..0000000000 --- a/meta-oe/recipes-support/upower/upower_0.99.11.bb +++ /dev/null @@ -1,35 +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 \ -" -SRC_URI[md5sum] = "abe6acb617f11f2e8dbd9846fcf86e24" -SRC_URI[sha256sum] = "64b5ffbfccd5bdb15d925777979a4dbee1a957f9eaeb158dc76175267eddbdef" - -inherit autotools pkgconfig gettext gobject-introspection systemd 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-oe/recipes-support/upower/upower_0.99.17.bb b/meta-oe/recipes-support/upower/upower_0.99.17.bb new file mode 100644 index 0000000000..0572cc801b --- /dev/null +++ b/meta-oe/recipes-support/upower/upower_0.99.17.bb @@ -0,0 +1,44 @@ +SUMMARY = "UPower is an abstraction for enumerating power devices" +DESCRIPTION = "UPower is an abstraction for enumerating power devices, listening to device events and querying history and statistics." +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=0de8fbf1d97a140d1d93b9f14dcfbf08" + +DEPENDS = " \ + intltool-native \ + libusb1 \ + libgudev \ + glib-2.0 \ + dbus-glib \ +" + +SRC_URI = "git://gitlab.freedesktop.org/upower/upower.git;protocol=https;branch=master" +SRCREV = "c889154ec8e3e2239db9260d48b2e198d72ba002" +S = "${WORKDIR}/git" + +UPSTREAM_CHECK_GITTAGREGEX = "UPOWER_(?P<pver>\d+(\_\d+)+)" + +GIR_MESON_ENABLE_FLAG = "enabled" +GIR_MESON_DISABLE_FLAG = "disabled" +GTKDOC_MESON_OPTION = "gtk-doc" + +inherit meson pkgconfig gtk-doc gettext gobject-introspection systemd + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG[idevice] = "-Didevice=enabled,-Didevice=disabled,libimobiledevice libplist" +PACKAGECONFIG[systemd] = "-Dsystemdsystemunitdir=${systemd_system_unitdir},-Dsystemdsystemunitdir=no -Dudevrulesdir=${base_libdir}/udev/rules.d,systemd" + +EXTRA_OEMESON = " \ + -Dos_backend=linux \ + -Dman=false \ +" + +SYSTEMD_SERVICE:${PN} = "upower.service" +# don't start on boot by default - dbus does that on demand +SYSTEMD_AUTO_ENABLE = "disable" + +RDEPENDS:${PN} += "dbus" +RRECOMMENDS:${PN} += "pm-utils" +FILES:${PN} += " \ + ${datadir}/dbus-1/ \ + ${base_libdir}/udev/* \ +" diff --git a/meta-oe/recipes-support/uriparser/uriparser_0.9.3.bb b/meta-oe/recipes-support/uriparser/uriparser_0.9.8.bb index 8c28c9d93a..3d76190d39 100644 --- a/meta-oe/recipes-support/uriparser/uriparser_0.9.3.bb +++ b/meta-oe/recipes-support/uriparser/uriparser_0.9.8.bb @@ -2,13 +2,14 @@ SUMMARY = "RFC 3986 compliant URI parsing library" HOMEPAGE = "https://uriparser.github.io" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=fc3bbde670fc6e95392a0e23bf57bda0" +LIC_FILES_CHKSUM = "file://COPYING;md5=fcc5a53146c2401f4b4f6a3bdf3f0168" SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${BP}/${BP}.tar.gz" -SRC_URI[md5sum] = "9874b64f6f4ff656f3f69598e38f12b7" -SRC_URI[sha256sum] = "6cef39d6eaf1a48504ee0264ce85f078758057dafb1edd0a898183b55ff76014" +SRC_URI[sha256sum] = "4cd0e4f93b477272fabceeb0202f269169fe6ec3044e10fac6acbcdf354bb080" -inherit cmake +inherit cmake github-releases + +UPSTREAM_CHECK_REGEX = "releases/tag/${BPN}-(?P<pver>\d+(\.\d+)+)" EXTRA_OECMAKE += "-DURIPARSER_BUILD_DOCS:BOOL=OFF -DURIPARSER_BUILD_TESTS:BOOL=OFF" diff --git a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20170806.bb b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20170806.bb deleted file mode 100644 index 6abd941680..0000000000 --- a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20170806.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "Data files for usbmodeswitch" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -inherit allarch - -DEPENDS += "tcl-native" - -SRC_URI = "http://www.draisberghof.de/usb_modeswitch/${BP}.tar.bz2" -SRC_URI[md5sum] = "fb50d15b52e909d742dd16f0a9882316" -SRC_URI[sha256sum] = "ce413ef2a50e648e9c81bc3ea6110e7324a8bf981034fc9ec4467d3562563c2c" - -do_install() { - oe_runmake install DESTDIR=${D} -} - -RDEPENDS_${PN} = "usb-modeswitch (>= 2.4.0)" -FILES_${PN} += "${base_libdir}/udev/rules.d/ \ - ${datadir}/usb_modeswitch" diff --git a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20191128.bb b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20191128.bb new file mode 100644 index 0000000000..351fe44d70 --- /dev/null +++ b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20191128.bb @@ -0,0 +1,19 @@ +SUMMARY = "Data files for usbmodeswitch" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +inherit allarch + +DEPENDS += "tcl-native" + +SRC_URI = "http://www.draisberghof.de/usb_modeswitch/${BP}.tar.bz2" +SRC_URI[md5sum] = "e8fce7eb949cbe16c61fb71bade4cc17" +SRC_URI[sha256sum] = "3f039b60791c21c7cb15c7986cac89650f076dc274798fa242231b910785eaf9" + +do_install() { + oe_runmake install DESTDIR=${D} RULESDIR=${D}/${nonarch_base_libdir}/udev/rules.d +} + +RDEPENDS:${PN} = "usb-modeswitch (>= 2.4.0)" +FILES:${PN} += "${nonarch_base_libdir}/udev/rules.d/ \ + ${datadir}/usb_modeswitch" diff --git a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.5.2.bb b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.5.2.bb deleted file mode 100644 index 33e40b36b4..0000000000 --- a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.5.2.bb +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "A mode switching tool for controlling 'flip flop' (multiple device) USB gear" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -DEPENDS = "libusb1" - -SRC_URI = "http://www.draisberghof.de/usb_modeswitch/${BP}.tar.bz2" -SRC_URI[md5sum] = "16b9a8efa1bf8fbd7d5612757eae4f26" -SRC_URI[sha256sum] = "abffac09c87eacd78e101545967dc25af7e989745b4276756d45dbf4008a2ea6" - -inherit pkgconfig systemd - -SYSTEMD_SERVICE_${PN} = "usb_modeswitch@.service" - -EXTRA_OEMAKE = "TCL=${bindir}/tclsh" - -FILES_${PN} = "${bindir} ${sysconfdir} ${nonarch_base_libdir}/udev/usb_modeswitch ${sbindir} ${localstatedir}/lib/usb_modeswitch" -RDEPENDS_${PN} = "tcl" -RRECOMMENDS_${PN} = "usb-modeswitch-data" - -do_install() { - oe_runmake DESTDIR=${D} install - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -d ${D}/${systemd_unitdir}/system - install -m 644 ${S}/usb_modeswitch@.service ${D}/${systemd_unitdir}/system - fi -} diff --git a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.6.1.bb b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.6.1.bb new file mode 100644 index 0000000000..cd3840feab --- /dev/null +++ b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.6.1.bb @@ -0,0 +1,31 @@ +SUMMARY = "A mode switching tool for controlling 'flip flop' (multiple device) USB gear" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=091556bd6d0154cd4c2d17a1bfc7380a" + +DEPENDS = "libusb1" + +SRC_URI = "http://www.draisberghof.de/usb_modeswitch/${BP}.tar.bz2" +SRC_URI[sha256sum] = "5195d9e136e52f658f19e9f93e4f982b1b67bffac197d0a455cd8c2cd245fa34" + +inherit pkgconfig systemd + +SYSTEMD_SERVICE:${PN} = "usb_modeswitch@.service" + +EXTRA_OEMAKE = "TCL=${bindir}/tclsh" + +FILES:${PN} = " \ + ${bindir} \ + ${sysconfdir} \ + ${nonarch_base_libdir}/udev/usb_modeswitch \ + ${sbindir} ${localstatedir}/lib/usb_modeswitch \ +" +RDEPENDS:${PN} = "tcl" +RRECOMMENDS:${PN} = "usb-modeswitch-data" + +do_install() { + oe_runmake DESTDIR=${D} UDEVDIR=${D}/${nonarch_base_libdir}/udev install + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + install -d ${D}/${systemd_unitdir}/system + install -m 644 ${S}/usb_modeswitch@.service ${D}/${systemd_unitdir}/system + fi +} diff --git a/meta-oe/recipes-support/usbids/usbids_2023.01.16.bb b/meta-oe/recipes-support/usbids/usbids_2023.01.16.bb new file mode 100644 index 0000000000..b0dd72fb25 --- /dev/null +++ b/meta-oe/recipes-support/usbids/usbids_2023.01.16.bb @@ -0,0 +1,18 @@ +SUMMARY = "usb device database." +HOMEPAGE = "https://github.com/usbids/usbids" + +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d" + +SRC_URI = "git://github.com/usbids/usbids.git;branch=master;protocol=https" + +SRCREV = "7963233faf69eb9c80ffca8dfc1f31940f75999f" + +S = "${WORKDIR}/git" + +do_install() { + install -d ${D}${datadir} + install -m0644 ${S}/usb.ids ${D}${datadir} +} + +FILES:${PN} = "${datadir}" diff --git a/meta-oe/recipes-support/usbpath/usbpath/configure.patch b/meta-oe/recipes-support/usbpath/usbpath/configure.patch deleted file mode 100644 index 271e6a53ad..0000000000 --- a/meta-oe/recipes-support/usbpath/usbpath/configure.patch +++ /dev/null @@ -1,11 +0,0 @@ -Index: usbpath/configure.ac -=================================================================== ---- usbpath.orig/configure.ac 2014-07-17 20:40:26.000000000 +0000 -+++ usbpath/configure.ac 2014-07-18 07:01:40.933474420 +0000 -@@ -1,5 +1,5 @@ - AC_INIT([usbpath],[0.1]) --AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) -+AM_INIT_AUTOMAKE([foreign]) - - AC_PROG_CC - AC_PROG_RANLIB diff --git a/meta-oe/recipes-support/usbpath/usbpath_svn.bb b/meta-oe/recipes-support/usbpath/usbpath_svn.bb deleted file mode 100644 index 6c9cd049fe..0000000000 --- a/meta-oe/recipes-support/usbpath/usbpath_svn.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "Convert the physical locations of a USB device to/from its number" -AUTHOR = "Werner Almesberger <werner@openmoko.org>" -SECTION = "console/utils" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://usbpath.c;endline=20;md5=0aa8c7d2af9110c78a99fbf9a504dc3f" -DEPENDS = "virtual/libusb0" -DEPENDS_class-native = "virtual/libusb0-native" - -BBCLASSEXTEND = "native" - -SRCREV = "3172" -PV = "0.0+svnr${SRCPV}" - -SRC_URI = "svn://svn.openmoko.org/trunk/src/host;module=usbpath;protocol=http \ - file://configure.patch" - -S = "${WORKDIR}/usbpath" - -inherit autotools pkgconfig - -RDEPENDS_${PN} += "perl" diff --git a/meta-oe/recipes-support/uthash/uthash_2.1.0.bb b/meta-oe/recipes-support/uthash/uthash_2.3.0.bb index 09cef44a85..ef15613586 100644 --- a/meta-oe/recipes-support/uthash/uthash_2.1.0.bb +++ b/meta-oe/recipes-support/uthash/uthash_2.3.0.bb @@ -8,11 +8,11 @@ DESCRIPTION = " uthash-dev provides a hash table implementation using C preproce HOMEPAGE = "https://troydhanson.github.io/uthash/" SECTION = "base" LICENSE = "BSD-1-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=a2513f7d2291df840527b76b2a8f9718" -SRCREV = "8b214aefcb81df86a7e5e0d4fa20e59a6c18bc02" +LIC_FILES_CHKSUM = "file://LICENSE;md5=736712b5904dd42f8678df7172bc5f2b" +SRCREV = "e493aa90a2833b4655927598f169c31cfcdf7861" SRC_URI = "\ - git://github.com/troydhanson/${BPN}.git \ + git://github.com/troydhanson/${BPN}.git;branch=master;protocol=https \ file://run-ptest \ " @@ -40,7 +40,7 @@ do_install_ptest() { # The main package is empty and non-existent, so -dev # should not depend on it... -RDEPENDS_${PN}-dev = "" -RDEPENDS_${PN}-ptest_remove = "${PN}" +RDEPENDS:${PN}-dev = "" +RDEPENDS:${PN}-ptest:remove = "${PN}" BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/utouch/utouch-evemu/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/meta-oe/recipes-support/utouch/utouch-evemu/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch index 71bf572699..7cfd470430 100644 --- a/meta-oe/recipes-support/utouch/utouch-evemu/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch +++ b/meta-oe/recipes-support/utouch/utouch-evemu/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch @@ -12,8 +12,8 @@ Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> --- src/evemu-impl.h | 5 +++++ - src/evemu.c | 16 +++++++++------- - 2 files changed, 14 insertions(+), 7 deletions(-) + src/evemu.c | 20 ++++++++++++-------- + 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/src/evemu-impl.h b/src/evemu-impl.h index acf2976..c08d861 100644 @@ -32,7 +32,7 @@ index acf2976..c08d861 100644 #define EVPLAY_NBYTES ((EVPLAY_NBITS + 7) / 8) diff --git a/src/evemu.c b/src/evemu.c -index 21187af..160c915 100644 +index 21187af..7489449 100644 --- a/src/evemu.c +++ b/src/evemu.c @@ -363,7 +363,7 @@ int evemu_read(struct evemu_device *dev, FILE *fp) @@ -55,16 +55,19 @@ index 21187af..160c915 100644 ev->type = type; ev->code = code; ev->value = value; -@@ -411,12 +411,14 @@ int evemu_read_event_realtime(FILE *fp, struct input_event *ev, +@@ -410,13 +411,16 @@ int evemu_read_event_realtime(FILE *fp, struct input_event *ev, + return ret; if (evtime) { - if (!evtime->tv_sec) +- if (!evtime->tv_sec) - *evtime = ev->time; - usec = 1000000L * (ev->time.tv_sec - evtime->tv_sec); - usec += ev->time.tv_usec - evtime->tv_usec; ++ if (!evtime->tv_sec) { + evtime->tv_sec = ev->input_event_sec; + evtime->tv_usec = ev->input_event_usec; -+ usec = 1000000L * (ev->input_event_sec - evtime->tv_sec); ++ } ++ usec = (ev->input_event_sec - evtime->tv_sec) * 1000000L; + usec += ev->input_event_usec - evtime->tv_usec; if (usec > 500) { usleep(usec); diff --git a/meta-oe/recipes-support/utouch/utouch-evemu_git.bb b/meta-oe/recipes-support/utouch/utouch-evemu_git.bb index 41d1cbfd97..bd69dbb11c 100644 --- a/meta-oe/recipes-support/utouch/utouch-evemu_git.bb +++ b/meta-oe/recipes-support/utouch/utouch-evemu_git.bb @@ -2,18 +2,18 @@ SUMMARY = "Kernel evdev device emulation" DESCRIPTION = "The evemu library and tools are used to describe devices, record data, create devices and replay data from kernel evdev devices. " HOMEPAGE = "http://bitmath.org/code/evemu/" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" inherit autotools -SRC_URI = "git://bitmath.org/git/evemu.git;protocol=http \ +SRC_URI = "git://bitmath.org/git/evemu.git;protocol=http;branch=master \ file://0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch \ " SRCREV = "9752b50e922572e4cd214ac45ed95e4ee410fe24" -PV = "1.0.5+git${SRCPV}" +PV = "1.0.6+git" -S = "${WORKDIR}/git/" +S = "${WORKDIR}/git" PARALLEL_MAKE = "" diff --git a/meta-oe/recipes-support/utouch/utouch-frame/0001-include-sys-stat.h-for-fixing-build-issue-on-musl.patch b/meta-oe/recipes-support/utouch/utouch-frame/0001-include-sys-stat.h-for-fixing-build-issue-on-musl.patch index f3c8eeb418..f0860fcd90 100644 --- a/meta-oe/recipes-support/utouch/utouch-frame/0001-include-sys-stat.h-for-fixing-build-issue-on-musl.patch +++ b/meta-oe/recipes-support/utouch/utouch-frame/0001-include-sys-stat.h-for-fixing-build-issue-on-musl.patch @@ -9,6 +9,8 @@ error: field has incomplete Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + tools/utouch-frame-test-mtdev.c | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-support/utouch/utouch-frame_git.bb b/meta-oe/recipes-support/utouch/utouch-frame_git.bb index 1ebebfa9f5..ddd27a7e30 100644 --- a/meta-oe/recipes-support/utouch/utouch-frame_git.bb +++ b/meta-oe/recipes-support/utouch/utouch-frame_git.bb @@ -2,20 +2,20 @@ SUMMARY = "Touch Frame Library" DESCRIPTION = "The frame library and tools are used to handle touch frames, i.e., collections of tracked contacts. Bindings for mtdev and XI2.1." HOMEPAGE = "http://bitmath.org/code/frame/" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=2f31b266d3440dd7ee50f92cf67d8e6c" DEPENDS += "mtdev utouch-evemu" inherit autotools pkgconfig -SRC_URI = "git://bitmath.org/git/frame.git;protocol=http \ +SRC_URI = "git://bitmath.org/git/frame.git;protocol=http;branch=master \ file://remove-man-page-creation.patch \ file://0001-include-sys-stat.h-for-fixing-build-issue-on-musl.patch \ file://0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch \ " SRCREV = "95363d5a1f7394d71144bf3b408ef4e6db4350fc" -PV = "1.1.2+git${SRCPV}" +PV = "1.1.2+git" -S = "${WORKDIR}/git/" +S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/utouch/utouch-mtview_git.bb b/meta-oe/recipes-support/utouch/utouch-mtview_git.bb index 5f07bf28ee..d964d7f263 100644 --- a/meta-oe/recipes-support/utouch/utouch-mtview_git.bb +++ b/meta-oe/recipes-support/utouch/utouch-mtview_git.bb @@ -2,18 +2,18 @@ SUMMARY = "Multitouch viewer" DESCRIPTION = "mtview is a small X application that shows a graphical view of your MT-enabled hardware. It uses mtdev." HOMEPAGE = "http://bitmath.org/code/mtview/" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=4c61b8950dc1aab4d2aa7c2ae6b1cfb3" inherit autotools pkgconfig features_check # depends on virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI = "git://bitmath.org/git/mtview.git;protocol=http" +SRC_URI = "git://bitmath.org/git/mtview.git;protocol=http;branch=master" SRCREV = "ad437c38dc111cf3990a03abf14efe1b5d89604b" DEPENDS += "mtdev utouch-frame utouch-evemu libx11" -PV = "1.1.7+git${SRCPV}" +PV = "1.1.7+git" -S = "${WORKDIR}/git/" +S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/Makefile.utils b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/Makefile.utils index 495601f08f..5982e2d08c 100644 --- a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/Makefile.utils +++ b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/Makefile.utils @@ -13,7 +13,7 @@ INCLUDES = -I. -I../vboxsf -I../vboxsf/include MOD_DEFS = -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 \ -DIN_SUP_R0 -DVBOX -DVBOX_WITH_HGCM -DIN_MODULE -DIN_GUEST_R0 -CFLAGS = ${INCLUDES} ${MOD_DEFS} +CFLAGS = ${INCLUDES} ${MOD_DEFS} ${EXTRA_CFLAGS} LDFLAGS = SRCS = mount.vboxsf.c \ diff --git a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.22.bb b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.22.bb deleted file mode 100644 index 0f8d7af3fa..0000000000 --- a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.22.bb +++ /dev/null @@ -1,83 +0,0 @@ -SUMMARY = "VirtualBox Linux Guest Drivers" -SECTION = "core" -LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://${WORKDIR}/${VBOX_NAME}/COPYING;md5=e197d5641bb35b29d46ca8c4bf7f2660" - -DEPENDS = "virtual/kernel" - -inherit module kernel-module-split - -COMPATIBLE_MACHINE = "(qemux86|qemux86-64)" - -VBOX_NAME = "VirtualBox-${PV}" - -SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \ - file://Makefile.utils \ -" -SRC_URI[md5sum] = "c9c2f162ac5f99d28d8c0ca43b19ed01" -SRC_URI[sha256sum] = "5580e875349341a1aabc6d5d2f697d242f277487316faaf1fbe68d9014f788d4" - -S = "${WORKDIR}/vbox_module" - -export BUILD_TARGET_ARCH="${ARCH}" -export BUILD_TARGET_ARCH_x86-64="amd64" - -EXTRA_OEMAKE += "KERN_DIR='${WORKDIR}/${KERNEL_VERSION}/build'" - -# otherwise 5.2.22 builds just vboxguest -MAKE_TARGETS = "all" - -addtask export_sources before do_patch after do_unpack - -do_export_sources() { - mkdir -p "${S}" - ${WORKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/export_modules.sh ${T}/vbox_modules.tar.gz - tar -C "${S}" -xzf ${T}/vbox_modules.tar.gz - - # add a mount utility to use shared folder from VBox Addition Source Code - mkdir -p "${S}/utils" - install ${WORKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/sharedfolders/mount.vboxsf.c ${S}/utils - install ${WORKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/sharedfolders/vbsfmount.c ${S}/utils - install ${S}/../Makefile.utils ${S}/utils/Makefile - -} - -do_configure_prepend() { - # vboxguestdrivers/5.2.6-r0/vbox_module/vboxguest/Makefile.include.header:99: *** The variable KERN_DIR must be a kernel build folder and end with /build without a trailing slash, or KERN_VER must be set. Stop. - # vboxguestdrivers/5.2.6-r0/vbox_module/vboxguest/Makefile.include.header:108: *** The kernel build folder path must end in <version>/build, or the variable KERN_VER must be set. Stop. - mkdir -p ${WORKDIR}/${KERNEL_VERSION} - ln -snf ${STAGING_KERNEL_DIR} ${WORKDIR}/${KERNEL_VERSION}/build -} - -# compile and install mount utility -do_compile_append() { - oe_runmake 'LD=${CC}' 'LDFLAGS=${LDFLAGS}' -C ${S}/utils - if ! [ -e vboxguest.ko -a -e vboxsf.ko -a -e vboxvideo.ko ] ; then - echo "ERROR: One of vbox*.ko modules wasn't built" - exit 1 - fi -} - -module_do_install() { - MODULE_DIR=${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel/misc - install -d $MODULE_DIR - install -m 644 vboxguest.ko $MODULE_DIR - install -m 644 vboxsf.ko $MODULE_DIR - install -m 644 vboxvideo.ko $MODULE_DIR -} - -do_install_append() { - install -d ${D}${base_sbindir} - install -m 755 ${S}/utils/mount.vboxsf ${D}${base_sbindir} -} - -PACKAGES += "kernel-module-vboxguest kernel-module-vboxsf kernel-module-vboxvideo" -RRECOMMENDS_${PN} += "kernel-module-vboxguest kernel-module-vboxsf kernel-module-vboxvideo" - -FILES_${PN} = "${base_sbindir}" - -# autoload if installed -KERNEL_MODULE_AUTOLOAD += "vboxguest vboxsf vboxvideo" - -PNBLACKLIST[vboxguestdrivers] = "Needs forward porting to kernel 5.2+" - diff --git a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.18.bb b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.18.bb new file mode 100644 index 0000000000..47f616e990 --- /dev/null +++ b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.18.bb @@ -0,0 +1,91 @@ +SUMMARY = "VirtualBox Linux Guest Drivers" +SECTION = "core" +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://${UNPACKDIR}/${VBOX_NAME}/COPYING;md5=fff5fe1c81dd6dc3d522e7862e44881e" + +DEPENDS = "virtual/kernel" + +inherit module kernel-module-split + +COMPATIBLE_MACHINE = "(qemux86|qemux86-64)" + +VBOX_NAME = "VirtualBox-${PV}" + +SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \ + file://Makefile.utils \ +" + +SRC_URI[sha256sum] = "d999513533631674a024762668de999411d8197060c51e68c5faf0a2c0eea1a5" + +S ?= "${WORKDIR}/vbox_module" +S:task-patch = "${WORKDIR}/${VBOX_NAME}" + +export VBOX_KBUILD_TARGET_ARCH="${ARCH}" +export VBOX_KBUILD_TARGET_ARCH:x86-64="amd64" + +EXTRA_OEMAKE += "KERN_DIR='${WORKDIR}/${KERNEL_VERSION}/build' KBUILD_VERBOSE=1 CC='${CC} ${DEBUG_PREFIX_MAP} -fdebug-prefix-map=${STAGING_KERNEL_DIR}=${KERNEL_SRC_PATH} -fdebug-prefix-map=${STAGING_KERNEL_BUILDDIR}=${KERNEL_SRC_PATH}'" + +# otherwise 5.2.22 builds just vboxguest +MAKE_TARGETS = "all" + +addtask export_sources after do_patch before do_configure +do_export_sources[depends] += "virtual/kernel:do_shared_workdir" + +do_export_sources() { + mkdir -p "${S}" + ${UNPACKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/export_modules.sh ${T}/vbox_modules.tar.gz + tar -C "${S}" -xzf ${T}/vbox_modules.tar.gz + + # add a mount utility to use shared folder from VBox Addition Source Code + mkdir -p "${S}/utils" + install ${UNPACKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/sharedfolders/mount.vboxsf.c ${S}/utils + install ${UNPACKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/sharedfolders/vbsfmount.c ${S}/utils + install ${UNPACKDIR}/Makefile.utils ${S}/utils/Makefile + + # some kernel versions have issues with stdarg.h and compatibility with + # the sysroot and libc-headers/uapi. If we include the file directly from + # the kernel source (STAGING_KERNEL_DIR) we get conflicting types on many + # structures, due to kernel .h files being found before libc .h files. + # if we grab just this one file from the source, and put it into our + # file structure, everything holds together + mkdir -p ${S}/vboxsf/include/linux + install ${STAGING_KERNEL_DIR}/include/linux/stdarg.h ${S}/vboxsf/include/linux +} + +do_configure:prepend() { + # vboxguestdrivers/5.2.6-r0/vbox_module/vboxguest/Makefile.include.header:99: *** The variable KERN_DIR must be a kernel build folder and end with /build without a trailing slash, or KERN_VER must be set. Stop. + # vboxguestdrivers/5.2.6-r0/vbox_module/vboxguest/Makefile.include.header:108: *** The kernel build folder path must end in <version>/build, or the variable KERN_VER must be set. Stop. + mkdir -p ${WORKDIR}/${KERNEL_VERSION} + ln -snf ${STAGING_KERNEL_DIR} ${WORKDIR}/${KERNEL_VERSION}/build +} + +# compile and install mount utility +do_compile() { + oe_runmake all + oe_runmake 'LD=${CC}' 'EXTRA_CFLAGS=-I${STAGING_KERNEL_BUILDDIR}/include/' 'LDFLAGS=${LDFLAGS}' -C ${S}/utils + if ! [ -e vboxguest.ko -a -e vboxsf.ko -a -e vboxvideo.ko ] ; then + echo "ERROR: One of vbox*.ko modules wasn't built" + exit 1 + fi +} + +module_do_install() { + MODULE_DIR=${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel/misc + install -d $MODULE_DIR + install -m 644 vboxguest.ko $MODULE_DIR + install -m 644 vboxsf.ko $MODULE_DIR + install -m 644 vboxvideo.ko $MODULE_DIR +} + +do_install:append() { + install -d ${D}${base_sbindir} + install -m 755 ${S}/utils/mount.vboxsf ${D}${base_sbindir} +} + +PACKAGES += "kernel-module-vboxguest kernel-module-vboxsf kernel-module-vboxvideo" +RRECOMMENDS:${PN} += "kernel-module-vboxguest kernel-module-vboxsf kernel-module-vboxvideo" + +FILES:${PN} = "${base_sbindir}" + +# autoload if installed +KERNEL_MODULE_AUTOLOAD += "vboxguest vboxsf vboxvideo" diff --git a/meta-oe/recipes-support/webkitgtk/webkitgtk3/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch b/meta-oe/recipes-support/webkitgtk/webkitgtk3/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch new file mode 100644 index 0000000000..06030c047c --- /dev/null +++ b/meta-oe/recipes-support/webkitgtk/webkitgtk3/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch @@ -0,0 +1,29 @@ +From e68e87c14243b1c8707c56883a53e841310974a1 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Tue, 27 Oct 2015 16:02:19 +0200 +Subject: [PATCH] FindGObjectIntrospection.cmake: prefix variables obtained + from pkg-config with PKG_CONFIG_SYSROOT_DIR + +See discussion at https://bugs.webkit.org/show_bug.cgi?id=232933 for +reasons why this is not approproiate for upstream submission. + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + Source/cmake/FindGI.cmake | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/Source/cmake/FindGI.cmake b/Source/cmake/FindGI.cmake +index fdc56b21..d42eca52 100644 +--- a/Source/cmake/FindGI.cmake ++++ b/Source/cmake/FindGI.cmake +@@ -72,6 +72,9 @@ if (PKG_CONFIG_FOUND) + endif () + endif () + ++set(_GI_SCANNER_EXE "$ENV{PKG_CONFIG_SYSROOT_DIR}${_GI_SCANNER_EXE}") ++set(_GI_COMPILER_EXE "$ENV{PKG_CONFIG_SYSROOT_DIR}${_GI_COMPILER_EXE}") ++ + find_program(GI_SCANNER_EXE NAMES ${_GI_SCANNER_EXE} g-ir-scanner) + find_program(GI_COMPILER_EXE NAMES ${_GI_COMPILER_EXE} g-ir-compiler) + diff --git a/meta-oe/recipes-support/webkitgtk/webkitgtk3/0001-LowLevelInterpreter.cpp-339-21-error-t6-was-not-decl.patch b/meta-oe/recipes-support/webkitgtk/webkitgtk3/0001-LowLevelInterpreter.cpp-339-21-error-t6-was-not-decl.patch new file mode 100644 index 0000000000..e6a43c2fff --- /dev/null +++ b/meta-oe/recipes-support/webkitgtk/webkitgtk3/0001-LowLevelInterpreter.cpp-339-21-error-t6-was-not-decl.patch @@ -0,0 +1,35 @@ +From fb81a5de7798eb7f68e0de1c281671553e1aa19d Mon Sep 17 00:00:00 2001 +From: Michael Catanzaro <mcatanzaro@redhat.com> +Date: Mon, 5 Feb 2024 11:00:49 -0600 +Subject: [PATCH] =?UTF-8?q?LowLevelInterpreter.cpp:339:21:=20error:=20?= + =?UTF-8?q?=E2=80=98t6=E2=80=99=20was=20not=20declared=20in=20this=20scope?= + =?UTF-8?q?=20https://bugs.webkit.org/show=5Fbug.cgi=3Fid=3D268739?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Unreviewed build fix. Seems a backport went badly, and we didn't notice +because the code is architecture-specific. + +* Source/JavaScriptCore/llint/LowLevelInterpreter.cpp: +(JSC::CLoop::execute): + +Upstream-Status: Backport [https://github.com/WebKit/WebKit/commit/3d5373575695b293b8559155431d0079a6153aff] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Source/JavaScriptCore/llint/LowLevelInterpreter.cpp | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp +index 75cecbbd..b1020ea4 100644 +--- a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp ++++ b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp +@@ -336,8 +336,6 @@ JSValue CLoop::execute(OpcodeID entryOpcodeID, void* executableAddress, VM* vm, + UNUSED_VARIABLE(t2); + UNUSED_VARIABLE(t3); + UNUSED_VARIABLE(t5); +- UNUSED_VARIABLE(t6); +- UNUSED_VARIABLE(t7); + + struct StackPointerScope { + StackPointerScope(CLoopStack& stack) diff --git a/meta-oe/recipes-support/webkitgtk/webkitgtk3/30e1d5e22213fdaca2a29ec3400c927d710a37a8.patch b/meta-oe/recipes-support/webkitgtk/webkitgtk3/30e1d5e22213fdaca2a29ec3400c927d710a37a8.patch new file mode 100644 index 0000000000..b2e40a88c8 --- /dev/null +++ b/meta-oe/recipes-support/webkitgtk/webkitgtk3/30e1d5e22213fdaca2a29ec3400c927d710a37a8.patch @@ -0,0 +1,65 @@ +From 1523e00a2a76e285262c8aa3721b5d99f3f2d612 Mon Sep 17 00:00:00 2001 +From: Thomas Devoogdt <thomas.devoogdt@barco.com> +Date: Mon, 16 Jan 2023 17:03:30 +0100 +Subject: [PATCH] REGRESSION(257865@main): B3Validate.cpp: fix + + !ENABLE(WEBASSEMBLY_B3JIT) + +https://bugs.webkit.org/show_bug.cgi?id=250681 + +Reviewed by NOBODY (OOPS!). + +WasmTypeDefinition.h isn't included if not ENABLE(WEBASSEMBLY_B3JIT). +Also, toB3Type and simdScalarType are not defined if it is included. + +Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com> + +Upstream-Status: Inappropriate [https://bugs.launchpad.net/ubuntu/+source/webkit2gtk/+bug/2008798] +--- + Source/JavaScriptCore/b3/B3Validate.cpp | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/Source/JavaScriptCore/b3/B3Validate.cpp b/Source/JavaScriptCore/b3/B3Validate.cpp +index eaaa3749..1d089783 100644 +--- a/Source/JavaScriptCore/b3/B3Validate.cpp ++++ b/Source/JavaScriptCore/b3/B3Validate.cpp +@@ -47,6 +47,12 @@ + #include <wtf/StringPrintStream.h> + #include <wtf/text/CString.h> + ++#if ENABLE(WEBASSEMBLY) && ENABLE(WEBASSEMBLY_B3JIT) ++#define simdScalarTypeToB3Type(type) toB3Type(Wasm::simdScalarType(type)) ++#else ++#define simdScalarTypeToB3Type(type) B3::Type() ++#endif ++ + namespace JSC { namespace B3 { + + namespace { +@@ -454,7 +460,7 @@ public: + case VectorExtractLane: + VALIDATE(!value->kind().hasExtraBits(), ("At ", *value)); + VALIDATE(value->numChildren() == 1, ("At ", *value)); +- VALIDATE(value->type() == toB3Type(Wasm::simdScalarType(value->asSIMDValue()->simdLane())), ("At ", *value)); ++ VALIDATE(value->type() == simdScalarTypeToB3Type(value->asSIMDValue()->simdLane()), ("At ", *value)); + VALIDATE(value->child(0)->type() == V128, ("At ", *value)); + break; + case VectorReplaceLane: +@@ -462,7 +468,7 @@ public: + VALIDATE(value->numChildren() == 2, ("At ", *value)); + VALIDATE(value->type() == V128, ("At ", *value)); + VALIDATE(value->child(0)->type() == V128, ("At ", *value)); +- VALIDATE(value->child(1)->type() == toB3Type(Wasm::simdScalarType(value->asSIMDValue()->simdLane())), ("At ", *value)); ++ VALIDATE(value->child(1)->type() == simdScalarTypeToB3Type(value->asSIMDValue()->simdLane()), ("At ", *value)); + break; + case VectorDupElement: + VALIDATE(!value->kind().hasExtraBits(), ("At ", *value)); +@@ -484,7 +490,7 @@ public: + VALIDATE(!value->kind().hasExtraBits(), ("At ", *value)); + VALIDATE(value->numChildren() == 1, ("At ", *value)); + VALIDATE(value->type() == V128, ("At ", *value)); +- VALIDATE(value->child(0)->type() == toB3Type(Wasm::simdScalarType(value->asSIMDValue()->simdLane())), ("At ", *value)); ++ VALIDATE(value->child(0)->type() == simdScalarTypeToB3Type(value->asSIMDValue()->simdLane()), ("At ", *value)); + break; + + case VectorPopcnt: diff --git a/meta-oe/recipes-support/webkitgtk/webkitgtk3/no-musttail-arm.patch b/meta-oe/recipes-support/webkitgtk/webkitgtk3/no-musttail-arm.patch new file mode 100644 index 0000000000..37bc6538c3 --- /dev/null +++ b/meta-oe/recipes-support/webkitgtk/webkitgtk3/no-musttail-arm.patch @@ -0,0 +1,30 @@ +From c50f2277509f2e6f087cda2eaf323eaf569aad8d Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 30 Sep 2023 12:42:06 -0700 +Subject: [PATCH] clang/arm: Do not use MUST_TAIL_CALL + +This causes clang-17 to crash see [1] +this code is new in webkit 2.42[2] thats why we do not see the crash in older webkit + +[1] https://github.com/llvm/llvm-project/issues/67767 +[2] https://github.com/WebKit/WebKit/commit/4d816460b765acd8aef90ab474615850b91ecc35 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Source/WTF/wtf/Compiler.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Source/WTF/wtf/Compiler.h b/Source/WTF/wtf/Compiler.h +index 449ca502..daac29d7 100644 +--- a/Source/WTF/wtf/Compiler.h ++++ b/Source/WTF/wtf/Compiler.h +@@ -321,7 +321,7 @@ + /* MUST_TAIL_CALL */ + + #if !defined(MUST_TAIL_CALL) && defined(__cplusplus) && defined(__has_cpp_attribute) +-#if __has_cpp_attribute(clang::musttail) ++#if __has_cpp_attribute(clang::musttail) && !defined(__arm__) + #define MUST_TAIL_CALL [[clang::musttail]] + #endif + #endif diff --git a/meta-oe/recipes-support/webkitgtk/webkitgtk3/reproducibility.patch b/meta-oe/recipes-support/webkitgtk/webkitgtk3/reproducibility.patch new file mode 100644 index 0000000000..0a5720c99e --- /dev/null +++ b/meta-oe/recipes-support/webkitgtk/webkitgtk3/reproducibility.patch @@ -0,0 +1,30 @@ +From 7336dfd02c20ec9b2a984e1e42d17201af55c8f5 Mon Sep 17 00:00:00 2001 +From: Richard Purdie <richard.purdie@linuxfoundation.org> +Date: Thu, 27 Jul 2023 22:09:06 +0200 +Subject: [PATCH] webkitgtk3: add recipe + +Injection a year based on the current date isn't reproducible. Hack this +to a specific year for now for reproducibilty and to avoid autobuilder failures. + +The correct fix would be to use SOURCE_DATE_EPOCH from the environment and +then this could be submitted upstream, sadly my ruby isn't up to that. + +Upstream-Status: Pending [could be reworked] +Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> +--- + Source/JavaScriptCore/generator/GeneratedFile.rb | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Source/JavaScriptCore/generator/GeneratedFile.rb b/Source/JavaScriptCore/generator/GeneratedFile.rb +index 6ed2b6e4..86a28286 100644 +--- a/Source/JavaScriptCore/generator/GeneratedFile.rb ++++ b/Source/JavaScriptCore/generator/GeneratedFile.rb +@@ -25,7 +25,7 @@ require 'date' + require 'digest' + + $LICENSE = <<-EOF +-Copyright (C) #{Date.today.year} Apple Inc. All rights reserved. ++Copyright (C) 2021 Apple Inc. All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions diff --git a/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.44.2.bb b/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.44.2.bb new file mode 100644 index 0000000000..31480b8d8e --- /dev/null +++ b/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.44.2.bb @@ -0,0 +1,188 @@ +SUMMARY = "WebKit web rendering engine for the GTK+ platform" +HOMEPAGE = "https://www.webkitgtk.org/" +BUGTRACKER = "https://bugs.webkit.org/" + +LICENSE = "BSD-2-Clause & LGPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://Source/JavaScriptCore/COPYING.LIB;md5=d0c6d6397a5d84286dda758da57bd691 \ + file://Source/WebCore/LICENSE-APPLE;md5=4646f90082c40bcf298c285f8bab0b12 \ + file://Source/WebCore/LICENSE-LGPL-2;md5=36357ffde2b64ae177b2494445b79d21 \ + file://Source/WebCore/LICENSE-LGPL-2.1;md5=a778a33ef338abbaf8b8a7c36b6eec80 \ + " + +SRC_URI = "https://www.webkitgtk.org/releases/webkitgtk-${PV}.tar.xz \ + file://0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch \ + file://reproducibility.patch \ + file://no-musttail-arm.patch \ + file://0001-LowLevelInterpreter.cpp-339-21-error-t6-was-not-decl.patch \ + file://30e1d5e22213fdaca2a29ec3400c927d710a37a8.patch \ + " +SRC_URI[sha256sum] = "523f42c8ff24832add17631f6eaafe8f9303afe316ef1a7e1844b952a7f7521b" + +inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen + +S = "${WORKDIR}/webkitgtk-${PV}" + +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" +REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'opengl', '', d)}" + +CVE_PRODUCT = "webkitgtk webkitgtk\+" + +DEPENDS += " \ + ruby-native \ + gperf-native \ + unifdef-native \ + cairo \ + harfbuzz \ + jpeg \ + atk \ + libwebp \ + gtk+3 \ + libxslt \ + libtasn1 \ + libnotify \ + gstreamer1.0 \ + gstreamer1.0-plugins-base \ + glib-2.0-native \ + gettext-native \ + " + +PACKAGECONFIG_SOUP ?= "soup3" +PACKAGECONFIG ??= " \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd wayland x11', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'webgl opengl', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'webgl gles2', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl-or-es', '', d)} \ + enchant \ + libsecret \ + ${PACKAGECONFIG_SOUP} \ + " + +PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe wpebackend-fdo wayland-native" +PACKAGECONFIG[angle] = "-DUSE_ANGLE_WEBGL=ON,-DUSE_ANGLE_WEBGL=OFF" +PACKAGECONFIG[x11] = "-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/libx11 libxcomposite libxdamage libxrender libxt" +PACKAGECONFIG[geoclue] = "-DENABLE_GEOLOCATION=ON,-DENABLE_GEOLOCATION=OFF,geoclue" +PACKAGECONFIG[enchant] = "-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant2" +PACKAGECONFIG[gles2] = "-DENABLE_GLES2=ON,-DENABLE_GLES2=OFF,virtual/libgles2" +PACKAGECONFIG[jpegxl] = " -DUSE_JPEGXL=ON,-DUSE_JPEGXL=OFF,libjxl" +PACKAGECONFIG[webgl] = "-DENABLE_WEBGL=ON,-DENABLE_WEBGL=OFF,virtual/egl" +PACKAGECONFIG[opengl] = "-DENABLE_GRAPHICS_CONTEXT_GL=ON,-DENABLE_GRAPHICS_CONTEXT_GL=OFF,virtual/egl" +PACKAGECONFIG[opengl-or-es] = "-DUSE_OPENGL_OR_ES=ON,-DUSE_OPENGL_OR_ES=OFF" +PACKAGECONFIG[libsecret] = "-DUSE_LIBSECRET=ON,-DUSE_LIBSECRET=OFF,libsecret" +PACKAGECONFIG[libhyphen] = "-DUSE_LIBHYPHEN=ON,-DUSE_LIBHYPHEN=OFF,libhyphen" +PACKAGECONFIG[woff2] = "-DUSE_WOFF2=ON,-DUSE_WOFF2=OFF,woff2" +PACKAGECONFIG[openjpeg] = "-DUSE_OPENJPEG=ON,-DUSE_OPENJPEG=OFF,openjpeg" +PACKAGECONFIG[systemd] = "-DUSE_SYSTEMD=ON,-DUSE_SYSTEMD=off,systemd" +PACKAGECONFIG[reduce-size] = "-DCMAKE_BUILD_TYPE=MinSizeRel,-DCMAKE_BUILD_TYPE=Release,," +PACKAGECONFIG[lcms] = "-DUSE_LCMS=ON,-DUSE_LCMS=OFF,lcms" +PACKAGECONFIG[soup2] = "-DUSE_SOUP2=ON,-DUSE_SOUP2=OFF,libsoup-2.4,,,soup3" +PACKAGECONFIG[soup3] = ",,libsoup,,,soup2" +PACKAGECONFIG[journald] = "-DENABLE_JOURNALD_LOG=ON,-DENABLE_JOURNALD_LOG=OFF,systemd" +PACKAGECONFIG[avif] = "-DUSE_AVIF_LOG=ON,-DUSE_AVIF=OFF,libavif" +PACKAGECONFIG[media-recorder] = "-DENABLE_MEDIA_RECORDER=ON,-DENABLE_MEDIA_RECORDER=OFF,gstreamer1.0-plugins-bad" +PACKAGECONFIG[gamepad] = "-DENABLE_GAMEPAD=ON,-DENABLE_GAMEPAD=OFF,libmanette" +PACKAGECONFIG[webrtc] = "-DENABLE_WEB_RTC=ON,-DENABLE_WEB_RTC=OFF" +PACKAGECONFIG[bubblewrap] = "-DENABLE_BUBBLEWRAP_SANDBOX=ON -DBWRAP_EXECUTABLE=${bindir}/bwrap -DDBUS_PROXY_EXECUTABLE=${bindir}/xdg-dbus-proxy,-DENABLE_BUBBLEWRAP_SANDBOX=OFF,,bubblewrap xdg-dbus-proxy" +PACKAGECONFIG[backtrace] = "-DUSE_LIBBACKTRACE=ON,-DUSE_LIBBACKTRACE=OFF,libbacktrace" + +EXTRA_OECMAKE = " \ + -DPORT=GTK \ + -DUSE_GTK4=OFF \ + ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_INTROSPECTION=ON', '-DENABLE_INTROSPECTION=OFF', d)} \ + ${@bb.utils.contains('GIDOCGEN_ENABLED', 'True', '-DENABLE_DOCUMENTATION=ON', '-DENABLE_DOCUMENTATION=OFF', d)} \ + -DENABLE_MINIBROWSER=ON \ + -DCMAKE_EXPORT_COMPILE_COMMANDS=OFF \ + " +# Unless DEBUG_BUILD is enabled, pass -g1 to massively reduce the size of the +# debug symbols (4.3GB to 700M at time of writing) +DEBUG_FLAGS:append = "${@oe.utils.vartrue('DEBUG_BUILD', '', ' -g1', d)}" + +# Javascript JIT is not supported on ARC +EXTRA_OECMAKE:append:arc = " -DENABLE_JIT=OFF " +# By default 25-bit "medium" calls are used on ARC +# which is not enough for binaries larger than 32 MiB +CFLAGS:append:arc = " -mlong-calls" +CXXFLAGS:append:arc = " -mlong-calls" + +# Needed for non-mesa graphics stacks when x11 is disabled +CXXFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '-DEGL_NO_X11=1', d)}" + +# Javascript JIT is not supported on powerpc +EXTRA_OECMAKE:append:powerpc = " -DENABLE_JIT=OFF " +EXTRA_OECMAKE:append:powerpc64 = " -DENABLE_JIT=OFF " + +# ARM JIT code does not build on ARMv4/5/6 anymore +EXTRA_OECMAKE:append:armv4 = " -DENABLE_JIT=OFF " +EXTRA_OECMAKE:append:armv5 = " -DENABLE_JIT=OFF " +EXTRA_OECMAKE:append:armv6 = " -DENABLE_JIT=OFF " + +# And for armv7* don't enable it for softfp, because after: +# https://github.com/WebKit/WebKit/commit/a2ec4ef1997d6fafa6ffc607bffb54e76168a918 +# https://bugs.webkit.org/show_bug.cgi?id=242172 +# softfp armv7* fails because WEBASSEMBLY is left enabled by default and JIT gets +# explicitly disabled causing: +# http://errors.yoctoproject.org/Errors/Details/734587/ +# PR was sent upstream, but the end result is the same both JIT and WEBASSEMBLY disabled +# https://github.com/WebKit/WebKit/pull/17447 +EXTRA_OECMAKE:append:armv7a = " -DENABLE_JIT=${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', 'ON', 'OFF', d)}" +EXTRA_OECMAKE:append:armv7r = " -DENABLE_JIT=${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', 'ON', 'OFF', d)}" +EXTRA_OECMAKE:append:armv7ve = " -DENABLE_JIT=${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', 'ON', 'OFF', d)}" + +EXTRA_OECMAKE:append:mipsarch = " -DUSE_LD_GOLD=OFF " +EXTRA_OECMAKE:append:powerpc = " -DUSE_LD_GOLD=OFF " + +# JIT and gold linker does not work on RISCV +EXTRA_OECMAKE:append:riscv32 = " -DUSE_LD_GOLD=OFF -DENABLE_JIT=OFF" +EXTRA_OECMAKE:append:riscv64 = " -DUSE_LD_GOLD=OFF" + +# JIT not supported on MIPS either +EXTRA_OECMAKE:append:mipsarch = " -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON " + +# JIT not supported on X32 +# An attempt was made to upstream JIT support for x32 in +# https://bugs.webkit.org/show_bug.cgi?id=100450, but this was closed as +# unresolved due to limited X32 adoption. +EXTRA_OECMAKE:append:x86-x32 = " -DENABLE_JIT=OFF " + +SECURITY_CFLAGS:remove:aarch64 = "-fpie" +SECURITY_CFLAGS:append:aarch64 = " -fPIE" + +FILES:${PN} += "${libdir}/webkit2gtk-4.*/injected-bundle/libwebkit2gtkinjectedbundle.so" + +RRECOMMENDS:${PN} += "ca-certificates shared-mime-info" + +# http://errors.yoctoproject.org/Errors/Details/20370/ +ARM_INSTRUCTION_SET:armv4 = "arm" +ARM_INSTRUCTION_SET:armv5 = "arm" +ARM_INSTRUCTION_SET:armv6 = "arm" + +# https://bugzilla.yoctoproject.org/show_bug.cgi?id=9474 +# https://bugs.webkit.org/show_bug.cgi?id=159880 +# JSC JIT can build on ARMv7 with -marm, but doesn't work on runtime. +# Upstream only tests regularly the JSC JIT on ARMv7 with Thumb2 (-mthumb). +ARM_INSTRUCTION_SET:armv7a = "thumb" +ARM_INSTRUCTION_SET:armv7r = "thumb" +ARM_INSTRUCTION_SET:armv7ve = "thumb" + +# ANGLE requires SSE support as of webkit 2.40.x on 32 bit x86 +COMPATIBLE_HOST:x86 = "${@bb.utils.contains_any('TUNE_FEATURES', 'core2 corei7', '.*', 'null', d)}" + +# introspection inside qemu-arm hangs forever on musl/arm builds +# therefore disable GI_DATA +GI_DATA_ENABLED:libc-musl:armv7a = "False" +GI_DATA_ENABLED:libc-musl:armv7ve = "False" + +do_install:append() { + mv ${D}${bindir}/WebKitWebDriver ${D}${bindir}/WebKitWebDriver3 +} + +PACKAGE_PREPROCESS_FUNCS += "src_package_preprocess" +src_package_preprocess () { + # Trim build paths from comments in generated sources to ensure reproducibility + sed -i -e "s,${WORKDIR},,g" \ + ${B}/JavaScriptCore/DerivedSources/*.h \ + ${B}/JavaScriptCore/DerivedSources/yarr/*.h \ + ${B}/JavaScriptCore/PrivateHeaders/JavaScriptCore/*.h \ + ${B}/WebCore/DerivedSources/*.cpp \ + ${B}/WebKitGTK/DerivedSources/webkit/*.cpp +} + diff --git a/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/0001-Replace-make_shared-with-new-in-some-cases.patch b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/0001-Replace-make_shared-with-new-in-some-cases.patch deleted file mode 100644 index 0c8285df98..0000000000 --- a/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/0001-Replace-make_shared-with-new-in-some-cases.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 080fc37949114184d4832f7acffe2613745833f3 Mon Sep 17 00:00:00 2001 -From: Stefan Floeren <42731906+stefan-floeren@users.noreply.github.com> -Date: Tue, 16 Apr 2019 08:38:01 +0200 -Subject: [PATCH 1/2] Replace make_shared with new in some cases - -Replace make_shared for asio types that take a lib::ref as a parameter. -This should fix the ASIO change (boostorg/asio@59066d8) for 1.70, -while keeping it backwards compatible to older boost versions. ---- - websocketpp/transport/asio/connection.hpp | 7 ++++--- - websocketpp/transport/asio/endpoint.hpp | 3 +-- - websocketpp/transport/asio/security/none.hpp | 3 +-- - websocketpp/transport/asio/security/tls.hpp | 3 +-- - 4 files changed, 7 insertions(+), 9 deletions(-) - -diff --git a/websocketpp/transport/asio/connection.hpp b/websocketpp/transport/asio/connection.hpp -index 60f88a7..1ccda8f 100644 ---- a/websocketpp/transport/asio/connection.hpp -+++ b/websocketpp/transport/asio/connection.hpp -@@ -311,9 +311,10 @@ public: - * needed. - */ - timer_ptr set_timer(long duration, timer_handler callback) { -- timer_ptr new_timer = lib::make_shared<lib::asio::steady_timer>( -- lib::ref(*m_io_service), -- lib::asio::milliseconds(duration) -+ timer_ptr new_timer( -+ new lib::asio::steady_timer( -+ *m_io_service, -+ lib::asio::milliseconds(duration)) - ); - - if (config::enable_multithreading) { -diff --git a/websocketpp/transport/asio/endpoint.hpp b/websocketpp/transport/asio/endpoint.hpp -index ddab2c7..4b719a9 100644 ---- a/websocketpp/transport/asio/endpoint.hpp -+++ b/websocketpp/transport/asio/endpoint.hpp -@@ -195,8 +195,7 @@ public: - - m_io_service = ptr; - m_external_io_service = true; -- m_acceptor = lib::make_shared<lib::asio::ip::tcp::acceptor>( -- lib::ref(*m_io_service)); -+ m_acceptor.reset(new lib::asio::ip::tcp::acceptor(*m_io_service)); - - m_state = READY; - ec = lib::error_code(); -diff --git a/websocketpp/transport/asio/security/none.hpp b/websocketpp/transport/asio/security/none.hpp -index 5c8293d..6c7d352 100644 ---- a/websocketpp/transport/asio/security/none.hpp -+++ b/websocketpp/transport/asio/security/none.hpp -@@ -168,8 +168,7 @@ protected: - return socket::make_error_code(socket::error::invalid_state); - } - -- m_socket = lib::make_shared<lib::asio::ip::tcp::socket>( -- lib::ref(*service)); -+ m_socket.reset(new lib::asio::ip::tcp::socket(*service)); - - if (m_socket_init_handler) { - m_socket_init_handler(m_hdl, *m_socket); -diff --git a/websocketpp/transport/asio/security/tls.hpp b/websocketpp/transport/asio/security/tls.hpp -index c76fd9a..04ac379 100644 ---- a/websocketpp/transport/asio/security/tls.hpp -+++ b/websocketpp/transport/asio/security/tls.hpp -@@ -193,8 +193,7 @@ protected: - if (!m_context) { - return socket::make_error_code(socket::error::invalid_tls_context); - } -- m_socket = lib::make_shared<socket_type>( -- _WEBSOCKETPP_REF(*service),lib::ref(*m_context)); -+ m_socket.reset(new socket_type(*service, *m_context)); - - if (m_socket_init_handler) { - m_socket_init_handler(m_hdl, get_socket()); --- -2.23.0 - diff --git a/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/0002-Fix-missed-entries-fix-testing.patch b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/0002-Fix-missed-entries-fix-testing.patch deleted file mode 100644 index 962d089679..0000000000 --- a/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/0002-Fix-missed-entries-fix-testing.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 12ab603ca962e83591985a585451d33544d75d56 Mon Sep 17 00:00:00 2001 -From: Stefan Floeren <42731906+stefan-floeren@users.noreply.github.com> -Date: Wed, 17 Apr 2019 10:06:18 +0000 -Subject: [PATCH 2/2] Fix missed entries; fix testing - ---- - CMakeLists.txt | 2 +- - websocketpp/transport/asio/connection.hpp | 3 +-- - websocketpp/transport/asio/endpoint.hpp | 7 ++----- - 3 files changed, 4 insertions(+), 8 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2786aba..951de97 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -202,7 +202,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES) - endif () - - if (NOT Boost_USE_STATIC_LIBS) -- add_definitions (/DBOOST_TEST_DYN_LINK) -+ add_definitions (-DBOOST_TEST_DYN_LINK) - endif () - - set (Boost_FIND_REQUIRED TRUE) -diff --git a/websocketpp/transport/asio/connection.hpp b/websocketpp/transport/asio/connection.hpp -index 1ccda8f..57dda74 100644 ---- a/websocketpp/transport/asio/connection.hpp -+++ b/websocketpp/transport/asio/connection.hpp -@@ -462,8 +462,7 @@ protected: - m_io_service = io_service; - - if (config::enable_multithreading) { -- m_strand = lib::make_shared<lib::asio::io_service::strand>( -- lib::ref(*io_service)); -+ m_strand.reset(new lib::asio::io_service::strand(*io_service)); - } - - lib::error_code ec = socket_con_type::init_asio(io_service, m_strand, -diff --git a/websocketpp/transport/asio/endpoint.hpp b/websocketpp/transport/asio/endpoint.hpp -index 4b719a9..94509ad 100644 ---- a/websocketpp/transport/asio/endpoint.hpp -+++ b/websocketpp/transport/asio/endpoint.hpp -@@ -687,9 +687,7 @@ public: - * @since 0.3.0 - */ - void start_perpetual() { -- m_work = lib::make_shared<lib::asio::io_service::work>( -- lib::ref(*m_io_service) -- ); -+ m_work.reset(new lib::asio::io_service::work(*m_io_service)); - } - - /// Clears the endpoint's perpetual flag, allowing it to exit when empty -@@ -853,8 +851,7 @@ protected: - - // Create a resolver - if (!m_resolver) { -- m_resolver = lib::make_shared<lib::asio::ip::tcp::resolver>( -- lib::ref(*m_io_service)); -+ m_resolver.reset(new lib::asio::ip::tcp::resolver(*m_io_service)); - } - - tcon->set_uri(u); --- -2.23.0 - diff --git a/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/0001-Correct-clang-compiler-flags.patch b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/0001-Correct-clang-compiler-flags.patch new file mode 100644 index 0000000000..7a99daf6b2 --- /dev/null +++ b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/0001-Correct-clang-compiler-flags.patch @@ -0,0 +1,32 @@ +From 5ccaff351297bca0e254bbfd66e3f03fef9d9c75 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 10 Jan 2020 21:54:39 -0800 +Subject: [PATCH] Correct clang compiler flags + +Fix misplaced quotes, this was leading to spurious ; in compiler cmdline +Remove demanding libc++, clang can link with both libc++ and libstdc++ +and platforms have their own defaults, user can demand non defaults via +adding it to cmake flags + +Upstream-Status: Submitted [https://github.com/zaphoyd/websocketpp/pull/859] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2d13117..c17354a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -154,7 +154,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES) + endif() + set (WEBSOCKETPP_PLATFORM_TLS_LIBS ssl crypto) + set (WEBSOCKETPP_BOOST_LIBS system thread) +- set (CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-std=c++0x -stdlib=libc++") # todo: is libc++ really needed here? ++ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") + if (NOT APPLE) + add_definitions (-DNDEBUG -Wall -Wno-padded) # todo: should we use CMAKE_C_FLAGS for these? + endif () +-- +2.24.1 + diff --git a/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/0001-cmake-Use-GNUInstallDirs.patch b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/0001-cmake-Use-GNUInstallDirs.patch new file mode 100644 index 0000000000..0ef2e12375 --- /dev/null +++ b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/0001-cmake-Use-GNUInstallDirs.patch @@ -0,0 +1,35 @@ +From 771d79eeb0ac5079482a4b3a131bbda744793e7d Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 19 Dec 2019 20:07:11 -0800 +Subject: [PATCH] cmake: Use GNUInstallDirs + +Helps install cmakefiles in right libdir + +Upstream-Status: Submitted [https://github.com/zaphoyd/websocketpp/pull/854] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + CMakeLists.txt | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2786aba..080be3e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -39,11 +39,13 @@ endif() + + set_property(GLOBAL PROPERTY USE_FOLDERS ON) + ++include(GNUInstallDirs) ++ + set(INSTALL_INCLUDE_DIR include CACHE PATH "Installation directory for header files") + if (WIN32 AND NOT CYGWIN) + set (DEF_INSTALL_CMAKE_DIR cmake) + else () +- set (DEF_INSTALL_CMAKE_DIR lib/cmake/websocketpp) ++ set (DEF_INSTALL_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/websocketpp) + endif () + set (INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH "Installation directory for CMake files") + +-- +2.24.1 + diff --git a/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/1024.patch b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/1024.patch new file mode 100644 index 0000000000..12613f8b19 --- /dev/null +++ b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/1024.patch @@ -0,0 +1,508 @@ +From 05d1189ffce562560da90056d96fe2084d84654a Mon Sep 17 00:00:00 2001 +From: "Laszlo Boszormenyi (GCS)" <gcs@debian.org> +Date: Mon, 14 Feb 2022 14:13:13 +0100 +Subject: [PATCH] SCons 4.2.0 no longer has env_cpp11.has_key() Check env_cpp11 + as an array. + +This fixes https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1003022 +--- +Upstream-Status: Pending + + examples/broadcast_server/SConscript | 2 +- + examples/debug_client/SConscript | 2 +- + examples/debug_server/SConscript | 2 +- + examples/dev/SConscript | 2 +- + examples/echo_client/SConscript | 2 +- + examples/echo_server/SConscript | 2 +- + examples/echo_server_both/SConscript | 2 +- + examples/echo_server_tls/SConscript | 2 +- + examples/external_io_service/SConscript | 2 +- + examples/iostream_server/SConscript | 2 +- + examples/print_client/SConscript | 2 +- + examples/print_client_tls/SConscript | 2 +- + examples/print_server/SConscript | 2 +- + examples/scratch_client/SConscript | 2 +- + examples/scratch_server/SConscript | 2 +- + examples/sip_client/SConscript | 2 +- + examples/subprotocol_server/SConscript | 2 +- + examples/telemetry_client/SConscript | 2 +- + examples/telemetry_server/SConscript | 2 +- + examples/testee_client/SConscript | 2 +- + examples/testee_server/SConscript | 2 +- + examples/utility_client/SConscript | 4 ++-- + test/connection/SConscript | 2 +- + test/endpoint/SConscript | 2 +- + test/extension/SConscript | 2 +- + test/http/SConscript | 2 +- + test/logger/SConscript | 2 +- + test/message_buffer/SConscript | 2 +- + test/processors/SConscript | 2 +- + test/random/SConscript | 2 +- + test/roles/SConscript | 2 +- + test/transport/SConscript | 2 +- + test/transport/asio/SConscript | 2 +- + test/transport/iostream/SConscript | 2 +- + test/utility/SConscript | 2 +- + 35 files changed, 36 insertions(+), 36 deletions(-) + +diff --git a/examples/broadcast_server/SConscript b/examples/broadcast_server/SConscript +index 5786f570d..06c55c147 100644 +--- a/examples/broadcast_server/SConscript ++++ b/examples/broadcast_server/SConscript +@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone () + prgs = [] + + # if a C++11 environment is available build using that, otherwise use boost +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + prgs += env_cpp11.Program('broadcast_server', ["broadcast_server.cpp"], LIBS = ALL_LIBS) + else: +diff --git a/examples/debug_client/SConscript b/examples/debug_client/SConscript +index 781db8371..b92b14653 100644 +--- a/examples/debug_client/SConscript ++++ b/examples/debug_client/SConscript +@@ -14,7 +14,7 @@ env_cpp11 = env_cpp11.Clone () + prgs = [] + + # if a C++11 environment is available build using that, otherwise use boost +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs] + prgs += env_cpp11.Program('debug_client', ["debug_client.cpp"], LIBS = ALL_LIBS) + else: +diff --git a/examples/debug_server/SConscript b/examples/debug_server/SConscript +index 4d02261c6..7e24b07c8 100644 +--- a/examples/debug_server/SConscript ++++ b/examples/debug_server/SConscript +@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone () + prgs = [] + + # if a C++11 environment is available build using that, otherwise use boost +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + prgs += env_cpp11.Program('debug_server', ["debug_server.cpp"], LIBS = ALL_LIBS) + else: +diff --git a/examples/dev/SConscript b/examples/dev/SConscript +index 34ddac2d5..31062fee9 100644 +--- a/examples/dev/SConscript ++++ b/examples/dev/SConscript +@@ -11,7 +11,7 @@ env_cpp11 = env_cpp11.Clone () + + prgs = [] + +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework','system','timer','chrono'],env_cpp11) + [platform_libs] + [polyfill_libs] + prgs += env_cpp11.Program('main', ["main.cpp"], LIBS = BOOST_LIBS_CPP11) + +diff --git a/examples/echo_client/SConscript b/examples/echo_client/SConscript +index 0e4110822..2adf1166d 100644 +--- a/examples/echo_client/SConscript ++++ b/examples/echo_client/SConscript +@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone () + prgs = [] + + # if a C++11 environment is available build using that, otherwise use boost +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + ['z'] + prgs += env_cpp11.Program('echo_client', ["echo_client.cpp"], LIBS = ALL_LIBS) + else: +diff --git a/examples/echo_server/SConscript b/examples/echo_server/SConscript +index a2978852e..a48724155 100644 +--- a/examples/echo_server/SConscript ++++ b/examples/echo_server/SConscript +@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone () + prgs = [] + + # if a C++11 environment is available build using that, otherwise use boost +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + prgs += env_cpp11.Program('echo_server', ["echo_server.cpp"], LIBS = ALL_LIBS) + else: +diff --git a/examples/echo_server_both/SConscript b/examples/echo_server_both/SConscript +index d1ecf202f..32f4c8c55 100644 +--- a/examples/echo_server_both/SConscript ++++ b/examples/echo_server_both/SConscript +@@ -14,7 +14,7 @@ env_cpp11 = env_cpp11.Clone () + prgs = [] + + # if a C++11 environment is available build using that, otherwise use boost +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs] + prgs += env_cpp11.Program('echo_server_both', ["echo_server_both.cpp"], LIBS = ALL_LIBS) + else: +diff --git a/examples/echo_server_tls/SConscript b/examples/echo_server_tls/SConscript +index e24cc4ce8..688bf7c14 100644 +--- a/examples/echo_server_tls/SConscript ++++ b/examples/echo_server_tls/SConscript +@@ -14,7 +14,7 @@ env_cpp11 = env_cpp11.Clone () + prgs = [] + + # if a C++11 environment is available build using that, otherwise use boost +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs] + prgs += env_cpp11.Program('echo_server_tls', ["echo_server_tls.cpp"], LIBS = ALL_LIBS) + else: +diff --git a/examples/external_io_service/SConscript b/examples/external_io_service/SConscript +index beb7c1c42..0abf3e175 100644 +--- a/examples/external_io_service/SConscript ++++ b/examples/external_io_service/SConscript +@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone () + prgs = [] + + # if a C++11 environment is available build using that, otherwise use boost +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + prgs += env_cpp11.Program('external_io_service', ["external_io_service.cpp"], LIBS = ALL_LIBS) + else: +diff --git a/examples/iostream_server/SConscript b/examples/iostream_server/SConscript +index dc90834cf..304142082 100644 +--- a/examples/iostream_server/SConscript ++++ b/examples/iostream_server/SConscript +@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone () + prgs = [] + + # if a C++11 environment is available build using that, otherwise use boost +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + prgs += env_cpp11.Program('iostream_server', ["iostream_server.cpp"], LIBS = ALL_LIBS) + else: +diff --git a/examples/print_client/SConscript b/examples/print_client/SConscript +index 8da4ce5b2..79fdea0fd 100644 +--- a/examples/print_client/SConscript ++++ b/examples/print_client/SConscript +@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone () + prgs = [] + + # if a C++11 environment is available build using that, otherwise use boost +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + prgs += env_cpp11.Program('print_client', ["print_client.cpp"], LIBS = ALL_LIBS) + else: +diff --git a/examples/print_client_tls/SConscript b/examples/print_client_tls/SConscript +index 01b011473..e57b9d691 100644 +--- a/examples/print_client_tls/SConscript ++++ b/examples/print_client_tls/SConscript +@@ -14,7 +14,7 @@ env_cpp11 = env_cpp11.Clone () + prgs = [] + + # if a C++11 environment is available build using that, otherwise use boost +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs] + prgs += env_cpp11.Program('print_client_tls', ["print_client_tls.cpp"], LIBS = ALL_LIBS) + else: +diff --git a/examples/print_server/SConscript b/examples/print_server/SConscript +index 4f0e492be..454dcf01b 100644 +--- a/examples/print_server/SConscript ++++ b/examples/print_server/SConscript +@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone () + prgs = [] + + # if a C++11 environment is available build using that, otherwise use boost +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + prgs += env_cpp11.Program('print_server', ["print_server.cpp"], LIBS = ALL_LIBS) + else: +diff --git a/examples/scratch_client/SConscript b/examples/scratch_client/SConscript +index 6e7b2ef07..4be98f437 100644 +--- a/examples/scratch_client/SConscript ++++ b/examples/scratch_client/SConscript +@@ -14,7 +14,7 @@ env_cpp11 = env_cpp11.Clone () + prgs = [] + + # if a C++11 environment is available build using that, otherwise use boost +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs] + prgs += env_cpp11.Program('scratch_client', ["scratch_client.cpp"], LIBS = ALL_LIBS) + else: +diff --git a/examples/scratch_server/SConscript b/examples/scratch_server/SConscript +index bf90f7433..cc495ba5c 100644 +--- a/examples/scratch_server/SConscript ++++ b/examples/scratch_server/SConscript +@@ -14,7 +14,7 @@ env_cpp11 = env_cpp11.Clone () + prgs = [] + + # if a C++11 environment is available build using that, otherwise use boost +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs] + ['z'] + prgs += env_cpp11.Program('scratch_server', ["scratch_server.cpp"], LIBS = ALL_LIBS) + else: +diff --git a/examples/sip_client/SConscript b/examples/sip_client/SConscript +index fafe7b4ff..e2afefe73 100644 +--- a/examples/sip_client/SConscript ++++ b/examples/sip_client/SConscript +@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone () + prgs = [] + + # if a C++11 environment is available build using that, otherwise use boost +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + prgs += env_cpp11.Program('sip_client', ["sip_client.cpp"], LIBS = ALL_LIBS) + else: +diff --git a/examples/subprotocol_server/SConscript b/examples/subprotocol_server/SConscript +index e97535ca5..299af43c5 100644 +--- a/examples/subprotocol_server/SConscript ++++ b/examples/subprotocol_server/SConscript +@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone () + prgs = [] + + # if a C++11 environment is available build using that, otherwise use boost +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + prgs += env_cpp11.Program('subprotocol_server', ["subprotocol_server.cpp"], LIBS = ALL_LIBS) + else: +diff --git a/examples/telemetry_client/SConscript b/examples/telemetry_client/SConscript +index 62396a5e3..ac0e6daba 100644 +--- a/examples/telemetry_client/SConscript ++++ b/examples/telemetry_client/SConscript +@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone () + prgs = [] + + # if a C++11 environment is available build using that, otherwise use boost +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + prgs += env_cpp11.Program('telemetry_client', ["telemetry_client.cpp"], LIBS = ALL_LIBS) + else: +diff --git a/examples/telemetry_server/SConscript b/examples/telemetry_server/SConscript +index 1b8ff2295..c620f38a4 100644 +--- a/examples/telemetry_server/SConscript ++++ b/examples/telemetry_server/SConscript +@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone () + prgs = [] + + # if a C++11 environment is available build using that, otherwise use boost +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + prgs += env_cpp11.Program('telemetry_server', ["telemetry_server.cpp"], LIBS = ALL_LIBS) + else: +diff --git a/examples/testee_client/SConscript b/examples/testee_client/SConscript +index 64f0ef1f3..6154bb966 100644 +--- a/examples/testee_client/SConscript ++++ b/examples/testee_client/SConscript +@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone () + prgs = [] + + # if a C++11 environment is available build using that, otherwise use boost +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + ['z'] + prgs += env_cpp11.Program('testee_client', ["testee_client.cpp"], LIBS = ALL_LIBS) + else: +diff --git a/examples/testee_server/SConscript b/examples/testee_server/SConscript +index 3c75f4ff2..ca8ffb7d7 100644 +--- a/examples/testee_server/SConscript ++++ b/examples/testee_server/SConscript +@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone () + prgs = [] + + # if a C++11 environment is available build using that, otherwise use boost +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + ['z'] + prgs += env_cpp11.Program('testee_server', ["testee_server.cpp"], LIBS = ALL_LIBS) + else: +diff --git a/examples/utility_client/SConscript b/examples/utility_client/SConscript +index 6e6cd8c9d..f6d673a43 100644 +--- a/examples/utility_client/SConscript ++++ b/examples/utility_client/SConscript +@@ -13,11 +13,11 @@ env_cpp11 = env_cpp11.Clone () + prgs = [] + + # if a C++11 environment is available build using that, otherwise use boost +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + prgs += env_cpp11.Program('utility_client', ["utility_client.cpp"], LIBS = ALL_LIBS) + else: + ALL_LIBS = boostlibs(['system','random'],env) + [platform_libs] + [polyfill_libs] + prgs += env.Program('utility_client', ["utility_client.cpp"], LIBS = ALL_LIBS) + +-Return('prgs') +\ No newline at end of file ++Return('prgs') +diff --git a/test/connection/SConscript b/test/connection/SConscript +index 4ed7a4e69..b79876bf1 100644 +--- a/test/connection/SConscript ++++ b/test/connection/SConscript +@@ -16,7 +16,7 @@ objs = env.Object('connection_boost.o', ["connection.cpp"], LIBS = BOOST_LIBS) + objs = env.Object('connection_tu2_boost.o', ["connection_tu2.cpp"], LIBS = BOOST_LIBS) + prgs = env.Program('test_connection_boost', ["connection_boost.o","connection_tu2_boost.o"], LIBS = BOOST_LIBS) + +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework','system'],env_cpp11) + [platform_libs] + [polyfill_libs] + objs += env_cpp11.Object('connection_stl.o', ["connection.cpp"], LIBS = BOOST_LIBS_CPP11) + objs += env_cpp11.Object('connection_tu2_stl.o', ["connection_tu2.cpp"], LIBS = BOOST_LIBS_CPP11) +diff --git a/test/endpoint/SConscript b/test/endpoint/SConscript +index 5cb3ede91..74912865e 100644 +--- a/test/endpoint/SConscript ++++ b/test/endpoint/SConscript +@@ -16,7 +16,7 @@ BOOST_LIBS = boostlibs(['unit_test_framework','system'],env) + [platform_libs] + + objs = env.Object('endpoint_boost.o', ["endpoint.cpp"], LIBS = BOOST_LIBS) + prgs = env.Program('test_endpoint_boost', ["endpoint_boost.o"], LIBS = BOOST_LIBS) + +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework','system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs] + objs += env_cpp11.Object('endpoint_stl.o', ["endpoint.cpp"], LIBS = BOOST_LIBS_CPP11) + prgs += env_cpp11.Program('test_endpoint_stl', ["endpoint_stl.o"], LIBS = BOOST_LIBS_CPP11) +diff --git a/test/extension/SConscript b/test/extension/SConscript +index d8b425fda..0cb813856 100644 +--- a/test/extension/SConscript ++++ b/test/extension/SConscript +@@ -17,7 +17,7 @@ objs += env.Object('permessage_deflate_boost.o', ["permessage_deflate.cpp"], LIB + prgs = env.Program('test_extension_boost', ["extension_boost.o"], LIBS = BOOST_LIBS) + prgs += env.Program('test_permessage_deflate_boost', ["permessage_deflate_boost.o"], LIBS = BOOST_LIBS) + +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework'],env_cpp11) + [platform_libs] + [polyfill_libs] + ['z'] + objs += env_cpp11.Object('extension_stl.o', ["extension.cpp"], LIBS = BOOST_LIBS_CPP11) + objs += env_cpp11.Object('permessage_deflate_stl.o', ["permessage_deflate.cpp"], LIBS = BOOST_LIBS_CPP11) +diff --git a/test/http/SConscript b/test/http/SConscript +index 0a24a8774..422998e24 100644 +--- a/test/http/SConscript ++++ b/test/http/SConscript +@@ -15,7 +15,7 @@ BOOST_LIBS = boostlibs(['unit_test_framework'],env) + [platform_libs] + objs = env.Object('parser_boost.o', ["parser.cpp"], LIBS = BOOST_LIBS) + prgs = env.Program('test_http_boost', ["parser_boost.o"], LIBS = BOOST_LIBS) + +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework'],env_cpp11) + [platform_libs] + [polyfill_libs] + objs += env_cpp11.Object('parser_stl.o', ["parser.cpp"], LIBS = BOOST_LIBS_CPP11) + prgs += env_cpp11.Program('test_http_stl', ["parser_stl.o"], LIBS = BOOST_LIBS_CPP11) +diff --git a/test/logger/SConscript b/test/logger/SConscript +index 81d607601..0ccbbc5df 100644 +--- a/test/logger/SConscript ++++ b/test/logger/SConscript +@@ -15,7 +15,7 @@ BOOST_LIBS = boostlibs(['unit_test_framework','system'],env) + [platform_libs] + objs = env.Object('logger_basic_boost.o', ["basic.cpp"], LIBS = BOOST_LIBS) + prgs = env.Program('logger_basic_boost', ["logger_basic_boost.o"], LIBS = BOOST_LIBS) + +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework','system'],env_cpp11) + [platform_libs] + [polyfill_libs] + objs += env_cpp11.Object('logger_basic_stl.o', ["basic.cpp"], LIBS = BOOST_LIBS_CPP11) + prgs += env_cpp11.Program('logger_basic_stl', ["logger_basic_stl.o"], LIBS = BOOST_LIBS_CPP11) +diff --git a/test/message_buffer/SConscript b/test/message_buffer/SConscript +index 2ef6d71f3..89785cb3e 100644 +--- a/test/message_buffer/SConscript ++++ b/test/message_buffer/SConscript +@@ -17,7 +17,7 @@ objs += env.Object('alloc_boost.o', ["alloc.cpp"], LIBS = BOOST_LIBS) + prgs = env.Program('test_message_boost', ["message_boost.o"], LIBS = BOOST_LIBS) + prgs += env.Program('test_alloc_boost', ["alloc_boost.o"], LIBS = BOOST_LIBS) + +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework'],env_cpp11) + [platform_libs] + [polyfill_libs] + objs += env_cpp11.Object('message_stl.o', ["message.cpp"], LIBS = BOOST_LIBS_CPP11) + objs += env_cpp11.Object('alloc_stl.o', ["alloc.cpp"], LIBS = BOOST_LIBS_CPP11) +diff --git a/test/processors/SConscript b/test/processors/SConscript +index 406a7edc9..1b40d0b1d 100644 +--- a/test/processors/SConscript ++++ b/test/processors/SConscript +@@ -26,7 +26,7 @@ prgs += env.Program('test_hybi07_boost', ["test_hybi07_boost.o"], LIBS = BOOST_L + prgs += env.Program('test_hybi00_boost', ["test_hybi00_boost.o"], LIBS = BOOST_LIBS) + prgs += env.Program('test_extension_permessage_compress_boost', ["test_extension_permessage_compress_boost.o"], LIBS = BOOST_LIBS + ['z']) + +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework'],env_cpp11) + [platform_libs] + [polyfill_libs] + ['z'] + # no C++11 features are used in processor so there are no C++11 versions of + # these tests. +diff --git a/test/random/SConscript b/test/random/SConscript +index 3cadc9e97..4a11b0ce5 100644 +--- a/test/random/SConscript ++++ b/test/random/SConscript +@@ -17,7 +17,7 @@ objs += env.Object('random_device_boost.o', ["random_device.cpp"], LIBS = BOOST_ + prgs = env.Program('test_random_none_boost', ["random_none_boost.o"], LIBS = BOOST_LIBS) + prgs += env.Program('test_random_device_boost', ["random_device_boost.o"], LIBS = BOOST_LIBS) + +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework'],env_cpp11) + [platform_libs] + [polyfill_libs] + objs += env_cpp11.Object('random_none_stl.o', ["none.cpp"], LIBS = BOOST_LIBS_CPP11) + objs += env_cpp11.Object('random_device_stl.o', ["random_device.cpp"], LIBS = BOOST_LIBS_CPP11) +diff --git a/test/roles/SConscript b/test/roles/SConscript +index e86107ece..17b3be105 100644 +--- a/test/roles/SConscript ++++ b/test/roles/SConscript +@@ -17,7 +17,7 @@ objs += env.Object('server_boost.o', ["server.cpp"], LIBS = BOOST_LIBS) + prgs = env.Program('test_client_boost', ["client_boost.o"], LIBS = BOOST_LIBS) + prgs += env.Program('test_server_boost', ["server_boost.o"], LIBS = BOOST_LIBS) + +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework'],env_cpp11) + [platform_libs] + [polyfill_libs] + objs += env_cpp11.Object('client_stl.o', ["client.cpp"], LIBS = BOOST_LIBS_CPP11) + objs += env_cpp11.Object('server_stl.o', ["server.cpp"], LIBS = BOOST_LIBS_CPP11) +diff --git a/test/transport/SConscript b/test/transport/SConscript +index 71b31b6c5..aa9b719ec 100644 +--- a/test/transport/SConscript ++++ b/test/transport/SConscript +@@ -16,7 +16,7 @@ BOOST_LIBS = boostlibs(['unit_test_framework','system','thread','random','chrono + objs = env.Object('boost_integration.o', ["integration.cpp"], LIBS = BOOST_LIBS) + prgs = env.Program('test_boost_integration', ["boost_integration.o"], LIBS = BOOST_LIBS) + +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework','system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs] + objs += env_cpp11.Object('stl_integration.o', ["integration.cpp"], LIBS = BOOST_LIBS_CPP11) + prgs += env_cpp11.Program('test_stl_integration', ["stl_integration.o"], LIBS = BOOST_LIBS_CPP11) +diff --git a/test/transport/asio/SConscript b/test/transport/asio/SConscript +index f8185e57e..518d362b1 100644 +--- a/test/transport/asio/SConscript ++++ b/test/transport/asio/SConscript +@@ -20,7 +20,7 @@ prgs = env.Program('test_base_boost', ["base_boost.o"], LIBS = BOOST_LIBS) + prgs += env.Program('test_timers_boost', ["timers_boost.o"], LIBS = BOOST_LIBS) + prgs += env.Program('test_security_boost', ["security_boost.o"], LIBS = BOOST_LIBS) + +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework','system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs] + objs += env_cpp11.Object('base_stl.o', ["base.cpp"], LIBS = BOOST_LIBS_CPP11) + objs += env_cpp11.Object('timers_stl.o', ["timers.cpp"], LIBS = BOOST_LIBS_CPP11) +diff --git a/test/transport/iostream/SConscript b/test/transport/iostream/SConscript +index 9e74c2f15..dcaf9f2d9 100644 +--- a/test/transport/iostream/SConscript ++++ b/test/transport/iostream/SConscript +@@ -19,7 +19,7 @@ prgs = env.Program('test_iostream_base_boost', ["iostream_base_boost.o"], LIBS = + prgs += env.Program('test_iostream_connection_boost', ["iostream_connection_boost.o"], LIBS = BOOST_LIBS) + prgs += env.Program('test_iostream_endpoint_boost', ["iostream_endpoint_boost.o"], LIBS = BOOST_LIBS) + +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework'],env_cpp11) + [platform_libs] + [polyfill_libs] + objs += env_cpp11.Object('iostream_base_stl.o', ["base.cpp"], LIBS = BOOST_LIBS_CPP11) + objs += env_cpp11.Object('iostream_connection_stl.o', ["connection.cpp"], LIBS = BOOST_LIBS_CPP11) +diff --git a/test/utility/SConscript b/test/utility/SConscript +index 80e9ef6c8..6f19aa52a 100644 +--- a/test/utility/SConscript ++++ b/test/utility/SConscript +@@ -24,7 +24,7 @@ prgs += env.Program('test_close_boost', ["close_boost.o"], LIBS = BOOST_LIBS) + prgs += env.Program('test_sha1_boost', ["sha1_boost.o"], LIBS = BOOST_LIBS) + prgs += env.Program('test_error_boost', ["error_boost.o"], LIBS = BOOST_LIBS) + +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework'],env_cpp11) + [platform_libs] + [polyfill_libs] + objs += env_cpp11.Object('utilities_stl.o', ["utilities.cpp"], LIBS = BOOST_LIBS_CPP11) + objs += env_cpp11.Object('uri_stl.o', ["uri.cpp"], LIBS = BOOST_LIBS_CPP11) diff --git a/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/855.patch b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/855.patch new file mode 100644 index 0000000000..68cb645b40 --- /dev/null +++ b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/855.patch @@ -0,0 +1,25 @@ +From 3590d77bb9753fbbf076028e2395182ced6466ba Mon Sep 17 00:00:00 2001 +From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it> +Date: Wed, 8 Jan 2020 17:59:48 +0100 +Subject: [PATCH] Fix cmake find boost with version >= 1.71 + +For some reasons "system;thread;random;unit_test_framework" was seen as a single module, because of the quotes. +--- +Upstream-Status: Pending + + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2d13117b..9a46bc10 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -217,7 +217,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES) + set (Boost_USE_MULTITHREADED TRUE) + set (Boost_ADDITIONAL_VERSIONS "1.39.0" "1.40.0" "1.41.0" "1.42.0" "1.43.0" "1.44.0" "1.46.1") # todo: someone who knows better spesify these! + +- find_package (Boost 1.39.0 COMPONENTS "${WEBSOCKETPP_BOOST_LIBS}") ++ find_package (Boost 1.39.0 COMPONENTS ${WEBSOCKETPP_BOOST_LIBS}) + + if (Boost_FOUND) + # Boost is a project wide global dependency. diff --git a/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/857.patch b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/857.patch new file mode 100644 index 0000000000..401a614dc1 --- /dev/null +++ b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/857.patch @@ -0,0 +1,134 @@ +From 931a55347a322f38eb82d5f387b2924e6c7a1746 Mon Sep 17 00:00:00 2001 +From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it> +Date: Thu, 9 Jan 2020 10:07:20 +0100 +Subject: [PATCH] Update SConstruct with new Python3 syntax: - new raise + keyword syntax - has_key deprecated method is now removed - commands + deprecated library is replaced by subprocess - print function fixes + +This should fix FTBFS against new scons 3.1.2 +https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=947584 +--- +Upstream-Status: Pending + + SConstruct | 45 +++++++++++++++++++++++---------------------- + 1 file changed, 23 insertions(+), 22 deletions(-) + +diff --git a/SConstruct b/SConstruct +index ae3df10b..9d1c8914 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -1,18 +1,19 @@ +-import os, sys, commands ++import os, sys ++from subprocess import check_output + env = Environment(ENV = os.environ) + + # figure out a better way to configure this +-if os.environ.has_key('CXX'): ++if 'CXX' in os.environ: + env['CXX'] = os.environ['CXX'] + +-if os.environ.has_key('DEBUG'): ++if 'DEBUG' in os.environ: + env['DEBUG'] = os.environ['DEBUG'] + +-if os.environ.has_key('CXXFLAGS'): ++if 'CXXFLAGS' in os.environ: + #env['CXXFLAGS'] = os.environ['CXXFLAGS'] + env.Append(CXXFLAGS = os.environ['CXXFLAGS']) + +-if os.environ.has_key('LINKFLAGS'): ++if 'LINKFLAGS' in os.environ: + #env['LDFLAGS'] = os.environ['LDFLAGS'] + env.Append(LINKFLAGS = os.environ['LINKFLAGS']) + +@@ -22,24 +23,24 @@ if os.environ.has_key('LINKFLAGS'): + ## or set BOOST_INCLUDES and BOOST_LIBS if Boost comes with your OS distro e.g. and + ## needs BOOST_INCLUDES=/usr/include/boost and BOOST_LIBS=/usr/lib like Ubuntu. + ## +-if os.environ.has_key('BOOSTROOT'): ++if 'BOOSTROOT' in os.environ: + os.environ['BOOST_ROOT'] = os.environ['BOOSTROOT'] + +-if os.environ.has_key('BOOST_ROOT'): ++if 'BOOST_ROOT' in os.environ: + env['BOOST_INCLUDES'] = os.environ['BOOST_ROOT'] + env['BOOST_LIBS'] = os.path.join(os.environ['BOOST_ROOT'], 'stage', 'lib') +-elif os.environ.has_key('BOOST_INCLUDES') and os.environ.has_key('BOOST_LIBS'): ++elif 'BOOST_INCLUDES' in os.environ and 'BOOST_LIBS' in os.environ: + env['BOOST_INCLUDES'] = os.environ['BOOST_INCLUDES'] + env['BOOST_LIBS'] = os.environ['BOOST_LIBS'] + else: +- raise SCons.Errors.UserError, "Neither BOOST_ROOT, nor BOOST_INCLUDES + BOOST_LIBS was set!" ++ raise SCons.Errors.UserError("Neither BOOST_ROOT, nor BOOST_INCLUDES + BOOST_LIBS were set!") + + ## Custom OpenSSL +-if os.environ.has_key('OPENSSL_PATH'): ++if 'OPENSSL_PATH' in os.environ: + env.Append(CPPPATH = os.path.join(os.environ['OPENSSL_PATH'], 'include')) + env.Append(LIBPATH = os.environ['OPENSSL_PATH']) + +-if os.environ.has_key('WSPP_ENABLE_CPP11'): ++if 'WSPP_ENABLE_CPP11' in os.environ: + env['WSPP_ENABLE_CPP11'] = True + else: + env['WSPP_ENABLE_CPP11'] = False +@@ -76,7 +77,7 @@ if env['PLATFORM'].startswith('win'): + env['CCFLAGS'] = '%s /EHsc /GR /GS- /MD /nologo %s %s' % (warn_flags, arch_flags, opt_flags) + env['LINKFLAGS'] = '/INCREMENTAL:NO /MANIFEST /NOLOGO /OPT:REF /OPT:ICF /MACHINE:X86' + elif env['PLATFORM'] == 'posix': +- if env.has_key('DEBUG'): ++ if 'DEBUG' in env: + env.Append(CCFLAGS = ['-g', '-O0']) + else: + env.Append(CPPDEFINES = ['NDEBUG']) +@@ -84,9 +85,9 @@ elif env['PLATFORM'] == 'posix': + env.Append(CCFLAGS = ['-Wall']) + #env['LINKFLAGS'] = '' + elif env['PLATFORM'] == 'darwin': +- if not os.environ.has_key('CXX'): ++ if not 'CXX' in os.environ: + env['CXX'] = "clang++" +- if env.has_key('DEBUG'): ++ if 'DEBUG' in env: + env.Append(CCFLAGS = ['-g', '-O0']) + else: + env.Append(CPPDEFINES = ['NDEBUG']) +@@ -157,29 +158,29 @@ env_cpp11 = env.Clone () + + if env_cpp11['CXX'].startswith('g++'): + # TODO: check g++ version +- GCC_VERSION = commands.getoutput(env_cpp11['CXX'] + ' -dumpversion') ++ GCC_VERSION = check_output([env_cpp11['CXX'], '-dumpversion']) + +- if GCC_VERSION > "4.4.0": +- print "C++11 build environment partially enabled" ++ if GCC_VERSION.decode('utf-8') > "4.4.0": ++ print("C++11 build environment partially enabled") + env_cpp11.Append(WSPP_CPP11_ENABLED = "true",CXXFLAGS = ['-std=c++0x'],TOOLSET = ['g++'],CPPDEFINES = ['_WEBSOCKETPP_CPP11_STL_']) + else: +- print "C++11 build environment is not supported on this version of G++" ++ print("C++11 build environment is not supported on this version of G++") + elif env_cpp11['CXX'].startswith('clang++'): +- print "C++11 build environment enabled" ++ print("C++11 build environment enabled") + env.Append(CXXFLANGS = ['-stdlib=libc++'],LINKFLAGS=['-stdlib=libc++']) + env_cpp11.Append(WSPP_CPP11_ENABLED = "true",CXXFLAGS = ['-std=c++0x','-stdlib=libc++'],LINKFLAGS = ['-stdlib=libc++'],TOOLSET = ['clang++'],CPPDEFINES = ['_WEBSOCKETPP_CPP11_STL_']) + + # look for optional second boostroot compiled with clang's libc++ STL library + # this prevents warnings/errors when linking code built with two different + # incompatible STL libraries. +- if os.environ.has_key('BOOST_ROOT_CPP11'): ++ if 'BOOST_ROOT_CPP11' in os.environ: + env_cpp11['BOOST_INCLUDES'] = os.environ['BOOST_ROOT_CPP11'] + env_cpp11['BOOST_LIBS'] = os.path.join(os.environ['BOOST_ROOT_CPP11'], 'stage', 'lib') +- elif os.environ.has_key('BOOST_INCLUDES_CPP11') and os.environ.has_key('BOOST_LIBS_CPP11'): ++ elif 'BOOST_INCLUDES_CPP11' in os.environ and 'BOOST_LIBS_CPP11' in os.environ: + env_cpp11['BOOST_INCLUDES'] = os.environ['BOOST_INCLUDES_CPP11'] + env_cpp11['BOOST_LIBS'] = os.environ['BOOST_LIBS_CPP11'] + else: +- print "C++11 build environment disabled" ++ print("C++11 build environment disabled") + + # if the build system is known to allow the isystem modifier for library include + # values then use it for the boost libraries. Otherwise just add them to the diff --git a/meta-oe/recipes-support/websocketpp/websocketpp_0.8.1.bb b/meta-oe/recipes-support/websocketpp/websocketpp_0.8.1.bb deleted file mode 100644 index 551621708c..0000000000 --- a/meta-oe/recipes-support/websocketpp/websocketpp_0.8.1.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "C++/Boost Asio based websocket client/server library." -SECTION = "libs/network" -HOMEPAGE = "https://github.com/zaphoyd/websocketpp" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=4d168d763c111f4ffc62249870e4e0ea" -DEPENDS = "openssl boost zlib" - -SRC_URI = "git://github.com/zaphoyd/websocketpp.git;protocol=https \ - file://0001-Replace-make_shared-with-new-in-some-cases.patch \ - file://0002-Fix-missed-entries-fix-testing.patch \ - " - -# tag 0.8.1 -SRCREV= "c6d7e295bf5a0ab9b5f896720cc1a0e0fdc397a7" - -S = "${WORKDIR}/git" - -inherit cmake diff --git a/meta-oe/recipes-support/websocketpp/websocketpp_0.8.2.bb b/meta-oe/recipes-support/websocketpp/websocketpp_0.8.2.bb new file mode 100644 index 0000000000..f437accc50 --- /dev/null +++ b/meta-oe/recipes-support/websocketpp/websocketpp_0.8.2.bb @@ -0,0 +1,39 @@ +SUMMARY = "C++/Boost Asio based websocket client/server library." +SECTION = "libs/network" +HOMEPAGE = "https://github.com/zaphoyd/websocketpp" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=4d168d763c111f4ffc62249870e4e0ea" + +DEPENDS = " ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'openssl boost zlib', '', d)} " + +SRC_URI = "git://github.com/zaphoyd/websocketpp.git;protocol=https;branch=master \ + file://0001-cmake-Use-GNUInstallDirs.patch \ + file://855.patch \ + file://857.patch \ + file://0001-Correct-clang-compiler-flags.patch \ + file://1024.patch \ + " + +EXTRA_OECMAKE = "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', '-DBUILD_EXAMPLES=ON -DBUILD_TESTS=ON', '', d)} " + +# this is an header only library, do not depend on the main package +RDEPENDS:${PN}-dev = "" + +# to add this package to an SDK, since it isn't a reverse-dependency of anything, just use something like this: +# TOOLCHAIN_TARGET_TASK:append = " websocketpp-dev" + +# tag 0.8.2 +SRCREV= "56123c87598f8b1dd471be83ca841ceae07f95ba" + +S = "${WORKDIR}/git" + +inherit cmake + +PACKAGES =+ "${PN}-examples" + +FILES:${PN}-examples = "${docdir}" + +do_install:append() { + install -d ${D}${docdir}/${BPN} + cp -R ${S}/examples ${D}${docdir}/${BPN} +} diff --git a/meta-oe/recipes-support/wmiconfig/wmiconfig/0001-makefile-Pass-CFLAGS-to-compile.patch b/meta-oe/recipes-support/wmiconfig/wmiconfig/0001-makefile-Pass-CFLAGS-to-compile.patch deleted file mode 100644 index 90eff5bb0f..0000000000 --- a/meta-oe/recipes-support/wmiconfig/wmiconfig/0001-makefile-Pass-CFLAGS-to-compile.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 0378cbb323c662a565f7f3de2dee3d8a646e7bd1 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 27 Jun 2017 09:32:42 -0700 -Subject: [PATCH 1/2] makefile: Pass CFLAGS to compile - -Set CC if not already set - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - host/tools/wmiconfig/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/host/tools/wmiconfig/Makefile b/host/tools/wmiconfig/Makefile -index c6738c5..3253a7e 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,4 +1,4 @@ --CC :=$(ATH_CROSS_COMPILE_TYPE)gcc -+CC ?= $(ATH_CROSS_COMPILE_TYPE)gcc - - all: -- $(CC) -Wall -DUSER_KEYS -g $(LDFLAGS) -I../../include -I../../../include -I../../wlan/include -I../../os/linux/include wmiconfig.c -o wmiconfig -+ $(CC) -Wall -DUSER_KEYS -g $(CFLAGS) $(LDFLAGS) -I../../include -I../../../include -I../../wlan/include -I../../os/linux/include wmiconfig.c -o wmiconfig --- -2.13.2 - diff --git a/meta-oe/recipes-support/wmiconfig/wmiconfig/0002-fix-err-API-to-have-format-string.patch b/meta-oe/recipes-support/wmiconfig/wmiconfig/0002-fix-err-API-to-have-format-string.patch deleted file mode 100644 index f67f784c1f..0000000000 --- a/meta-oe/recipes-support/wmiconfig/wmiconfig/0002-fix-err-API-to-have-format-string.patch +++ /dev/null @@ -1,656 +0,0 @@ -From 909ebdde4ee2233d65de8fa01fde8e9a3bec12b7 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 27 Jun 2017 09:33:26 -0700 -Subject: [PATCH 2/2] fix err() API to have format string - -Fixes errors with hardening flags - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - host/tools/wmiconfig/wmiconfig.c | 148 +++++++++++++++++++-------------------- - 1 file changed, 74 insertions(+), 74 deletions(-) - -diff --git a/host/tools/wmiconfig/wmiconfig.c b/host/tools/wmiconfig/wmiconfig.c -index 21c9dcd..a6ec481 100644 ---- a/wmiconfig.c -+++ b/wmiconfig.c -@@ -483,7 +483,7 @@ main (int argc, char **argv) - strcpy(ifname, ethIf); - s = socket(AF_INET, SOCK_DGRAM, 0); - if (s < 0) { -- err(1, "socket"); -+ err(1, "%s", "socket"); - } - - while (1) { -@@ -1506,28 +1506,28 @@ main (int argc, char **argv) - ifr.ifr_data = (void *)filterCmd; - if (ioctl(s, AR6000_IOCTL_WMI_SETBSSFILTER, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_POWER_MODE: - ifr.ifr_data = (void *)pwrCmd; - if (ioctl(s, AR6000_IOCTL_WMI_SETPWR, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_PM_PARAMS: - ifr.ifr_data = (void *)pmParamCmd; - if (ioctl(s, AR6000_IOCTL_WMI_SET_PMPARAMS, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_IBSS_PM_CAPS: - ifr.ifr_data = (void *)adhocPmCmd; - if (ioctl(s, AR6000_IOCTL_WMI_SET_IBSS_PM_CAPS, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_ERROR_DETECTION: -@@ -1535,7 +1535,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_GET_HB_CHALLENGE_RESP: -@@ -1543,7 +1543,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - #ifdef USER_KEYS -@@ -1554,7 +1554,7 @@ main (int argc, char **argv) - - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - - break; -@@ -1575,7 +1575,7 @@ main (int argc, char **argv) - ifr.ifr_data = (void *)sParamCmd; - if (ioctl(s, AR6000_IOCTL_WMI_SETSCAN, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_GET_VERSION: -@@ -1586,7 +1586,7 @@ main (int argc, char **argv) - ifr.ifr_data = (void *)revinfo; - if (ioctl(s, AR6000_IOCTL_WMI_GETREV, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - printf("Host Rev = 0x%x(%u.%u.%u.%u), Target Rev = 0x%x(%u.%u.%u.%u)\n", - revinfo->host_ver, -@@ -1606,14 +1606,14 @@ main (int argc, char **argv) - ifr.ifr_data = (void *)listenCmd; - if (ioctl(s, AR6000_IOCTL_WMI_SETLISTENINT, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_BMISS_TIME: - ifr.ifr_data = (void *)bmissCmd; - if (ioctl(s, AR6000_IOCTL_WMI_SET_BMISS_TIME, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_RSSI_THRESHOLDS: -@@ -1621,14 +1621,14 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_SNR_THRESHOLDS: - ifr.ifr_data = (void *)snrThresholdParam; - if (ioctl(s, AR6000_IOCTL_WMI_SET_SNRTHRESHOLD, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_CLR_RSSISNR: -@@ -1636,7 +1636,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_LQ_THRESHOLDS: -@@ -1644,7 +1644,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_CHANNEL: -@@ -1693,18 +1693,18 @@ main (int argc, char **argv) - - if (ioctl(s, AR6000_IOCTL_WMI_SET_CHANNELPARAMS, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_SSID: - if (index > MAX_PROBED_SSID_INDEX) { - printf("num option for ssid command too large\n"); -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - break; - } - if (strlen((char *)ssid) > sizeof (ssidCmd->ssid)) { - printf("ssid name too large\n"); -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - break; - } - ssidCmd->entryIndex = index; -@@ -1722,7 +1722,7 @@ main (int argc, char **argv) - ifr.ifr_data = (void *)ssidCmd; - if (ioctl(s, AR6000_IOCTL_WMI_SET_PROBEDSSID, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_BADAP: -@@ -1735,7 +1735,7 @@ main (int argc, char **argv) - ifr.ifr_data = (void *)badApCmd; - if (ioctl(s, AR6000_IOCTL_WMI_SET_BADAP, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_CREATE_QOS: -@@ -1794,7 +1794,7 @@ main (int argc, char **argv) - ifr.ifr_data = (void *)crePStreamCmd; - if (ioctl(s, AR6000_IOCTL_WMI_CREATE_QOS, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_GET_TARGET_STATS: -@@ -1807,7 +1807,7 @@ main (int argc, char **argv) - ifr.ifr_data = (void *)&tgtStatsCmd; - if (ioctl(s, AR6000_IOCTL_WMI_GET_TARGET_STATS, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - printTargetStats(&(tgtStatsCmd.targetStats)); - break; -@@ -1815,7 +1815,7 @@ main (int argc, char **argv) - ifr.ifr_data = (void *)pBitMask; - if (ioctl(s, AR6000_IOCTL_WMI_SET_ERROR_REPORT_BITMASK, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_DELETE_QOS: -@@ -1824,7 +1824,7 @@ main (int argc, char **argv) - ifr.ifr_data = (void *)delPStreamCmd; - if (ioctl(s, AR6000_IOCTL_WMI_DELETE_QOS, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_GET_QOS_QUEUE: -@@ -1840,7 +1840,7 @@ main (int argc, char **argv) - ifr.ifr_data = (void *)getQosQueueCmd; - if (ioctl(s, AR6000_IOCTL_WMI_GET_QOS_QUEUE, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - - printf("Active TSIDs \n"); -@@ -1855,7 +1855,7 @@ main (int argc, char **argv) - ifr.ifr_data = (void *)ieInfo; - if (ioctl(s, AR6000_IOCTL_WMI_SET_ASSOC_INFO, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_AC_PARAMS: -@@ -1871,14 +1871,14 @@ main (int argc, char **argv) - ifr.ifr_data = (void *)acParamsCmd; - if (ioctl(s, AR6000_IOCTL_WMI_SET_ACCESS_PARAMS, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_DISC_TIMEOUT: - ifr.ifr_data = (void *)discCmd; - if (ioctl(s, AR6000_IOCTL_WMI_SET_DISC_TIMEOUT, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_ADHOC_BSSID: -@@ -1887,7 +1887,7 @@ main (int argc, char **argv) - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { - printf("fail to set adhoc bssid \n"); -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_OPT_MODE: -@@ -1895,7 +1895,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_OPT_SEND_FRAME: -@@ -1903,7 +1903,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_BEACON_INT: -@@ -1911,7 +1911,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_VOICE_PKT_SIZE: -@@ -1919,7 +1919,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_MAX_SP: -@@ -1927,7 +1927,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_GET_ROAM_TBL: -@@ -1935,7 +1935,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_ROAM_CTRL: -@@ -1943,7 +1943,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_POWERSAVE_TIMERS: -@@ -1951,7 +1951,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_GET_POWER_MODE: -@@ -1959,7 +1959,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - printf("Power mode is %s\n", - (getPowerMode->powerMode == MAX_PERF_POWER) ? "maxperf" : "rec"); -@@ -1969,7 +1969,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_GET_ROAM_DATA: -@@ -1977,7 +1977,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_BT_STATUS: -@@ -1985,7 +1985,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_BT_PARAMS: -@@ -1993,7 +1993,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_RETRYLIMITS: -@@ -2001,14 +2001,14 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_START_SCAN: - ((int *)buf)[0] = AR6000_XIOCTL_WMI_STARTSCAN; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_FIX_RATES: -@@ -2031,14 +2031,14 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_GET_FIX_RATES: - ((int *)buf)[0] = AR6000_XIOCTL_WMI_GETFIXRATES; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } else { - int i; - printf("Fix rate set index:"); -@@ -2057,7 +2057,7 @@ main (int argc, char **argv) - index--; - setAuthMode->mode = atoi(argv[index]); - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_REASSOC_MODE: -@@ -2067,42 +2067,42 @@ main (int argc, char **argv) - index--; - setReassocMode->mode = atoi(argv[index]); - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_LPREAMBLE: - ((int *)buf)[0] = AR6000_XIOCTL_WMI_SET_LPREAMBLE; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_RTS: - ((int *)buf)[0] = AR6000_XIOCTL_WMI_SET_RTS; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_WMM: - ((int *)buf)[0] = AR6000_XIOCTL_WMI_SET_WMM; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_TXOP: - ((int *)buf)[0] = AR6000_XIOCTL_WMI_SET_TXOP; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case DIAG_READ: - ((int *)buf)[0] = AR6000_XIOCTL_DIAG_READ; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - printf("diagdata: 0x%x\n", *diagdata); - break; -@@ -2110,7 +2110,7 @@ main (int argc, char **argv) - ((int *)buf)[0] = AR6000_XIOCTL_DIAG_WRITE; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_GET_RD: -@@ -2118,7 +2118,7 @@ main (int argc, char **argv) - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) - { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - else - { -@@ -2139,14 +2139,14 @@ main (int argc, char **argv) - index--; - setKeepAlive->keepaliveInterval = atoi(argv[index]); - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_GET_KEEPALIVE: - ((int *)buf)[0] = AR6000_XIOCTL_WMI_GET_KEEPALIVE; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - printf("Keepalive interval is %d secs and AP is %s\n", - getKeepAlive->keepaliveInterval, (getKeepAlive->configured ? -@@ -2156,63 +2156,63 @@ main (int argc, char **argv) - ((int *)buf)[0] = AR6000_XIOCTL_WMI_SET_APPIE; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_MGMT_FRM_RX_FILTER: - ((int *)buf)[0] = AR6000_XIOCTL_WMI_SET_MGMT_FRM_RX_FILTER; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_DBGLOG_CFG_MODULE: - ((int *)buf)[0] = AR6000_XIOCTL_DBGLOG_CFG_MODULE; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_DBGLOG_GET_DEBUG_LOGS: - ((int *)buf)[0] = AR6000_XIOCTL_DBGLOG_GET_DEBUG_LOGS; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_HOST_SLEEP_MODE: - ((int *)buf)[0] = AR6000_XIOCTL_WMI_SET_HOST_SLEEP_MODE; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_WOW_MODE: - ((int *)buf)[0] = AR6000_XIOCTL_WMI_SET_WOW_MODE; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_ADD_WOW_PATTERN: - ((int *)buf)[0] = AR6000_XIOCTL_WMI_ADD_WOW_PATTERN; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_DEL_WOW_PATTERN: - ((int *)buf)[0] = AR6000_XIOCTL_WMI_DEL_WOW_PATTERN; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_GET_WOW_LIST: - ((int *)buf)[0] = AR6000_XIOCTL_WMI_GET_WOW_LIST; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case DIAG_DUMP_CHIP_MEM: -@@ -2225,7 +2225,7 @@ main (int argc, char **argv) - ((int *)buf)[0] = AR6000_XIOCTL_DIAG_READ; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - printf("0x%04x:0x%04x\n", *diagaddr, *diagdata); - } -@@ -2237,21 +2237,21 @@ main (int argc, char **argv) - index = optind - 1; - *connectCtrlFlags = strtoul(argv[index], NULL, 0); - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case DUMP_HTC_CREDITS: - ((int *)buf)[0] = AR6000_XIOCTL_DUMP_HTC_CREDIT_STATE; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_AKMP_INFO: - ((int *)buf)[0] = AR6000_XIOCTL_WMI_SET_AKMP_PARAMS; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_PMKID_LIST: -@@ -2259,7 +2259,7 @@ main (int argc, char **argv) - ((int *)buf)[0] = AR6000_XIOCTL_WMI_SET_PMKID_LIST; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - } else { - printf("No PMKIDs entered\n"); -@@ -2269,7 +2269,7 @@ main (int argc, char **argv) - ((int *)buf)[0] = AR6000_XIOCTL_WMI_GET_PMKID_LIST; - ifr.ifr_data = buf; - if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - case WMI_SET_BSS_PMKID_INFO: -@@ -2277,7 +2277,7 @@ main (int argc, char **argv) - iwr.u.data.length = sizeof(*pi_cmd); - if (ioctl(s, IEEE80211_IOCTL_ADDPMKID, &iwr) < 0) { - printf("ADDPMKID IOCTL Error\n"); -- err(1, ifr.ifr_name); -+ err(1, "%s", ifr.ifr_name); - } - break; - default: --- -2.13.2 - diff --git a/meta-oe/recipes-support/wmiconfig/wmiconfig_svn.bb b/meta-oe/recipes-support/wmiconfig/wmiconfig_svn.bb deleted file mode 100644 index c66572b1c1..0000000000 --- a/meta-oe/recipes-support/wmiconfig/wmiconfig_svn.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "Atheros 6K Wifi configuration utility" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://wmiconfig.c;endline=19;md5=4394a56bca1c5b2446c9f8e406c82911" -SECTION = "console/network" -SRCREV = "5394" -PV = "0.0.0+svnr${SRCPV}" -PR = "r2" - -SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=AR6kSDK.build_sw.18;protocol=http \ - file://0001-makefile-Pass-CFLAGS-to-compile.patch \ - file://0002-fix-err-API-to-have-format-string.patch \ - " -S = "${WORKDIR}/AR6kSDK.build_sw.18/host/tools/wmiconfig" - -CLEANBROKEN = "1" - -EXTRA_OEMAKE = "-e MAKEFLAGS=" - -TARGET_CC_ARCH += "${LDFLAGS}" - -do_install() { - install -d ${D}${bindir} - install -m 0755 wmiconfig ${D}${bindir} -} - diff --git a/meta-oe/recipes-support/xdelta/xdelta3_3.1.0.bb b/meta-oe/recipes-support/xdelta/xdelta3_3.1.0.bb index d100030f9b..6b35d71a55 100644 --- a/meta-oe/recipes-support/xdelta/xdelta3_3.1.0.bb +++ b/meta-oe/recipes-support/xdelta/xdelta3_3.1.0.bb @@ -4,10 +4,10 @@ DESCRIPTION = "Open-source binary diff, differential compression tools, \ HOMEPAGE = "http://xdelta.org/" SECTION = "console/utils" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" -SRC_URI = "git://github.com/jmacd/xdelta.git;branch=release3_1_apl" +SRC_URI = "git://github.com/jmacd/xdelta.git;branch=release3_1_apl;protocol=https" SRCREV = "4b4aed71a959fe11852e45242bb6524be85d3709" S = "${WORKDIR}/git/xdelta3" diff --git a/meta-oe/recipes-support/xdg-dbus-proxy/xdg-dbus-proxy_0.1.5.bb b/meta-oe/recipes-support/xdg-dbus-proxy/xdg-dbus-proxy_0.1.5.bb new file mode 100644 index 0000000000..e10ccd04ea --- /dev/null +++ b/meta-oe/recipes-support/xdg-dbus-proxy/xdg-dbus-proxy_0.1.5.bb @@ -0,0 +1,19 @@ +SUMMARY = "xdg-dbus-proxy is a filtering proxy for D-Bus connections" +HOMEPAGE = "https://github.com/flatpak/xdg-dbus-proxy" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +DEPENDS = " \ + glib-2.0 \ + libxslt-native \ + docbook-xsl-stylesheets-native \ +" + +inherit meson pkgconfig + +SRC_URI = "git://github.com/flatpak/xdg-dbus-proxy.git;protocol=https;branch=main" + +S = "${WORKDIR}/git" +SRCREV = "7466c8137fc06f863fde8486521984e43a26cd10" + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal/0001-meson.build-add-a-hack-for-crosscompile.patch b/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal/0001-meson.build-add-a-hack-for-crosscompile.patch new file mode 100644 index 0000000000..3410a88310 --- /dev/null +++ b/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal/0001-meson.build-add-a-hack-for-crosscompile.patch @@ -0,0 +1,28 @@ +From 7abb3840ac2870fcfc174fbbd81c4209c838e1a9 Mon Sep 17 00:00:00 2001 +From: Markus Volk <f_l_k@t-online.de> +Date: Mon, 18 Sep 2023 22:22:17 +0200 +Subject: [PATCH] meson.build: add a hack for cross-compiling + +Signed-off-by: Markus Volk <f_l_k@t-online.de> + +Upstream-Status: Inappropriate [cross-compile specific] +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 760613a..d339d26 100644 +--- a/meson.build ++++ b/meson.build +@@ -168,7 +168,7 @@ pkgconfig.generate( + 'prefix': get_option('prefix'), + 'datarootdir': dataroot_dir, + 'datadir': '${prefix}/@0@'.format(get_option('datadir')), +- 'interfaces_dir': '${datadir}/dbus-1/interfaces/', ++ 'interfaces_dir': '${pc_sysrootdir}${datadir}/dbus-1/interfaces/', + }, + ) + +-- +2.41.0 + diff --git a/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.18.4.bb b/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.18.4.bb new file mode 100644 index 0000000000..87e8f1f5e9 --- /dev/null +++ b/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.18.4.bb @@ -0,0 +1,49 @@ +SUMMARY = "A portal frontend service for Flatpak and possibly other desktop containment frameworks." +HOMEPAGE = "https://github.com/flatpak/xdg-desktop-portal" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +REQUIRED_DISTRO_FEATURES = "polkit" + +DEPENDS = " \ + json-glib \ + glib-2.0 \ + glib-2.0-native \ + flatpak \ + libportal \ + geoclue \ + pipewire \ + fuse3 \ + xmlto-native \ +" + +PORTAL_BACKENDS ?= " \ + ${@bb.utils.contains('DISTRO_FEATURES', 'gtk+3', 'xdg-desktop-portal-gtk', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'gtk4', 'xdg-desktop-portal-gtk', '', d)} \ +" + +RDEPENDS:${PN} = "bubblewrap rtkit ${PORTAL_BACKENDS} fuse3-utils" + +inherit meson pkgconfig python3native features_check + +SRC_URI = " \ + git://github.com/flatpak/xdg-desktop-portal.git;protocol=https;branch=xdg-desktop-portal-1.18 \ + file://0001-meson.build-add-a-hack-for-crosscompile.patch \ +" + +S = "${WORKDIR}/git" +SRCREV = "11c8a96b147aeae70e3f770313f93b367d53fedd" + +FILES:${PN} += "${libdir}/systemd ${datadir}/dbus-1" + +EXTRA_OEMESON += " \ + --cross-file=${WORKDIR}/meson-${PN}.cross \ + -Ddbus-service-dir=${datadir}/dbus-1/services \ +" + +do_write_config:append() { + cat >${WORKDIR}/meson-${PN}.cross <<EOF +[binaries] +bwrap = '${bindir}/bwrap' +EOF +} diff --git a/meta-oe/recipes-support/xdg-user-dirs/xdg-user-dirs_0.17.bb b/meta-oe/recipes-support/xdg-user-dirs/xdg-user-dirs_0.18.bb index e3ce9268cd..84fc9e2f18 100644 --- a/meta-oe/recipes-support/xdg-user-dirs/xdg-user-dirs_0.17.bb +++ b/meta-oe/recipes-support/xdg-user-dirs/xdg-user-dirs_0.18.bb @@ -1,16 +1,15 @@ DESCRIPTION = "xdg-user-dirs is a tool to help manage user directories like the desktop folder and the music folder" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" SRC_URI = "http://user-dirs.freedesktop.org/releases/${BPN}-${PV}.tar.gz" -SRC_URI[md5sum] = "e0564ec6d838e6e41864d872a29b3575" -SRC_URI[sha256sum] = "2a07052823788e8614925c5a19ef5b968d8db734fdee656699ea4f97d132418c" +SRC_URI[sha256sum] = "ec6f06d7495cdba37a732039f9b5e1578bcb296576fde0da40edb2f52220df3c" inherit autotools gettext EXTRA_OECONF = "--disable-documentation" -CONFFILES_${PN} += " \ +CONFFILES:${PN} += " \ ${sysconfdir}/xdg/user-dirs.conf \ ${sysconfdir}/xdg/user-dirs.defaults \ " diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1/0001-nss-nspr-fix-for-multilib.patch b/meta-oe/recipes-support/xmlsec1/xmlsec1/0001-nss-nspr-fix-for-multilib.patch new file mode 100644 index 0000000000..f107f42dab --- /dev/null +++ b/meta-oe/recipes-support/xmlsec1/xmlsec1/0001-nss-nspr-fix-for-multilib.patch @@ -0,0 +1,50 @@ +From 4d73b85fb1b794c649359bc8a774b0111d36994a Mon Sep 17 00:00:00 2001 +From: Chen Qi <Qi.Chen@windriver.com> +Date: Tue, 4 Feb 2020 23:39:49 -0800 +Subject: [PATCH] nss/nspr: fix for multilib + +Upstream-Status: Pending + +Signed-off-by: Chen Qi <Qi.Chen@windriver.com> + +--- + configure.ac | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 51621d6..3d23683 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -960,24 +960,24 @@ fi + dnl Priority 1: User specifies the path to installation + if test "z$NSPR_FOUND" = "zno" -a "z$with_nspr" != "z" -a "z$with_nspr" != "zyes" ; then + AC_MSG_CHECKING(for nspr library installation in "$with_nspr" folder) +- if test -f "$with_nspr/include/$NSPR_INCLUDE_MARKER" -a -f "$with_nspr/lib/$NSPR_LIB_MARKER" ; then +- NSPR_INCLUDE_PATH="$with_nspr/include" +- NSPR_LIB_PATH="$with_nspr/lib" ++ if test -f "$with_nspr/${includedir}/$NSPR_INCLUDE_MARKER" -a -f "$with_nspr/${libdir}/$NSPR_LIB_MARKER" ; then ++ NSPR_INCLUDE_PATH="$with_nspr/${includedir}" ++ NSPR_LIB_PATH="$with_nspr/${libdir}" + NSPR_FOUND="yes" + AC_MSG_RESULT([yes]) + else +- AC_MSG_ERROR([not found: "$with_nspr/include/$NSPR_INCLUDE_MARKER" and/or "$with_nspr/lib/$NSPR_LIB_MARKER" files don't exist), typo?]) ++ AC_MSG_ERROR([not found: "$with_nspr/${includedir}/$NSPR_INCLUDE_MARKER" and/or "$with_nspr/${libdir}/$NSPR_LIB_MARKER" files don't exist), typo?]) + fi + fi + if test "z$NSS_FOUND" = "zno" -a "z$with_nss" != "z" -a "z$with_nss" != "zyes" ; then + AC_MSG_CHECKING(for nss library installation in "$with_nss" folder) +- if test -f "$with_nss/include/$NSS_INCLUDE_MARKER" -a -f "$with_nss/lib/$NSS_LIB_MARKER" ; then +- NSS_INCLUDE_PATH="$with_nss/include" +- NSS_LIB_PATH="$with_nss/lib" ++ if test -f "$with_nss/${includedir}/$NSS_INCLUDE_MARKER" -a -f "$with_nss/${libdir}/$NSS_LIB_MARKER" ; then ++ NSS_INCLUDE_PATH="$with_nss/${includedir}" ++ NSS_LIB_PATH="$with_nss/${libdir}" + NSS_FOUND="yes" + AC_MSG_RESULT([yes]) + else +- AC_MSG_ERROR([not found: "$with_nss/include/$NSS_INCLUDE_MARKER" and/or "$with_nss/lib/$NSS_LIB_MARKER" files don't exist), typo?]) ++ AC_MSG_ERROR([not found: "$with_nss/${includedir}/$NSS_INCLUDE_MARKER" and/or "$with_nss/${libdir}/$NSS_LIB_MARKER" files don't exist), typo?]) + fi + fi + diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1/change-finding-path-of-nss.patch b/meta-oe/recipes-support/xmlsec1/xmlsec1/change-finding-path-of-nss.patch index 1cec47fca0..3a1531deb1 100644 --- a/meta-oe/recipes-support/xmlsec1/xmlsec1/change-finding-path-of-nss.patch +++ b/meta-oe/recipes-support/xmlsec1/xmlsec1/change-finding-path-of-nss.patch @@ -1,4 +1,4 @@ -From c1c980a95d85bcaf8802524d6148783522b300d7 Mon Sep 17 00:00:00 2001 +From 9c861646e034b1c80fafd389279b0a7da90a8ba7 Mon Sep 17 00:00:00 2001 From: Yulong Pei <Yulong.pei@windriver.com> Date: Wed, 21 Jul 2010 22:33:43 +0800 Subject: [PATCH] change finding path of nss and nspr @@ -8,60 +8,21 @@ Upstream-Status: Pending Signed-off-by: Yulong Pei <Yulong.pei@windriver.com> Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> Signed-off-by: Yi Zhao <yi.zhao@windriver.com> + --- - configure.ac | 20 ++++++++++---------- - 1 file changed, 10 insertions(+), 10 deletions(-) + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 951b3eb..1fdeb0f 100644 +index ce8a278..51621d6 100644 --- a/configure.ac +++ b/configure.ac -@@ -866,10 +866,10 @@ MOZILLA_MIN_VERSION="1.4" - NSS_CRYPTO_LIB="$XMLSEC_PACKAGE-nss" - NSPR_PACKAGE=mozilla-nspr - NSS_PACKAGE=mozilla-nss --NSPR_INCLUDE_MARKER="nspr/nspr.h" -+NSPR_INCLUDE_MARKER="nspr.h" +@@ -935,7 +935,7 @@ NSS_PACKAGE=mozilla-nss + NSPR_INCLUDE_MARKER="nspr/nspr.h" NSPR_LIB_MARKER="libnspr4$shrext" NSPR_LIBS_LIST="-lnspr4 -lplds4 -lplc4" -NSS_INCLUDE_MARKER="nss/nss.h" +NSS_INCLUDE_MARKER="nss3/nss.h" NSS_LIB_MARKER="libnss3$shrext" - NSS_LIBS_LIST="-lnss3 -lsmime3" - -@@ -898,24 +898,24 @@ fi - dnl Priority 1: User specifies the path to installation - if test "z$NSPR_FOUND" = "zno" -a "z$with_nspr" != "z" -a "z$with_nspr" != "zyes" ; then - AC_MSG_CHECKING(for nspr library installation in "$with_nspr" folder) -- if test -f "$with_nspr/include/$NSPR_INCLUDE_MARKER" -a -f "$with_nspr/lib/$NSPR_LIB_MARKER" ; then -- NSPR_INCLUDE_PATH="$with_nspr/include" -- NSPR_LIB_PATH="$with_nspr/lib" -+ if test -f "$with_nspr/usr/include/$NSPR_INCLUDE_MARKER" -a -f "$with_nspr/${libdir}/$NSPR_LIB_MARKER" ; then -+ NSPR_INCLUDE_PATH="$with_nspr/usr/include" -+ NSPR_LIB_PATH="$with_nspr/${libdir}" - NSPR_FOUND="yes" - AC_MSG_RESULT([yes]) - else -- AC_MSG_ERROR([not found: "$with_nspr/include/$NSPR_INCLUDE_MARKER" and/or "$with_nspr/lib/$NSPR_LIB_MARKER" files don't exist), typo?]) -+ AC_MSG_ERROR([not found: "$with_nspr/usr/include/$NSPR_INCLUDE_MARKER" and/or "$with_nspr/${libdir}/$NSPR_LIB_MARKER" files don't exist), typo?]) - fi - fi - if test "z$NSS_FOUND" = "zno" -a "z$with_nss" != "z" -a "z$with_nss" != "zyes" ; then - AC_MSG_CHECKING(for nss library installation in "$with_nss" folder) -- if test -f "$with_nss/include/$NSS_INCLUDE_MARKER" -a -f "$with_nss/lib/$NSS_LIB_MARKER" ; then -- NSS_INCLUDE_PATH="$with_nss/include" -- NSS_LIB_PATH="$with_nss/lib" -+ if test -f "$with_nss/usr/include/$NSS_INCLUDE_MARKER" -a -f "$with_nss/${libdir}/$NSS_LIB_MARKER" ; then -+ NSS_INCLUDE_PATH="$with_nss/usr/include/nss3" -+ NSS_LIB_PATH="$with_nss/${libdir}" - NSS_FOUND="yes" - AC_MSG_RESULT([yes]) - else -- AC_MSG_ERROR([not found: "$with_nss/include/$NSS_INCLUDE_MARKER" and/or "$with_nss/lib/$NSS_LIB_MARKER" files don't exist), typo?]) -+ AC_MSG_ERROR([not found: "$with_nss/usr/include/$NSS_INCLUDE_MARKER" and/or "$with_nss/${libdir}/$NSS_LIB_MARKER" files don't exist), typo?]) - fi - fi + NSS_LIBS_LIST="-lnss3 -lsmime3 -lnssutil3" --- -2.7.4 - diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1/ensure-search-path-non-host.patch b/meta-oe/recipes-support/xmlsec1/xmlsec1/ensure-search-path-non-host.patch new file mode 100644 index 0000000000..7b07628e5f --- /dev/null +++ b/meta-oe/recipes-support/xmlsec1/xmlsec1/ensure-search-path-non-host.patch @@ -0,0 +1,31 @@ +From c16d384fb64cf53351e150fb9e9b99cc6ba970b2 Mon Sep 17 00:00:00 2001 +From: Anatol Belski <anbelski@linux.microsoft.com> +Date: Thu, 14 Jan 2021 17:36:23 +0000 +Subject: [PATCH] xmlsec1: Fix configure QA error caused by host lookup path + +ERROR: mc:my-sdk:xmlsec1-1.2.30-r0 do_configure: QA Issue: This autoconf log indicates errors, it looked at host include and/or library paths while determining system capabilities. + +It will eventually arise after the configure QA as the configure script should only look at the staging sysroot dir, not at the host. + +Upstream-Status: Inappropriate [embedded specific] +Signed-off-by: Anatol Belski <anbelski@linux.microsoft.com> + +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 3d23683..baf27b7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -286,8 +286,8 @@ fi + dnl ========================================================================== + dnl Common installation locations + dnl ========================================================================== +-COMMON_INCLUDE_DIR="/usr/include /usr/local/include" +-COMMON_LIB_DIR="/usr/lib /usr/lib64 /usr/local/lib" ++COMMON_INCLUDE_DIR="${STAGING_INCDIR}" ++COMMON_LIB_DIR="${STAGING_LIBDIR}" + case $host in + i*86-*-linux-gnu) COMMON_LIB_DIR="$COMMON_LIB_DIR /usr/lib/i386-linux-gnu" ;; + x86_64-*-linux-gnu) COMMON_LIB_DIR="$COMMON_LIB_DIR /usr/lib/x86_64-linux-gnu" ;; diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1/fix-ltmain.sh.patch b/meta-oe/recipes-support/xmlsec1/xmlsec1/fix-ltmain.sh.patch index af598fe749..73c6ddb027 100644 --- a/meta-oe/recipes-support/xmlsec1/xmlsec1/fix-ltmain.sh.patch +++ b/meta-oe/recipes-support/xmlsec1/xmlsec1/fix-ltmain.sh.patch @@ -1,4 +1,4 @@ -From 847dc52f5a50e34ee4d6e3dc2c708711747a58ca Mon Sep 17 00:00:00 2001 +From 1b9701faf22f5a17a81a2a2732794d9627499fcb Mon Sep 17 00:00:00 2001 From: Yulong Pei <Yulong.pei@windriver.com> Date: Thu, 21 Jan 2010 14:11:20 +0800 Subject: [PATCH] force to use our own libtool @@ -12,10 +12,10 @@ Signed-off-by: Yulong Pei <Yulong.pei@windriver.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ltmain.sh b/ltmain.sh -index 147d758..a61f16b 100644 +index 1dea62a..bfb9784 100755 --- a/ltmain.sh +++ b/ltmain.sh -@@ -6969,7 +6969,7 @@ func_mode_link () +@@ -7225,7 +7225,7 @@ func_mode_link () dir=$func_resolve_sysroot_result # We need an absolute path. case $dir in diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1/makefile-ptest.patch b/meta-oe/recipes-support/xmlsec1/xmlsec1/makefile-ptest.patch index d45356924b..26ebce343d 100644 --- a/meta-oe/recipes-support/xmlsec1/xmlsec1/makefile-ptest.patch +++ b/meta-oe/recipes-support/xmlsec1/xmlsec1/makefile-ptest.patch @@ -9,13 +9,12 @@ and it's installed as ptest. Upstream-Status: Inappropriate [ OE ptest specific ] Signed-off-by: Jackie Huang <jackie.huang@windriver.com> - --- examples/Makefile | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/examples/Makefile b/examples/Makefile -index 89b1d61..c1cbcca 100644 +index 02480c2..cbc2661 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -8,9 +8,17 @@ PROGRAMS = \ @@ -24,12 +23,12 @@ index 89b1d61..c1cbcca 100644 +ifndef CC CC = gcc --CFLAGS += -g $(shell xmlsec1-config --cflags) -DUNIX_SOCKETS +-CFLAGS += -g $(shell xmlsec1-config --cflags) -DUNIX_SOCKETS -Wall -Wextra -LDLIBS += -g $(shell xmlsec1-config --libs) +endif + -+CFLAGS += -I../include -g $(shell PKG_CONFIG_PATH=.. pkg-config --cflags xmlsec1 ) -DUNIX_SOCKETS -+LDLIBS += -L../src/.libs -g $(shell PKG_CONFIG_PATH=.. pkg-config --libs xmlsec1 ) ++CFLAGS += -I../include -g $(shell PKG_CONFIG_PATH=.. pkg-config --cflags xmlsec1 ) -DUNIX_SOCKETS -Wall -Wextra ++LDLIBS += -L../src/.libs -g $(shell PKG_CONFIG_PATH=.. pkg-config --libs xmlsec1 ) + +DESTDIR = /usr/share/xmlsec1 +install-ptest: @@ -38,3 +37,6 @@ index 89b1d61..c1cbcca 100644 all: $(PROGRAMS) +-- +2.25.1 + diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1/run-ptest b/meta-oe/recipes-support/xmlsec1/xmlsec1/run-ptest index a203c38f27..afd8c69853 100755 --- a/meta-oe/recipes-support/xmlsec1/xmlsec1/run-ptest +++ b/meta-oe/recipes-support/xmlsec1/xmlsec1/run-ptest @@ -34,8 +34,8 @@ check_return verify-single-key echo "---------------------------------------------------" echo "Verifying a signature with keys manager..." -./verify2 sign1-res.xml rsapub.pem -./verify2 sign2-res.xml rsapub.pem +./verify2 sign1-res.xml rsakey.pem +./verify2 sign2-res.xml rsakey.pem check_return verify-keys-manager echo "---------------------------------------------------" diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1/xmlsec1-examples-allow-build-in-separate-dir.patch b/meta-oe/recipes-support/xmlsec1/xmlsec1/xmlsec1-examples-allow-build-in-separate-dir.patch index 8b2533ed9e..9e6a6a840f 100644 --- a/meta-oe/recipes-support/xmlsec1/xmlsec1/xmlsec1-examples-allow-build-in-separate-dir.patch +++ b/meta-oe/recipes-support/xmlsec1/xmlsec1/xmlsec1-examples-allow-build-in-separate-dir.patch @@ -6,25 +6,27 @@ Subject: [PATCH] examples: allow build in separate dir Upstream-Status: Inappropriate [ OE specific ] Signed-off-by: Jackie Huang <jackie.huang@windriver.com> - --- examples/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/examples/Makefile b/examples/Makefile -index c1cbcca..3f1bd14 100644 +index cbc2661..e882b61 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -12,8 +12,10 @@ ifndef CC CC = gcc endif --CFLAGS += -I../include -g $(shell PKG_CONFIG_PATH=.. pkg-config --cflags xmlsec1 ) -DUNIX_SOCKETS --LDLIBS += -L../src/.libs -g $(shell PKG_CONFIG_PATH=.. pkg-config --libs xmlsec1 ) +-CFLAGS += -I../include -g $(shell PKG_CONFIG_PATH=.. pkg-config --cflags xmlsec1 ) -DUNIX_SOCKETS -Wall -Wextra +-LDLIBS += -L../src/.libs -g $(shell PKG_CONFIG_PATH=.. pkg-config --libs xmlsec1 ) +top_srcdir = .. +top_builddir = .. -+CFLAGS += -I$(top_srcdir)/include -g $(shell PKG_CONFIG_PATH=$(top_srcdir) pkg-config --cflags xmlsec1 ) -DUNIX_SOCKETS ++CFLAGS += -I$(top_srcdir)/include -g $(shell PKG_CONFIG_PATH=$(top_srcdir) pkg-config --cflags xmlsec1 ) -DUNIX_SOCKETS -Wall -Wextra +LDLIBS += -L$(top_builddir)/src/.libs -g $(shell PKG_CONFIG_PATH=$(top_srcdir) pkg-config --libs xmlsec1 ) DESTDIR = /usr/share/xmlsec1 install-ptest: +-- +2.25.1 + diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.29.bb b/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.4.bb index 40c585ee10..7639209e19 100644 --- a/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.29.bb +++ b/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.4.bb @@ -13,38 +13,39 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=352791d62092ea8104f085042de7f4d0" SECTION = "libs" SRC_URI = "http://www.aleksey.com/xmlsec/download/${BP}.tar.gz \ - file://fix-ltmain.sh.patch \ - file://change-finding-path-of-nss.patch \ - file://makefile-ptest.patch \ - file://xmlsec1-examples-allow-build-in-separate-dir.patch \ - file://run-ptest \ - " + file://fix-ltmain.sh.patch \ + file://change-finding-path-of-nss.patch \ + file://makefile-ptest.patch \ + file://xmlsec1-examples-allow-build-in-separate-dir.patch \ + file://0001-nss-nspr-fix-for-multilib.patch \ + file://run-ptest \ + file://ensure-search-path-non-host.patch \ + " -SRC_URI[md5sum] = "4755621ff2a7150e208de6bd7decca10" -SRC_URI[sha256sum] = "b1d1deba966019930f608d1f2b95c40ca3450f1393bcd3a3c001a8ba1d2839ab" +SRC_URI[sha256sum] = "45ad9078d41ae76844ad2f8651600ffeec0fdd128ead988a8d69e907c57aee75" inherit autotools-brokensep ptest pkgconfig -CFLAGS += "-I${STAGING_INCDIR}/nspr4 -I${STAGING_INCDIR}/nss3" -CPPFLAGS += "-I${STAGING_INCDIR}/nspr4 -I${STAGING_INCDIR}/nss3" +#CFLAGS += "-I${STAGING_INCDIR}/nss3" +#CPPFLAGS += "-I${STAGING_INCDIR}/nss3" PACKAGECONFIG ??= "gnutls libgcrypt nss openssl des" PACKAGECONFIG[gnutls] = ",,gnutls" PACKAGECONFIG[libgcrypt] = ",,libgcrypt" -PACKAGECONFIG[nss] = "--with-nss=${STAGING_LIBDIR}/../.. --with-nspr=${STAGING_LIBDIR}/../..,,nss nspr" +PACKAGECONFIG[nss] = "--with-nss=${STAGING_DIR_HOST} --with-nspr=${STAGING_DIR_HOST},--with-nss=no --with-nspr=no,nss nspr" PACKAGECONFIG[openssl] = ",,openssl" PACKAGECONFIG[des] = ",--disable-des,," # these can be dynamically loaded with xmlSecCryptoDLLoadLibrary() FILES_SOLIBSDEV = "${libdir}/libxmlsec1.so" -FILES_${PN} += "${libdir}/libxmlsec1-*.so" -INSANE_SKIP_${PN} = "dev-so" +FILES:${PN} += "${libdir}/libxmlsec1-*.so" +INSANE_SKIP:${PN} = "dev-so" -FILES_${PN}-dev += "${libdir}/xmlsec1Conf.sh" -FILES_${PN}-dbg += "${PTEST_PATH}/.debug/*" +FILES:${PN}-dev += "${libdir}/xmlsec1Conf.sh" +FILES:${PN}-dbg += "${PTEST_PATH}/.debug/*" -RDEPENDS_${PN}-ptest += "${PN}-dev" -INSANE_SKIP_${PN}-ptest += "dev-deps" +RDEPENDS:${PN}-ptest += "${PN}-dev" +INSANE_SKIP:${PN}-ptest += "dev-deps" PTEST_EXTRA_ARGS = "top_srcdir=${S} top_builddir=${B}" @@ -52,7 +53,7 @@ do_compile_ptest () { oe_runmake -C ${S}/examples ${PTEST_EXTRA_ARGS} all } -do_install_append() { +do_install:append() { for i in ${bindir}/xmlsec1-config ${libdir}/xmlsec1Conf.sh \ ${libdir}/pkgconfig/xmlsec1-openssl.pc; do sed -i -e "s@${RECIPE_SYSROOT}@@g" ${D}$i @@ -62,3 +63,5 @@ do_install_append() { do_install_ptest () { oe_runmake -C ${S}/examples DESTDIR=${D}${PTEST_PATH} ${PTEST_EXTRA_ARGS} install-ptest } + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/xmlstarlet/files/0001-Fix-hash_key_put-signature.patch b/meta-oe/recipes-support/xmlstarlet/files/0001-Fix-hash_key_put-signature.patch new file mode 100644 index 0000000000..2a766dbb87 --- /dev/null +++ b/meta-oe/recipes-support/xmlstarlet/files/0001-Fix-hash_key_put-signature.patch @@ -0,0 +1,33 @@ +From 64cb138aaaafc87c8462885d502c9323be86a003 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 18 Jan 2023 14:50:08 -0800 +Subject: [PATCH] Fix hash_key_put() signature + +Fixes + +../xmlstarlet-1.6.1/src/xml_elem.c:271:27: error: incompatible function pointer types passing 'void (void *, void *, xmlChar *)' (aka 'void (void *, void *, unsigned char *)') to parameter of type 'xmlHashScanner' (aka 'void (*)(void *, void *, const unsigned char *)') [-Wincompatible-function-pointer-types] + xmlHashScan(uniq, hash_key_put, &lines); + ^~~~~~~~~~~~ + +Upstream-Status: Submitted [https://sourceforge.net/p/xmlstar/code/merge-requests/6/] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/xml_elem.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/xml_elem.c b/src/xml_elem.c +index 024e62a..a73038a 100644 +--- a/src/xml_elem.c ++++ b/src/xml_elem.c +@@ -186,7 +186,7 @@ typedef struct { + * put @name into @data->array[@data->offset] + */ + static void +-hash_key_put(void *payload, void *data, xmlChar *name) ++hash_key_put(void *payload, void *data, const xmlChar *name) + { + ArrayDest *dest = data; + dest->array[dest->offset++] = name; +-- +2.39.1 + diff --git a/meta-oe/recipes-support/xmlstarlet/files/0001-Make-xmlError-struct-constant.patch b/meta-oe/recipes-support/xmlstarlet/files/0001-Make-xmlError-struct-constant.patch new file mode 100644 index 0000000000..a9d98db69c --- /dev/null +++ b/meta-oe/recipes-support/xmlstarlet/files/0001-Make-xmlError-struct-constant.patch @@ -0,0 +1,45 @@ +From f7a5ebc3a673b246a64c9a664df304c1520a3951 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 7 Mar 2024 12:35:17 -0800 +Subject: [PATCH] Make xmlError struct constant + +In libxml2 commit v2.12.0~14 the API changed so that +xmlGetLastError() returns pointer to a constant xmlError struct. +Reflect this change in our code. + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/xml.c | 2 +- + src/xmlstar.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/xml.c b/src/xml.c +index cf47cc2..e6f19c1 100644 +--- a/src/xml.c ++++ b/src/xml.c +@@ -104,7 +104,7 @@ void reportGenericError(void* ctx, const char * msg, ...) { + /* by default all errors are reported */ + static ErrorInfo errorInfo = { NULL, NULL, VERBOSE, CONTINUE }; + +-void reportError(void *ptr, xmlErrorPtr error) ++void reportError(void *ptr, const xmlError *error) + { + ErrorInfo *errorInfo = (ErrorInfo*) ptr; + assert(errorInfo); +diff --git a/src/xmlstar.h b/src/xmlstar.h +index 3e1eed3..7e41ac4 100644 +--- a/src/xmlstar.h ++++ b/src/xmlstar.h +@@ -32,7 +32,7 @@ typedef struct _errorInfo { + ErrorStop stop; + } ErrorInfo; + +-void reportError(void *ptr, xmlErrorPtr error); ++void reportError(void *ptr, const xmlError* error); + void suppressErrors(void); + + typedef struct _gOptions { +-- +2.44.0 + diff --git a/meta-oe/recipes-support/xmlstarlet/files/configure.ac.patch b/meta-oe/recipes-support/xmlstarlet/files/configure.ac.patch index e55f4f3b13..7e13110a3b 100644 --- a/meta-oe/recipes-support/xmlstarlet/files/configure.ac.patch +++ b/meta-oe/recipes-support/xmlstarlet/files/configure.ac.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + configure.ac: don't use xml-config if --with-libxml-prefix is specified to configure Same behavior for xslt-config. diff --git a/meta-oe/recipes-support/xmlstarlet/xmlstarlet_1.6.1.bb b/meta-oe/recipes-support/xmlstarlet/xmlstarlet_1.6.1.bb index e28fd61a03..61eeaaa095 100644 --- a/meta-oe/recipes-support/xmlstarlet/xmlstarlet_1.6.1.bb +++ b/meta-oe/recipes-support/xmlstarlet/xmlstarlet_1.6.1.bb @@ -14,8 +14,9 @@ DEPENDS = "libxml2 libxslt" SRC_URI = "${SOURCEFORGE_MIRROR}/xmlstar/${BP}.tar.gz \ file://configure.ac.patch \ - file://0001-usage2c.awk-fix-wrong-basename-regexp.patch" -SRC_URI[md5sum] = "f3c5dfa3b1a2ee06cd57c255cc8b70a0" + file://0001-usage2c.awk-fix-wrong-basename-regexp.patch \ + file://0001-Make-xmlError-struct-constant.patch \ + file://0001-Fix-hash_key_put-signature.patch" SRC_URI[sha256sum] = "15d838c4f3375332fd95554619179b69e4ec91418a3a5296e7c631b7ed19e7ca" inherit autotools diff --git a/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.2.5.bb b/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.9.19.bb index 481e7303b3..9650d43695 100644 --- a/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.2.5.bb +++ b/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.9.19.bb @@ -10,14 +10,14 @@ DEPENDS = "virtual/libx11 xserver-xorg xrdp nasm-native" inherit features_check REQUIRED_DISTRO_FEATURES = "x11 pam" -SRC_URI = "git://github.com/neutrinolabs/xorgxrdp.git" +SRC_URI = "git://github.com/neutrinolabs/xorgxrdp.git;branch=v0.9;protocol=https" -SRCREV = "c122544f184d4031bbae1ad80fbab554c34a9427" +SRCREV = "d463bad9639c910fadc2f30dac473c7688b11cfc" -PV = "0.2.5" +PV = "0.9.19" S = "${WORKDIR}/git" -FILES_${PN} += "${libdir}/xorg/modules/*" +FILES:${PN} += "${libdir}/xorg/modules/*" -INSANE_SKIP_${PN} += "xorg-driver-abi" +INSANE_SKIP:${PN} += "xorg-driver-abi" diff --git a/meta-oe/recipes-support/xrdp/xrdp/0001-Added-req_distinguished_name-in-etc-xrdp-openssl.con.patch b/meta-oe/recipes-support/xrdp/xrdp/0001-Added-req_distinguished_name-in-etc-xrdp-openssl.con.patch index 5e7fca02a5..05803266cb 100644 --- a/meta-oe/recipes-support/xrdp/xrdp/0001-Added-req_distinguished_name-in-etc-xrdp-openssl.con.patch +++ b/meta-oe/recipes-support/xrdp/xrdp/0001-Added-req_distinguished_name-in-etc-xrdp-openssl.con.patch @@ -6,6 +6,8 @@ Subject: [PATCH] Added req_distinguished_name in /etc/xrdp/openssl.conf, Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> --- +Upstream-Status: Pending + keygen/openssl.conf | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/meta-oe/recipes-support/xrdp/xrdp/0001-Fix-the-compile-error.patch b/meta-oe/recipes-support/xrdp/xrdp/0001-Fix-the-compile-error.patch index 82b2790856..e8b4ffa6bf 100644 --- a/meta-oe/recipes-support/xrdp/xrdp/0001-Fix-the-compile-error.patch +++ b/meta-oe/recipes-support/xrdp/xrdp/0001-Fix-the-compile-error.patch @@ -5,6 +5,8 @@ Fix the compile error: Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> --- +Upstream-Status: Pending + xrdp/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/xrdp/xrdp/0001-arch-Define-NO_NEED_ALIGN-on-ppc64.patch b/meta-oe/recipes-support/xrdp/xrdp/0001-arch-Define-NO_NEED_ALIGN-on-ppc64.patch new file mode 100644 index 0000000000..ea3eb11f0a --- /dev/null +++ b/meta-oe/recipes-support/xrdp/xrdp/0001-arch-Define-NO_NEED_ALIGN-on-ppc64.patch @@ -0,0 +1,27 @@ +From 5958db649855bfb2ada7c0ed22a00f839b9a1161 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 12 Mar 2021 21:40:35 -0800 +Subject: [PATCH] arch: Define NO_NEED_ALIGN on ppc64 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + common/arch.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/common/arch.h b/common/arch.h +index 617feb5e..6edb39db 100644 +--- a/common/arch.h ++++ b/common/arch.h +@@ -85,7 +85,7 @@ typedef int bool_t; + #define NEED_ALIGN + #elif defined(__x86__) || defined(__x86_64__) || \ + defined(__AMD64__) || defined(_M_IX86) || defined (_M_AMD64) || \ +- defined(__i386__) || defined(__aarch64__) || \ ++ defined(__i386__) || defined(__aarch64__) || defined(__powerpc64__) || \ + defined(__PPC__) || defined(__LITTLE_ENDIAN__) || \ + defined(__s390__) || defined (__s390x__) || \ + defined(__riscv) +-- +2.31.1 + diff --git a/meta-oe/recipes-support/xrdp/xrdp/0001-mark-count-with-unused-attribute.patch b/meta-oe/recipes-support/xrdp/xrdp/0001-mark-count-with-unused-attribute.patch new file mode 100644 index 0000000000..77a394d556 --- /dev/null +++ b/meta-oe/recipes-support/xrdp/xrdp/0001-mark-count-with-unused-attribute.patch @@ -0,0 +1,31 @@ +From 492f74dbea1d9a15fbc3e870e78ab52e7fc5583b Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 31 Aug 2022 20:19:32 -0700 +Subject: [PATCH] mark count with unused attribute + +This may throw a warning when devel logs are disabled +Fixed +../../../xrdp-0.9.19/sesman/chansrv/chansrv.c:198:9: error: variable 'count' set but not used [-Werror,-Wunused-but-set-variable] int count; ^ 1 error generated. + +Upstream-Status: Submitted [https://github.com/neutrinolabs/xrdp/pull/2353] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + sesman/chansrv/chansrv.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sesman/chansrv/chansrv.c b/sesman/chansrv/chansrv.c +index 4452d998..b818bff3 100644 +--- a/sesman/chansrv/chansrv.c ++++ b/sesman/chansrv/chansrv.c +@@ -195,7 +195,7 @@ check_timeout(void) + struct timeout_obj *tobj; + struct timeout_obj *last_tobj; + struct timeout_obj *temp_tobj; +- int count; ++ int count __attribute__((unused)); + tui32 now; + + LOG_DEVEL(LOG_LEVEL_DEBUG, "check_timeout:"); +-- +2.37.3 + diff --git a/meta-oe/recipes-support/xrdp/xrdp_0.9.11.bb b/meta-oe/recipes-support/xrdp/xrdp_0.9.19.bb index deda0fd1b5..c1b75e6138 100644 --- a/meta-oe/recipes-support/xrdp/xrdp_0.9.11.bb +++ b/meta-oe/recipes-support/xrdp/xrdp_0.9.19.bb @@ -6,79 +6,73 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=72cfbe4e7bd33a0a1de9630c91195c21 \ inherit features_check autotools pkgconfig useradd systemd -DEPENDS = "openssl virtual/libx11 libxfixes libxrandr libpam nasm-native" +DEPENDS = "openssl virtual/libx11 libxfixes libxrandr libpam nasm-native imlib2 pixman libsm" REQUIRED_DISTRO_FEATURES = "x11 pam" -SRC_URI = "git://github.com/neutrinolabs/xrdp.git \ +SRC_URI = "https://github.com/neutrinolabs/${BPN}/releases/download/v${PV}/${BPN}-${PV}.tar.gz \ file://xrdp.sysconfig \ file://0001-Added-req_distinguished_name-in-etc-xrdp-openssl.con.patch \ file://0001-Fix-the-compile-error.patch \ + file://0001-arch-Define-NO_NEED_ALIGN-on-ppc64.patch \ + file://0001-mark-count-with-unused-attribute.patch \ " -SRCREV = "1e4b03eb3c9aa7173de251a328c93c073dcc0fca" +SRC_URI[sha256sum] = "94017d30e475c6d7a24f651e16791551862ae46f82d8de62385e63393f5f93d0" -PV = "0.9.11" - -S = "${WORKDIR}/git" +CFLAGS += " -Wno-deprecated-declarations" 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 \ +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 \ +FILES:${PN} += "${datadir}/dbus-1/services/*.service \ ${datadir}/dbus-1/accessibility-services/*.service " -FILES_${PN}-dev += "${libdir}/xrdp/libcommon.so \ +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" +EXTRA_OECONF = "--enable-pam-config=suse --enable-fuse \ + --enable-pixman --enable-painter --enable-vsock \ + --enable-ipv6 --with-imlib2 --with-socketdir=${localstatedir}/run/${PN}" -do_configure_prepend() { +do_configure:prepend() { cd ${S} ./bootstrap cd - } -do_compile_prepend() { +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 + echo "" > ${B}/xrdp_configure_options.h } +do_install:append() { -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 + 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 -d ${D}${sysconfdir}/sysconfig/xrdp 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/ + install -m 0644 ${UNPACKDIR}/xrdp.sysconfig ${D}${sysconfdir}/sysconfig/xrdp/ chown xrdp:xrdp ${D}${sysconfdir}/xrdp } -SYSTEMD_SERVICE_${PN} = "xrdp.service xrdp-sesman.service" +SYSTEMD_SERVICE:${PN} = "xrdp.service xrdp-sesman.service" -pkg_postinst_${PN}() { +pkg_postinst:${PN}() { if test -z "$D" then if test -x ${bindir}/xrdp-keygen @@ -92,6 +86,6 @@ pkg_postinst_${PN}() { -out ${sysconfdir}/xrdp/cert.pem \ -config ${sysconfdir}/xrdp/openssl.conf >/dev/null 2>&1 chmod 400 ${sysconfdir}/xrdp/key.pem - fi + fi fi } diff --git a/meta-oe/recipes-support/xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.5.bb b/meta-oe/recipes-support/xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.10.bb index 1d75d52d29..76aea6f41a 100644 --- a/meta-oe/recipes-support/xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.5.bb +++ b/meta-oe/recipes-support/xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.10.bb @@ -1,6 +1,6 @@ SUMMARY = "X.Org X cvt" HOMEPAGE = "https://linux.die.net/man/1/cvt" -LICENSE = "MIT-X" +LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=5df87950af51ac2c5822094553ea1880" DEPENDS += "pixman-native xorgproto-native libxrandr-native" @@ -8,13 +8,13 @@ DEPENDS += "pixman-native xorgproto-native libxrandr-native" XORG_PN = "xorg-server" SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2" -SRC_URI[md5sum] = "c9fc7e21e11286dbedd22c00df652130" -SRC_URI[sha256sum] = "a81d8243f37e75a03d4f8c55f96d0bc25802be6ec45c3bfa5cb614c6d01bac9d" +SRC_URI[md5sum] = "8cf8bd1f33e3736bc8dd279b20a32399" +SRC_URI[sha256sum] = "977420c082450dc808de301ef56af4856d653eea71519a973c3490a780cb7c99" S = "${WORKDIR}/${XORG_PN}-${PV}" B = "${WORKDIR}/build" -inherit native pkgconfig +inherit pkgconfig native do_configure[noexec] = "1" diff --git a/meta-oe/recipes-support/yaml-cpp/yaml-cpp_0.8.0.bb b/meta-oe/recipes-support/yaml-cpp/yaml-cpp_0.8.0.bb new file mode 100644 index 0000000000..44ac0687a7 --- /dev/null +++ b/meta-oe/recipes-support/yaml-cpp/yaml-cpp_0.8.0.bb @@ -0,0 +1,17 @@ +SUMMARY = "yaml-cpp parser and emitter library" +DESCRIPTION = "yaml-cpp is a YAML parser and emitter in C++ matching the YAML 1.2 spec." +HOMEPAGE = "https://github.com/jbeder/yaml-cpp" +SECTION = "devel" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=6a8aaf0595c2efc1a9c2e0913e9c1a2c" + +# yaml-cpp releases are stored as archive files in github. +# download the exact revision of release +SRC_URI = "git://github.com/jbeder/yaml-cpp.git;branch=master;protocol=https" +SRCREV = "f7320141120f720aecc4c32be25586e7da9eb978" + +S = "${WORKDIR}/git" + +inherit cmake + +EXTRA_OECMAKE = "-DYAML_CPP_BUILD_TESTS=OFF -DYAML_BUILD_SHARED_LIBS=ON -DYAML_CPP_BUILD_TOOLS=OFF" diff --git a/meta-oe/recipes-support/zbar/zbar/0001-make-relies-GNU-extentions.patch b/meta-oe/recipes-support/zbar/zbar/0001-make-relies-GNU-extentions.patch deleted file mode 100644 index 04239bacdb..0000000000 --- a/meta-oe/recipes-support/zbar/zbar/0001-make-relies-GNU-extentions.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 224507bc4b6e58f7a6e445bfebfb59d6b8d78bd6 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 2 Dec 2016 17:38:51 -0800 -Subject: [PATCH] make relies GNU extentions - -We get errors like -`%'-style pattern rules are a GNU make extension - -Disable this warning, since we use gmake with OE -anyway - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 56d3dd0..9f85fd7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3,7 +3,7 @@ AC_PREREQ([2.61]) - AC_INIT([zbar], [0.10], [spadix@users.sourceforge.net]) - AC_CONFIG_AUX_DIR(config) - AC_CONFIG_MACRO_DIR(config) --AM_INIT_AUTOMAKE([1.10 -Wall -Werror foreign subdir-objects std-options dist-bzip2]) -+AM_INIT_AUTOMAKE([1.10 -Wall -Werror -Wno-portability foreign subdir-objects std-options dist-bzip2]) - AC_CONFIG_HEADERS([include/config.h]) - AC_CONFIG_SRCDIR(zbar/scanner.c) - LT_PREREQ([2.2]) --- -2.10.2 - diff --git a/meta-oe/recipes-support/zbar/zbar/0001-qt-Create-subdir-in-Makefile.patch b/meta-oe/recipes-support/zbar/zbar/0001-qt-Create-subdir-in-Makefile.patch new file mode 100644 index 0000000000..3d8c07f02b --- /dev/null +++ b/meta-oe/recipes-support/zbar/zbar/0001-qt-Create-subdir-in-Makefile.patch @@ -0,0 +1,37 @@ +From 9c67f377477a07495a712f478eabfa8d33164c45 Mon Sep 17 00:00:00 2001 +From: Daniel Gomez <dagmcr@gmail.com> +Date: Sun, 17 Jan 2021 23:32:51 +0100 +Subject: [PATCH 1/2] qt: Create subdir in Makefile + +Create builddir/qt subdir when --with-qt5 is enabled. + +Fixes the following error: + +moc -Iqt -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB +-I/var/lib/yocto/gallium/tmp_20210113/work/znver1-poky-linux/zbar/0.23.1+gitAUTOINC+89e7900d85-r0/recipe-sysroot/usr/include/QtWidgets +-I/var/lib/yocto/gallium/tmp_20210113/work/znver1-poky-linux/zbar/0.23.1+gitAUTOINC+89e7900d85-r0/recipe-sysroot/usr/include/QtGui +-I/var/lib/yocto/gallium/tmp_20210113/work/znver1-poky-linux/zbar/0.23.1+gitAUTOINC+89e7900d85-r0/recipe-sysroot/usr/include/QtCore +-I../git/include ../git/include/zbar/QZBar.h -o qt/moc_QZBar.cpp +moc: Cannot create qt/moc_QZBar.cpp +make: *** [Makefile:2459: qt/moc_QZBar.cpp] Error 1 + +Signed-off-by: Daniel Gomez <dagmcr@gmail.com> +--- +Upstream-Status: Pending + + qt/Makefile.am.inc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/qt/Makefile.am.inc b/qt/Makefile.am.inc +index b099c2b..c98fbeb 100644 +--- a/qt/Makefile.am.inc ++++ b/qt/Makefile.am.inc +@@ -15,4 +15,5 @@ qt/moc_%.cpp: qt/%.h + $(MOC) $(qt_libzbarqt_la_CPPFLAGS) $< -o $@ + + qt/moc_%.cpp: include/zbar/%.h ++ @$(mkdir_p) qt 2>/dev/null + $(MOC) $(qt_libzbarqt_la_CPPFLAGS) $< -o $@ +-- +2.29.2 + diff --git a/meta-oe/recipes-support/zbar/zbar/0001-undefine-__va_arg_pack.patch b/meta-oe/recipes-support/zbar/zbar/0001-undefine-__va_arg_pack.patch deleted file mode 100644 index f7d8ba1e96..0000000000 --- a/meta-oe/recipes-support/zbar/zbar/0001-undefine-__va_arg_pack.patch +++ /dev/null @@ -1,51 +0,0 @@ -From f842872244219d9881fbec77054702412b1e16f8 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 2 Dec 2016 16:41:27 -0800 -Subject: [PATCH] undefine __va_arg_pack - -dprintf() is also a libc function. This fixes -the compile errors - -/usr/include/bits/stdio2.h:140:1: error: expected identifier or '(' before '{' token -| { - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - zbar/debug.h | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/zbar/debug.h b/zbar/debug.h -index 482ca8d..68948f6 100644 ---- a/zbar/debug.h -+++ b/zbar/debug.h -@@ -23,6 +23,7 @@ - - /* varargs variations on compile time debug spew */ - -+#undef __va_arg_pack - #ifndef DEBUG_LEVEL - - # ifdef __GNUC__ -@@ -36,15 +37,14 @@ - #else - - # include <stdio.h> -- - # ifdef __GNUC__ --# define dprintf(level, args...) \ -+# define dprintf(level, format, args...) \ - if((level) <= DEBUG_LEVEL) \ -- fprintf(stderr, args) -+ fprintf(stderr, format, args) - # else --# define dprintf(level, ...) \ -+# define dprintf(level, format, ...) \ - if((level) <= DEBUG_LEVEL) \ -- fprintf(stderr, __VA_ARGS__) -+ fprintf(stderr, format, __VA_ARGS__) - # endif - - #endif /* DEBUG_LEVEL */ --- -2.10.2 - diff --git a/meta-oe/recipes-support/zbar/zbar/0002-zbarcam-Create-subdir-in-Makefile.patch b/meta-oe/recipes-support/zbar/zbar/0002-zbarcam-Create-subdir-in-Makefile.patch new file mode 100644 index 0000000000..9030ed88f2 --- /dev/null +++ b/meta-oe/recipes-support/zbar/zbar/0002-zbarcam-Create-subdir-in-Makefile.patch @@ -0,0 +1,42 @@ +From fe751929ccc8fd75e350ed6db9d28d04bd31fc79 Mon Sep 17 00:00:00 2001 +From: Daniel Gomez <dagmcr@gmail.com> +Date: Sun, 17 Jan 2021 23:33:19 +0100 +Subject: [PATCH 2/2] zbarcam: Create subdir in Makefile + +Create builddir/zbarcam when --with-qt5 is enabled. + +Fixes the following error: + +moc -i -Izbarcam -DQT_WIDGETS_LIB -DQT_X11EXTRAS_LIB -DQT_GUI_LIB +-DQT_CORE_LIB +-I/var/lib/yocto/gallium/tmp_20210113/work/znver1-poky-linux/zbar/0.23.1+gitAUTOINC+89e7900d85-r0/recipe-sysroot/usr/include/QtWidgets +-I/var/lib/yocto/gallium/tmp_20210113/work/znver1-poky-linux/zbar/0.23.1+gitAUTOINC+89e7900d85-r0/recipe-sysroot/usr/include/QtX11Extras +-I/var/lib/yocto/gallium/tmp_20210113/work/znver1-poky-linux/zbar/0.23.1+gitAUTOINC+89e7900d85-r0/recipe-sysroot/usr/include/QtGui +-I/var/lib/yocto/gallium/tmp_20210113/work/znver1-poky-linux/zbar/0.23.1+gitAUTOINC+89e7900d85-r0/recipe-sysroot/usr/include/QtCore +-I../git/include ../git/zbarcam/zbarcam-qt.cpp -o +zbarcam/moc_zbarcam_qt.h +moc: Cannot create zbarcam/moc_zbarcam_qt.h +make: *** [Makefile:2438: zbarcam/moc_zbarcam_qt.h] Error 1 + +Signed-off-by: Daniel Gomez <dagmcr@gmail.com> +--- +Upstream-Status: Pending + + zbarcam/Makefile.am.inc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/zbarcam/Makefile.am.inc b/zbarcam/Makefile.am.inc +index b6de82c..e90c50c 100644 +--- a/zbarcam/Makefile.am.inc ++++ b/zbarcam/Makefile.am.inc +@@ -28,6 +28,7 @@ DISTCLEANFILES += $(nodist_zbarcam_zbarcam_qt_SOURCES) zbarcam/moc_zbarcam_qt.h + + + zbarcam/moc_zbarcam_qt.h: zbarcam/zbarcam-qt.cpp ++ @$(mkdir_p) zbarcam 2>/dev/null + $(MOC) -i $(zbarcam_zbarcam_qt_CPPFLAGS) $< -o $@ + endif + +-- +2.29.2 + diff --git a/meta-oe/recipes-support/zbar/zbar_0.10.bb b/meta-oe/recipes-support/zbar/zbar_0.10.bb deleted file mode 100644 index ebd1f7a12f..0000000000 --- a/meta-oe/recipes-support/zbar/zbar_0.10.bb +++ /dev/null @@ -1,28 +0,0 @@ -DESRIPTION = "2D barcode scanner toolkit." -SECTION = "graphics" -LICENSE = "LGPL-2.1" - -DEPENDS = "pkgconfig intltool-native libpng jpeg" - -LIC_FILES_CHKSUM = "file://COPYING;md5=42bafded1b380c6fefbeb6c5cd5448d9" - -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.bz2 \ - file://0001-undefine-__va_arg_pack.patch \ - file://0001-make-relies-GNU-extentions.patch \ -" - -SRC_URI[md5sum] = "0fd61eb590ac1bab62a77913c8b086a5" -SRC_URI[sha256sum] = "234efb39dbbe5cef4189cc76f37afbe3cfcfb45ae52493bfe8e191318bdbadc6" - -inherit autotools pkgconfig - -PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" - -PACKAGECONFIG[x11] = "--with-x,-without-x,libxcb libx11 libsm libxau libxext libxv libice libxdmcp" - -EXTRA_OECONF = " --without-imagemagick --without-qt --without-python --disable-video --without-gtk" - -do_install_append() { - #remove usr/bin if empty - rmdir ${D}${bindir} -} diff --git a/meta-oe/recipes-support/zbar/zbar_git.bb b/meta-oe/recipes-support/zbar/zbar_git.bb new file mode 100644 index 0000000000..975779cd18 --- /dev/null +++ b/meta-oe/recipes-support/zbar/zbar_git.bb @@ -0,0 +1,58 @@ +HOMEPAGE = "https://github.com/mchehab/zbar" +SUMMARY = "A bar code library" +DESRIPTION = "ZBar is an open source software suite for reading bar codes \ +from various sources, such as video streams, image files and raw \ +intensity sensors. It supports EAN-13/UPC-A, UPC-E, EAN-8, Code 128, \ +Code 93, Code 39, Codabar, Interleaved 2 of 5, QR Code and SQ Code" +SECTION = "graphics" + +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=5e9ee833a2118adc7d8b5ea38e5b1cef" + +SRC_URI = "git://github.com/mchehab/zbar.git;branch=master;protocol=https \ + file://0001-qt-Create-subdir-in-Makefile.patch \ + file://0002-zbarcam-Create-subdir-in-Makefile.patch \ +" +SRCREV = "89e7900d85dd54ef351a7ed582aec6a5a5d7fa37" + +S = "${WORKDIR}/git" +PV = "0.23.1+git" + +DEPENDS += "xmlto-native" + +PACKAGECONFIG ??= "\ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ +" + +PACKAGECONFIG ??= "video" + +inherit autotools pkgconfig gettext \ + ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3native', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'gtk3', 'gobject-introspection', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'qmake5_paths', '', d)} + +PACKAGECONFIG[x11] = "--with-x, --without-x, libxv" +PACKAGECONFIG[video] = "--enable-video, --disable-video, v4l-utils libv4l" +PACKAGECONFIG[jpeg] = "--with-jpeg, --without-jpeg, jpeg" +PACKAGECONFIG[python3] = "--with-python=auto, --without-python, python3" +PACKAGECONFIG[gtk3] = "--with-gtk=gtk3, --without-gtk, gtk+3" +PACKAGECONFIG[qt5] = "--with-qt5, --without-qt5, qtbase qtbase-native qtx11extras qtsvg, qtbase" +PACKAGECONFIG[imagemagick] = "--with-imagemagick, --without-imagemagick, imagemagick" + +FILES:${PN} += "${bindir} \ + ${@bb.utils.contains('DEPENDS', 'python3-native', '${libdir}', '', d)} \ +" + +CPPFLAGS:append = "\ + ${@bb.utils.contains('PACKAGECONFIG', 'qt5', '\ + -I${STAGING_INCDIR}/QtX11Extras \ + -I${STAGING_INCDIR}/dbus-1.0 \ + -I${STAGING_LIBDIR}/dbus-1.0/include \ + ', '', d)} \ +" + +TARGET_CXXFLAGS:append = " -fPIC" + +do_configure:prepend() { + install -m 755 ${STAGING_DATADIR_NATIVE}/gettext/ABOUT-NLS ${S}/ +} diff --git a/meta-oe/recipes-support/zchunk/zchunk_1.4.0.bb b/meta-oe/recipes-support/zchunk/zchunk_1.4.0.bb new file mode 100644 index 0000000000..0c8a9c7a5f --- /dev/null +++ b/meta-oe/recipes-support/zchunk/zchunk_1.4.0.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "A file format designed for highly efficient deltas while maintaining good compression" + +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=daf6e68539f564601a5a5869c31e5242" + +SRC_URI = "git://github.com/zchunk/zchunk.git;protocol=https;branch=main" + +SRCREV = "4dd91d31157ede4a1b092721d944ae2fdd161cd9" +S = "${WORKDIR}/git" + +DEPENDS = "zstd" +DEPENDS:append:libc-musl = " argp-standalone" + +inherit meson pkgconfig lib_package + +PACKAGECONFIG ??= "openssl zckdl" + +# zckdl gets packaged into zchunk-bin +PACKAGECONFIG[zckdl] = "-Dwith-curl=enabled,-Dwith-curl=disabled,curl" +# Use OpenSSL primitives for SHA +PACKAGECONFIG[openssl] = "-Dwith-openssl=enabled,-Dwith-openssl=disabled,openssl" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/zile/zile_2.4.14.bb b/meta-oe/recipes-support/zile/zile_2.4.15.bb index 3b846c1511..e86b3f82d2 100644 --- a/meta-oe/recipes-support/zile/zile_2.4.14.bb +++ b/meta-oe/recipes-support/zile/zile_2.4.15.bb @@ -2,24 +2,24 @@ SUMMARY = "Zile is lossy Emacs" HOMEPAGE = "http://zile.sourceforge.net/" DEPENDS = "ncurses bdwgc" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" SRC_URI = "${GNU_MIRROR}/zile/${BP}.tar.gz \ file://remove-help2man.patch \ " -SRC_URI[md5sum] = "c7d7eec93231c6878f255978d9747a73" -SRC_URI[sha256sum] = "7a78742795ca32480f2bab697fd5e328618d9997d6f417cf1b14e9da9af26b74" +SRC_URI[md5sum] = "05efa90dfee1821ca018b0b2ef8f50a8" +SRC_URI[sha256sum] = "39c300a34f78c37ba67793cf74685935a15568e14237a3a66fda8fcf40e3035e" inherit autotools pkgconfig -do_install_append() { +do_install:append() { rm -rf ${D}${libdir}/charset.alias rmdir --ignore-fail-on-non-empty ${D}${libdir} || true } PACKAGECONFIG ??= "" -PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)}" +PACKAGECONFIG:append = " ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)}" PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl," |