libsemanage: remove dependency on ustr
PATCH 1/3 libsemanage: remove dependency on ustr
Use the upstream patches to remove the dependency on ustr which no longer builds with new versions of GCC and the author is unresponsive and the site hosting the code is down.
Signed-off-by Doug Goldstein <[email protected]>
--- recipes-security/selinux/libsemanage.inc | 2 +- ...anage-simplify-string-utilities-functions.patch | 115 ++++++++ ...-add-semanage_str_replace-utility-functio.patch | 164 +++++++++++ ...manage-genhomedircon-drop-ustr-dependency.patch | 323 +++++++++++++++++++++ ...-remove-ustr-library-from-Makefiles-READM.patch | 61 ++++ recipes-security/selinux/libsemanage_2.6.bb | 4 + 6 files changed, 668 insertions(+), 1 deletion(-) create mode 100644 recipes-security/selinux/libsemanage/0001-libsemanage-simplify-string-utilities-functions.patch create mode 100644 recipes-security/selinux/libsemanage/0002-libsemanage-add-semanage_str_replace-utility-functio.patch create mode 100644 recipes-security/selinux/libsemanage/0003-libsemanage-genhomedircon-drop-ustr-dependency.patch create mode 100644 recipes-security/selinux/libsemanage/0004-libsemanage-remove-ustr-library-from-Makefiles-READM.patch
recipes-security/selinux/libsemanage.inc +1 -1
@@ -8,7 +8,7 @@ LICENSE = "LGPLv2.1+" inherit lib_package python-dir -DEPENDS += "libsepol libselinux ustr bzip2 python bison-native flex-native" +DEPENDS += "libsepol libselinux bzip2 python bison-native flex-native" DEPENDS_append_class-target += "audit" # For /usr/libexec/selinux/semanage_migrate_store
recipes-security/selinux/libsemanage/0001-libsemanage-simplify-string-utilities-functions.patch new file +115 -0
115 lines not on this page · raw message
recipes-security/selinux/libsemanage/0002-libsemanage-add-semanage_str_replace-utility-functio.patch new file +164 -0
164 lines not on this page · raw message
recipes-security/selinux/libsemanage/0003-libsemanage-genhomedircon-drop-ustr-dependency.patch new file +323 -0
323 lines not on this page · raw message
recipes-security/selinux/libsemanage/0004-libsemanage-remove-ustr-library-from-Makefiles-READM.patch new file +61 -0
61 lines not on this page · raw message
recipes-security/selinux/libsemanage_2.6.bb +4 -0
@@ -15,5 +15,9 @@ SRC_URI += "\ file://libsemanage-allow-to-disable-audit-support.patch \ file://libsemanage-disable-expand-check-on-policy-load.patch \ file://0001-src-Makefile-fix-includedir-in-libselinux.pc.patch \ + file://0001-libsemanage-simplify-string-utilities-functions.patch;striplevel=2 \ + file://0002-libsemanage-add-semanage_str_replace-utility-functio.patch;striplevel=2 \ + file://0003-libsemanage-genhomedircon-drop-ustr-dependency.patch;striplevel=2 \ + file://0004-libsemanage-remove-ustr-library-from-Makefiles-READM.patch;striplevel=2 \ " FILES_${PN} += "/usr/libexec"
Signature · 1 line
2.10.2
PATCH 2/3 removed ustr as a required RDEPEND
Signed-off-by Doug Goldstein <[email protected]>
--- recipes-security/packagegroups/packagegroup-core-selinux.bb | 1 - 1 file changed, 1 deletion(-)
recipes-security/packagegroups/packagegroup-core-selinux.bb +0 -1
@@ -11,7 +11,6 @@ PACKAGES = "\ ALLOW_EMPTY_${PN} = "1" RDEPENDS_${PN} = " \ - ustr \ libsepol \ libsepol-bin \ libselinux \
Signature · 1 line
2.10.2
PATCH 3/3 removed ustr package as it is unused
In reply to Doug GoldsteinSigned-off-by Doug Goldstein <[email protected]>
--- recipes-extended/ustr/ustr/ustr-c99-inline.patch | 30 - .../ustr/ustr/ustr-fix__va_copy-not-defined.patch | 26 - recipes-extended/ustr/ustr/ustr-gnu-inline.diff | 871 --------------------- recipes-extended/ustr/ustr/ustr-makefile-fix.patch | 215 ----- recipes-extended/ustr/ustr_1.0.4.bb | 55 -- 5 files changed, 1197 deletions(-) delete mode 100644 recipes-extended/ustr/ustr/ustr-c99-inline.patch delete mode 100644 recipes-extended/ustr/ustr/ustr-fix__va_copy-not-defined.patch delete mode 100644 recipes-extended/ustr/ustr/ustr-gnu-inline.diff delete mode 100644 recipes-extended/ustr/ustr/ustr-makefile-fix.patch delete mode 100644 recipes-extended/ustr/ustr_1.0.4.bb
recipes-extended/ustr/ustr/ustr-c99-inline.patch deleted +0 -30
@@ -1,30 +0,0 @@ -diff -rup ustr-1.0.4-orig/ustr-compiler.h ustr-1.0.4/ustr-compiler.h ---- ustr-1.0.4-orig/ustr-compiler.h 2008-02-15 15:12:28.000000000 -0500 -+++ ustr-1.0.4/ustr-compiler.h 2008-06-13 15:25:18.000000000 -0400 -@@ -113,17 +113,23 @@ - #endif - - #ifndef USTR_CONF_EI_PROTO /* external inline */ --# if USTR_CONF_INCLUDE_CODEONLY_HEADERS -+# if USTR_CONF_INCLUDE_CODEONLY_HEADERS || ! defined(__GNUC__) || \ -+ ! USTR_CONF_COMPILE_USE_INLINE - # define USTR_CONF_EI_PROTO static USTR__INLINE - # else - # define USTR_CONF_EI_PROTO extern - # endif - #endif - #ifndef USTR_CONF_II_PROTO /* implementation of inline */ --# if USTR_CONF_INCLUDE_CODEONLY_HEADERS -+# if USTR_CONF_INCLUDE_CODEONLY_HEADERS || ! defined(__GNUC__) || \ -+ ! USTR_CONF_COMPILE_USE_INLINE - # define USTR_CONF_II_PROTO static USTR__INLINE - # else --# define USTR_CONF_II_PROTO extern inline -+# if defined(__GNUC_STDC_INLINE__) || defined(__GNUC_GNU_INLINE__) -+# define USTR_CONF_II_PROTO extern inline __attribute__ ((__gnu_inline__)) -+# else -+# define USTR_CONF_II_PROTO extern inline -+# endif - # endif - #endif -
recipes-extended/ustr/ustr/ustr-fix__va_copy-not-defined.patch deleted +0 -26
@@ -1,26 +0,0 @@ -From c35a8949e305666ffe7fdc89f7cf506c6e6821d0 Mon Sep 17 00:00:00 2001 -From: Xin Ouyang <[email protected]> -Date: Fri, 3 Feb 2012 11:28:21 +0800 -Subject: [PATCH] Fix "__va_copy" not defined warning. - -ustr-compiler.h:19:16: warning: "__va_copy" is not defined [-Wundef] ---- - ustr-compiler.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/ustr-compiler.h b/ustr-compiler.h -index 9e71276..642e6e8 100644 ---- a/ustr-compiler.h -+++ b/ustr-compiler.h -@@ -16,7 +16,7 @@ - #ifdef va_copy - # define USTR_CONF_HAVE_VA_COPY 1 - # define USTR__VA_COPY(x, y) va_copy(x, y) --#elif __va_copy -+#elif defined(__va_copy) - # define USTR_CONF_HAVE_VA_COPY 1 - # define USTR__VA_COPY(x, y) __va_copy(x, y) - #else --- -1.7.5.4 -
recipes-extended/ustr/ustr/ustr-gnu-inline.diff deleted +0 -871
871 lines not on this page · raw message
recipes-extended/ustr/ustr/ustr-makefile-fix.patch deleted +0 -215
215 lines not on this page · raw message
recipes-extended/ustr/ustr_1.0.4.bb deleted +0 -55
55 lines not on this page · raw message
Signature · 1 line
2.10.2