[OE-core] [PATCH 1/2] portmap: fix INITSCRIPT_PARAMS
Fix portmap init to make it run at runlevel 2,3,4,5.
Signed-off-by: Chen Qi
---
meta/recipes-connectivity/portmap/portmap.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-connectivity/portmap/portmap.inc
b/meta/recipes-connectivity/portmap/portmap.inc
index 7588341..9b42859 100644
--- a/meta/recipes-connectivity/portmap/portmap.inc
+++ b/meta/recipes-connectivity/portmap/portmap.inc
@@ -13,7 +13,7 @@ SRC_URI =
"${DEBIAN_MIRROR}/main/p/portmap/portmap_5.orig.tar.gz \
S = "${WORKDIR}/portmap_5beta"
INITSCRIPT_NAME = "portmap"
-INITSCRIPT_PARAMS = "start 43 S . start 32 0 6 . stop 81 1 ."
+INITSCRIPT_PARAMS = "start 10 2 3 4 5 . stop 32 0 1 6 ."
inherit update-rc.d
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] portmap: add systemd service file
Add systemd service file for systemd support.
Signed-off-by: Chen Qi
---
meta/recipes-connectivity/portmap/portmap.inc | 5 -
meta/recipes-connectivity/portmap/portmap/portmap.service | 10 ++
meta/recipes-connectivity/portmap/portmap_6.0.bb | 7 ++-
3 files changed, 20 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-connectivity/portmap/portmap/portmap.service
diff --git a/meta/recipes-connectivity/portmap/portmap.inc
b/meta/recipes-connectivity/portmap/portmap.inc
index 9b42859..f5f7fde 100644
--- a/meta/recipes-connectivity/portmap/portmap.inc
+++ b/meta/recipes-connectivity/portmap/portmap.inc
@@ -10,12 +10,15 @@ SRC_URI =
"${DEBIAN_MIRROR}/main/p/portmap/portmap_5.orig.tar.gz \
${DEBIAN_MIRROR}/main/p/portmap/portmap_${PV}.diff.gz \
file://portmap.init \
file://make.patch;apply=yes"
+
S = "${WORKDIR}/portmap_5beta"
INITSCRIPT_NAME = "portmap"
INITSCRIPT_PARAMS = "start 10 2 3 4 5 . stop 32 0 1 6 ."
-inherit update-rc.d
+inherit update-rc.d systemd
+
+SYSTEMD_SERVICE_${PN} = "portmap.service"
sbindir = "/sbin"
diff --git a/meta/recipes-connectivity/portmap/portmap/portmap.service
b/meta/recipes-connectivity/portmap/portmap/portmap.service
new file mode 100644
index 000..7ef9d7b
--- /dev/null
+++ b/meta/recipes-connectivity/portmap/portmap/portmap.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=The RPC portmapper
+After=network.target
+
+[Service]
+Type=forking
+ExecStart=@BASE_SBINDIR@/portmap
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta/recipes-connectivity/portmap/portmap_6.0.bb
b/meta/recipes-connectivity/portmap/portmap_6.0.bb
index b0a9454..8b65a03 100644
--- a/meta/recipes-connectivity/portmap/portmap_6.0.bb
+++ b/meta/recipes-connectivity/portmap/portmap_6.0.bb
@@ -5,7 +5,8 @@ PR = "r9"
SRC_URI =
"http://www.sourcefiles.org/Networking/Tools/Miscellanenous/portmap-6.0.tgz \
file://destdir-no-strip.patch \
file://tcpd-config.patch \
- file://portmap.init"
+ file://portmap.init \
+ file://portmap.service"
SRC_URI[md5sum] = "ac108ab68bf0f34477f8317791aaf1ff"
SRC_URI[sha256sum] =
"02c820d39f3e6e729d1bea3287a2d8a6c684f1006fb9612f97dcad4a281d41de"
@@ -23,4 +24,8 @@ fakeroot do_install() {
install -d ${D}${mandir}/man8/ ${D}${base_sbindir} ${D}${sysconfdir}/init.d
install -m 0755 ${WORKDIR}/portmap.init ${D}${sysconfdir}/init.d/portmap
oe_runmake install DESTDIR=${D}
+
+install -d ${D}${systemd_unitdir}/system
+install -m 0644 ${WORKDIR}/portmap.service ${D}${systemd_unitdir}/system
+sed -i -e 's,@BASE_SBINDIR@,${base_sbindir},g'
${D}${systemd_unitdir}/system/portmap.service
}
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2] portmap: fixes for sysvinit and systemd
The following changes since commit 10df0718d6a626d99beb68cde8d914ee0820d7eb: classes/populate_sdk_base: enable adding custom commands to SDK install script (2014-09-11 17:44:40 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib ChenQi/portmap-systemd http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=ChenQi/portmap-systemd Chen Qi (2): portmap: fix INITSCRIPT_PARAMS portmap: add systemd service file meta/recipes-connectivity/portmap/portmap.inc | 7 +-- meta/recipes-connectivity/portmap/portmap/portmap.service | 10 ++ meta/recipes-connectivity/portmap/portmap_6.0.bb | 7 ++- 3 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 meta/recipes-connectivity/portmap/portmap/portmap.service -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] systemd: fix to use ${libdir}
We need to user ${libdir} instead of ${exec_prefix}/lib.
Otherwise, we would neet do_install errors if multilib is enabled.
Signed-off-by: Chen Qi
---
meta/recipes-core/systemd/systemd_216.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/systemd/systemd_216.bb
b/meta/recipes-core/systemd/systemd_216.bb
index bd52891..331da99 100644
--- a/meta/recipes-core/systemd/systemd_216.bb
+++ b/meta/recipes-core/systemd/systemd_216.bb
@@ -129,7 +129,7 @@ do_install() {
fi
# Move libgudev back to ${rootlibdir} to keep backward compatibility
- [ ${rootlibdir} != ${exec_prefix}/lib ] && mv -t ${D}${rootlibdir}
${D}${exec_prefix}/lib/libgudev*
+ [ ${rootlibdir} != ${libdir} ] && mv -t ${D}${rootlibdir}
${D}${libdir}/libgudev*
# Delete journal README, as log can be symlinked inside volatile.
rm -f ${D}/${localstatedir}/log/README
@@ -241,7 +241,7 @@ FILES_${PN} = " ${base_bindir}/* \
${rootlibexecdir}/systemd/* \
${systemd_unitdir}/* \
${base_libdir}/security/*.so \
-${exec_prefix}/lib/libnss_* \
+${libdir}/libnss_* \
/cgroup \
${bindir}/systemd* \
${bindir}/busctl \
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] systemd: fix to use ${libdir}
The following changes since commit 10df0718d6a626d99beb68cde8d914ee0820d7eb:
classes/populate_sdk_base: enable adding custom commands to SDK install
script (2014-09-11 17:44:40 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib ChenQi/systemd-libdir
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=ChenQi/systemd-libdir
Chen Qi (1):
systemd: fix to use ${libdir}
meta/recipes-core/systemd/systemd_216.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] u-boot: update to version 2014.07
From: Denys Dmytriyenko
* Update U-boot and corresponding tools to version 2014.07
* Small cleanups with indentation and consolidation of u-boot.inc
Signed-off-by: Denys Dmytriyenko
---
...h-Add-use-DEFAULT_LINUX_BOOT_ENV-environm.patch | 74 --
...2013.07.bb => u-boot-fw-utils-cross_2014.07.bb} | 22 +++
...utils_2013.07.bb => u-boot-fw-utils_2014.07.bb} | 24 +++
...kimage_2013.07.bb => u-boot-mkimage_2014.07.bb} | 19 +++---
meta/recipes-bsp/u-boot/u-boot.inc | 11 +++-
.../{u-boot_2013.07.bb => u-boot_2014.07.bb} | 24 ++-
6 files changed, 45 insertions(+), 129 deletions(-)
delete mode 100644
meta/recipes-bsp/u-boot/files/0001-am335x_evm.h-Add-use-DEFAULT_LINUX_BOOT_ENV-environm.patch
rename meta/recipes-bsp/u-boot/{u-boot-fw-utils-cross_2013.07.bb =>
u-boot-fw-utils-cross_2014.07.bb} (49%)
rename meta/recipes-bsp/u-boot/{u-boot-fw-utils_2013.07.bb =>
u-boot-fw-utils_2014.07.bb} (40%)
rename meta/recipes-bsp/u-boot/{u-boot-mkimage_2013.07.bb =>
u-boot-mkimage_2014.07.bb} (51%)
rename meta/recipes-bsp/u-boot/{u-boot_2013.07.bb => u-boot_2014.07.bb} (12%)
diff --git
a/meta/recipes-bsp/u-boot/files/0001-am335x_evm.h-Add-use-DEFAULT_LINUX_BOOT_ENV-environm.patch
b/meta/recipes-bsp/u-boot/files/0001-am335x_evm.h-Add-use-DEFAULT_LINUX_BOOT_ENV-environm.patch
deleted file mode 100644
index 77e35bb..000
---
a/meta/recipes-bsp/u-boot/files/0001-am335x_evm.h-Add-use-DEFAULT_LINUX_BOOT_ENV-environm.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 5701384cea4a829b772bf7a96a74825b58c22385 Mon Sep 17 00:00:00 2001
-From: Denys Dmytriyenko
-Date: Thu, 17 Apr 2014 12:25:40 -0400
-Subject: [PATCH] am335x_evm.h: Add, use DEFAULT_LINUX_BOOT_ENV environment
- string
-
-Modified version of the patch currently being reviewed for mainline:
-http://patchwork.ozlabs.org/patch/334861/
-
-To deal with a reoccurring problem properly we need to specify addresses
-for the Linux kernel, Flatted Device Tree and ramdisk that obey the
-constraints within the kernel's Documentation/arm/Booting file but also
-make sure that we relocate things within a valid address range.
-
-Signed-off-by: Denys Dmytriyenko
-Signed-off-by: Tom Rini
-
-Upstream-Status: Pending
- include/configs/am335x_evm.h | 31 ++-
- 1 file changed, 26 insertions(+), 5 deletions(-)
-
-diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
-index c5a6d4b..01e32b3 100644
a/include/configs/am335x_evm.h
-+++ b/include/configs/am335x_evm.h
-@@ -54,10 +54,7 @@
- #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
- #ifndef CONFIG_SPL_BUILD
- #define CONFIG_EXTRA_ENV_SETTINGS \
-- "loadaddr=0x8020\0" \
-- "fdtaddr=0x80F8\0" \
-- "fdt_high=0x\0" \
-- "rdaddr=0x8100\0" \
-+ DEFAULT_LINUX_BOOT_ENV \
- "bootdir=/boot\0" \
- "bootfile=uImage\0" \
- "fdtfile=undefined\0" \
-@@ -197,7 +194,31 @@
- #define CONFIG_SYS_MEMTEST_END(CONFIG_SYS_MEMTEST_START \
- + (8 * 1024 * 1024))
-
--#define CONFIG_SYS_LOAD_ADDR 0x8100 /* Default load address */
-+/*
-+ * Our DDR memory always starts at 0x8000 and U-Boot shall have
-+ * relocated itself to higher in memory by the time this value is used.
-+ * However, set this to a 32MB offset to allow for easier Linux kernel
-+ * booting as the default is often used as the kernel load address.
-+ */
-+#define CONFIG_SYS_LOAD_ADDR 0x8200 /* Default load address */
-+
-+/*
-+ * We setup defaults based on constraints from the Linux kernel, which should
-+ * also be safe elsewhere. We have the default load at 32MB into DDR (for
-+ * the kernel), FDT above 128MB (the maximum location for the end of the
-+ * kernel), and the ramdisk 512KB above that (allowing for hopefully never
-+ * seen large trees). We say all of this must be within the first 256MB
-+ * as that will normally be within the kernel lowmem and thus visible via
-+ * bootm_size and we only run on platforms with 256MB or more of memory.
-+ */
-+#define DEFAULT_LINUX_BOOT_ENV \
-+ "loadaddr=0x8200\0" \
-+ "kernel_addr_r=0x8200\0" \
-+ "fdtaddr=0x8800\0" \
-+ "fdt_addr_r=0x8800\0" \
-+ "rdaddr=0x8808\0" \
-+ "ramdisk_addr_r=0x8808\0" \
-+ "bootm_size=0x1000\0"
-
- #define CONFIG_MMC
- #define CONFIG_GENERIC_MMC
---
-1.9.2
-
diff --git a/meta/recipes-bsp/u-boot/u-boot-fw-utils-cross_2013.07.bb
b/meta/recipes-bsp/u-boot/u-boot-fw-utils-cross_2014.07.bb
similarity index 49%
rename from meta/recipes-bsp/u-boot/u-boot-fw-utils-cross_2013.07.bb
rename to meta/recipes-bsp/u-boot/u-boot-fw-utils-cross_2014.07.bb
index e616397..d1f1f9a 100644
--- a/meta/recipes-bsp/u-boot/u-boot-fw-utils-cross_2013.07.bb
+++ b/meta/recipes-bsp/u-boot/u-boot-fw-utils-cross_2014.07.bb
@@ -1,15 +1,15 @@
SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities"
LICENSE = "GPLv2+"
-LIC_FILES_C
[OE-core] [PATCH][Daisy] eglibc: CVE-2014-5119 fix
__gconv_translit_find: Disable function [BZ #17187]
This functionality has never worked correctly, and the implementation
contained a security vulnerability (CVE-2014-5119).
Signed-off-by: Armin Kuster
---
.../eglibc/eglibc-2.19/CVE-2014-5119.patch | 240 +
meta/recipes-core/eglibc/eglibc_2.19.bb| 1 +
2 files changed, 241 insertions(+)
create mode 100644 meta/recipes-core/eglibc/eglibc-2.19/CVE-2014-5119.patch
diff --git a/meta/recipes-core/eglibc/eglibc-2.19/CVE-2014-5119.patch
b/meta/recipes-core/eglibc/eglibc-2.19/CVE-2014-5119.patch
new file mode 100644
index 000..51c7037
--- /dev/null
+++ b/meta/recipes-core/eglibc/eglibc-2.19/CVE-2014-5119.patch
@@ -0,0 +1,240 @@
+CVE-2014-5119
+
+Signed-off-by: Armin Kuster
+
+Upstream commit:
+
+https://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=a1a6a401ab0a3c9f15fb7eaebbdcee24192254e8
+
+
+From a1a6a401ab0a3c9f15fb7eaebbdcee24192254e8 Mon Sep 17 00:00:00 2001
+From: Florian Weimer
+Date: Tue, 26 Aug 2014 19:38:59 +0200
+Subject: [PATCH] __gconv_translit_find: Disable function [BZ #17187]
+
+This functionality has never worked correctly, and the implementation
+contained a security vulnerability (CVE-2014-5119).
+---
+ ChangeLog |7 ++
+ NEWS|9 ++-
+ iconv/gconv_trans.c | 177 +-
+ 3 files changed, 19 insertions(+), 174 deletions(-)
+
+Index: libc/NEWS
+===
+--- libc.orig/NEWS
libc/NEWS
+@@ -26,7 +26,7 @@ Version 2.19
+ 16271, 16274, 16283, 16289, 16293, 16314, 16316, 16330, 16337, 16338,
+ 16356, 16365, 16366, 16369, 16372, 16375, 16379, 16384, 16385, 16386,
+ 16387, 16390, 16394, 16398, 16400, 16407, 16408, 16414, 16430, 16431,
+- 16453, 16474, 16506, 16510, 16529
++ 16453, 16474, 16506, 16510, 16529, 17187
+
+ * Slovenian translations for glibc messages have been contributed by the
+ Translation Project's Slovenian team of translators.
+Index: libc/iconv/gconv_trans.c
+===
+--- libc.orig/iconv/gconv_trans.c
libc/iconv/gconv_trans.c
+@@ -241,181 +241,12 @@ __gconv_transliterate (struct __gconv_st
+ return __GCONV_ILLEGAL_INPUT;
+ }
+
+-
+-/* Structure to represent results of found (or not) transliteration
+- modules. */
+-struct known_trans
+-{
+- /* This structure must remain the first member. */
+- struct trans_struct info;
+-
+- char *fname;
+- void *handle;
+- int open_count;
+-};
+-
+-
+-/* Tree with results of previous calls to __gconv_translit_find. */
+-static void *search_tree;
+-
+-/* We modify global data. */
+-__libc_lock_define_initialized (static, lock);
+-
+-
+-/* Compare two transliteration entries. */
+-static int
+-trans_compare (const void *p1, const void *p2)
+-{
+- const struct known_trans *s1 = (const struct known_trans *) p1;
+- const struct known_trans *s2 = (const struct known_trans *) p2;
+-
+- return strcmp (s1->info.name, s2->info.name);
+-}
+-
+-
+-/* Open (maybe reopen) the module named in the struct. Get the function
+- and data structure pointers we need. */
+-static int
+-open_translit (struct known_trans *trans)
+-{
+- __gconv_trans_query_fct queryfct;
+-
+- trans->handle = __libc_dlopen (trans->fname);
+- if (trans->handle == NULL)
+-/* Not available. */
+-return 1;
+-
+- /* Find the required symbol. */
+- queryfct = __libc_dlsym (trans->handle, "gconv_trans_context");
+- if (queryfct == NULL)
+-{
+- /* We cannot live with that. */
+-close_and_out:
+- __libc_dlclose (trans->handle);
+- trans->handle = NULL;
+- return 1;
+-}
+-
+- /* Get the context. */
+- if (queryfct (trans->info.name, &trans->info.csnames, &trans->info.ncsnames)
+- != 0)
+-goto close_and_out;
+-
+- /* Of course we also have to have the actual function. */
+- trans->info.trans_fct = __libc_dlsym (trans->handle, "gconv_trans");
+- if (trans->info.trans_fct == NULL)
+-goto close_and_out;
+-
+- /* Now the optional functions. */
+- trans->info.trans_init_fct =
+-__libc_dlsym (trans->handle, "gconv_trans_init");
+- trans->info.trans_context_fct =
+-__libc_dlsym (trans->handle, "gconv_trans_context");
+- trans->info.trans_end_fct =
+-__libc_dlsym (trans->handle, "gconv_trans_end");
+-
+- trans->open_count = 1;
+-
+- return 0;
+-}
+-
+-
+ int
+ internal_function
+ __gconv_translit_find (struct trans_struct *trans)
+ {
+- struct known_trans **found;
+- const struct path_elem *runp;
+- int res = 1;
+-
+- /* We have to have a name. */
+- assert (trans->name != NULL);
+-
+- /* Acquire the lock. */
+- __libc_lock_lock (lock);
+-
+- /* See whether we know this module already. */
+- found = __tfind (trans, &search_tree, trans_compare);
+- if (found != NULL)
+-{
+- /* Is this module available? */
+- if ((*found)->handle != NULL)
+- {
+-
