add 5 recipes
cover add 5 recipes
Changed in V3:
- xmlrpc-c, usermode: fixed when compile with "-Wformat -Wformat-security -Werror=format-security" (already updated the status on patchwork)
- Add recipe libpwquality, libbytesize and libtimezonemap
Changed in V2:
- xmlrpc-c, usermode: fix compile failure against musl C library
//Hongxu
The following changes since commit 86e87c049f612534ce85301de8110a045596b7f7:
keybinder: add recipe 3.0 (2017-07-24 02:04:30 -0400)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib hongxu/add-recipe1
http://cgit.openembedded.org/openembedded-core-contrib/log/?h=hongxu/add-recipe1
Hongxu Jia (5):
libpwquality: add recipe 1.4.0
libbytesize: add recipe 0.10
libtimezonemap: add recipe 0.4.5
xmlrpc-c: add recipe 1.31.0
usermode: add recipe 1.111
.../libtimezonemap/libtimezonemap_0.4.5.bb | 22 +++++++++ ...ix-compile-failure-against-musl-C-library.patch | 27 +++++++++++ .../usermode/usermode/0001-formatting-issues.patch | 34 ++++++++++++++ .../recipes-support/usermode/usermode_1.111.bb | 29 ++++++++++++ ...ix-compile-failure-against-musl-C-library.patch | 52 ++++++++++++++++++++++ .../xmlrpc-c/0002-fix-formatting-issues.patch | 34 ++++++++++++++ .../recipes-devtools/xmlrpc-c/xmlrpc-c_1.31.0.bb | 24 ++++++++++ .../add-missing-python-include-dir-for-cross.patch | 48 ++++++++++++++++++++ .../libpwquality/libpwquality_1.4.0.bb | 45 +++++++++++++++++++ .../files/0001-remove-python2-support.patch | 30 +++++++++++++ .../libbytesize/libbytesize_0.10.bb | 34 ++++++++++++++ 11 files changed, 379 insertions(+) create mode 100644 meta-gnome/recipes-gnome/libtimezonemap/libtimezonemap_0.4.5.bb create mode 100644 meta-gnome/recipes-support/usermode/usermode/0001-fix-compile-failure-against-musl-C-library.patch create mode 100644 meta-gnome/recipes-support/usermode/usermode/0001-formatting-issues.patch create mode 100644 meta-gnome/recipes-support/usermode/usermode_1.111.bb create mode 100644 meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0001-fix-compile-failure-against-musl-C-library.patch create mode 100644 meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0002-fix-formatting-issues.patch create mode 100644 meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.31.0.bb create mode 100644 meta-oe/recipes-extended/libpwquality/files/add-missing-python-include-dir-for-cross.patch create mode 100644 meta-oe/recipes-extended/libpwquality/libpwquality_1.4.0.bb create mode 100644 meta-oe/recipes-support/libbytesize/files/0001-remove-python2-support.patch create mode 100644 meta-oe/recipes-support/libbytesize/libbytesize_0.10.bb
Signature · 1 line
2.8.1
PATCH 1/5 libpwquality: add recipe 1.4.0
--- .../add-missing-python-include-dir-for-cross.patch | 48 ++++++++++++++++++++++ .../libpwquality/libpwquality_1.4.0.bb | 45 ++++++++++++++++++++ 2 files changed, 93 insertions(+) create mode 100644 meta-oe/recipes-extended/libpwquality/files/add-missing-python-include-dir-for-cross.patch create mode 100644 meta-oe/recipes-extended/libpwquality/libpwquality_1.4.0.bb
meta-oe/recipes-extended/libpwquality/files/add-missing-python-include-dir-for-cross.patch new file +48 -0
@@ -0,0 +1,48 @@ +From 1ea09e09ab2387c326bb7170835361ece6e25477 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <[email protected]> +Date: Mon, 3 Aug 2015 13:43:14 +0800 +Subject: [PATCH] setup.py.in: add missing python include dir for cross + compiling + +Upstream-Status: inappropriate [oe-core specific] + +Signed-off-by: Hongxu Jia <[email protected]> +--- + python/Makefile.am | 2 +- + python/setup.py.in | 3 ++- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/python/Makefile.am b/python/Makefile.am +index abc5cd3..e35ba71 100644 +--- a/python/Makefile.am ++++ b/python/Makefile.am +@@ -14,4 +14,4 @@ all-local: + CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-lib=. + + install-exec-local: +- CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py install --prefix=${DESTDIR}${prefix} ++ CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py install --prefix=${DESTDIR}${prefix} --install-lib=${DESTDIR}/${PYTHONSITEDIR} +diff --git a/python/setup.py.in b/python/setup.py.in +index 6457595..d3db0e5 100755 +--- a/python/setup.py.in ++++ b/python/setup.py.in +@@ -6,6 +6,7 @@ + + from distutils.core import setup, Extension + from distutils.command.build_ext import build_ext as _build_ext ++import os + + class build_ext(_build_ext): + def genconstants(self, headerfile, outputfile): +@@ -23,7 +24,7 @@ class build_ext(_build_ext): + + pwqmodule = Extension('pwquality', + sources = ['pwquality.c'], +- include_dirs = ['../src'], ++ include_dirs = ['../src', os.path.join(os.environ['STAGING_INCDIR'], os.environ['PYTHON_DIR'])], + library_dirs = ['../src/.libs'], + libraries = ['pwquality']) + +-- +1.9.1 +
meta-oe/recipes-extended/libpwquality/libpwquality_1.4.0.bb new file +45 -0
45 lines not on this page · raw message
Signature · 1 line
2.8.1
PATCH 2/5 libbytesize: add recipe 0.10
In reply to Hongxu Jia--- .../files/0001-remove-python2-support.patch | 30 +++++++++++++++++++ .../libbytesize/libbytesize_0.10.bb | 34 ++++++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 meta-oe/recipes-support/libbytesize/files/0001-remove-python2-support.patch create mode 100644 meta-oe/recipes-support/libbytesize/libbytesize_0.10.bb
meta-oe/recipes-support/libbytesize/files/0001-remove-python2-support.patch new file +30 -0
@@ -0,0 +1,30 @@ +From 2ddc97b30792817d162f51ec3818376aefbf184e Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <[email protected]> +Date: Wed, 3 May 2017 02:05:33 -0400 +Subject: [PATCH] remove python2 support + +We use python3 rather than python2 support + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Hongxu Jia <[email protected]> +--- + src/python/Makefile.am | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/src/python/Makefile.am b/src/python/Makefile.am +index 567d0d7..8d9f446 100644 +--- a/src/python/Makefile.am ++++ b/src/python/Makefile.am +@@ -1,8 +1,3 @@ +-pylibdir = $(shell python -c "import distutils.sysconfig; print(distutils.sysconfig.get_python_lib(1,0,prefix='${exec_prefix}'))") +- +-pybytesizedir = $(pylibdir)/bytesize +-dist_pybytesize_DATA = bytesize.py __init__.py +- + if WITH_PYTHON3 + py3libdir = $(shell python3 -c "import distutils.sysconfig; print(distutils.sysconfig.get_python_lib(1,0,prefix='${exec_prefix}'))") + py3bytesizedir = $(py3libdir)/bytesize +-- +2.8.1 +
meta-oe/recipes-support/libbytesize/libbytesize_0.10.bb new file +34 -0
@@ -0,0 +1,34 @@ +DESCRIPTION = "The goal of this project is to provide a tiny library that would \ +facilitate the common operations with sizes in bytes." +HOMEPAGE = "https://github.com/rhinstaller/libbytesize" +LICENSE = "LGPLv2+" +SECTION = "devel/lib" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=c07cb499d259452f324bb90c3067d85c" + +S = "${WORKDIR}/git" +B = "${S}" + +SRCREV = "369127c0edbba7d1a4e2e02486375dd9d379524f" +PV = "0.10+git${SRCPV}" +SRC_URI = "git://github.com/rhinstaller/libbytesize;branch=master \ + file://0001-remove-python2-support.patch \ +" + +inherit gettext autotools python3native + +DEPENDS += " \ + libpcre \ + gmp \ + mpfr \ +" + +FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}/bytesize" + +PACKAGECONFIG ??= "python3" +PACKAGECONFIG[python3] = "--with-python3, --without-python3,,python3" +PACKAGECONFIG[doc] = "--with-gtk-doc, --without-gtk-doc, gtk-doc-native" + +EXTRA_OEMAKE = "py3libdir=${PYTHON_SITEPACKAGES_DIR}" + +
Signature · 1 line
2.8.1
PATCH 3/5 libtimezonemap: add recipe 0.4.5
In reply to Hongxu Jia--- .../libtimezonemap/libtimezonemap_0.4.5.bb | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 meta-gnome/recipes-gnome/libtimezonemap/libtimezonemap_0.4.5.bb
meta-gnome/recipes-gnome/libtimezonemap/libtimezonemap_0.4.5.bb new file +22 -0
@@ -0,0 +1,22 @@ +DESCRIPTION = "Time zone map widget for Gtk+" +HOMEPAGE = "https://launchpad.net/timezonemap" +SECTION = "devel/lib" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +SRC_URI = "http://archive.ubuntu.com/ubuntu/pool/main/libt/${BPN}/${BPN}_${PV}.tar.gz \ +" +SRC_URI[md5sum] = "054306fa998fe580f17b68aa1e16551b" +SRC_URI[sha256sum] = "327e64a17c676c1bcda3b6ba3394d3d01250e5ac9a49222b9ff5737d90b15383" + + +DEPENDS = "gtk+3 gdk-pixbuf libsoup-2.4 json-glib gnome-common-native \ +" + +B = "${S}" + +inherit autotools pkgconfig gobject-introspection + +do_configure_prepend() { + (cd ${S}; NOCONFIGURE="yes" . ${S}/autogen.sh) +}
Signature · 1 line
2.8.1
PATCH v3 4/5 xmlrpc-c: add recipe 1.31.0
In reply to Hongxu Jia- Fix compile failure against musl C library
- Fixed when compile with "-Wformat -Wformat-security -Werror=format-security"
--- ...ix-compile-failure-against-musl-C-library.patch | 52 ++++++++++++++++++++++ .../xmlrpc-c/0002-fix-formatting-issues.patch | 34 ++++++++++++++ .../recipes-devtools/xmlrpc-c/xmlrpc-c_1.31.0.bb | 24 ++++++++++ 3 files changed, 110 insertions(+) create mode 100644 meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0001-fix-compile-failure-against-musl-C-library.patch create mode 100644 meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0002-fix-formatting-issues.patch create mode 100644 meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.31.0.bb
meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0001-fix-compile-failure-against-musl-C-library.patch new file +52 -0
@@ -0,0 +1,52 @@ +From 950b27f8320b841490cafcb3e6e3b818c7174c0d Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <[email protected]> +Date: Thu, 20 Jul 2017 22:32:50 -0400 +Subject: [PATCH] fix compile failure against musl C library + +Upstream-Status: Pending + +Signed-off-by: Hongxu Jia <[email protected]> +--- + test/cpp/server_abyss.cpp | 2 +- + tools/xmlrpc_pstream/xmlrpc_pstream.cpp | 10 +++++++--- + 2 files changed, 8 insertions(+), 4 deletions(-) + +diff --git a/test/cpp/server_abyss.cpp b/test/cpp/server_abyss.cpp +index 2458a8f..82f91da 100644 +--- a/test/cpp/server_abyss.cpp ++++ b/test/cpp/server_abyss.cpp +@@ -18,7 +18,7 @@ + #ifdef WIN32 + #include <winsock2.h> + #else +- #include <sys/unistd.h> ++ #include <unistd.h> + #include <sys/socket.h> + #include <arpa/inet.h> + #include <netinet/in.h> +diff --git a/tools/xmlrpc_pstream/xmlrpc_pstream.cpp b/tools/xmlrpc_pstream/xmlrpc_pstream.cpp +index d39e105..1fd8900 100644 +--- a/tools/xmlrpc_pstream/xmlrpc_pstream.cpp ++++ b/tools/xmlrpc_pstream/xmlrpc_pstream.cpp +@@ -15,11 +15,15 @@ + #include "xmlrpc-c/girerr.hpp" + using girerr::throwf; + +-#include <features.h> // for __BEGIN_DECLS ++#ifdef __cplusplus ++extern "C" { ++#endif + +-__BEGIN_DECLS + #include "dumpvalue.h" /* An internal Xmlrpc-c header file ! */ +-__END_DECLS ++ ++#ifdef __cplusplus ++} ++#endif + + + #include <xmlrpc-c/base.hpp> +-- +2.8.1 +
meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0002-fix-formatting-issues.patch new file +34 -0
@@ -0,0 +1,34 @@ +From 14f15cb0f03defa8efb4c8e2fece58e50655be6b Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <[email protected]> +Date: Sun, 23 Jul 2017 22:20:29 -0400 +Subject: [PATCH] src/xmlrpc_server_abyss.c: fix formatting issues + +Fixed when compile with "-Wformat -Wformat-security -Werror=format-security": +|src/xmlrpc_server_abyss.c:771:13: error: format not a string literal +and no format arguments [-Werror=format-security] +| xmlrpc_faultf(envP, error); +| ^~~~~~~~~~~~~ + +Upstream-Status: Pending + +Signed-off-by: Hongxu Jia <[email protected]> +--- + src/xmlrpc_server_abyss.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/xmlrpc_server_abyss.c b/src/xmlrpc_server_abyss.c +index 2388652..3843f10 100644 +--- a/src/xmlrpc_server_abyss.c ++++ b/src/xmlrpc_server_abyss.c +@@ -768,7 +768,7 @@ createServer(xmlrpc_env * const envP, + ServerInit2(abyssServerP, &error); + + if (error) { +- xmlrpc_faultf(envP, error); ++ xmlrpc_faultf(envP, "%s", error); + xmlrpc_strfree(error); + } + } +-- +2.8.1 +
meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.31.0.bb new file +24 -0
@@ -0,0 +1,24 @@ +DESCRIPTION = "XML-RPC for C/C++ is programming libraries and related tools to help you \ +write an XML-RPC server or client in C or C++." + +HOMEPAGE = "http://xmlrpc-c.sourceforge.net/" +LICENSE = "BSD & MIT" +LIC_FILES_CHKSUM = "file://doc/COPYING;md5=aefbf81ba0750f02176b6f86752ea951" + +SRC_URI = "git://github.com/ensc/xmlrpc-c.git;branch=master \ + file://0001-fix-compile-failure-against-musl-C-library.patch \ + file://0002-fix-formatting-issues.patch \ +" +SRCREV = "81443a9dc234cc275449dbc17867ad77ae189124" +S = "${WORKDIR}/git" + +DEPENDS = "curl libxml2" +RDEPENDS_${PN} = "curl" + +inherit cmake + +EXTRA_OECMAKE = "-D_lib:STRING=${baselib}" + +BBCLASSEXTEND = "native" + +TARGET_CFLAGS += "-Wno-narrowing"
Signature · 1 line
2.8.1
PATCH v3 5/5 usermode: add recipe 1.111
In reply to Hongxu Jia- Fix compile failure against musl C library
- Fixed when compile with "-Wformat -Wformat-security -Werror=format-security"
--- ...ix-compile-failure-against-musl-C-library.patch | 27 +++++++++++++++++ .../usermode/usermode/0001-formatting-issues.patch | 34 ++++++++++++++++++++++ .../recipes-support/usermode/usermode_1.111.bb | 29 ++++++++++++++++++ 3 files changed, 90 insertions(+) create mode 100644 meta-gnome/recipes-support/usermode/usermode/0001-fix-compile-failure-against-musl-C-library.patch create mode 100644 meta-gnome/recipes-support/usermode/usermode/0001-formatting-issues.patch create mode 100644 meta-gnome/recipes-support/usermode/usermode_1.111.bb
meta-gnome/recipes-support/usermode/usermode/0001-fix-compile-failure-against-musl-C-library.patch new file +27 -0
@@ -0,0 +1,27 @@ +From c77e3f0d4560797f7dc56549ae5ebcc035714a4d Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <[email protected]> +Date: Thu, 20 Jul 2017 23:20:53 -0400 +Subject: [PATCH] fix compile failure against musl C library + +Upstream-Status: Pending + +Signed-off-by: Hongxu Jia <[email protected]> +--- + usermount.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/usermount.c b/usermount.c +index 3aafadd..4107027 100644 +--- a/usermount.c ++++ b/usermount.c +@@ -46,6 +46,7 @@ + #include <limits.h> + #include <locale.h> + #include <mntent.h> ++#include <paths.h> + #include <stdio.h> + #include <stdlib.h> + #include <string.h> +-- +2.8.1 +
meta-gnome/recipes-support/usermode/usermode/0001-formatting-issues.patch new file +34 -0
@@ -0,0 +1,34 @@ +From 7a316dad0697af2ef4e8079a5af51565a8195aa6 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <[email protected]> +Date: Mon, 24 Jul 2017 01:42:30 -0400 +Subject: [PATCH] userhelper.c: fix formatting issues + +Fixed when compile with "-Wformat -Wformat-security -Werror=format-security": +|../usermode-1.111/userhelper.c:585:4: error: format not a string +literal and no format arguments [-Werror=format-security] +| text = g_strdup_printf(dgettext(data->domain, data->banner)); +| ^~~~ + +Upstream-Status: Pending + +Signed-off-by: Hongxu Jia <[email protected]> +--- + userhelper.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/userhelper.c b/userhelper.c +index 76ad492..ee0da49 100644 +--- a/userhelper.c ++++ b/userhelper.c +@@ -582,7 +582,7 @@ converse_console(int num_msg, const struct pam_message **msg, + + if (banner == 0) { + if ((data->banner != NULL) && (data->domain != NULL)) { +- text = g_strdup_printf(dgettext(data->domain, data->banner)); ++ text = g_strdup_printf("%s", dgettext(data->domain, data->banner)); + } else { + if ((service != NULL) && (strlen(service) > 0)) { + if (data->fallback_allowed) { +-- +2.8.1 +
meta-gnome/recipes-support/usermode/usermode_1.111.bb new file +29 -0
@@ -0,0 +1,29 @@ +DESCRIPTION = "The usermode contains the userhelper program, which can be used to allow configured \ +programs to be run with superuser privileges by ordinary users, and several \ +graphical tools for users: \ +* userinfo allows users to change their finger information. \ +* usermount lets users mount, unmount, and format filesystems. \ +* userpasswd allows users to change their passwords. \ +" +HOMEPAGE = "https://pagure.io/usermode" +LICENSE = "GPLv2+" +DEPENDS = "libuser ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} \ + gtk+ desktop-file-utils-native \ + startup-notification intltool-native \ + util-linux \ +" + +SRC_URI = "https://releases.pagure.org/${BPN}/${BPN}-${PV}.tar.xz \ + file://0001-formatting-issues.patch \ +" +SRC_URI[md5sum] = "28ba510fbd8da9f4e86e57d6c31cff29" +SRC_URI[sha256sum] = "3dd0b9639b5bd396b7ea5fada6aaa694dbfdaa3ad06eb95a6eabcdfd02f875c6" + +SRC_URI_append_libc-musl = " file://0001-fix-compile-failure-against-musl-C-library.patch" + +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + +inherit autotools gettext pkgconfig + +EXTRA_OEMAKE += "INSTALL='install -p'" +
Signature · 1 line
2.8.1