[oe] [PATCH] lmbench: avoid gcc optimize-away multiplication

[rongqing.li]

From: Roy Li 

Change expression used in do_integer_mul and do_uint64_mul
benchmarks so GCC doesn't optimize-away the loops,

Signed-off-by: Roy Li 
---
 .../0001-avoid-gcc-optimize-away-the-loops.patch   | 79 ++
 .../recipes-benchmark/lmbench/lmbench_3.0-a9.bb|  1 +
 2 files changed, 80 insertions(+)
 create mode 100644 
meta-oe/recipes-benchmark/lmbench/lmbench/0001-avoid-gcc-optimize-away-the-loops.patch

diff --git 
a/meta-oe/recipes-benchmark/lmbench/lmbench/0001-avoid-gcc-optimize-away-the-loops.patch
 
b/meta-oe/recipes-benchmark/lmbench/lmbench/0001-avoid-gcc-optimize-away-the-loops.patch
new file mode 100644
index 000..2d8a246
--- /dev/null
+++ 
b/meta-oe/recipes-benchmark/lmbench/lmbench/0001-avoid-gcc-optimize-away-the-loops.patch
@@ -0,0 +1,79 @@
+[PATCH] avoid gcc optimize-away the loops
+
+Upstream-Status: pending
+
+Change expression used in do_integer_mul and do_uint64_mul
+benchmarks so GCC doesn't optimize-away the loops, other
+things are same:
+-   TEN(r *= s;); r -= t;
++   i = 0;
++   while ( i++ < 10)
++   r *= s;
++   r -= t;
+
+and TEN is macro:
+   #define TEN(a) a a a a a a a a a a
+
+Signed-off-by: Roy Li 
+---
+ src/lat_ops.c | 30 +-
+ 1 file changed, 25 insertions(+), 5 deletions(-)
+
+diff --git a/src/lat_ops.c b/src/lat_ops.c
+index d343ff3..457072b 100644
+--- a/src/lat_ops.c
 b/src/lat_ops.c
+@@ -126,11 +126,23 @@ do_integer_mul(iter_t iterations, void* cookie)
+   struct _state *pState = (struct _state*)cookie;
+   register int r = pState->N + 37431;
+   register int s = pState->N + 4;
+-  register int t = r * s * s * s * s * s * s * s * s * s * s - r;
++  register int t = r;
++  int i = 0;
++
++  while ( i++ < 10)
++  t *= s;
++  t -= r;
+ 
+   while (iterations-- > 0) {
+-  TEN(r *= s;); r -= t;
+-  TEN(r *= s;); r -= t;
++  i = 0;
++  while ( i++ < 10)
++  r *= s;
++  r -= t;
++
++  i = 0;
++  while ( i++ < 10)
++  r *= s;
++  r -= t;
+   }
+   use_int(r);
+ }
+@@ -207,13 +219,21 @@ do_int64_mul(iter_t iterations, void* cookie)
+   register int64 r = (int64)pState->N + 37420;
+   register int64 s = (int64)pState->N + 4;
+   register int64 t;
++  int i = 0;
+ 
+   r += (int64)(pState->N + 6)<<32;
+   t = r * s * s * s * s * s * s * s * s * s * s - r;
+ 
+   while (iterations-- > 0) {
+-  TEN(r *= s;); r -= t;
+-  TEN(r *= s;); r -= t;
++  i = 0;
++  while ( i++ < 10)
++  r *= s;
++  r -= t;
++
++  i = 0;
++  while ( i++ < 10)
++  r *= s;
++  r -= t;
+   }
+   use_int((int)r);
+ }
+-- 
+2.8.1
+
diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb 
b/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb
index 24cd0b0..7585436 100644
--- a/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb
+++ b/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb
@@ -18,6 +18,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/lmbench/lmbench-${PV}.tgz \
file://use-base_libdir-instead-of-hardcoded-lib.patch \
file://lmbench_result_html_report.patch \
file://fix-lmbench-memory-check-failure.patch \
+   file://0001-avoid-gcc-optimize-away-the-loops.patch \
 "
 SRC_URI[md5sum] = "b3351a3294db66a72e2864a199d37cbf"
 SRC_URI[sha256sum] = 
"cbd5777d15f44eab7666dcac418054c3c09df99826961a397d9acf43d8a2a551"
-- 
2.8.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH][meta-oe] krb5: add native and nativesdk extend

[rongqing.li]

From: Roy Li 

add native and nativesdk extend, curl-native/nativesdk need them.
replace the hardcode /etc with ${sysconfdir}, /var with ${localstatedir}

Signed-off-by: Roy Li 
---
 meta-oe/recipes-connectivity/krb5/krb5_1.13.2.bb | 14 --
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/meta-oe/recipes-connectivity/krb5/krb5_1.13.2.bb 
b/meta-oe/recipes-connectivity/krb5/krb5_1.13.2.bb
index 297cc1b..099e8e9 100644
--- a/meta-oe/recipes-connectivity/krb5/krb5_1.13.2.bb
+++ b/meta-oe/recipes-connectivity/krb5/krb5_1.13.2.bb
@@ -61,7 +61,7 @@ FILES_${PN}-doc += "${datadir}/examples"
 FILES_${PN}-dbg += "${libdir}/krb5/plugins/*/.debug"
 
 # As this recipe doesn't inherit update-rc.d, we need to add this dependency 
here
-RDEPENDS_${PN} += "initscripts-functions"
+RDEPENDS_${PN}_class-target += "initscripts-functions"
 
 krb5_do_unpack() {
 # ${P}-signed.tar contains ${P}.tar.gz.asc and ${P}.tar.gz
@@ -80,12 +80,12 @@ do_configure() {
 }
 
 do_install_append() {
-mkdir -p ${D}/etc/init.d ${D}/etc/default
-install -m 0755 ${WORKDIR}/etc/init.d/* ${D}/etc/init.d
-install -m 0644 ${WORKDIR}/etc/default/* ${D}/etc/default
+mkdir -p ${D}/${sysconfdir}/init.d ${D}/${sysconfdir}/default
+install -m 0755 ${WORKDIR}/etc/init.d/* ${D}/${sysconfdir}/init.d
+install -m 0644 ${WORKDIR}/etc/default/* ${D}/${sysconfdir}/default
 
-rm -rf ${D}/var/run
-mkdir -p ${D}/etc/default/volatiles
+rm -rf ${D}/${localstatedir}/run
+mkdir -p ${D}/${sysconfdir}/default/volatiles
 echo "d root root 0755 ${localstatedir}/run/krb5kdc none" \
> ${D}${sysconfdir}/default/volatiles/87_krb5
 if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; 
then
@@ -105,3 +105,5 @@ pkg_postinst_${PN} () {
 fi
 fi
 }
+
+BBCLASSEXTEND = "native nativesdk"
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH][meta-oe] minicoredumper: add the recipe

[rongqing.li]

From: Roy Li 

minicoredumper provides an alternate core dump facility for Linux
to allow minimal and customized crash dumps

Signed-off-by: Roy Li 
---
 .../minicoredumper/files/minicoredumper.service|  9 
 .../minicoredumper/minicoredumper_1.0.2.bb | 24 ++
 2 files changed, 33 insertions(+)
 create mode 100644 
meta-oe/recipes-kernel/minicoredumper/files/minicoredumper.service
 create mode 100644 
meta-oe/recipes-kernel/minicoredumper/minicoredumper_1.0.2.bb

diff --git a/meta-oe/recipes-kernel/minicoredumper/files/minicoredumper.service 
b/meta-oe/recipes-kernel/minicoredumper/files/minicoredumper.service
new file mode 100644
index 000..161ce88
--- /dev/null
+++ b/meta-oe/recipes-kernel/minicoredumper/files/minicoredumper.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Enable minicoredumper.
+
+[Service]
+Type=oneshot
+ExecStart=/bin/sh -c '/bin/echo "|/usr/bin/minicoredumper %%p %%u %%g %%s %%t 
%%h %%e" > /proc/sys/kernel/core_pattern'
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-oe/recipes-kernel/minicoredumper/minicoredumper_1.0.2.bb 
b/meta-oe/recipes-kernel/minicoredumper/minicoredumper_1.0.2.bb
new file mode 100644
index 000..6b55732
--- /dev/null
+++ b/meta-oe/recipes-kernel/minicoredumper/minicoredumper_1.0.2.bb
@@ -0,0 +1,24 @@
+SUMMARY = "minicoredumper provides an alternate core dump facility for Linux \
+to allow minimal and customized crash dumps"
+LICENSE = " LGPLv2.1 & BSD"
+LIC_FILES_CHKSUM = "file://COPYING;md5=45445387350de96a0e70410470ee5cab"
+DEPENDS = "elfutils dbus dbus-glib-native glib-2.0 dbus-glib util-linux"
+
+inherit autotools pkgconfig systemd
+
+SRC_URI = "https://linutronix.de/${BPN}/files/${BPN}-${PV}.tar.gz \
+   file://minicoredumper.service \
+"
+SRC_URI[md5sum] = "5ba9d116b52a8e2fb93456260644e753"
+SRC_URI[sha256sum] = 
"1b0eeb3d70dbd2ad6f2f673e4e3446e5dd784e132730e21d8f9dc0977e47dd9a"
+
+SYSTEMD_SERVICE_${PN} = "minicoredumper.service"
+SYSTEMD_AUTO_ENABLE = "enable"
+
+do_install_append() {
+   install -d ${D}/${sysconfdir}/minicoredumper
+   cp -rf ${S}/etc/* ${D}/${sysconfdir}/
+
+   install -d ${D}${systemd_unitdir}/system
+   install -m 0644 ${WORKDIR}/minicoredumper.service 
${D}${systemd_unitdir}/system
+}
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH][meta-oe] virt-what: add the recipe

[rongqing.li]

From: Roy Li 

virt-what is a a shell script which can be used to detect if the program
is running in a virtual machine.

Signed-off-by: Roy Li 
---
 .../recipes-extended/virt-what/virt-what_1.15.bb   | 36 ++
 1 file changed, 36 insertions(+)
 create mode 100644 meta-oe/recipes-extended/virt-what/virt-what_1.15.bb

diff --git a/meta-oe/recipes-extended/virt-what/virt-what_1.15.bb 
b/meta-oe/recipes-extended/virt-what/virt-what_1.15.bb
new file mode 100644
index 000..7509eee
--- /dev/null
+++ b/meta-oe/recipes-extended/virt-what/virt-what_1.15.bb
@@ -0,0 +1,36 @@
+SUMMARY = "Detect if we are running in a virtual machine"
+DESCRIPTION =" virt-what is a shell script which can be used to detect if the 
program \
+is running in a virtual machine. \
+The program prints out a list of "facts" about the virtual machine, \
+derived from heuristics.  One fact is printed per line. \
+If nothing is printed and the script exits with code 0 (no error), \
+then it can mean either that the program is running on bare-metal or \
+the program is running inside a type of virtual machine which we don't \
+know about or can't detect. \
+Current types of virtualization detected: \
+ - hyperv   Microsoft Hyper-V \
+ - kvm  Linux Kernel Virtual Machine (KVM) \
+ - openvz   OpenVZ or Virtuozzo \
+ - powervm_lx86 IBM PowerVM Lx86 Linux/x86 emulator \
+ - qemu QEMU (unaccelerated) \
+ - uml  User-Mode Linux (UML) \
+ - virtage  Hitachi Virtualization Manager (HVM) Virtage LPAR \
+ - virtualbox   VirtualBox \
+ - virtualpcMicrosoft VirtualPC \
+ - vmware   VMware \
+ - xen  Xen \
+ - xen-dom0 Xen dom0 (privileged domain) \
+ - xen-domU Xen domU (paravirtualized guest domain) \
+ - xen-hvm  Xen guest fully virtualized (HVM) \
+"
+
+SECTION = "base"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+
+SRC_URI = "http://people.redhat.com/~rjones/virt-what/files/${PN}-${PV}.tar.gz";
+
+inherit autotools
+
+SRC_URI[md5sum] = "35d19ca3305e8ae88c1985fbd8388f53"
+SRC_URI[sha256sum] = 
"7ab9220d4682eadf9139c6afe62d33ebd273fff69e49054279caba5514937c41"
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH][meta-oe] tmon: add recipes

[rongqing.li]

From: Roy Li 

tmon is a monitoring and testing tool for Linux kernel thermal subsystem

Signed-off-by: Roy Li 
---
 meta-oe/recipes-kernel/tmon/tmon.bb | 34 ++
 1 file changed, 34 insertions(+)
 create mode 100644 meta-oe/recipes-kernel/tmon/tmon.bb

diff --git a/meta-oe/recipes-kernel/tmon/tmon.bb 
b/meta-oe/recipes-kernel/tmon/tmon.bb
new file mode 100644
index 000..3bf2b3d
--- /dev/null
+++ b/meta-oe/recipes-kernel/tmon/tmon.bb
@@ -0,0 +1,34 @@
+SUMMARY = "A monitoring and testing tool for Linux kernel thermal subsystem"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
+DEPENDS = "ncurses"
+
+inherit kernelsrc kernel-arch
+
+do_configure[depends] += "virtual/kernel:do_shared_workdir"
+do_populate_lic[depends] += "virtual/kernel:do_patch"
+
+B = "${WORKDIR}/${BPN}-${PV}"
+
+EXTRA_OEMAKE = '\
+-C ${S}/tools/thermal/tmon \
+CROSS_COMPILE=${TARGET_PREFIX} \
+ARCH=${ARCH} \
+CC="${CC}" \
+AR="${AR}" \
+'
+do_compile() {
+   unset CFLAGS
+   oe_runmake tmon
+}
+
+do_install() {
+   unset CFLAGS
+   oe_runmake INSTALL_ROOT=${D} install
+}
+
+python do_package_prepend() {
+d.setVar('PKGV', d.getVar("KERNEL_VERSION", True).split("-")[0])
+}
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH][meta-oe] cpupower: add recipes

[rongqing.li]

From: Roy Li 

cpupower is tools to shows and sets processor power related values

Signed-off-by: Roy Li 
---
 meta-oe/recipes-kernel/cpupower/cpupower.bb | 41 +
 1 file changed, 41 insertions(+)
 create mode 100644 meta-oe/recipes-kernel/cpupower/cpupower.bb

diff --git a/meta-oe/recipes-kernel/cpupower/cpupower.bb 
b/meta-oe/recipes-kernel/cpupower/cpupower.bb
new file mode 100644
index 000..d53deac
--- /dev/null
+++ b/meta-oe/recipes-kernel/cpupower/cpupower.bb
@@ -0,0 +1,41 @@
+SUMMARY = "Shows and sets processor power related values"
+DESCRIPTION = "cpupower is a collection of tools to examine and tune power \
+saving related features of your processor."
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
+DEPENDS = "pciutils"
+
+inherit kernelsrc kernel-arch
+
+do_configure[depends] += "virtual/kernel:do_shared_workdir"
+do_populate_lic[depends] += "virtual/kernel:do_patch"
+
+PROVIDES = "virtual/cpupower"
+
+B = "${WORKDIR}/${BPN}-${PV}"
+
+EXTRA_OEMAKE = '\
+-C ${S}/tools/power/cpupower \
+O=${B} \
+CROSS=${TARGET_PREFIX} \
+ARCH=${ARCH} \
+CC="${CC}" \
+AR="${AR}" \
+'
+do_compile() {
+   unset CFLAGS
+   oe_runmake all
+}
+
+do_install() {
+   unset CFLAGS
+   oe_runmake DESTDIR=${D} install
+   chown root:root ${D}/${libdir}/*
+}
+
+python do_package_prepend() {
+d.setVar('PKGV', d.getVar("KERNEL_VERSION", True).split("-")[0])
+}
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+RDEPENDS_${PN} = "bash"
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH][meta-oe] edac-utils: update the version

[rongqing.li]

From: Roy Li 

The current edac-utils is v0.18, not v0.16 as the declaration in NEWS file:
  ---
  | Version 0.18 (2011-11-09);
  |- Do not print "No errors to report" with edac-util --quiet
  |- Add DIMM labels for Intel S2600JF and Supermicro H8QG6
  ---

Signed-off-by: Roy Li 
---
 meta-oe/recipes-support/edac-utils/edac-utils_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-support/edac-utils/edac-utils_git.bb 
b/meta-oe/recipes-support/edac-utils/edac-utils_git.bb
index d315324..76d5af4 100644
--- a/meta-oe/recipes-support/edac-utils/edac-utils_git.bb
+++ b/meta-oe/recipes-support/edac-utils/edac-utils_git.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = 
"file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 DEPENDS = " sysfsutils"
 
 SRCREV = "f9aa96205f610de39a79ff43c7478b7ef02e3138"
-PV = "0.16+git${SRCPV}"
+PV = "0.18+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH] ebtables: enable KERNEL_64_USERSPACE_32 for powerpc

[rongqing.li]

From: Roy Li 

Enable KERNEL_64_USERSPACE_32 when powerpc is using 64bit kernel and 32bit
userspace.

Some structs, which is used to communicate between user space and kernel,
have the alignment issue on 64bit kernel with 32 bit userspace. To fix
this issue, ebtables redefines these struct, not use the kernel(sysroot)
include/uapi/linux/netfilter_bridge/ebtables.h, like ebt_entry_target:

The kernel's:
struct ebt_entry_target {
   union {
   char name[EBT_FUNCTION_MAXNAMELEN];
   struct xt_target *target;
   } u;
   /* size of data */
   unsigned int target_size;
   unsigned char data[0] __attribute__ ((aligned (__alignof__(struct 
ebt_replace;
};

The ebtables:
struct ebt_entry_target
{
union {
char name[EBT_FUNCTION_MAXNAMELEN];
struct ebt_target *target;
} u;
/* size of data */
unsigned int target_size;
|#ifdef KERNEL_64_USERSPACE_32
unsigned int pad;
|#endif
unsigned char data[0] __attribute__ ((aligned (__alignof__(struct 
ebt_replace;
};

If the MLPREFIX of package matchs "lib.?32", the 32bit multilib package on
64bit kernel is being built, then enable KERNEL_64_USERSPACE_32.

Signed-off-by: Roy Li 
---
 .../recipes-filter/ebtables/ebtables_2.0.10-4.bb| 13 +
 1 file changed, 13 insertions(+)

diff --git a/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb 
b/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb
index 2e49dab..e9b726c 100644
--- a/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb
+++ b/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb
@@ -27,6 +27,19 @@ S = "${WORKDIR}/ebtables-v${PV}"
 
 inherit update-rc.d systemd
 
+python __anonymous () {
+import re
+
+karch = d.getVar('KARCH', True)
+multilib = d.getVar('MLPREFIX', True)
+
+if multilib and karch == 'powerpc64':
+searchstr = "lib.?32"
+reg = re.compile(searchstr)
+if reg.search(multilib):
+d.appendVar('CFLAGS' ,' -DKERNEL_64_USERSPACE_32 
-DEBT_MIN_ALIGN=8')
+}
+
 EXTRA_OEMAKE = " \
 BINDIR=${base_sbindir} \
 MANDIR=${mandir} \
-- 
2.5.0

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH] libx86-1: port a patch to make it work

[rongqing.li]

From: Roy Li 

port a patch from libx86-1.1-21.fc23.src.rpm, and make libx86-1 be able to work
and assume zero which return by LRMI_common_init is valid address

Signed-off-by: Roy Li 
---
 .../0001-assume-zero-is-valid-address.patch|  26 +++
 .../libx86-1/libx86-1.1/libx86-mmap-offset.patch   | 190 +
 meta-oe/recipes-extended/libx86-1/libx86-1_1.1.bb  |   6 +-
 3 files changed, 221 insertions(+), 1 deletion(-)
 create mode 100644 
meta-oe/recipes-extended/libx86-1/libx86-1.1/0001-assume-zero-is-valid-address.patch
 create mode 100644 
meta-oe/recipes-extended/libx86-1/libx86-1.1/libx86-mmap-offset.patch

diff --git 
a/meta-oe/recipes-extended/libx86-1/libx86-1.1/0001-assume-zero-is-valid-address.patch
 
b/meta-oe/recipes-extended/libx86-1/libx86-1.1/0001-assume-zero-is-valid-address.patch
new file mode 100644
index 000..7a46301
--- /dev/null
+++ 
b/meta-oe/recipes-extended/libx86-1/libx86-1.1/0001-assume-zero-is-valid-address.patch
@@ -0,0 +1,26 @@
+assume zero is valid address
+
+Upstream-Status: Pending
+
+Signed-off-by: Roy Li 
+---
+ thunk.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/thunk.c b/thunk.c
+index 796e88b..6121ea1 100644
+--- a/thunk.c
 b/thunk.c
+@@ -141,9 +141,6 @@ int LRMI_init() {
+ 
+   mmap_addr = LRMI_common_init(1);
+ 
+-  if (!mmap_addr)
+-  return 0;
+-
+   X86EMU_pioFuncs pioFuncs = {
+   (&x_inb),
+   (&x_inw),
+-- 
+1.9.1
+
diff --git 
a/meta-oe/recipes-extended/libx86-1/libx86-1.1/libx86-mmap-offset.patch 
b/meta-oe/recipes-extended/libx86-1/libx86-1.1/libx86-mmap-offset.patch
new file mode 100644
index 000..843acc8
--- /dev/null
+++ b/meta-oe/recipes-extended/libx86-1/libx86-1.1/libx86-mmap-offset.patch
@@ -0,0 +1,190 @@
+Upstream-Statue: Pending 
+[from 
ftp://195.220.108.108/linux/fedora/linux/development/rawhide/source/SRPMS/l/libx86-1.1-21.fc23.src.rpm]
+
+diff -ur libx86-1.1/lrmi.c libx86-1.1.hack/lrmi.c
+--- libx86-1.1/lrmi.c  2006-10-30 15:10:16.0 -0500
 libx86-1.1.hack/lrmi.c 2009-10-26 15:55:42.0 -0400
+@@ -136,7 +136,7 @@
+   if (context.ready)
+   return 1;
+ 
+-  if (!LRMI_common_init())
++  if (!LRMI_common_init(0))
+   return 0;
+ 
+   /*
+diff -ur libx86-1.1/thunk.c libx86-1.1.hack/thunk.c
+--- libx86-1.1/thunk.c 2008-04-02 20:48:00.0 -0400
 libx86-1.1.hack/thunk.c2009-10-26 16:05:39.0 -0400
+@@ -139,11 +139,11 @@
+   int i;
+   X86EMU_intrFuncs intFuncs[256];
+ 
+-  if (!LRMI_common_init())
++  mmap_addr = LRMI_common_init(1);
++
++  if (!mmap_addr)
+   return 0;
+ 
+-  mmap_addr = 0;
+-  
+   X86EMU_pioFuncs pioFuncs = {
+   (&x_inb),
+   (&x_inw),
+@@ -169,10 +169,10 @@
+   X86_ESP = 0xFFF9;
+   memset (stack, 0, 64*1024);
+ 
+-  *((char *)0) = 0x4f; /* Make sure that we end up jumping back to a
+-  halt instruction */
++  *mmap_addr = 0x4f; /* Make sure that we end up jumping back to a
++halt instruction */
+ 
+-  M.mem_base = 0;
++  M.mem_base = (unsigned long)mmap_addr;
+   M.mem_size = 1024*1024;
+ 
+   return 1;
+diff -ur libx86-1.1/x86-common.c libx86-1.1.hack/x86-common.c
+--- libx86-1.1/x86-common.c2008-05-16 12:56:23.0 -0400
 libx86-1.1.hack/x86-common.c   2009-10-26 16:03:21.0 -0400
+@@ -45,14 +45,15 @@
+ static struct {
+   int ready;
+   int count;
++  void *offset;
+   struct mem_block blocks[REAL_MEM_BLOCKS];
+ } mem_info = { 0 };
+ 
+ static int
+-real_mem_init(void)
++real_mem_init(int high_page)
+ {
+   void *m;
+-  int fd_zero;
++  int fd_zero, flags = MAP_SHARED;
+ 
+   if (mem_info.ready)
+   return 1;
+@@ -63,9 +64,12 @@
+   return 0;
+   }
+ 
++  if (!high_page)
++  flags |= MAP_FIXED;
++
+   m = mmap((void *)REAL_MEM_BASE, REAL_MEM_SIZE,
+-   PROT_READ | PROT_WRITE | PROT_EXEC,
+-   MAP_FIXED | MAP_SHARED, fd_zero, 0);
++   PROT_READ | PROT_WRITE | PROT_EXEC,
++   flags, fd_zero, 0);
+ 
+   if (m == (void *)-1) {
+   perror("mmap /dev/zero");
+@@ -76,6 +80,7 @@
+   close(fd_zero);
+ 
+   mem_info.ready = 1;
++  mem_info.offset = m;
+   mem_info.count = 1;
+   mem_info.blocks[0].size = REAL_MEM_SIZE;
+   mem_info.blocks[0].free = 1;
+@@ -87,7 +92,7 @@
+ real_mem_deinit(void)
+ {
+   if (mem_info.ready) {
+-  munmap((void *)REAL_MEM_BASE, REAL_MEM_SIZE);
++  munmap(mem_info.offset, REAL_MEM_SIZE);
+   mem_info.ready = 0;
+   }
+ }
+@@ -119,7 +124,7 @@
+ LRMI_alloc_real(int size)
+ {
+   int i;
+-  char *r = (char *)REAL_MEM_BASE;
++  char *r = (char *)mem_info.offset;
+ 
+   if (!mem_info.ready)
+   return NULL;
+@@ -151,7 +156,7 @@
+ LRMI_free_real(v

[oe] [PATCH][meta-networking] mime-construct: Perform more mangling for perl path

[rongqing.li]

From: Roy Li 

native perl is in /usr/bin/mime-construct, introduce the below
QA warning, it should be replaced:

WARNING: QA Issue: /usr/bin/mime-construct_mime-construct contained in package 
mime-construct requires
tmp/sysroots/x86_64-linux/usr/bin/perl-native/perl, but no providers found in 
its RDEPENDS [file-rdeps]

Signed-off-by: Roy Li 
---
 .../recipes-extended/mime-construct/mime-construct_1.11.bb  | 6 ++
 1 file changed, 6 insertions(+)

diff --git 
a/meta-networking/recipes-extended/mime-construct/mime-construct_1.11.bb 
b/meta-networking/recipes-extended/mime-construct/mime-construct_1.11.bb
index 6db4fdf..61bcd13 100644
--- a/meta-networking/recipes-extended/mime-construct/mime-construct_1.11.bb
+++ b/meta-networking/recipes-extended/mime-construct/mime-construct_1.11.bb
@@ -20,3 +20,9 @@ inherit cpan
 RDEPENDS_${PN} = "msmtp perl perl-module-mime-base64 
perl-module-mime-quotedprint \
 libproc-waitstat-perl libmime-types-perl perl-module-filehandle 
perl-module-posix \
 "
+
+do_install_append() {
+   #change the interpreter in file
+   sed -i -e "s|${STAGING_BINDIR_NATIVE}/perl-native/perl -w|${bindir}/env 
perl|g" \
+  ${D}/${bindir}/mime-construct
+}
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH][meta-networking][V2] net-snmp: fix the replacement in net-snmp-config

[rongqing.li]

From: Roy Li 

when net-snmp-config is used to configure by other package, and fail since
/libnl3 is not found, in fact, it should be -I/usr/include/libnl3, and is
modified as /libnl3 incorrectly.

instead of modify the net-snmp-config for target, the one under
${bindir_crossscripts} should be replaced with ${TAGING_INCDIR}

Signed-off-by: Roy Li 
---
 meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb 
b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb
index b32d842..68eea3f 100644
--- a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb
+++ b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb
@@ -63,8 +63,7 @@ do_install_append() {
 install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/snmpd
 install -m 644 ${WORKDIR}/snmpd.conf ${D}${sysconfdir}/snmp/
 install -m 644 ${WORKDIR}/snmptrapd.conf ${D}${sysconfdir}/snmp/
-sed -e "s@-I/usr/include@@g" \
--e "s@^prefix=.*@prefix=${STAGING_DIR_HOST}@g" \
+sed-e "s@^prefix=.*@prefix=${STAGING_DIR_HOST}@g" \
 -e "s@^exec_prefix=.*@exec_prefix=${STAGING_DIR_HOST}@g" \
 -e "s@^includedir=.*@includedir=${STAGING_INCDIR}@g" \
 -e "s@^libdir=.*@libdir=${STAGING_LIBDIR}@g" \
@@ -98,6 +97,8 @@ net_snmp_sysroot_preprocess () {
 if [ -e ${D}${bindir}/net-snmp-config ]; then
 install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/
 install -m 755 ${D}${bindir}/net-snmp-config 
${SYSROOT_DESTDIR}${bindir_crossscripts}/
+sed -e "s@-I/usr/include@-I${STAGING_INCDIR}@g" \
+  -i  ${SYSROOT_DESTDIR}${bindir_crossscripts}/net-snmp-config
 fi
 }
 
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [meta-networking][PATCH 1/1] net-snmp: fix the replacement in net-snmp-config

[rongqing.li]

From: Roy Li 

when net-snmp-config is used to configure by other package, and fail since
/libnl3 is not found, in fact, it should be -I/usr/include/libnl3, and is
modified as /libnl3 incorrectly.

fix this replacement by adding = after -I to consider the sysroot

Signed-off-by: Roy Li 
---
 meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb 
b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb
index b32d842..ebd0c68 100644
--- a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb
+++ b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb
@@ -63,7 +63,7 @@ do_install_append() {
 install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/snmpd
 install -m 644 ${WORKDIR}/snmpd.conf ${D}${sysconfdir}/snmp/
 install -m 644 ${WORKDIR}/snmptrapd.conf ${D}${sysconfdir}/snmp/
-sed -e "s@-I/usr/include@@g" \
+sed -e "s@-I/usr/include@-I=/usr/include@g" \
 -e "s@^prefix=.*@prefix=${STAGING_DIR_HOST}@g" \
 -e "s@^exec_prefix=.*@exec_prefix=${STAGING_DIR_HOST}@g" \
 -e "s@^includedir=.*@includedir=${STAGING_INCDIR}@g" \
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH][meta-oe][v3] phoronix-test-suite: uprev it to 6.0.1

[rongqing.li]

From: Roy Li 

1. inherit systemd and move the systemd unit files to correct dir
2. inherit allarch
3. add bash/python to RDEDEPENDS

Signed-off-by: Roy Li 
---
 ...-suite_5.2.1.bb => phoronix-test-suite_6.0.1.bb} | 21 ++---
 1 file changed, 18 insertions(+), 3 deletions(-)
 rename 
meta-oe/recipes-benchmark/phoronix-test-suite/{phoronix-test-suite_5.2.1.bb => 
phoronix-test-suite_6.0.1.bb} (56%)

diff --git 
a/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_5.2.1.bb 
b/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_6.0.1.bb
similarity index 56%
rename from 
meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_5.2.1.bb
rename to 
meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_6.0.1.bb
index ef9f735..6b16887 100644
--- a/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_5.2.1.bb
+++ b/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_6.0.1.bb
@@ -6,19 +6,34 @@ LIC_FILES_CHKSUM = 
"file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 SECTION = "console/tests"
 
 SRC_URI = "http://www.phoronix-test-suite.com/releases/${BP}.tar.gz";
-SRC_URI[md5sum] = "51e52d883710dc516c5494bd1c377219"
-SRC_URI[sha256sum] = 
"1186f460691e2fe7a07df5edb8d8ed1ac0c65327512e646da2b2e3a60dda6cd9"
+SRC_URI[md5sum] = "c3b26fcc57a3a253e558f759fdc1089f"
+SRC_URI[sha256sum] = 
"27add54f4ecb464549de580cece84b4a4945b99df3ef7ff7034eb7f23ffb3b39"
 S = "${WORKDIR}/phoronix-test-suite"
 
+inherit systemd
+
 do_install() {
DESTDIR=${D} ./install-sh ${exec_prefix}
+
+   if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; 
then
+   if [ "${systemd_unitdir}" != "/usr/lib/systemd" ]; then
+   install -d ${D}/${systemd_unitdir}/system/
+   mv ${D}/usr/lib/systemd/system/* 
${D}/${systemd_unitdir}/system/
+   rm -rf ${D}/usr/lib/
+   fi
+   else
+   rm -rf ${D}/usr/lib/
+   fi
 }
 
-RDEPENDS_${PN} = "php-cli"
+SYSTEMD_SERVICE_${PN} = "phoromatic-client.service phoromatic-server.service"
+RDEPENDS_${PN} += "bash python php-cli"
+
 FILES_${PN} += " \
${datadir}/phoronix-test-suite \
${datadir}/appdata/phoronix-test-suite.appdata.xml \
${datadir}/icons/hicolor/48x48/apps/phoronix-test-suite.png \

${datadir}/icons/hicolor/64x64/mimetypes/application-x-openbenchmarking.png \
${datadir}/mime/packages/openbenchmarking-mime.xml \
+   ${systemd_unitdir}/* \
 "
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH][meta-oe] phoronix-test-suite: uprev it to 6.0.1

[rongqing.li]

From: Roy Li 

1. inherit systemd and move the systemd unit files to correct dir
2. inherit allarch
3. add bash/python to RDEDEPENDS

Signed-off-by: Roy Li 
---
 ...test-suite_5.2.1.bb => phoronix-test-suite_6.0.1.bb} | 17 ++---
 1 file changed, 14 insertions(+), 3 deletions(-)
 rename 
meta-oe/recipes-benchmark/phoronix-test-suite/{phoronix-test-suite_5.2.1.bb => 
phoronix-test-suite_6.0.1.bb} (60%)

diff --git 
a/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_5.2.1.bb 
b/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_6.0.1.bb
similarity index 60%
rename from 
meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_5.2.1.bb
rename to 
meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_6.0.1.bb
index ef9f735..5acfbf1 100644
--- a/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_5.2.1.bb
+++ b/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_6.0.1.bb
@@ -6,19 +6,30 @@ LIC_FILES_CHKSUM = 
"file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 SECTION = "console/tests"
 
 SRC_URI = "http://www.phoronix-test-suite.com/releases/${BP}.tar.gz";
-SRC_URI[md5sum] = "51e52d883710dc516c5494bd1c377219"
-SRC_URI[sha256sum] = 
"1186f460691e2fe7a07df5edb8d8ed1ac0c65327512e646da2b2e3a60dda6cd9"
+SRC_URI[md5sum] = "c3b26fcc57a3a253e558f759fdc1089f"
+SRC_URI[sha256sum] = 
"27add54f4ecb464549de580cece84b4a4945b99df3ef7ff7034eb7f23ffb3b39"
 S = "${WORKDIR}/phoronix-test-suite"
 
+inherit systemd allarch
+
 do_install() {
DESTDIR=${D} ./install-sh ${exec_prefix}
+
+   if [ "${systemd_unitdir}" != "/usr/lib/systemd" ]; then
+   install -d ${D}/${systemd_unitdir}/system/
+   mv ${D}/usr/lib/systemd/system/* ${D}/${systemd_unitdir}/system/
+   rm -rf ${D}/usr/lib/
+   fi
 }
 
-RDEPENDS_${PN} = "php-cli"
+SYSTEMD_SERVICE_${PN} = "phoromatic-client.service phoromatic-server.service"
+RDEPENDS_${PN} += "bash python php-cli"
+
 FILES_${PN} += " \
${datadir}/phoronix-test-suite \
${datadir}/appdata/phoronix-test-suite.appdata.xml \
${datadir}/icons/hicolor/48x48/apps/phoronix-test-suite.png \

${datadir}/icons/hicolor/64x64/mimetypes/application-x-openbenchmarking.png \
${datadir}/mime/packages/openbenchmarking-mime.xml \
+   ${systemd_unitdir}/* \
 "
-- 
2.5.0

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH] phoronix-test-suite: uprev it to 6.0.1

[rongqing.li]

From: Roy Li 

1. inherit systemd and move the systemd unit files to correct dir
2. inherit allarch
3. add bash/python/php-cli to RDEDEPENDS

Signed-off-by: Roy Li 
---
 .../phoronix-test-suite_5.2.1.bb   | 24 
 .../phoronix-test-suite_6.0.1.bb   | 33 ++
 2 files changed, 33 insertions(+), 24 deletions(-)
 delete mode 100644 
meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_5.2.1.bb
 create mode 100644 
meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_6.0.1.bb

diff --git 
a/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_5.2.1.bb 
b/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_5.2.1.bb
deleted file mode 100644
index 0fc5e8d..000
--- a/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_5.2.1.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-SUMMARY = "Phoronix Test Suite"
-DESCRIPTION = "The Phoronix Test Suite is designed to carry out both 
qualitative \
-and quantitative benchmarks in a clean, reproducible, and easy-to-use manner."
-LICENSE = "GPLv3"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
-SECTION = "console/tests"
-
-SRC_URI = "http://www.phoronix-test-suite.com/releases/${BP}.tar.gz";
-SRC_URI[md5sum] = "51e52d883710dc516c5494bd1c377219"
-SRC_URI[sha256sum] = 
"1186f460691e2fe7a07df5edb8d8ed1ac0c65327512e646da2b2e3a60dda6cd9"
-S = "${WORKDIR}/phoronix-test-suite"
-
-do_install() {
-   DESTDIR=${D} ./install-sh ${exec_prefix}
-}
-
-#RDEPENDS_${PN} = "php-cli"
-FILES_${PN} += " \
-   ${datadir}/phoronix-test-suite \
-   ${datadir}/appdata/phoronix-test-suite.appdata.xml \
-   ${datadir}/icons/hicolor/48x48/apps/phoronix-test-suite.png \
-   
${datadir}/icons/hicolor/64x64/mimetypes/application-x-openbenchmarking.png \
-   ${datadir}/mime/packages/openbenchmarking-mime.xml \
-"
diff --git 
a/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_6.0.1.bb 
b/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_6.0.1.bb
new file mode 100644
index 000..7f617ce
--- /dev/null
+++ b/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_6.0.1.bb
@@ -0,0 +1,33 @@
+SUMMARY = "Phoronix Test Suite"
+DESCRIPTION = "The Phoronix Test Suite is designed to carry out both 
qualitative \
+and quantitative benchmarks in a clean, reproducible, and easy-to-use manner."
+LICENSE = "GPLv3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
+SECTION = "console/tests"
+
+SRC_URI = "http://www.phoronix-test-suite.com/releases/${BP}.tar.gz";
+SRC_URI[md5sum] = "c3b26fcc57a3a253e558f759fdc1089f"
+SRC_URI[sha256sum] = 
"27add54f4ecb464549de580cece84b4a4945b99df3ef7ff7034eb7f23ffb3b39"
+S = "${WORKDIR}/phoronix-test-suite"
+
+
+inherit systemd allarch
+
+do_install() {
+   DESTDIR=${D} ./install-sh ${exec_prefix}
+install -d ${D}/${systemd_unitdir}/system/
+mv ${D}/usr/lib/systemd/system/* ${D}/${systemd_unitdir}/system/
+rm -rf ${D}/usr/lib/
+}
+
+SYSTEMD_SERVICE_${PN} = "phoromatic-client.service phoromatic-server.service"
+RDEPENDS_${PN} += "bash python php-cli"
+
+FILES_${PN} += " \
+   ${datadir}/phoronix-test-suite \
+   ${datadir}/appdata/phoronix-test-suite.appdata.xml \
+   ${datadir}/icons/hicolor/48x48/apps/phoronix-test-suite.png \
+   
${datadir}/icons/hicolor/64x64/mimetypes/application-x-openbenchmarking.png \
+   ${datadir}/mime/packages/openbenchmarking-mime.xml \
+   ${systemd_unitdir}/system/* \
+"
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH][meta-networking] ufw: improve RRECOMMENDS

[rongqing.li]

From: Roy Li 

ufw needs lots of netfilter module to run

Signed-off-by: Roy Li 
---
 meta-networking/recipes-connectivity/ufw/ufw_0.33.bb | 8 
 1 file changed, 8 insertions(+)

diff --git a/meta-networking/recipes-connectivity/ufw/ufw_0.33.bb 
b/meta-networking/recipes-connectivity/ufw/ufw_0.33.bb
index 66e917e..19cfe46 100644
--- a/meta-networking/recipes-connectivity/ufw/ufw_0.33.bb
+++ b/meta-networking/recipes-connectivity/ufw/ufw_0.33.bb
@@ -30,6 +30,14 @@ RDEPENDS_${PN} = " \
 
 RRECOMMENDS_${PN} = " \
  kernel-module-ipv6 \
+ kernel-module-nf-conntrack-ipv6 \
+ kernel-module-nf-log-common \
+ kernel-module-nf-log-ipv4 \
+ kernel-module-nf-log-ipv6 \
+ kernel-module-nf-addrtype \
+ kernel-module-nf-limit \
+ kernel-module-nf-log \
+ kernel-module-nf-recent \
 "
 
 # Certain items are explicitly put under /lib, not base_libdir when installed.
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH][meta-oe] lldpd: configure the systemd unit file dir

[rongqing.li]

From: Roy Li 

configure the systemd unit file dir, otherwise it will be auto-checked
by 'pkg-config --variable=systemdsystemunitdir systemd', but if systemd
is not built firstly, and the the unit file will not be installed, and
lead to below error:
ERROR: Function failed: SYSTEMD_SERVICE_lldpd value lldpd.service does not 
exist
and disable sysusersdir, since sysuser is not used currently.

Signed-off-by: Roy Li 
---
 meta-networking/recipes-daemons/lldpd/lldpd_0.7.17.bb | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/meta-networking/recipes-daemons/lldpd/lldpd_0.7.17.bb 
b/meta-networking/recipes-daemons/lldpd/lldpd_0.7.17.bb
index 47d3c38..ba7f09e 100644
--- a/meta-networking/recipes-daemons/lldpd/lldpd_0.7.17.bb
+++ b/meta-networking/recipes-daemons/lldpd/lldpd_0.7.17.bb
@@ -24,7 +24,10 @@ GROUPADD_PARAM_${PN} = "--system lldpd"
 EXTRA_OECONF += "--without-embedded-libevent \
  --disable-oldies \
  --with-privsep-user=lldpd \
- --with-privsep-group=lldpd"
+ --with-privsep-group=lldpd \
+ --with-systemdsystemunitdir=${systemd_system_unitdir} \
+ --without-sysusersdir \
+"
 
 PACKAGECONFIG ??= "cdp fdp edp sonmp lldpmed dot1 dot3"
 PACKAGECONFIG[json] = "--with-json,--without-json,jansson"
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH][meta-oe] libubox: fix libdir

[rongqing.li]

From: Roy Li 

The library dir maybe /usr/lib64 or /usr/lib, so use the variable
CMAKE_INSTALL_LIBDIR, not hardcode to lib

Signed-off-by: Roy Li 
---
 .../libubox/libubox/fix-libdir.patch   | 40 ++
 meta-oe/recipes-devtools/libubox/libubox_git.bb|  1 +
 2 files changed, 41 insertions(+)
 create mode 100644 meta-oe/recipes-devtools/libubox/libubox/fix-libdir.patch

diff --git a/meta-oe/recipes-devtools/libubox/libubox/fix-libdir.patch 
b/meta-oe/recipes-devtools/libubox/libubox/fix-libdir.patch
new file mode 100644
index 000..6f09c8b
--- /dev/null
+++ b/meta-oe/recipes-devtools/libubox/libubox/fix-libdir.patch
@@ -0,0 +1,40 @@
+[PATCH] fix the CMAKE_INSTALL_LIBDIR
+
+Upstream-Status: Pending
+
+libdir maybe /usr/lib64 for 64bit machine
+
+Signed-off-by: Roy Li 
+---
+ CMakeLists.txt | 8 
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 57804cf..2c7bdc1 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -35,8 +35,8 @@ INSTALL(FILES ${headers}
+   DESTINATION include/libubox
+ )
+ INSTALL(TARGETS ubox ubox-static
+-  ARCHIVE DESTINATION lib
+-  LIBRARY DESTINATION lib
++  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ )
+ 
+ ADD_SUBDIRECTORY(lua)
+@@ -58,8 +58,8 @@ IF(EXISTS ${json})
+   TARGET_LINK_LIBRARIES(json_script ubox)
+ 
+   INSTALL(TARGETS blobmsg_json blobmsg_json-static jshn json_script
+-  ARCHIVE DESTINATION lib
+-  LIBRARY DESTINATION lib
++  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+   RUNTIME DESTINATION bin
+   )
+ 
+-- 
+1.9.1
+
diff --git a/meta-oe/recipes-devtools/libubox/libubox_git.bb 
b/meta-oe/recipes-devtools/libubox/libubox_git.bb
index 3e886b7..d0da2c5 100644
--- a/meta-oe/recipes-devtools/libubox/libubox_git.bb
+++ b/meta-oe/recipes-devtools/libubox/libubox_git.bb
@@ -15,6 +15,7 @@ LIC_FILES_CHKSUM = "\
 SRC_URI = "\
 git://git.openwrt.org/project/libubox.git \
 file://0001-version-libraries.patch \
+file://fix-libdir.patch \
 "
 
 SRCREV = "136a5196266d03d537f822c4e67d2fde2ed59505"
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH][meta-oe] libx86-1: add the recipe

[rongqing.li]

From: Roy Li 

A library to provide support for making real-mode calls x86 calls. On
x86 hardware, vm86 mode is used. On other platforms, x86 emulation is
provided.

Signed-off-by: Roy Li 
---
 meta-oe/recipes-extended/libx86-1/libx86-1_1.1.bb | 20 
 1 file changed, 20 insertions(+)
 create mode 100644 meta-oe/recipes-extended/libx86-1/libx86-1_1.1.bb

diff --git a/meta-oe/recipes-extended/libx86-1/libx86-1_1.1.bb 
b/meta-oe/recipes-extended/libx86-1/libx86-1_1.1.bb
new file mode 100644
index 000..7551e7d
--- /dev/null
+++ b/meta-oe/recipes-extended/libx86-1/libx86-1_1.1.bb
@@ -0,0 +1,20 @@
+SUMMARY = "x86 real-mode library"
+DESCRIPTION = "A library to provide support for making real-mode calls x86 
calls. On \
+x86 hardware, vm86 mode is used. On other platforms, x86 emulation is \
+provided."
+HOMEPAGE = "http://www.codon.org.uk/~mjg59/libx86/";
+LICENSE = "MIT & BSD-3-Clause"
+SECTION = "libs"
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=633af6c02e6f624d4c472d970a2aca53"
+
+SRC_URI = "http://www.codon.org.uk/~mjg59/libx86/downloads/${BPN}-${PV}.tar.gz";
+SRC_URI[md5sum] = "41bee1f8e22b82d82b5f7d7ba51abc2a"
+SRC_URI[sha256sum] = 
"5bf13104cb327472b5cb65643352a9138646becacc06763088d83001d832d048"
+
+BPN = "libx86"
+COMPATIBLE_HOST = '(x86_64|i.86).*-linux'
+
+export LIBDIR = "${libdir}"
+export BACKEND = "x86emu"
+
+inherit autotools-brokensep
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [meta-networking][PATCH 1/3] dovecot: add PACKAGECONFIG for lz4

[rongqing.li]

From: Roy Li 

Signed-off-by: Roy Li 
---
 meta-networking/recipes-support/dovecot/dovecot_2.2.18.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-networking/recipes-support/dovecot/dovecot_2.2.18.bb 
b/meta-networking/recipes-support/dovecot/dovecot_2.2.18.bb
index 9b5f536..a01ef83 100644
--- a/meta-networking/recipes-support/dovecot/dovecot_2.2.18.bb
+++ b/meta-networking/recipes-support/dovecot/dovecot_2.2.18.bb
@@ -23,6 +23,7 @@ PACKAGECONFIG ??= " \
 
 PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam,"
 PACKAGECONFIG[ldap] = "--with-ldap=plugin,--without-ldap,openldap,"
+PACKAGECONFIG[lz4] = "--with-lz4,--without-lz4,lz4,"
 
 # From native build in armv7a-hf/eglibc
 CACHED_CONFIGUREVARS += "i_cv_signed_size_t=no \
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [meta-networking][PATCH 3/3] tcpdump: add PACKAGECONFIG for libcap-ng

[rongqing.li]

From: Roy Li 

Signed-off-by: Roy Li 
---
 meta-networking/recipes-support/tcpdump/tcpdump_4.7.4.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-networking/recipes-support/tcpdump/tcpdump_4.7.4.bb 
b/meta-networking/recipes-support/tcpdump/tcpdump_4.7.4.bb
index 0ffe589..150e55f 100644
--- a/meta-networking/recipes-support/tcpdump/tcpdump_4.7.4.bb
+++ b/meta-networking/recipes-support/tcpdump/tcpdump_4.7.4.bb
@@ -23,6 +23,7 @@ PACKAGECONFIG ??= "openssl ipv6"
 PACKAGECONFIG[openssl] = "--with-crypto=yes, --without-openssl 
--without-crypto, openssl"
 PACKAGECONFIG[ipv6] = "--enable-ipv6, --disable-ipv6,"
 PACKAGECONFIG[smi] = "--with-smi, --without-smi,libsmi"
+PACKAGECONFIG[libcap-ng] = "--with-cap-ng=yes,--with-cap-ng=no,libcap-ng"
 
 EXTRA_AUTORECONF += " -I m4"
 
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [meta-networking][PATCH 2/3] pure-ftpd: add PACKAGECONFIG for libsodium

[rongqing.li]

From: Roy Li 

Signed-off-by: Roy Li 
---
 meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.42.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.42.bb 
b/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.42.bb
index fa592dc..c1f1504 100644
--- a/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.42.bb
+++ b/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.42.bb
@@ -18,3 +18,5 @@ SRC_URI[sha256sum] = 
"7be73a8e58b190a7054d2ae00c5e650cb9e091980420082d02ec3c3b68
 inherit autotools
 
 EXTRA_OECONF = "--with-minimal"
+PACKAGECONFIG[libsodium] 
="ac_cv_lib_sodium_crypto_pwhash_scryptsalsa208sha256_str=yes, \
+   
ac_cv_lib_sodium_crypto_pwhash_scryptsalsa208sha256_str=no, libsodium"
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [meta-networking][PATCH 1/3] dovecot: add PACKAGECONFIG for lz4

[rongqing.li]

From: Roy Li 

Signed-off-by: Roy Li 
---
 meta-networking/recipes-support/dovecot/dovecot_2.2.18.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-networking/recipes-support/dovecot/dovecot_2.2.18.bb 
b/meta-networking/recipes-support/dovecot/dovecot_2.2.18.bb
index 9b5f536..a01ef83 100644
--- a/meta-networking/recipes-support/dovecot/dovecot_2.2.18.bb
+++ b/meta-networking/recipes-support/dovecot/dovecot_2.2.18.bb
@@ -23,6 +23,7 @@ PACKAGECONFIG ??= " \
 
 PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam,"
 PACKAGECONFIG[ldap] = "--with-ldap=plugin,--without-ldap,openldap,"
+PACKAGECONFIG[lz4] = "--with-lz4,--without-lz4,lz4,"
 
 # From native build in armv7a-hf/eglibc
 CACHED_CONFIGUREVARS += "i_cv_signed_size_t=no \
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH][meta-networking] lldap: fix the building failure when gcc5 is used or DEBUG_BUILD is 1

[rongqing.li]

From: Roy Li 

1. fix the building failure when host is gcc5
2. fix the building failure when DEBUG_BUILD is 1 by removal of -Werror
   Remove -Werror, since it is suitable to develop only; otherwise when
   gcc adds -O0 option to compile codes, the error will be generated
   since the warning:
 //#  warning _FORTIFY_SOURCE requires compiling with optimization (-O)

Signed-off-by: Roy Li 
---
 ...-functions-work-with-both-gnu11-and-gnu89.patch | 99 ++
 .../recipes-daemons/lldpad/lldpad_0.9.46.bb|  8 +-
 2 files changed, 106 insertions(+), 1 deletion(-)
 create mode 100644 
meta-networking/recipes-daemons/lldpad/lldpad/0001-get-inline-functions-work-with-both-gnu11-and-gnu89.patch

diff --git 
a/meta-networking/recipes-daemons/lldpad/lldpad/0001-get-inline-functions-work-with-both-gnu11-and-gnu89.patch
 
b/meta-networking/recipes-daemons/lldpad/lldpad/0001-get-inline-functions-work-with-both-gnu11-and-gnu89.patch
new file mode 100644
index 000..9ff7c0f
--- /dev/null
+++ 
b/meta-networking/recipes-daemons/lldpad/lldpad/0001-get-inline-functions-work-with-both-gnu11-and-gnu89.patch
@@ -0,0 +1,99 @@
+From 67399dcc2575c0e9c64fc77354f9653127cddf64 Mon Sep 17 00:00:00 2001
+From: Roy Li 
+Date: Mon, 14 Sep 2015 17:07:26 +0800
+Subject: [PATCH] get inline functions work with both gnu11 and gnu89
+
+Upstream-status: Pending
+
+After gcc upgraded to gcc5, and if the codes are compiled without 
optimization(-O0),
+and the below error will happen:
+
+./include/lldp_8021qaz.h:237:12: error: inline function 'ieee8021qaz_clif_cmd' 
declared but never defined [-Werror]
+ inline int ieee8021qaz_clif_cmd(void *data, struct sockaddr_un *from,
+^
+./include/lldp_8021qaz.h:222:13: error: inline function 'set_prio_map' 
declared but never defined [-Werror]
+ inline void set_prio_map(u32 *prio_map, u8 prio, int tc);
+ ^
+./include/lldp_8021qaz.h:221:12: error: inline function 'get_prio_map' 
declared but never defined [-Werror]
+ inline int get_prio_map(u32 prio_map, int tc);
+
+gcc5 defaults to -std=gnu11 instead of -std=gnu89, and it requires that 
exactly one C
+source file has the callable copy of the inline function. Consider the 
following
+program:
+
+  inline int
+  foo (void)
+  {
+return 42;
+  }
+
+  int
+  main (void)
+  {
+return foo ();
+  }
+
+The program above will not link with the C99 inline semantics, because no 
out-of-line
+function foo is generated. To fix this, either mark the function foo as 
static, or
+add the following declaration:
+  static inline int foo (void);
+
+more information refer to: https://gcc.gnu.org/gcc-5/porting_to.html;
+
+but the use of "extern inline" will lead to the compilation issue if gcc is not
+gcc5, so replace inline with "static inline"
+
+Signed-off-by: Roy Li 
+---
+ include/lldp_8021qaz.h | 5 -
+ lldp_8021qaz.c | 4 ++--
+ 2 files changed, 2 insertions(+), 7 deletions(-)
+
+diff --git a/include/lldp_8021qaz.h b/include/lldp_8021qaz.h
+index 55353b8..d321625 100644
+--- a/include/lldp_8021qaz.h
 b/include/lldp_8021qaz.h
+@@ -218,8 +218,6 @@ int ieee8021qaz_mod_app(struct app_tlv_head *head, int 
peer,
+   u8 prio, u8 sel, u16 proto, u32 ops);
+ int ieee8021qaz_app_sethw(char *ifname, struct app_tlv_head *head);
+ 
+-inline int get_prio_map(u32 prio_map, int tc);
+-inline void set_prio_map(u32 *prio_map, u8 prio, int tc);
+ 
+ struct ieee8021qaz_tlvs *ieee8021qaz_data(const char *);
+ 
+@@ -234,9 +232,6 @@ int ieee8021qaz_rchange(struct port *port, struct 
lldp_agent *,
+ void ieee8021qaz_ifup(char *ifname, struct lldp_agent *);
+ void ieee8021qaz_ifdown(char *ifname, struct lldp_agent *);
+ u8 ieee8021qaz_mibDeleteObject(struct port *port, struct lldp_agent *);
+-inline int ieee8021qaz_clif_cmd(void *data, struct sockaddr_un *from,
+-  socklen_t fromlen, char *ibuf, int ilen,
+-  char *rbuf);
+ int ieee8021qaz_check_operstate(void);
+ int get_dcbx_hw(const char *ifname, __u8 *dcbx);
+ 
+diff --git a/lldp_8021qaz.c b/lldp_8021qaz.c
+index 094676d..f154317 100644
+--- a/lldp_8021qaz.c
 b/lldp_8021qaz.c
+@@ -396,7 +396,7 @@ static int read_cfg_file(char *ifname, struct lldp_agent 
*agent,
+   return 0;
+ }
+ 
+-inline int get_prio_map(u32 prio_map, int prio)
++static inline int get_prio_map(u32 prio_map, int prio)
+ {
+   if (prio > 7)
+   return 0;
+@@ -404,7 +404,7 @@ inline int get_prio_map(u32 prio_map, int prio)
+   return (prio_map >> (4 * (7-prio))) & 0xF;
+ }
+ 
+-inline void set_prio_map(u32 *prio_map, u8 prio, int tc)
++static inline void set_prio_map(u32 *prio_map, u8 prio, int tc)
+ {
+   u32 mask = ~(0x & (0xF << (4 * (7-prio;
+   *prio_map &= mask;
+-- 
+1.9.1
+
diff --git a/meta-networking/recipes-daemons/lldpad/lldpad_0.9.46.bb 
b/meta-networking/recipes-daemons/lldpad/lldpad_0.9.46.bb
index 8c44a3e..0c8c5d8 100644
--- a/meta-networking/recipes-daemons/lldpad

[oe] [PATCH][meta-oe] lvm2: install initscript or systemd unit service conditionally

[rongqing.li]

From: Roy Li 

Issue: LIN8-854

install systemd unit files and modify them only when DISTRO_FEATURE
systemd is enabled, otherwise do_install failed due to no
blk-availability.service file
   sed: can't read 
tmp/work/armv5e-wrs-linux-gnueabi/lvm2/2.02.125-r0/image/lib/systemd/system/blk-availability.service:
 No such file or directory

install the initscript when init is not systemd

Signed-off-by: Roy Li 
---
 meta-oe/recipes-support/lvm2/lvm2.inc | 10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc 
b/meta-oe/recipes-support/lvm2/lvm2.inc
index 2b2d8ed..cc70246 100644
--- a/meta-oe/recipes-support/lvm2/lvm2.inc
+++ b/meta-oe/recipes-support/lvm2/lvm2.inc
@@ -39,8 +39,14 @@ do_install_append() {
 # Install machine specific configuration file
 install -m 0644 ${WORKDIR}/lvm.conf ${D}${sysconfdir}/lvm/lvm.conf
 sed -i -e 's:@libdir@:${libdir}:g' ${D}${sysconfdir}/lvm/lvm.conf
-oe_runmake 'DESTDIR=${D}' install install_systemd_units
-sed -i -e 's:/usr/bin/true:${base_bindir}/true:g' 
${D}${systemd_unitdir}/system/blk-availability.service
+if ${@base_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_unitdir}/system/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
 }
 
 SYSTEMD_PACKAGES = "${PN}"
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH][meta-networking] net-snmp: make it be able to be compiled by gcc5 with "-O0"

[rongqing.li]

From: Roy Li 

Signed-off-by: Roy Li 
---
 ...-functions-work-with-both-gnu11-and-gnu89.patch | 85 ++
 .../recipes-protocols/net-snmp/net-snmp_5.7.2.1.bb |  1 +
 2 files changed, 86 insertions(+)
 create mode 100644 
meta-networking/recipes-protocols/net-snmp/net-snmp/0001-get-inline-functions-work-with-both-gnu11-and-gnu89.patch

diff --git 
a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-get-inline-functions-work-with-both-gnu11-and-gnu89.patch
 
b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-get-inline-functions-work-with-both-gnu11-and-gnu89.patch
new file mode 100644
index 000..2d7ba57
--- /dev/null
+++ 
b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-get-inline-functions-work-with-both-gnu11-and-gnu89.patch
@@ -0,0 +1,85 @@
+From 6f319d981ee190c7e858a4b0382617c469cfa77a Mon Sep 17 00:00:00 2001
+From: Roy Li 
+Date: Mon, 14 Sep 2015 13:52:12 +0800
+Subject: [PATCH] get inline functions work with both gnu11 and gnu89
+
+Upstream-status: Pending
+
+After gcc upgraded to gcc5, and if the codes are compiled without 
optimization(-O0),
+and the below error will happen:
+
+./.libs/libnetsnmpagent.so: undefined reference to 
`netsnmp_subtree_change_prev'
+./.libs/libnetsnmpagent.so: undefined reference to 
`netsnmp_table_dataset_delete_data'
+./.libs/libnetsnmpagent.so: undefined reference to 
`netsnmp_subtree_change_next'
+collect2: error: ld returned 1 exit status
+
+gcc5 defaults to -std=gnu11 instead of -std=gnu89, and it requires that 
exactly one C
+source file has the callable copy of the inline function. Consider the 
following
+program:
+
+  inline int
+  foo (void)
+  {
+return 42;
+  }
+
+  int
+  main (void)
+  {
+return foo ();
+  }
+
+The program above will not link with the C99 inline semantics, because no 
out-of-line
+function foo is generated. To fix this, either mark the function foo as 
static, or
+add the following declaration:
+  static inline int foo (void);
+
+more information refer to: https://gcc.gnu.org/gcc-5/porting_to.html;
+
+but the use of "extern inline" will lead to the compilation issue if gcc is not
+gcc5, so replace inline with "static inline"
+
+Signed-off-by: Roy Li 
+---
+ agent/agent_registry.c| 4 ++--
+ agent/helpers/table_dataset.c | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/agent/agent_registry.c b/agent/agent_registry.c
+index 1e2482a..3f0aa12 100644
+--- a/agent/agent_registry.c
 b/agent/agent_registry.c
+@@ -528,7 +528,7 @@ netsnmp_subtree_deepcopy(netsnmp_subtree *a)
+ /** @private
+  *  Replaces next subtree pointer in given subtree.
+  */
+-NETSNMP_INLINE void
++NETSNMP_STATIC_INLINE void
+ netsnmp_subtree_change_next(netsnmp_subtree *ptr, netsnmp_subtree *thenext)
+ {
+ ptr->next = thenext;
+@@ -543,7 +543,7 @@ netsnmp_subtree_change_next(netsnmp_subtree *ptr, 
netsnmp_subtree *thenext)
+ /** @private
+  *  Replaces previous subtree pointer in given subtree.
+  */
+-NETSNMP_INLINE void
++NETSNMP_STATIC_INLINE void
+ netsnmp_subtree_change_prev(netsnmp_subtree *ptr, netsnmp_subtree *theprev)
+ {
+ ptr->prev = theprev;
+diff --git a/agent/helpers/table_dataset.c b/agent/helpers/table_dataset.c
+index 0949a8a..d993993 100644
+--- a/agent/helpers/table_dataset.c
 b/agent/helpers/table_dataset.c
+@@ -107,7 +107,7 @@ netsnmp_init_table_dataset(void) {
+ /** deletes a single dataset table data.
+  *  returns the (possibly still good) next pointer of the deleted data object.
+  */
+-NETSNMP_INLINE netsnmp_table_data_set_storage *
++NETSNMP_STATIC_INLINE netsnmp_table_data_set_storage *
+ netsnmp_table_dataset_delete_data(netsnmp_table_data_set_storage *data)
+ {
+ netsnmp_table_data_set_storage *nextPtr = NULL;
+-- 
+1.9.1
+
diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.2.1.bb 
b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.2.1.bb
index 464473e..f3fa3ba 100644
--- a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.2.1.bb
+++ b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.2.1.bb
@@ -23,6 +23,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.zip \
 file://0001-Fix-CVE-2014-2285.patch \
 file://dont-return-incompletely-parsed-varbinds.patch \
 file://net-snmp-5.7.2-fix-mib-timeout-values.patch \
+file://0001-get-inline-functions-work-with-both-gnu11-and-gnu89.patch \
 "
 
 SRC_URI[md5sum] = "a2c83518648b0f2a5d378625e45c0e18"
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH] collectd: fix a floating dependence on openjdk

[rongqing.li]

From: Roy Li 

1. fix a floating dependence on openjdk
2. fix the host contamination, since the default value of java home
is /usr/lib/jvm:
   warning: library search path "/usr/lib/jvm/jre-1.7.0/lib/amd64/server" is 
unsafe for cross-compilation

Signed-off-by: Roy Li 
---
 meta-oe/recipes-extended/collectd/collectd_5.5.0.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-oe/recipes-extended/collectd/collectd_5.5.0.bb 
b/meta-oe/recipes-extended/collectd/collectd_5.5.0.bb
index 55d7b38..6a3476f 100644
--- a/meta-oe/recipes-extended/collectd/collectd_5.5.0.bb
+++ b/meta-oe/recipes-extended/collectd/collectd_5.5.0.bb
@@ -25,6 +25,7 @@ SYSTEMD_SERVICE_${PN} = "collectd.service"
 FPLAYOUT ?= "--with-fp-layout=nothing"
 
 PACKAGECONFIG ??= ""
+PACKAGECONFIG[openjdk] = 
"--with-java=${STAGING_DIR_TARGET}${libdir}/jvm,--without-java,openjdk-7"
 PACKAGECONFIG[snmp] = "--enable-snmp,--disable-snmp 
--with-libnetsnmp=no,net-snmp"
 PACKAGECONFIG[libmemcached] = 
"--with-libmemcached,--without-libmemcached,libmemcached"
 PACKAGECONFIG[iptables] = "--enable-iptables,--disable-iptables,iptables"
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [meta-oe][PATCH] mysql-python: upgrade to 1.2.5

[rongqing.li]

From: Roy Li 

remove the remove-distribute.patch, v1.2.5 has a similar fix

Signed-off-by: Roy Li 
---
 .../mysql/mysql-python/remove-distribute.patch  | 17 -
 .../{mysql-python_1.2.4.bb => mysql-python_1.2.5.bb}|  8 +++-
 2 files changed, 3 insertions(+), 22 deletions(-)
 delete mode 100644 
meta-oe/recipes-support/mysql/mysql-python/remove-distribute.patch
 rename meta-oe/recipes-support/mysql/{mysql-python_1.2.4.bb => 
mysql-python_1.2.5.bb} (64%)

diff --git a/meta-oe/recipes-support/mysql/mysql-python/remove-distribute.patch 
b/meta-oe/recipes-support/mysql/mysql-python/remove-distribute.patch
deleted file mode 100644
index 0ce750d..000
--- a/meta-oe/recipes-support/mysql/mysql-python/remove-distribute.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Upstream-Status: Innapropriate
-
-Index: MySQL-python-1.2.4/setup.py
-===
 MySQL-python-1.2.4.orig/setup.py
-+++ MySQL-python-1.2.4/setup.py
-@@ -3,8 +3,8 @@
- import os
- import sys
- 
--from distribute_setup import use_setuptools
--use_setuptools()
-+#from distribute_setup import use_setuptools
-+#use_setuptools()
- from setuptools import setup, Extension
- 
- if not hasattr(sys, "hexversion") or sys.hexversion < 0x0204:
diff --git a/meta-oe/recipes-support/mysql/mysql-python_1.2.4.bb 
b/meta-oe/recipes-support/mysql/mysql-python_1.2.5.bb
similarity index 64%
rename from meta-oe/recipes-support/mysql/mysql-python_1.2.4.bb
rename to meta-oe/recipes-support/mysql/mysql-python_1.2.5.bb
index 6fc974e..ac0df4f 100644
--- a/meta-oe/recipes-support/mysql/mysql-python_1.2.4.bb
+++ b/meta-oe/recipes-support/mysql/mysql-python_1.2.5.bb
@@ -8,11 +8,9 @@ DEPENDS = "mysql5"
 
 SRCNAME = "MySQL-python"
 
-SRC_URI = 
"https://pypi.python.org/packages/source/M/${SRCNAME}/${SRCNAME}-${PV}.zip \
-   file://remove-distribute.patch"
-
-SRC_URI[md5sum] = "ddf2386daf10a97af115ffad2ed4a9a0"
-SRC_URI[sha256sum] = 
"e405f9d6be33923d428acaa4db4f4470427f1d15ea0d2d82a933449ace26bbd9"
+SRC_URI = 
"https://pypi.python.org/packages/source/M/${SRCNAME}/${SRCNAME}-${PV}.zip";
+SRC_URI[md5sum] = "654f75b302db6ed8dc5a898c625e030c"
+SRC_URI[sha256sum] = 
"811040b647e5d5686f84db415efd697e6250008b112b6909ba77ac059e140c74"
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH] ypbind-mt: add status command for initscript

[rongqing.li]

From: Zhu Yanjun 

Add the "status" command in initscript to check the status of ypbind.
remove ypbind-yocto.init as ypbind.init, which is the initscript, make
its name similar to other recipes

Signed-off-by: Zhu Yanjun 
Signed-off-by: Roy Li 
---
 .../recipes-support/nis/files/{ypbind-yocto.init => ypbind.init}   | 7 +++
 meta-networking/recipes-support/nis/ypbind-mt_1.38.bb  | 4 ++--
 meta-networking/recipes-support/nis/ypbind-mt_2.2.bb   | 4 ++--
 3 files changed, 11 insertions(+), 4 deletions(-)
 rename meta-networking/recipes-support/nis/files/{ypbind-yocto.init => 
ypbind.init} (96%)

diff --git a/meta-networking/recipes-support/nis/files/ypbind-yocto.init 
b/meta-networking/recipes-support/nis/files/ypbind.init
similarity index 96%
rename from meta-networking/recipes-support/nis/files/ypbind-yocto.init
rename to meta-networking/recipes-support/nis/files/ypbind.init
index 2c50d12..244dc78 100644
--- a/meta-networking/recipes-support/nis/files/ypbind-yocto.init
+++ b/meta-networking/recipes-support/nis/files/ypbind.init
@@ -21,6 +21,9 @@
 #  the NIS binding information.
 ### END INIT INFO
 
+# Need to use status function
+. /etc/init.d/functions
+
 YPBIND_BIN=/usr/sbin/ypbind
 pidfile=/var/run/ypbind.pid
 
@@ -92,6 +95,10 @@ case "$1" in
echo -n "Reload service ypbind"
start-stop-daemon --stop --quiet --signal 1 --pidfile $pidfile
;;
+status)
+   echo -n "Checking for ypbind: "
+   status $YPBIND_BIN
+   ;;
 *)
echo "Usage: $0 
{start|stop|status|try-restart|restart|force-reload|reload|probe}"
exit 1
diff --git a/meta-networking/recipes-support/nis/ypbind-mt_1.38.bb 
b/meta-networking/recipes-support/nis/ypbind-mt_1.38.bb
index d25ef5c..5702cd6 100644
--- a/meta-networking/recipes-support/nis/ypbind-mt_1.38.bb
+++ b/meta-networking/recipes-support/nis/ypbind-mt_1.38.bb
@@ -26,7 +26,7 @@ DEPENDS = " \
 PROVIDES += "ypbind"
 
 SRC_URI = "http://www.linux-nis.org/download/ypbind-mt/${BP}.tar.bz2 \
-   file://ypbind-yocto.init \
+   file://ypbind.init \
file://ypbind.service \
 "
 SRC_URI[md5sum] = "094088c0e282fa7f3b3dd6cc51d0a4e1"
@@ -44,7 +44,7 @@ do_install_append () {
 install -d ${D}${sysconfdir}/init.d
 install -d ${D}${sysconfdir}/rcS.d
 
-install -m 0755 ${WORKDIR}/ypbind-yocto.init 
${D}${sysconfdir}/init.d/ypbind
+install -m 0755 ${WORKDIR}/ypbind.init ${D}${sysconfdir}/init.d/ypbind
 
 install -d ${D}${systemd_unitdir}/system
 install -m 0644 ${WORKDIR}/ypbind.service ${D}${systemd_unitdir}/system
diff --git a/meta-networking/recipes-support/nis/ypbind-mt_2.2.bb 
b/meta-networking/recipes-support/nis/ypbind-mt_2.2.bb
index 6a9262a..cee5880 100644
--- a/meta-networking/recipes-support/nis/ypbind-mt_2.2.bb
+++ b/meta-networking/recipes-support/nis/ypbind-mt_2.2.bb
@@ -21,7 +21,7 @@ PROVIDES += "ypbind"
 PNBLACKLIST[ypbind-mt] ?= "BROKEN: Depends on broken yp-tools"
 
 SRC_URI = "http://www.linux-nis.org/download/ypbind-mt/${BP}.tar.bz2 \
-   file://ypbind-yocto.init \
+   file://ypbind.init \
file://ypbind.service \
 "
 SRC_URI[md5sum] = "54e2040d8266ae7d302d081ca310c8a8"
@@ -41,7 +41,7 @@ do_install_append () {
 install -d ${D}${sysconfdir}/init.d
 install -d ${D}${sysconfdir}/rcS.d
 
-install -m 0755 ${WORKDIR}/ypbind-yocto.init 
${D}${sysconfdir}/init.d/ypbind
+install -m 0755 ${WORKDIR}/ypbind.init ${D}${sysconfdir}/init.d/ypbind
 
 install -d ${D}${systemd_unitdir}/system
 install -m 0644 ${WORKDIR}/ypbind.service ${D}${systemd_unitdir}/system
-- 
2.1.4

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [meta-networking][PATCH 1/2] libnetfilter-conntrack: upgrade to 1.0.4

[rongqing.li]

From: Roy Li 

Signed-off-by: Roy Li 
---
 ...ibnetfilter-conntrack_1.0.2.bb => libnetfilter-conntrack_1.0.4.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename 
meta-networking/recipes-filter/libnetfilter/{libnetfilter-conntrack_1.0.2.bb => 
libnetfilter-conntrack_1.0.4.bb} (80%)

diff --git 
a/meta-networking/recipes-filter/libnetfilter/libnetfilter-conntrack_1.0.2.bb 
b/meta-networking/recipes-filter/libnetfilter/libnetfilter-conntrack_1.0.4.bb
similarity index 80%
rename from 
meta-networking/recipes-filter/libnetfilter/libnetfilter-conntrack_1.0.2.bb
rename to 
meta-networking/recipes-filter/libnetfilter/libnetfilter-conntrack_1.0.4.bb
index df4030c..c1df1cb 100644
--- 
a/meta-networking/recipes-filter/libnetfilter/libnetfilter-conntrack_1.0.2.bb
+++ 
b/meta-networking/recipes-filter/libnetfilter/libnetfilter-conntrack_1.0.4.bb
@@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = 
"file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
 DEPENDS = "libnfnetlink libmnl"
 
 SRC_URI = 
"http://www.netfilter.org/projects/libnetfilter_conntrack/files/libnetfilter_conntrack-${PV}.tar.bz2;name=tar";
-SRC_URI[tar.md5sum] = "447114b5d61bb9a9617ead3217c3d3ff"
-SRC_URI[tar.sha256sum] = 
"a0bd747dd58ae1513586b43c7125b41e6325f97eb95ac63d53cf5aeb33254d12"
+SRC_URI[tar.md5sum] = "18cf80c4b339a3285e78822dbd4f08d7"
+SRC_URI[tar.sha256sum] = 
"d9ec4a3caf49417f2b0a2d8d44249133e8c3ec78c757b7eb8c273f1cb6929c7d"
 
 S = "${WORKDIR}/libnetfilter_conntrack-${PV}"
 
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [meta-networking][PATCH 2/2] conntrack-tools: upgrade to 1.4.2

[rongqing.li]

From: Roy Li 

1. upgrade to 1.4.2
2. backport a patch to fix CVE-2015-6496:
   http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2015-6496

Signed-off-by: Roy Li 
---
 ...ack-tools_1.4.0.bb => conntrack-tools_1.4.2.bb} |  5 +-
 ...build-fix-crash-when-optional-kernel-modu.patch | 85 ++
 2 files changed, 88 insertions(+), 2 deletions(-)
 rename 
meta-networking/recipes-filter/conntrack-tools/{conntrack-tools_1.4.0.bb => 
conntrack-tools_1.4.2.bb} (87%)
 create mode 100644 
meta-networking/recipes-filter/conntrack-tools/files/0001-conntrackd-build-fix-crash-when-optional-kernel-modu.patch

diff --git 
a/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.0.bb 
b/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.2.bb
similarity index 87%
rename from 
meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.0.bb
rename to 
meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.2.bb
index 57fe21c..7b11d20 100644
--- a/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.0.bb
+++ b/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.2.bb
@@ -9,9 +9,10 @@ SRC_URI = " \
 
http://www.netfilter.org/projects/conntrack-tools/files/conntrack-tools-${PV}.tar.bz2;name=tar
 \
 file://conntrack-failover \
 file://init \
+file://0001-conntrackd-build-fix-crash-when-optional-kernel-modu.patch \
 "
-SRC_URI[tar.md5sum] = "ee737c774e01349f75e935228a2d851b"
-SRC_URI[tar.sha256sum] = 
"036b032a5c4d180aad686df21399d74506b9b3d3000794eb13ac313482e24896"
+SRC_URI[tar.md5sum] = "b1f9d006e7bf000a77395ff7cd3fac16"
+SRC_URI[tar.sha256sum] = 
"e5c423dc077f9ca8767eaa6cf40446943905711c6a8fe27f9cc1977d4d6aa11e"
 
 inherit autotools-brokensep update-rc.d pkgconfig
 
diff --git 
a/meta-networking/recipes-filter/conntrack-tools/files/0001-conntrackd-build-fix-crash-when-optional-kernel-modu.patch
 
b/meta-networking/recipes-filter/conntrack-tools/files/0001-conntrackd-build-fix-crash-when-optional-kernel-modu.patch
new file mode 100644
index 000..49c7772
--- /dev/null
+++ 
b/meta-networking/recipes-filter/conntrack-tools/files/0001-conntrackd-build-fix-crash-when-optional-kernel-modu.patch
@@ -0,0 +1,85 @@
+From c392c159605956c7bd4a264ab4490e2b2704c0cd Mon Sep 17 00:00:00 2001
+From: Pablo Neira Ayuso 
+Date: Fri, 13 Jun 2014 12:53:17 +0200
+Subject: [PATCH] conntrackd: build: fix crash when optional kernel modules are
+ not loaded
+
+Upstream-Status: Backport 
+
+Fix a possible crash if conntrackd sees DCCP, SCTP and ICMPv6 traffic
+and the corresponding kernel modules that track this traffic are not
+available.
+
+Fixes: http://bugzilla.netfilter.org/show_bug.cgi?id=910
+Signed-off-by: Pablo Neira Ayuso 
+---
+ src/build.c | 22 +-
+ 1 file changed, 13 insertions(+), 9 deletions(-)
+
+diff --git a/src/build.c b/src/build.c
+index 5799b51..9ba8b57 100644
+--- a/src/build.c
 b/src/build.c
+@@ -105,14 +105,14 @@ static enum nf_conntrack_attr nat_type[] =
+ ATTR_ORIG_NAT_SEQ_OFFSET_AFTER, ATTR_REPL_NAT_SEQ_CORRECTION_POS,
+ ATTR_REPL_NAT_SEQ_OFFSET_BEFORE, ATTR_REPL_NAT_SEQ_OFFSET_AFTER };
+ 
++/* ICMP, UDP and TCP are always loaded with nf_conntrack_ipv4 */
+ static void build_l4proto_tcp(const struct nf_conntrack *ct, struct nethdr *n)
+ {
+-  ct_build_group(ct, ATTR_GRP_ORIG_PORT, n, NTA_PORT,
+-sizeof(struct nfct_attr_grp_port));
+-
+   if (!nfct_attr_is_set(ct, ATTR_TCP_STATE))
+   return;
+ 
++  ct_build_group(ct, ATTR_GRP_ORIG_PORT, n, NTA_PORT,
++sizeof(struct nfct_attr_grp_port));
+   ct_build_u8(ct, ATTR_TCP_STATE, n, NTA_TCP_STATE);
+   if (CONFIG(sync).tcp_window_tracking) {
+   ct_build_u8(ct, ATTR_TCP_WSCALE_ORIG, n, NTA_TCP_WSCALE_ORIG);
+@@ -122,12 +122,12 @@ static void build_l4proto_tcp(const struct nf_conntrack 
*ct, struct nethdr *n)
+ 
+ static void build_l4proto_sctp(const struct nf_conntrack *ct, struct nethdr 
*n)
+ {
+-  ct_build_group(ct, ATTR_GRP_ORIG_PORT, n, NTA_PORT,
+-sizeof(struct nfct_attr_grp_port));
+-
++  /* SCTP is optional, make sure nf_conntrack_sctp is loaded */
+   if (!nfct_attr_is_set(ct, ATTR_SCTP_STATE))
+   return;
+ 
++  ct_build_group(ct, ATTR_GRP_ORIG_PORT, n, NTA_PORT,
++sizeof(struct nfct_attr_grp_port));
+   ct_build_u8(ct, ATTR_SCTP_STATE, n, NTA_SCTP_STATE);
+   ct_build_u32(ct, ATTR_SCTP_VTAG_ORIG, n, NTA_SCTP_VTAG_ORIG);
+   ct_build_u32(ct, ATTR_SCTP_VTAG_REPL, n, NTA_SCTP_VTAG_REPL);
+@@ -135,18 +135,22 @@ static void build_l4proto_sctp(const struct nf_conntrack 
*ct, struct nethdr *n)
+ 
+ static void build_l4proto_dccp(const struct nf_conntrack *ct, struct nethdr 
*n)
+ {
+-  ct_build_group(ct, ATTR_GRP_ORIG_PORT, n, NTA_PORT,
+-sizeof(struct nfct_attr_grp_port));
+-
++  /* DCCP is optional, make sure nf_conntrack_dccp is loaded */
+   

[oe] [PATCH][meta-networking][v4] squid: upgrade to 3.5.7

[rongqing.li]

From: Roy Li 

1. Remove the squid-change-ksh-referen*.patch which is not needed, since
   3.5.7 did not use ksh by default.
2. Update the checksum of COPYING,since the date in it has been changed.
3. Define BUILDCXXFLAGS, otherwise the target gcc options -std=c++11 will
   add into it, and lead to building failure since host gcc maybe not
   support "-std=c++11"
4. Assume to support GNU atomic operations by default, the running check
   on cross-compile setup does not work
5. enable basic auth by checking the DISTRO_FEATURE, and the default
   dependency on db, opensasl and openldap nis have been set, so enable
   them by default.

Signed-off-by: Roy Li 
Signed-off-by: Martin Jansa 
---
 ...ge-ksh-reference-in-krb-ldap-helper-to-sh.patch | 39 --
 .../squid/{squid_3.4.7.bb => squid_3.5.7.bb}   | 16 ++---
 2 files changed, 11 insertions(+), 44 deletions(-)
 delete mode 100644 
meta-networking/recipes-daemons/squid/files/squid-change-ksh-reference-in-krb-ldap-helper-to-sh.patch
 rename meta-networking/recipes-daemons/squid/{squid_3.4.7.bb => 
squid_3.5.7.bb} (79%)

diff --git 
a/meta-networking/recipes-daemons/squid/files/squid-change-ksh-reference-in-krb-ldap-helper-to-sh.patch
 
b/meta-networking/recipes-daemons/squid/files/squid-change-ksh-reference-in-krb-ldap-helper-to-sh.patch
deleted file mode 100644
index 8e03860..000
--- 
a/meta-networking/recipes-daemons/squid/files/squid-change-ksh-reference-in-krb-ldap-helper-to-sh.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-squid: change ksh reference in krb ldap helper to sh
-
-Very simple cert_tool script with no ksh specifics.
-Change it to use sh so a package dependency doesn't
-get created to ksh.
-
-Upstream-Status: Pending
-
-Signed-off-by: Jim Somerville 
-Signed-off-by: Chong Lu 

- helpers/external_acl/kerberos_ldap_group/cert_tool | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/helpers/external_acl/kerberos_ldap_group/cert_tool 
b/helpers/external_acl/kerberos_ldap_group/cert_tool
-index 9f14959..8c4ea11 100644
 a/helpers/external_acl/kerberos_ldap_group/cert_tool
-+++ b/helpers/external_acl/kerberos_ldap_group/cert_tool
-@@ -1,4 +1,4 @@
--#!/bin/ksh
-+#!/bin/sh
- #
- #  
-
- # 
-@@ -64,9 +64,9 @@ QUIT
- # Create database for Sun ldap and pem file for Openldap 
- #
- rm ${server}_[0-9]*.pem 2>/dev/null
--let i=0
-+i=0
-  ls ${server}_[0-9]*.cert | while read file; do
-- let i=i+1
-+ i=`expr $i + 1`
-  cat  $file  >> ${server}_$i.pem
-  CA=`openssl x509 -noout -text -in  ${server}_$i.pem | grep -i "CA:.*true"`
-  if [ -n "$CA" ]; then
--- 
-1.9.1
-
diff --git a/meta-networking/recipes-daemons/squid/squid_3.4.7.bb 
b/meta-networking/recipes-daemons/squid/squid_3.5.7.bb
similarity index 79%
rename from meta-networking/recipes-daemons/squid/squid_3.4.7.bb
rename to meta-networking/recipes-daemons/squid/squid_3.5.7.bb
index 7b00dfc..5d058dc 100644
--- a/meta-networking/recipes-daemons/squid/squid_3.4.7.bb
+++ b/meta-networking/recipes-daemons/squid/squid_3.5.7.bb
@@ -16,17 +16,16 @@ SRC_URI = 
"http://www.squid-cache.org/Versions/v${MAJ_VER}/${MIN_VER}/${BPN}-${P
file://Set-up-for-cross-compilation.patch \
file://Skip-AC_RUN_IFELSE-tests.patch \
file://Fix-flawed-dynamic-ldb-link-test-in-configure.patch \
-   file://squid-change-ksh-reference-in-krb-ldap-helper-to-sh.patch \
file://squid-use-serial-tests-config-needed-by-ptest.patch \
file://run-ptest \
file://volatiles.03_squid \
 "
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=c492e2d6d32ec5c1aad0e0609a141ce9 \
-file://COPYRIGHT;md5=2900f50789c498be8e9f1eb23b55cbe9 \
+
file://errors/COPYRIGHT;md5=0fed8f1462f6fdbc62bb431bcb618f46 \
"
-SRC_URI[md5sum] = "9951034b10f7ee0f45a95cfae61c57c2"
-SRC_URI[sha256sum] = 
"7b423f3d3495a317503ca559ea535f80445fd7c4e3c3e268cb7a8c97c61af2b6"
+SRC_URI[md5sum] = "06e43abc67aedcc3903a2780de20a3ed"
+SRC_URI[sha256sum] = 
"b7dcec8c5cb7f5687aff4256a7522f670c310a350cc9e9c0f29f3fd9cf88d017"
 
 DEPENDS = "libtool krb5 openldap db cyrus-sasl"
 
@@ -37,7 +36,14 @@ USERADD_PARAM_${PN} = "--system --no-create-home --home-dir 
/var/run/squid --she
 
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[libnetfilter-conntrack] = 
"--with-netfilter-conntrack=${includedir}, --without-netfilter-conntrack, 
libnetfilter-conntrack"
-EXTRA_OECONF += "--with-default-user=squid"
+
+BASIC_AUTH = "DB SASL LDAP NIS"
+DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
+BASIC_AUTH += "${@base_contains('DISTRO_FEATURES', 'pam', 'PAM', '', d)}"
+
+EXTRA_OECONF += "--with-default-user=squid --enable-auth-basic='${BASIC_AUTH}'"
+export BUILDCXXFLAGS="${BUILD_CXXFLAGS}"
+CACHED_CONFIGUREVARS += "squid_cv_gnu_atomics=yes"
 
 TESTDIR = "test-suite"
 do_compile_ptest() {
-- 
1.9.1

-- 
__

[oe] [meta-oe][PATCH] collectd: fix a floating dependence on openldap

[rongqing.li]

From: Roy Li 

Signed-off-by: Roy Li 
---
 meta-oe/recipes-extended/collectd/collectd_5.5.0.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-oe/recipes-extended/collectd/collectd_5.5.0.bb 
b/meta-oe/recipes-extended/collectd/collectd_5.5.0.bb
index fd3b1ab..55d7b38 100644
--- a/meta-oe/recipes-extended/collectd/collectd_5.5.0.bb
+++ b/meta-oe/recipes-extended/collectd/collectd_5.5.0.bb
@@ -45,6 +45,7 @@ PACKAGECONFIG[libvirt] = 
"--enable-libvirt,--disable-libvirt,libvirt"
 PACKAGECONFIG[libesmtp] = "--with-libesmtp,--without-libesmtp,libesmtp"
 PACKAGECONFIG[libmnl] = "--with-libmnl,--without-libmnl,libmnl"
 PACKAGECONFIG[libatasmart] = 
"--with-libatasmart,--without-libatasmart,libatasmart"
+PACKAGECONFIG[ldap] = "--enable-openldap --with-libldap,--disable-openldap 
--without-libldap, openldap"
 
 EXTRA_OECONF = " \
 ${FPLAYOUT} \
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [meta-oe][PATCH] postgresql: set the tclsh as target path

[rongqing.li]

From: Yue Tao 

The tclsh path in pltcl_listmod is set to sysroot, which causes pltcl_listmod
to fails to run on target, so fix the path to /usr/bin/tclsh.
$ pltcl_listmod
/usr/bin/pltcl_listmod: line 5: 
/buildarea1/WRLinux70-STD-0825/bitbake_build/tmp/sysroots/x86_64-linux/usr/bin/tclsh:
 No such file or directory
$

Signed-off-by: Yue Tao 
Signed-off-by: Roy Li 
---
 meta-oe/recipes-support/postgresql/postgresql.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-oe/recipes-support/postgresql/postgresql.inc 
b/meta-oe/recipes-support/postgresql/postgresql.inc
index 15fb7c7..2b8db34 100644
--- a/meta-oe/recipes-support/postgresql/postgresql.inc
+++ b/meta-oe/recipes-support/postgresql/postgresql.inc
@@ -139,6 +139,7 @@ do_configure() {
-e "/^perl_embed_ldflags/s:${LIBPNA}:${STAGING_LIBDIR}:g" \
-e "/^perl_embed_ldflags/s:${LIBNA}:${STAGING_LIBDIR}:g"  \
-e "/^perl_embed_ldflags/s:${BLIBNA}:${STAGING_BASELIBDIR}:g" \
+   -e "/^TCLSH/s:=.*:= ${bindir}/tclsh:g" \
${B}/src/Makefile.global
 
# workaround perl package's libperl.so problem
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH][meta-oe] collectd: fix a floating dependence on libvirt

[rongqing.li]

From: Roy Li 

Even though the PACKAGECONFIG of libvirt is used to fix the floating
dependence, but enable-libvirt/disable-libvirt become useless after
collectd upgrade, and libvirt is checked unconditionally, and lead to
a floating dependence on libvirt.

check if libvirt is available only when a user wants to use libvirt
to fix this issue

Signed-off-by: Roy Li 
---
 .../0001-conditionally-check-libvirt.patch | 39 ++
 .../recipes-extended/collectd/collectd_5.5.0.bb|  4 ++-
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 
meta-oe/recipes-extended/collectd/collectd/0001-conditionally-check-libvirt.patch

diff --git 
a/meta-oe/recipes-extended/collectd/collectd/0001-conditionally-check-libvirt.patch
 
b/meta-oe/recipes-extended/collectd/collectd/0001-conditionally-check-libvirt.patch
new file mode 100644
index 000..d0a5804
--- /dev/null
+++ 
b/meta-oe/recipes-extended/collectd/collectd/0001-conditionally-check-libvirt.patch
@@ -0,0 +1,39 @@
+[PATCH] conditionally check libvirt
+
+Upstream-Statue: Pending
+
+check if libvirt is available only when a user wants to use libvirt
+
+Signed-off-by: Roy Li 
+---
+ configure.ac | 14 --
+ 1 file changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 923498e..7206095 100644
+--- a/configure.ac
 b/configure.ac
+@@ -4778,12 +4778,14 @@ then
+   with_libxml2="no (pkg-config doesn't know libxml-2.0)"
+   fi
+ 
+-  $PKG_CONFIG --exists libvirt 2>/dev/null
+-  if test "$?" = "0"
+-  then
+-  with_libvirt="yes"
+-  else
+-  with_libvirt="no (pkg-config doesn't know libvirt)"
++  if test "x$enable_libvirt" = "xyes"; then
++  $PKG_CONFIG --exists libvirt 2>/dev/null
++  if test "$?" = "0"
++  then
++  with_libvirt="yes"
++  else
++  with_libvirt="no (pkg-config doesn't know libvirt)"
++  fi
+   fi
+ fi
+ if test "x$with_libxml2" = "xyes"
+-- 
+1.9.1
+
diff --git a/meta-oe/recipes-extended/collectd/collectd_5.5.0.bb 
b/meta-oe/recipes-extended/collectd/collectd_5.5.0.bb
index feda26b..fd3b1ab 100644
--- a/meta-oe/recipes-extended/collectd/collectd_5.5.0.bb
+++ b/meta-oe/recipes-extended/collectd/collectd_5.5.0.bb
@@ -10,7 +10,9 @@ SRC_URI = "http://collectd.org/files/collectd-${PV}.tar.bz2 \
file://collectd-version.patch \
file://0001-redefine-the-dependence.patch  \
file://collectd.init \
-   file://collectd.service"
+   file://collectd.service \
+   file://0001-conditionally-check-libvirt.patch \
+"
 SRC_URI[md5sum] = "c39305ef5514b44238b0d31f77e29e6a"
 SRC_URI[sha256sum] = 
"847684cf5c10de1dc34145078af3fcf6e0d168ba98c14f1343b1062a4b569e88"
 
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH][meta-oe] lvm2: enable lvmetad

[rongqing.li]

From: Roy Li 

the systemd unit file of lvm2-monitor requires lvm2-lvmetad.socket which
asks to enable lvmetad, lvmetad is a metadata caching daemon for LVM. so
this fixed the below error:
  # systemctl start lvm2-monitor
  Failed to start lvm2-monitor.service: Unit lvm2-lvmetad.socket failed to 
load: No such file or directory.
  #

replace the installation of system unit file by make install_systemd_units

Signed-off-by: Roy Li 
---
 meta-oe/recipes-support/lvm2/lvm2.inc | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc 
b/meta-oe/recipes-support/lvm2/lvm2.inc
index 099164c..2b2d8ed 100644
--- a/meta-oe/recipes-support/lvm2/lvm2.inc
+++ b/meta-oe/recipes-support/lvm2/lvm2.inc
@@ -24,6 +24,7 @@ EXTRA_OECONF = "--with-user= \
 --enable-udev_rules \
 --enable-pkgconfig \
 --enable-dmeventd \
+--enable-lvmetad \
 --with-udev-prefix= \
 --with-usrlibdir=${libdir} \
 "
@@ -38,14 +39,13 @@ do_install_append() {
 # Install machine specific configuration file
 install -m 0644 ${WORKDIR}/lvm.conf ${D}${sysconfdir}/lvm/lvm.conf
 sed -i -e 's:@libdir@:${libdir}:g' ${D}${sysconfdir}/lvm/lvm.conf
-install -d ${D}${systemd_unitdir}/system
-install -m 0644 ${B}/scripts/lvm2_monitoring_systemd_red_hat.service 
${D}${systemd_unitdir}/system/lvm2-monitor.service
-install -m 0644 ${B}/scripts/dm_event_systemd_red_hat.socket 
${D}${systemd_unitdir}/system/dm-event.socket
-install -m 0644 ${B}/scripts/dm_event_systemd_red_hat.service 
${D}${systemd_unitdir}/system/dm-event.service
+oe_runmake 'DESTDIR=${D}' install install_systemd_units
+sed -i -e 's:/usr/bin/true:${base_bindir}/true:g' 
${D}${systemd_unitdir}/system/blk-availability.service
 }
 
 SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN} = "lvm2-monitor.service dm-event.socket dm-event.service"
+SYSTEMD_SERVICE_${PN} = "lvm2-monitor.service dm-event.socket dm-event.service 
lvm2-lvmetad.socket \
+ lvm2-pvscan@.service blk-availability.service"
 SYSTEMD_AUTO_ENABLE = "disable"
 
 TARGET_CC_ARCH += "${LDFLAGS}"
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH][meta-oe] sg3-utils: upgrade to 1.41

[rongqing.li]

From: Roy Li 

Signed-off-by: Roy Li 
---
 .../sg3-utils/{sg3-utils_1.40.bb => sg3-utils_1.41.bb}| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-support/sg3-utils/{sg3-utils_1.40.bb => 
sg3-utils_1.41.bb} (77%)

diff --git a/meta-oe/recipes-support/sg3-utils/sg3-utils_1.40.bb 
b/meta-oe/recipes-support/sg3-utils/sg3-utils_1.41.bb
similarity index 77%
rename from meta-oe/recipes-support/sg3-utils/sg3-utils_1.40.bb
rename to meta-oe/recipes-support/sg3-utils/sg3-utils_1.41.bb
index 754e03f..61250fa 100644
--- a/meta-oe/recipes-support/sg3-utils/sg3-utils_1.40.bb
+++ b/meta-oe/recipes-support/sg3-utils/sg3-utils_1.41.bb
@@ -10,8 +10,8 @@ LIC_FILES_CHKSUM = 
"file://COPYING;md5=f90da7fc52172599dbf082d7620f18ca"
 
 SRC_URI = "http://sg.danny.cz/sg/p/sg3_utils-${PV}.tgz";
 
-SRC_URI[md5sum] = "4a74ed491b0891fc60cd91d2b5d68331"
-SRC_URI[sha256sum] = 
"44a9ecfd3af018fa9f3586067a8fa5f4874451c3d773d74436d262a7e530ee83"
+SRC_URI[md5sum] = "86ebe3881535ee5c48f81be5be44b362"
+SRC_URI[sha256sum] = 
"c4e2893c36df1ee5b07840ab7c22129544f5dc8a55f7cc8815c9cd8e44ec31c0"
 
 inherit autotools-brokensep
 
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH][meta-oe] lcms: upgrade 2.6->2.7

[rongqing.li]

From: Roy Li 

2.7 is a maintenance release

Signed-off-by: Roy Li 
---
 meta-oe/recipes-support/lcms/{lcms_2.6.bb => lcms_2.7.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-support/lcms/{lcms_2.6.bb => lcms_2.7.bb} (70%)

diff --git a/meta-oe/recipes-support/lcms/lcms_2.6.bb 
b/meta-oe/recipes-support/lcms/lcms_2.7.bb
similarity index 70%
rename from meta-oe/recipes-support/lcms/lcms_2.6.bb
rename to meta-oe/recipes-support/lcms/lcms_2.7.bb
index ad727df..12ccb20 100644
--- a/meta-oe/recipes-support/lcms/lcms_2.6.bb
+++ b/meta-oe/recipes-support/lcms/lcms_2.7.bb
@@ -3,8 +3,8 @@ SECTION = "libs"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6c786c3b7a4afbd3c990f1b81261d516"
 SRC_URI = "${SOURCEFORGE_MIRROR}/lcms/lcms2-${PV}.tar.gz"
-SRC_URI[md5sum] = "f4c08d38ceade4a664ebff7228910a33"
-SRC_URI[sha256sum] = 
"5172528839647c54c3da211837225e221be93e4733f5b5e9f57668f7107e14b1"
+SRC_URI[md5sum] = "06c1626f625424a811fb4b5eb070839d"
+SRC_URI[sha256sum] = 
"4524234ae7de185e6b6da5d31d6875085b2198bc63b1211f7dde6e2d197d6a53"
 
 DEPENDS = "tiff"
 
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH][meta-oe] php: create recipe for 5.6.12

[rongqing.li]

From: Roy Li 

The difference between 5.6.x and 5.5.x is in http://php.net/migration56
Most improvements in PHP 5.6.x have no impact on existing code.
There are a few incompatibilities and new features that should be
considered, and code should be tested before switching PHP versions
in production environments.

Signed-off-by: Roy Li 
---
 .../change-AC_TRY_RUN-to-AC_TRY_LINK.patch |  56 +
 meta-oe/recipes-devtools/php/php.inc   | 271 
 meta-oe/recipes-devtools/php/php_5.5.26.bb | 273 +
 meta-oe/recipes-devtools/php/php_5.6.12.bb |   5 +
 4 files changed, 333 insertions(+), 272 deletions(-)
 create mode 100644 
meta-oe/recipes-devtools/php/php-5.6.12/change-AC_TRY_RUN-to-AC_TRY_LINK.patch
 create mode 100644 meta-oe/recipes-devtools/php/php.inc
 create mode 100644 meta-oe/recipes-devtools/php/php_5.6.12.bb

diff --git 
a/meta-oe/recipes-devtools/php/php-5.6.12/change-AC_TRY_RUN-to-AC_TRY_LINK.patch
 
b/meta-oe/recipes-devtools/php/php-5.6.12/change-AC_TRY_RUN-to-AC_TRY_LINK.patch
new file mode 100644
index 000..39c334f
--- /dev/null
+++ 
b/meta-oe/recipes-devtools/php/php-5.6.12/change-AC_TRY_RUN-to-AC_TRY_LINK.patch
@@ -0,0 +1,56 @@
+[PATCH] config.m4: change AC_TRY_RUN to AC_TRY_LINK
+
+Upstream-Status: Pending
+
+AC_TRY_RUN is not suitable for cross-compile
+
+Signed-off-by: Roy Li 
+---
+ ext/fileinfo/config.m4 | 31 ++-
+ 1 file changed, 6 insertions(+), 25 deletions(-)
+
+diff --git a/ext/fileinfo/config.m4 b/ext/fileinfo/config.m4
+index 7e98d62..8a8ea0e 100644
+--- a/ext/fileinfo/config.m4
 b/ext/fileinfo/config.m4
+@@ -14,31 +14,12 @@ if test "$PHP_FILEINFO" != "no"; then
+ libmagic/readcdf.c libmagic/softmagic.c"
+ 
+   AC_MSG_CHECKING([for strcasestr])
+-  AC_TRY_RUN([
+-#include 
+-#include 
+-#include 
+-
+-int main(void)
+-{
+-char *s0, *s1, *ret;
+-
+-s0 = (char *) malloc(42);
+-s1 = (char *) malloc(8);
+-
+-memset(s0, 'X', 42);
+-s0[24] = 'Y';
+-s0[26] = 'Z';
+-s0[41] = '\0';
+-memset(s1, 'x', 8);
+-s1[0] = 'y';
+-s1[2] = 'Z';
+-s1[7] = '\0';
+-
+-ret = strcasestr(s0, s1);
+-
+-return !(NULL != ret);
+-}
++  AC_TRY_COMPILE([
++ #include 
++ #include 
++ #include 
++  ],[
++ strcasestr(NULL, NULL);
+   ],[
+ dnl using the platform implementation
+ AC_MSG_RESULT(yes)
+-- 
+1.9.1
+
diff --git a/meta-oe/recipes-devtools/php/php.inc 
b/meta-oe/recipes-devtools/php/php.inc
new file mode 100644
index 000..67d2362
--- /dev/null
+++ b/meta-oe/recipes-devtools/php/php.inc
@@ -0,0 +1,271 @@
+SUMMARY = "A server-side, HTML-embedded scripting language"
+HOMEPAGE = "http://www.php.net";
+SECTION = "console/network"
+
+LICENSE = "PHP-3.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=464ca70af214d2407f6b7d4458158afd"
+
+BBCLASSEXTEND = "native"
+DEPENDS = "zlib bzip2 libxml2 virtual/libiconv php-native lemon-native \
+   openssl libmcrypt"
+DEPENDS_class-native = "zlib-native libxml2-native"
+
+SRC_URI = "http://php.net/distributions/php-${PV}.tar.bz2 \
+   file://acinclude-xml2-config.patch \
+   file://0001-php-don-t-use-broken-wrapper-for-mkdir.patch \
+   file://0001-acinclude-use-pkgconfig-for-libxml2-config.patch \
+  "
+
+SRC_URI_append_class-target += " \
+file://iconv.patch \
+file://imap-fix-autofoo.patch \
+file://pear-makefile.patch \
+file://phar-makefile.patch \
+file://php_exec_native.patch \
+file://php-fpm.conf \
+file://php-fpm-apache.conf \
+file://configure.patch \
+file://pthread-check-threads-m4.patch \
+file://70_mod_php5.conf \
+file://php-fpm.service \
+  "
+S = "${WORKDIR}/php-${PV}"
+
+inherit autotools pkgconfig pythonnative gettext
+
+# phpize is not scanned for absolute paths by default (but php-config is).
+#
+SSTATE_SCAN_FILES += "phpize"
+SSTATE_SCAN_FILES += "build-defs.h"
+
+PHP_LIBDIR = "${libdir}/php5"
+
+# Common EXTRA_OECONF
+COMMON_EXTRA_OECONF = "--enable-sockets \
+   --enable-pcntl \
+   --enable-shared \
+   --disable-opcache \
+   --disable-rpath \
+   --with-pic \
+   --libdir=${PHP_LIBDIR} \
+"
+EXTRA_OECONF = "--enable-mbstring \
+--enable-wddx \
+--enable-fpm \
+--enable-zip \
+--with-libdir=${baselib} \
+--with-gettext=${STAGING_LIBDIR}/.. \
+--with-zlib=${STAGING_LIBDIR}/.. \
+--with-iconv=${STAGING_LIBDIR}/.. \
+--with-mcrypt=${STAGING_DIR_TARGET}${exec_prefix} \
+--with-bz2=${STAGING_DIR_TARGET}${exec_prefix} \
+--with-config-file-path=${sysconfdir}/php/apache2-

[oe] [PATCH 1/2][meta-oe] libsodium: create recipe

[rongqing.li]

From: Roy Li 

zeromq 4.1.3 requires libsodium

Sodium is a new, easy-to-use software library for encryption, decryption,
signatures, password hashing and more. It is a portable, cross-compilable,
installable, packageable fork of NaCl, with a compatible API, and an extended
API to improve usability even further. Its goal is to provide all of the core
operations needed to build higher-level cryptographic tools. The design
choices emphasize security, and "magic constants" have clear rationales.

The same cannot be said of NIST curves, where the specific origins of certain
constants are not described by the standards. And despite the emphasis on
higher security, primitives are faster across-the-board than most
implementations of the NIST standards.

Signed-off-by: Roy Li 
---
 meta-oe/recipes-support/libsodium/libsodium_1.0.3.bb | 11 +++
 1 file changed, 11 insertions(+)
 create mode 100644 meta-oe/recipes-support/libsodium/libsodium_1.0.3.bb

diff --git a/meta-oe/recipes-support/libsodium/libsodium_1.0.3.bb 
b/meta-oe/recipes-support/libsodium/libsodium_1.0.3.bb
new file mode 100644
index 000..d02bb9b
--- /dev/null
+++ b/meta-oe/recipes-support/libsodium/libsodium_1.0.3.bb
@@ -0,0 +1,11 @@
+SUMMARY = "The Sodium crypto library"
+HOMEPAGE = "http://libsodium.org/";
+LICENSE = "ISC"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=092a09b78c3be486fac807435bf17b7a"
+
+SRC_URI = 
"https://download.libsodium.org/libsodium/releases/${BPN}-${PV}.tar.gz";
+
+SRC_URI[md5sum] = "b3bcc98e34d3250f55ae196822307fab"
+SRC_URI[sha256sum] = 
"cbcfc63cc90c05d18a20f229a62c7e7054a73731d0aa858c0517152c549b1288"
+
+inherit autotools
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH 2/2][meta-oe] zeromq: upgrade to 4.1.3

[rongqing.li]

From: Roy Li 

4.1.3 has the dependence on libsodium,
4.1.3 asks pkgconfig bbclass to configure,
add a target to build ptest, since the orignial check will build and run
which is not suitable for cross-compile, and change the ptest installation
directories

Signed-off-by: Roy Li 
---
 .../zeromq/{zeromq_4.0.4.bb => zeromq_4.1.3.bb}| 14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)
 rename meta-oe/recipes-connectivity/zeromq/{zeromq_4.0.4.bb => 
zeromq_4.1.3.bb} (62%)

diff --git a/meta-oe/recipes-connectivity/zeromq/zeromq_4.0.4.bb 
b/meta-oe/recipes-connectivity/zeromq/zeromq_4.1.3.bb
similarity index 62%
rename from meta-oe/recipes-connectivity/zeromq/zeromq_4.0.4.bb
rename to meta-oe/recipes-connectivity/zeromq/zeromq_4.1.3.bb
index 80907fa..5d0e2d5 100644
--- a/meta-oe/recipes-connectivity/zeromq/zeromq_4.0.4.bb
+++ b/meta-oe/recipes-connectivity/zeromq/zeromq_4.1.3.bb
@@ -2,12 +2,13 @@ DESCRIPTION = "ZeroMQ looks like an embeddable networking 
library but acts like
 HOMEPAGE = "http://www.zeromq.org";
 LICENSE = "LGPLv3+"
 LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=d5311495d952062e0e4fbba39cbf3de1"
+DEPENDS = "libsodium"
 
 SRC_URI = "http://download.zeromq.org/zeromq-${PV}.tar.gz \
file://run-ptest \
"
-SRC_URI[md5sum] = "f3c3defbb5ef6cc000ca65e529fdab3b"
-SRC_URI[sha256sum] = 
"1ef71d46e94f33e27dd5a1661ed626cd39be4d2d6967792a275040e34457d399"
+SRC_URI[md5sum] = "d0824317348cfb44b8692e19cc73dc3a"
+SRC_URI[sha256sum] = 
"61b31c830db37e417235a24d3660a4bcc3f40d303ee58df082fcd68bf411"
 
 S = "${WORKDIR}/zeromq-${PV}"
 
@@ -16,9 +17,14 @@ S = "${WORKDIR}/zeromq-${PV}"
 #CFLAGS_append += "-O0"
 #CXXFLAGS_append += "-O0"
 
-inherit autotools ptest
+inherit autotools ptest pkgconfig
+
+do_compile_ptest () {
+   echo 'buildtest-TESTS: $(check_PROGRAMS)' >> ${B}/Makefile
+   oe_runmake buildtest-TESTS
+}
 
 do_install_ptest () {
 install -d ${D}${PTEST_PATH}/tests
-install -m 0755 ${B}/tests/.libs/* ${D}${PTEST_PATH}/tests
+install -m 0755 ${B}/.libs/test_* ${D}${PTEST_PATH}/tests
 }
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH][meta-oe] dialog: upgrade to 1.2-20150528

[rongqing.li]

From: Roy Li 

remove use-pkg-config-for-ncurses-detection.patch, the new version is
using the pkg-config to check ncurses
configuration assumes the cf_have_ncuconfig is unknown for cross-compile,
but ncurses is added into DEPENDS, so change it as yes

Signed-off-by: Roy Li 
---
 ...alog_1.2-20150225.bb => dialog_1.2-20150528.bb} |  6 ++--
 .../use-pkg-config-for-ncurses-detection.patch | 32 --
 2 files changed, 3 insertions(+), 35 deletions(-)
 rename meta-oe/recipes-extended/dialog/{dialog_1.2-20150225.bb => 
dialog_1.2-20150528.bb} (78%)
 delete mode 100644 
meta-oe/recipes-extended/dialog/files/use-pkg-config-for-ncurses-detection.patch

diff --git a/meta-oe/recipes-extended/dialog/dialog_1.2-20150225.bb 
b/meta-oe/recipes-extended/dialog/dialog_1.2-20150528.bb
similarity index 78%
rename from meta-oe/recipes-extended/dialog/dialog_1.2-20150225.bb
rename to meta-oe/recipes-extended/dialog/dialog_1.2-20150528.bb
index 88af59f..4fb938e 100644
--- a/meta-oe/recipes-extended/dialog/dialog_1.2-20150225.bb
+++ b/meta-oe/recipes-extended/dialog/dialog_1.2-20150528.bb
@@ -8,11 +8,10 @@ DEPENDS = "ncurses"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343"
 
-SRC_URI[md5sum] = "38ef59a7daa5459119cb06777c735e4b"
-SRC_URI[sha256sum] = 
"6844b13a7a1fea568a8d5bb3004e1af90888cd4a5e8c2ded2c38f34fcc7397ff"
+SRC_URI[md5sum] = "593615fb448e001e5b81420473a7354b"
+SRC_URI[sha256sum] = 
"a8cd7a66bdb41e53a3145cbb0eb370c5ce7300fe0e9ad6d3e8d3b9e16ff16418"
 
 SRC_URI = "ftp://invisible-island.net/dialog/dialog-${PV}.tgz \
-   file://use-pkg-config-for-ncurses-detection.patch \
   "
 
 # hardcoded here for use in dialog-static recipe
@@ -26,5 +25,6 @@ EXTRA_OECONF = "--with-ncurses \
 do_configure() {
 gnu-configize --force
 sed -i 's,${cf_ncuconfig_root}6-config,${cf_ncuconfig_root}-config,g' -i 
configure
+sed -i 's,cf_have_ncuconfig=unknown,cf_have_ncuconfig=yes,g' -i configure
 oe_runconf
 }
diff --git 
a/meta-oe/recipes-extended/dialog/files/use-pkg-config-for-ncurses-detection.patch
 
b/meta-oe/recipes-extended/dialog/files/use-pkg-config-for-ncurses-detection.patch
deleted file mode 100644
index 0a25a7f..000
--- 
a/meta-oe/recipes-extended/dialog/files/use-pkg-config-for-ncurses-detection.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Subject: [PATCH] use pkg-config for ncurses detection.
-
-Upstream-Status: Inappropriate [configuration]
-
-This is a workaround to make dialog be able to build after ncurses-config
-does not work, since the configure file is called directly in dialog bb
-file, and autoconf can not work, make a workaround in configure file.
-
-Signed-off-by: Roy Li 

- configure | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/configure b/configure
-index 8afe3d7..a54bcc1 100755
 a/configure
-+++ b/configure
-@@ -11567,9 +11567,8 @@ fi
- 
- if test "$NCURSES_CONFIG" != none ; then
- 
--CPPFLAGS="$CPPFLAGS `$NCURSES_CONFIG --cflags`"
--
--cf_add_libs="`$NCURSES_CONFIG --libs`"
-+CPPFLAGS="$CPPFLAGS `pkg-config --short-errors --print-errors --cflags 
"ncurses" 2>/dev/null`"
-+cf_add_libs="`pkg-config --short-errors --print-errors --libs "ncurses" 
2>/dev/null` $LIBS"
- # Filter out duplicates - this happens with badly-designed ".pc" files...
- for cf_add_1lib in $LIBS
- do
--- 
-1.7.10.4
-
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH][meta-oe] gd: upgrade to 2.1.1

[rongqing.li]

From: Roy Li 

remove fix-the-subdir-objects-error.patch, a same fix has been merged
into source code.

Signed-off-by: Roy Li 
---
 .../gd/gd-2.1.0/fix-the-subdir-objects-error.patch | 39 --
 .../gd/{gd_2.1.0.bb => gd_2.1.1.bb}|  5 ++-
 2 files changed, 2 insertions(+), 42 deletions(-)
 delete mode 100644 
meta-oe/recipes-support/gd/gd-2.1.0/fix-the-subdir-objects-error.patch
 rename meta-oe/recipes-support/gd/{gd_2.1.0.bb => gd_2.1.1.bb} (87%)

diff --git 
a/meta-oe/recipes-support/gd/gd-2.1.0/fix-the-subdir-objects-error.patch 
b/meta-oe/recipes-support/gd/gd-2.1.0/fix-the-subdir-objects-error.patch
deleted file mode 100644
index 02b1670..000
--- a/meta-oe/recipes-support/gd/gd-2.1.0/fix-the-subdir-objects-error.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From b1ae702a4e2c3b0ebe0772a88b45a37b84f5 Mon Sep 17 00:00:00 2001
-From: Robert Yang 
-Date: Fri, 17 Jan 2014 01:58:05 -0500
-Subject: [PATCH] configure.ac: fix the subdir-objects error
-
-Fix this error:
-iautomake: warning: possible forward-incompatibility.
-automake: At least a source file is in a subdirectory, but the 'subdir-objects'
-automake: automake option hasn't been enabled.  For now, the corresponding 
output
-automake: object file(s) will be placed in the top-level directory.  However,
-automake: this behaviour will change in future Automake versions: they will
-automake: unconditionally cause object files to be placed in the same 
subdirectory
-automake: of the corresponding sources.
-automake: You are advised to start using 'subdir-objects' option throughout 
your
-automake: project, to avoid future incompatibilities.
-
-Upstream-Status: Pending
-
-Signed-off-by: Robert Yang 

- configure.ac |2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 2f9f744..438e08b 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -45,7 +45,7 @@ AC_SUBST(GDLIB_AGE)
- FEATURES="GD_GIF GD_GIFANIM GD_OPENPOLYGON"
- AC_SUBST(FEATURES)
- 
--AM_INIT_AUTOMAKE([foreign dist-bzip2 dist-xz -Wall -Werror])
-+AM_INIT_AUTOMAKE([foreign dist-bzip2 dist-xz -Wall -Werror subdir-objects])
- AC_CONFIG_HEADERS([src/config.h:src/config.hin])
- 
- dnl newer automake wants this, but we still want to work with older
--- 
-1.7.10.4
-
diff --git a/meta-oe/recipes-support/gd/gd_2.1.0.bb 
b/meta-oe/recipes-support/gd/gd_2.1.1.bb
similarity index 87%
rename from meta-oe/recipes-support/gd/gd_2.1.0.bb
rename to meta-oe/recipes-support/gd/gd_2.1.1.bb
index f03b9b0..0731902 100644
--- a/meta-oe/recipes-support/gd/gd_2.1.0.bb
+++ b/meta-oe/recipes-support/gd/gd_2.1.1.bb
@@ -13,10 +13,9 @@ LIC_FILES_CHKSUM = 
"file://COPYING;md5=c97638cafd3581eb87abd37332137669"
 DEPENDS = "freetype libpng jpeg zlib tiff libvpx"
 
 SRC_URI = "https://bitbucket.org/libgd/gd-libgd/downloads/libgd-${PV}.tar.bz2 \
-   file://fix-the-subdir-objects-error.patch \
 "
-SRC_URI[md5sum] = "5a1d5bab3a4a41d9f111bcceee4ad25b"
-SRC_URI[sha256sum] = 
"f3e1bc472bd81ee976a739436659fe752a14727a964c64530fde68531ddeee91"
+SRC_URI[md5sum] = "d3f1a992ac9c550ebc6da89c147f89af"
+SRC_URI[sha256sum] = 
"895ea9c6fcab187b0a908ae3e9e6b06423756f8a643d362349b0caab4014bd0d"
 
 S = "${WORKDIR}/libgd-${PV}"
 
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH][meta-oe] imagemagick: upgrade 6.9.1 -> 6.9.2

[rongqing.li]

From: Roy Li 

Signed-off-by: Roy Li 
---
 .../imagemagick/{imagemagick_6.9.1.bb => imagemagick_6.9.2.bb}  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta-oe/recipes-support/imagemagick/{imagemagick_6.9.1.bb => 
imagemagick_6.9.2.bb} (92%)

diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_6.9.1.bb 
b/meta-oe/recipes-support/imagemagick/imagemagick_6.9.2.bb
similarity index 92%
rename from meta-oe/recipes-support/imagemagick/imagemagick_6.9.1.bb
rename to meta-oe/recipes-support/imagemagick/imagemagick_6.9.2.bb
index 6ee3724..bb71037 100644
--- a/meta-oe/recipes-support/imagemagick/imagemagick_6.9.1.bb
+++ b/meta-oe/recipes-support/imagemagick/imagemagick_6.9.2.bb
@@ -5,11 +5,11 @@ LIC_FILES_CHKSUM = 
"file://LICENSE;md5=0887b670be7ef0c3cb37092b64d57514"
 # FIXME: There are many more checked libraries. All should be added or 
explicitly disabled to get consistent results.
 DEPENDS = "lcms bzip2 jpeg libpng librsvg tiff zlib virtual/fftw freetype"
 
-PATCHSET = "4"
+PATCHSET = "0"
 SRC_URI = 
"http://www.imagemagick.org/download/releases/ImageMagick-${PV}-${PATCHSET}.tar.xz
 \
 "
-SRC_URI[md5sum] = "b5929717d848a386f2674aeb31257c42"
-SRC_URI[sha256sum] = 
"74973478058069ce44040ff76b61df713d70adcadfd207836cc0622cadf1e4bf"
+SRC_URI[md5sum] = "99471c8c3f38c9264faf5c4ca7a31287"
+SRC_URI[sha256sum] = 
"07a2de28f7f9ab888ef47c02eb7e10cc3e0dd0e9797c5d71d6e71d19f842399e"
 
 S = "${WORKDIR}/ImageMagick-${PV}-${PATCHSET}"
 
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH][meta-oe] cryptsetup: upgrade 1.6.6 -> 1.6.7

[rongqing.li]

From: Roy Li 

1.6.7 is a bugfix release.

Signed-off-by: Roy Li 
---
 .../cryptsetup/{cryptsetup_1.6.6.bb => cryptsetup_1.6.7.bb}   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-support/cryptsetup/{cryptsetup_1.6.6.bb => 
cryptsetup_1.6.7.bb} (89%)

diff --git a/meta-oe/recipes-support/cryptsetup/cryptsetup_1.6.6.bb 
b/meta-oe/recipes-support/cryptsetup/cryptsetup_1.6.7.bb
similarity index 89%
rename from meta-oe/recipes-support/cryptsetup/cryptsetup_1.6.6.bb
rename to meta-oe/recipes-support/cryptsetup/cryptsetup_1.6.7.bb
index d84ad2f..939ee35 100644
--- a/meta-oe/recipes-support/cryptsetup/cryptsetup_1.6.6.bb
+++ b/meta-oe/recipes-support/cryptsetup/cryptsetup_1.6.7.bb
@@ -12,8 +12,8 @@ LIC_FILES_CHKSUM = 
"file://COPYING;md5=32107dd283b1dfeb66c9b3e6be312326"
 DEPENDS = "util-linux lvm2 popt libgcrypt"
 
 SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v1.6/${BP}.tar.xz"
-SRC_URI[md5sum] = "179c0781de59838a4e39f61b2df5ea48"
-SRC_URI[sha256sum] = 
"2d2ce28e4e1137dd599d87884b62ef6dbf14fd7848b2a2bf7d61cf125fbd8e6f"
+SRC_URI[md5sum] = "918406eb5d2e2f5a7348c432ea9b1473"
+SRC_URI[sha256sum] = 
"c23c24c8d662032da8650c1c84985221be8bbedf4737c1540bba7e4517dfe820"
 
 inherit autotools gettext pkgconfig
 
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH 1/3][meta-oe] libestr: upgrade to 0.1.10

[rongqing.li]

From: Roy Li 

rsyslog 7.6.1 needs the new version libestr

Signed-off-by: Roy Li 
---
 .../recipes-support/libestr/{libestr_0.1.6.bb => libestr_0.1.10.bb}   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-support/libestr/{libestr_0.1.6.bb => libestr_0.1.10.bb} 
(67%)

diff --git a/meta-oe/recipes-support/libestr/libestr_0.1.6.bb 
b/meta-oe/recipes-support/libestr/libestr_0.1.10.bb
similarity index 67%
rename from meta-oe/recipes-support/libestr/libestr_0.1.6.bb
rename to meta-oe/recipes-support/libestr/libestr_0.1.10.bb
index e3f675a..9bff4f3 100644
--- a/meta-oe/recipes-support/libestr/libestr_0.1.6.bb
+++ b/meta-oe/recipes-support/libestr/libestr_0.1.10.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = 
"file://COPYING;md5=9d6c993486c18262afba4ca5bcb894d0"
 
 SRC_URI = "http://libestr.adiscon.com/files/download/${BP}.tar.gz";
 
-SRC_URI[md5sum] = "f48a7098080eebfe7842673c23dcd064"
-SRC_URI[sha256sum] = 
"b9c819d30397845fdf85bb1f37c52e81de23aa3b061ec6cc4386f1b942960153"
+SRC_URI[md5sum] = "f4c9165a23587e77f7efe65d676d5e8e"
+SRC_URI[sha256sum] = 
"bd655e126e750edd18544b88eb1568d200a424a0c23f665eb14bbece07ac703c"
 
 inherit autotools
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH 3/3][meta-oe] rsyslog: upgrade to 7.6.1

[rongqing.li]

From: Roy Li 

1. remove two backport patch: 0001-bugfix-potential-abort-during-HUP.patch
and 0001-remove-memleak-introduced-by-GenerateLocalHostName-H.patch
2. update the patch json-0.12-fix.patch
3. remove a obsolete patch rsyslog-use-serial-tests-config-needed-by-ptest.patch
4. update the Dependence
5. update the checksum

Signed-off-by: Roy Li 
---
 .../0001-bugfix-potential-abort-during-HUP.patch   |  91 --
 ...eak-introduced-by-GenerateLocalHostName-H.patch | 103 -
 .../rsyslog/rsyslog/json-0.12-fix.patch|  18 ++--
 ...g-use-serial-tests-config-needed-by-ptest.patch |  28 --
 .../rsyslog/{rsyslog_7.4.4.bb => rsyslog_7.6.1.bb} |  11 +--
 5 files changed, 14 insertions(+), 237 deletions(-)
 delete mode 100644 
meta-oe/recipes-extended/rsyslog/rsyslog/0001-bugfix-potential-abort-during-HUP.patch
 delete mode 100644 
meta-oe/recipes-extended/rsyslog/rsyslog/0001-remove-memleak-introduced-by-GenerateLocalHostName-H.patch
 delete mode 100644 
meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog-use-serial-tests-config-needed-by-ptest.patch
 rename meta-oe/recipes-extended/rsyslog/{rsyslog_7.4.4.bb => rsyslog_7.6.1.bb} 
(93%)

diff --git 
a/meta-oe/recipes-extended/rsyslog/rsyslog/0001-bugfix-potential-abort-during-HUP.patch
 
b/meta-oe/recipes-extended/rsyslog/rsyslog/0001-bugfix-potential-abort-during-HUP.patch
deleted file mode 100644
index 14e8b3f..000
--- 
a/meta-oe/recipes-extended/rsyslog/rsyslog/0001-bugfix-potential-abort-during-HUP.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From 9a775051f7373176c6e54bee1110965342dd41ad Mon Sep 17 00:00:00 2001
-From: Rainer Gerhards 
-Date: Mon, 28 Oct 2013 12:56:02 +0100
-Subject: [PATCH] bugfix: potential abort during HUP
-
-This could happen when one of imklog, imzmq3, imkmsg, impstats,
-imjournal, or imuxsock were under heavy load during a HUP.
-closes: http://bugzilla.adiscon.com/show_bug.cgi?id=489
-Thanks to Guy Rozendorn for reporting the problem and Peval Levhshin for
-his analysis.
-
-Upstream-Status: backport
-
-Signed-off-by: Li Zhou 

- ChangeLog  |6 ++
- runtime/glbl.c |   25 ++---
- 2 files changed, 24 insertions(+), 7 deletions(-)
-
-Index: rsyslog-7.4.4/ChangeLog
-===
 rsyslog-7.4.4.orig/ChangeLog
-+++ rsyslog-7.4.4/ChangeLog
-@@ -1,5 +1,11 @@
- ---
- Version 7.4.4  [v7.4-stable] 2013-09-03
-+- bugfix: potential abort during HUP
-+  This could happen when one of imklog, imzmq3, imkmsg, impstats,
-+  imjournal, or imuxsock were under heavy load during a HUP.
-+  closes: http://bugzilla.adiscon.com/show_bug.cgi?id=489
-+  Thanks to Guy Rozendorn for reporting the problem and Peval Levhshin for
-+  his analysis.
- - better error messages in GuardTime signature provider
-   Thanks to Ahto Truu for providing the patch.
- - make rsyslog use the new json-c pkgconfig file if available
-Index: rsyslog-7.4.4/runtime/glbl.c
-===
 rsyslog-7.4.4.orig/runtime/glbl.c
-+++ rsyslog-7.4.4/runtime/glbl.c
-@@ -32,6 +32,7 @@
- #include 
- #include 
- #include 
-+#include 
- #include 
- 
- #include "rsyslog.h"
-@@ -379,17 +380,24 @@ GetLocalDomain(void)
- /* generate the local hostname property. This must be done after the hostname 
info
-  * has been set as well as PreserveFQDN.
-  * rgerhards, 2009-06-30
-+ * NOTE: This function DELIBERATELY introduces a small memory leak in order 
to gain
-+ * speed. Each time it is called when a property name already exists, a new 
one is
-+ * allocated but the previous one is NOT freed. This is so that current 
readers can
-+ * continue to use the previous name. Otherwise, we would need to use 
read/write locks
-+ * to protect the update process. As this function is called extremely 
infrequently and
-+ * the memory leak is very small, this is totally accessible. Think that 
otherwise we
-+ * would need to place a read look each time the property is read, which is 
much more
-+ * frequent (once per message for the modules that use this local hostname!).
-+ * rgerhards, 2013-10-28
-  */
- static rsRetVal
- GenerateLocalHostNameProperty(void)
- {
--  DEFiRet;
-+  prop_t *hostnameNew;
-   uchar *pszName;
-+  DEFiRet;
- 
--  if(propLocalHostName != NULL)
--  prop.Destruct(&propLocalHostName);
--
--  CHKiRet(prop.Construct(&propLocalHostName));
-+  CHKiRet(prop.Construct(&hostnameNew));
-   if(LocalHostNameOverride == NULL) {
-   if(LocalHostName == NULL)
-   pszName = (uchar*) "[localhost]";
-@@ -403,8 +411,11 @@ GenerateLocalHostNameProperty(void)
-   pszName = LocalHostNameOverride;
-   }
-   DBGPRINTF("GenerateLocalHostName uses '%s'\n", pszName);
--  CHKiRet(prop.SetString(propLocalHostName, pszName, ustrlen(pszName)));
--  CHKiRet(prop.Constr

[oe] [PATCH 2/3][meta-oe] liblogging: add the recipe

[rongqing.li]

From: Roy Li 

rsyslog 7.6.1 needs it

Signed-off-by: Roy Li 
---
 .../liblogging/liblogging_1.0.5.bb | 23 ++
 1 file changed, 23 insertions(+)
 create mode 100644 meta-oe/recipes-extended/liblogging/liblogging_1.0.5.bb

diff --git a/meta-oe/recipes-extended/liblogging/liblogging_1.0.5.bb 
b/meta-oe/recipes-extended/liblogging/liblogging_1.0.5.bb
new file mode 100644
index 000..3488b19
--- /dev/null
+++ b/meta-oe/recipes-extended/liblogging/liblogging_1.0.5.bb
@@ -0,0 +1,23 @@
+SUMMARY = "An easy to use logging library"
+DESCRIPTION = " \
+liblogging (the upstream project) is a collection of several components. \
+Namely: stdlog, journalemu, rfc3195. \
+The stdlog component of liblogging can be viewed as an enhanced version of \
+the syslog(3) API. It retains the easy semantics, but makes the API more \
+sophisticated "behind the scenes" with better support for multiple threads \
+and flexibility for different log destinations (e.g. syslog and systemd \
+journal)."
+SECTION = "libs"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://COPYING;md5=63fe03535d83726f5655072502bef1bc"
+SRC_URI = "http://download.rsyslog.com/${BPN}/${BPN}-${PV}.tar.gz";
+
+SRC_URI[md5sum] = "44b8ce2daa1bfb84c9feaf42f9925fd7"
+SRC_URI[sha256sum] = 
"310dc1691279b7a669d383581fe4b0babdc7bf75c9b54a24e51e60428624890b"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--disable-man-pages"
+
+PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "systemd", 
"systemd", "", d)}"
+PACKAGECONFIG[systemd] = "--enable-journal, --disable-journal, systemd"
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH][meta-oe] sdparm: upgrade to 1.09

[rongqing.li]

From: Roy Li 

Signed-off-by: Roy Li 
---
 meta-oe/recipes-support/sdparm/{sdparm_1.08.bb => sdparm_1.09.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-support/sdparm/{sdparm_1.08.bb => sdparm_1.09.bb} (83%)

diff --git a/meta-oe/recipes-support/sdparm/sdparm_1.08.bb 
b/meta-oe/recipes-support/sdparm/sdparm_1.09.bb
similarity index 83%
rename from meta-oe/recipes-support/sdparm/sdparm_1.08.bb
rename to meta-oe/recipes-support/sdparm/sdparm_1.09.bb
index b603a56..ca11ca4 100644
--- a/meta-oe/recipes-support/sdparm/sdparm_1.08.bb
+++ b/meta-oe/recipes-support/sdparm/sdparm_1.09.bb
@@ -14,8 +14,8 @@ SRC_URI = "http://sg.danny.cz/sg/p/${BPN}-${PV}.tgz \
 PACKAGES =+ "${PN}-scripts"
 RDEPENDS_${PN}-scripts += "bash ${PN}"
 
-SRC_URI[md5sum] = "be5786f37499018ef44f409597c92d42"
-SRC_URI[sha256sum] = 
"376b78a414b1a9c47f3f13dbeb963e7a3ec7be126f83927d6856b5f7ac425e57"
+SRC_URI[md5sum] = "e51b1fd41c3e4c9d1274a2e4f046eebf"
+SRC_URI[sha256sum] = 
"7294f44173ac0946f1de8af02b1bdb0bd648079245396589397a2b0d3abc42d3"
 
 inherit autotools
 
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH][meta-oe][v2] collectd: upgrade to 5.5.0

[rongqing.li]

From: Roy Li 

1. remove two patch glibc-2.20-compatiblity.patch and
0001-netlink-ensure-size_t-portability-in-DEBUG-statement.patch, which
have been merged into
2. update collectd-version.patch
3. redefine the collectd dependence
4. update the license, lots of components have been relicensed to the MIT
license, and The majority of plugins is licensed either under the "MIT License"
or the "GNU General Public License"
4. update the checksum

Signed-off-by: Roy Li 
---
 ...ure-size_t-portability-in-DEBUG-statement.patch |  30 --
 .../collectd/0001-redefine-the-dependence.patch|  28 ++
 .../collectd/collectd/collectd-version.patch   |  16 ++--
 .../collectd/glibc-2.20-compatiblity.patch | 102 -
 .../{collectd_5.4.1.bb => collectd_5.5.0.bb}   |  12 +--
 5 files changed, 41 insertions(+), 147 deletions(-)
 delete mode 100644 
meta-oe/recipes-extended/collectd/collectd/0001-netlink-ensure-size_t-portability-in-DEBUG-statement.patch
 create mode 100644 
meta-oe/recipes-extended/collectd/collectd/0001-redefine-the-dependence.patch
 delete mode 100644 
meta-oe/recipes-extended/collectd/collectd/glibc-2.20-compatiblity.patch
 rename meta-oe/recipes-extended/collectd/{collectd_5.4.1.bb => 
collectd_5.5.0.bb} (90%)

diff --git 
a/meta-oe/recipes-extended/collectd/collectd/0001-netlink-ensure-size_t-portability-in-DEBUG-statement.patch
 
b/meta-oe/recipes-extended/collectd/collectd/0001-netlink-ensure-size_t-portability-in-DEBUG-statement.patch
deleted file mode 100644
index 52b9a86..000
--- 
a/meta-oe/recipes-extended/collectd/collectd/0001-netlink-ensure-size_t-portability-in-DEBUG-statement.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From f6c89c17955223bf8c99a901ca6f901b83fa521f Mon Sep 17 00:00:00 2001
-From: Marc Fournier 
-Date: Wed, 3 Dec 2014 16:15:28 +0100
-Subject: [PATCH] netlink: ensure size_t portability in DEBUG() statement
-
-This prevents the following error when building on 32bit systems with
-gcc 4.7.2:
-
-netlink.c: In function 'ir_read':
-netlink.c:783:7: error: format '%lu' expects argument of type 'long unsigned 
int', but argument 5 has type 'size_t' [-Werror=format]

- src/netlink.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/netlink.c b/src/netlink.c
-index 422dc8c..3c4642c 100644
 a/src/netlink.c
-+++ b/src/netlink.c
-@@ -683,7 +683,7 @@ static int ir_read (void)
- continue;
-   }
- 
--  DEBUG ("netlink plugin: ir_read: querying %s from %s (%lu).",
-+  DEBUG ("netlink plugin: ir_read: querying %s from %s (%zu).",
-   type_name[type_index], iflist[ifindex], ifindex);
- 
-   nlh = mnl_nlmsg_put_header (buf);
--- 
-2.1.4
-
diff --git 
a/meta-oe/recipes-extended/collectd/collectd/0001-redefine-the-dependence.patch 
b/meta-oe/recipes-extended/collectd/collectd/0001-redefine-the-dependence.patch
new file mode 100644
index 000..ef6afad
--- /dev/null
+++ 
b/meta-oe/recipes-extended/collectd/collectd/0001-redefine-the-dependence.patch
@@ -0,0 +1,28 @@
+[PATCH] define the collectd dependence
+
+Upstream-Status: Pending
+
+libavltree.la libcommon.la libheap.la are created dynamically, and in LDADD,
+but not in DEPENDENCIES
+
+Signed-off-by: Roy Li 
+---
+ src/daemon/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
+index 10860ec..7f826e3 100644
+--- a/src/daemon/Makefile.am
 b/src/daemon/Makefile.am
+@@ -49,7 +49,7 @@ collectd_CPPFLAGS =  $(AM_CPPFLAGS) $(LTDLINCL)
+ collectd_CFLAGS = $(AM_CFLAGS)
+ collectd_LDFLAGS = -export-dynamic
+ collectd_LDADD = libavltree.la libcommon.la libheap.la -lm
+-collectd_DEPENDENCIES =
++collectd_DEPENDENCIES = libavltree.la libcommon.la libheap.la
+ 
+ # Link to these libraries..
+ if BUILD_WITH_LIBRT
+-- 
+1.9.1
+
diff --git a/meta-oe/recipes-extended/collectd/collectd/collectd-version.patch 
b/meta-oe/recipes-extended/collectd/collectd/collectd-version.patch
index 1e2b7c1..86c3f65 100644
--- a/meta-oe/recipes-extended/collectd/collectd/collectd-version.patch
+++ b/meta-oe/recipes-extended/collectd/collectd/collectd-version.patch
@@ -11,21 +11,19 @@ Upstream-Status: Pending
 Signed-off-by: Paul Eggleton 
 
 diff --git a/version-gen.sh b/version-gen.sh
-index e344541..d1c0929 100755
+index b09be8e..2671066 100755
 --- a/version-gen.sh
 +++ b/version-gen.sh
-@@ -2,7 +2,10 @@
+@@ -2,8 +2,10 @@
  
- DEFAULT_VERSION="5.2.2.git"
+ DEFAULT_VERSION="5.5.0.git"
  
--VERSION="`git describe 2> /dev/null | sed -e 's/^collectd-//'`"
+-VERSION="`git describe 2> /dev/null | grep collectd | sed -e 
's/^collectd-//'`"
+-
 +VERSION=""
 +if test -d .git ; then
-+  VERSION="`git describe 2> /dev/null | sed -e 's/^collectd-//'`"
++  VERSION="`git describe 2> /dev/null | grep collectd | sed -e 
's/^collectd-//'`"
 +fi
- 
  if test -z "$VERSION"; then
VERSION="$DEFAULT_VERSION"
--- 
-1.7.10.4
-
+ fi
diff --git 
a/meta-oe/recipes-extended/collectd/collectd/glibc-2.20-compat

[oe] [PATCH][meta-oe] collectd: upgrade to 5.5.0

[rongqing.li]

From: Roy Li 

1. remove two patch glibc-2.20-compatiblity.patch and
0001-netlink-ensure-size_t-portability-in-DEBUG-statement.patch, which
have been merged into 
2. update collectd-version.patch
3. redefine the collectd dependence
4. update the checksum

Signed-off-by: Roy Li 
---
 ...ure-size_t-portability-in-DEBUG-statement.patch |  30 --
 .../collectd/0001-redefine-the-dependence.patch|  28 ++
 .../collectd/collectd/collectd-version.patch   |  16 ++--
 .../collectd/glibc-2.20-compatiblity.patch | 102 -
 .../{collectd_5.4.1.bb => collectd_5.5.0.bb}   |   9 +-
 5 files changed, 39 insertions(+), 146 deletions(-)
 delete mode 100644 
meta-oe/recipes-extended/collectd/collectd/0001-netlink-ensure-size_t-portability-in-DEBUG-statement.patch
 create mode 100644 
meta-oe/recipes-extended/collectd/collectd/0001-redefine-the-dependence.patch
 delete mode 100644 
meta-oe/recipes-extended/collectd/collectd/glibc-2.20-compatiblity.patch
 rename meta-oe/recipes-extended/collectd/{collectd_5.4.1.bb => 
collectd_5.5.0.bb} (91%)

diff --git 
a/meta-oe/recipes-extended/collectd/collectd/0001-netlink-ensure-size_t-portability-in-DEBUG-statement.patch
 
b/meta-oe/recipes-extended/collectd/collectd/0001-netlink-ensure-size_t-portability-in-DEBUG-statement.patch
deleted file mode 100644
index 52b9a86..000
--- 
a/meta-oe/recipes-extended/collectd/collectd/0001-netlink-ensure-size_t-portability-in-DEBUG-statement.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From f6c89c17955223bf8c99a901ca6f901b83fa521f Mon Sep 17 00:00:00 2001
-From: Marc Fournier 
-Date: Wed, 3 Dec 2014 16:15:28 +0100
-Subject: [PATCH] netlink: ensure size_t portability in DEBUG() statement
-
-This prevents the following error when building on 32bit systems with
-gcc 4.7.2:
-
-netlink.c: In function 'ir_read':
-netlink.c:783:7: error: format '%lu' expects argument of type 'long unsigned 
int', but argument 5 has type 'size_t' [-Werror=format]

- src/netlink.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/netlink.c b/src/netlink.c
-index 422dc8c..3c4642c 100644
 a/src/netlink.c
-+++ b/src/netlink.c
-@@ -683,7 +683,7 @@ static int ir_read (void)
- continue;
-   }
- 
--  DEBUG ("netlink plugin: ir_read: querying %s from %s (%lu).",
-+  DEBUG ("netlink plugin: ir_read: querying %s from %s (%zu).",
-   type_name[type_index], iflist[ifindex], ifindex);
- 
-   nlh = mnl_nlmsg_put_header (buf);
--- 
-2.1.4
-
diff --git 
a/meta-oe/recipes-extended/collectd/collectd/0001-redefine-the-dependence.patch 
b/meta-oe/recipes-extended/collectd/collectd/0001-redefine-the-dependence.patch
new file mode 100644
index 000..c17020a
--- /dev/null
+++ 
b/meta-oe/recipes-extended/collectd/collectd/0001-redefine-the-dependence.patch
@@ -0,0 +1,28 @@
+[PATCH] define the collectd dependence
+
+Upstream-Status: Pending
+
+libavltree.la libcommon.la libheap.la are created dynamically, and in LDADD,
+but not in DEPENDENCIES 
+
+Signed-off-by: Roy Li 
+---
+ src/daemon/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
+index 10860ec..7f826e3 100644
+--- a/src/daemon/Makefile.am
 b/src/daemon/Makefile.am
+@@ -49,7 +49,7 @@ collectd_CPPFLAGS =  $(AM_CPPFLAGS) $(LTDLINCL)
+ collectd_CFLAGS = $(AM_CFLAGS)
+ collectd_LDFLAGS = -export-dynamic
+ collectd_LDADD = libavltree.la libcommon.la libheap.la -lm
+-collectd_DEPENDENCIES =
++collectd_DEPENDENCIES = libavltree.la libcommon.la libheap.la
+ 
+ # Link to these libraries..
+ if BUILD_WITH_LIBRT
+-- 
+1.9.1
+
diff --git a/meta-oe/recipes-extended/collectd/collectd/collectd-version.patch 
b/meta-oe/recipes-extended/collectd/collectd/collectd-version.patch
index 1e2b7c1..86c3f65 100644
--- a/meta-oe/recipes-extended/collectd/collectd/collectd-version.patch
+++ b/meta-oe/recipes-extended/collectd/collectd/collectd-version.patch
@@ -11,21 +11,19 @@ Upstream-Status: Pending
 Signed-off-by: Paul Eggleton 
 
 diff --git a/version-gen.sh b/version-gen.sh
-index e344541..d1c0929 100755
+index b09be8e..2671066 100755
 --- a/version-gen.sh
 +++ b/version-gen.sh
-@@ -2,7 +2,10 @@
+@@ -2,8 +2,10 @@
  
- DEFAULT_VERSION="5.2.2.git"
+ DEFAULT_VERSION="5.5.0.git"
  
--VERSION="`git describe 2> /dev/null | sed -e 's/^collectd-//'`"
+-VERSION="`git describe 2> /dev/null | grep collectd | sed -e 
's/^collectd-//'`"
+-
 +VERSION=""
 +if test -d .git ; then
-+  VERSION="`git describe 2> /dev/null | sed -e 's/^collectd-//'`"
++  VERSION="`git describe 2> /dev/null | grep collectd | sed -e 
's/^collectd-//'`"
 +fi
- 
  if test -z "$VERSION"; then
VERSION="$DEFAULT_VERSION"
--- 
-1.7.10.4
-
+ fi
diff --git 
a/meta-oe/recipes-extended/collectd/collectd/glibc-2.20-compatiblity.patch 
b/meta-oe/recipes-extended/collectd/collectd/glibc-2.20-compatiblity.patch
deleted file mode 100644
index 2596bed..000
--- a/meta-oe/recipes-extended/collectd/collectd/gli

[oe] [PATCH][meta-networking][v2] ypbind-mt: add status command for initscript

[rongqing.li]

From: Zhu Yanjun 

Add the "status" command in initscript to check the status of ypbind.
remove ypbind-yocto.init as ypbind.init, which is the initscript, make
its name similar to other recipes

Signed-off-by: Zhu Yanjun 
Signed-off-by: Roy Li 
---
 .../recipes-support/nis/files/{ypbind-yocto.init => ypbind.init}   | 7 +++
 meta-networking/recipes-support/nis/ypbind-mt_1.38.bb  | 4 ++--
 meta-networking/recipes-support/nis/ypbind-mt_2.2.bb   | 4 ++--
 3 files changed, 11 insertions(+), 4 deletions(-)
 rename meta-networking/recipes-support/nis/files/{ypbind-yocto.init => 
ypbind.init} (96%)

diff --git a/meta-networking/recipes-support/nis/files/ypbind-yocto.init 
b/meta-networking/recipes-support/nis/files/ypbind.init
similarity index 96%
rename from meta-networking/recipes-support/nis/files/ypbind-yocto.init
rename to meta-networking/recipes-support/nis/files/ypbind.init
index 2c50d12..244dc78 100644
--- a/meta-networking/recipes-support/nis/files/ypbind-yocto.init
+++ b/meta-networking/recipes-support/nis/files/ypbind.init
@@ -21,6 +21,9 @@
 #  the NIS binding information.
 ### END INIT INFO
 
+# Need to use status function
+. /etc/init.d/functions
+
 YPBIND_BIN=/usr/sbin/ypbind
 pidfile=/var/run/ypbind.pid
 
@@ -92,6 +95,10 @@ case "$1" in
echo -n "Reload service ypbind"
start-stop-daemon --stop --quiet --signal 1 --pidfile $pidfile
;;
+status)
+   echo -n "Checking for ypbind: "
+   status $YPBIND_BIN
+   ;;
 *)
echo "Usage: $0 
{start|stop|status|try-restart|restart|force-reload|reload|probe}"
exit 1
diff --git a/meta-networking/recipes-support/nis/ypbind-mt_1.38.bb 
b/meta-networking/recipes-support/nis/ypbind-mt_1.38.bb
index d25ef5c..5702cd6 100644
--- a/meta-networking/recipes-support/nis/ypbind-mt_1.38.bb
+++ b/meta-networking/recipes-support/nis/ypbind-mt_1.38.bb
@@ -26,7 +26,7 @@ DEPENDS = " \
 PROVIDES += "ypbind"
 
 SRC_URI = "http://www.linux-nis.org/download/ypbind-mt/${BP}.tar.bz2 \
-   file://ypbind-yocto.init \
+   file://ypbind.init \
file://ypbind.service \
 "
 SRC_URI[md5sum] = "094088c0e282fa7f3b3dd6cc51d0a4e1"
@@ -44,7 +44,7 @@ do_install_append () {
 install -d ${D}${sysconfdir}/init.d
 install -d ${D}${sysconfdir}/rcS.d
 
-install -m 0755 ${WORKDIR}/ypbind-yocto.init 
${D}${sysconfdir}/init.d/ypbind
+install -m 0755 ${WORKDIR}/ypbind.init ${D}${sysconfdir}/init.d/ypbind
 
 install -d ${D}${systemd_unitdir}/system
 install -m 0644 ${WORKDIR}/ypbind.service ${D}${systemd_unitdir}/system
diff --git a/meta-networking/recipes-support/nis/ypbind-mt_2.2.bb 
b/meta-networking/recipes-support/nis/ypbind-mt_2.2.bb
index 6a9262a..cee5880 100644
--- a/meta-networking/recipes-support/nis/ypbind-mt_2.2.bb
+++ b/meta-networking/recipes-support/nis/ypbind-mt_2.2.bb
@@ -21,7 +21,7 @@ PROVIDES += "ypbind"
 PNBLACKLIST[ypbind-mt] ?= "BROKEN: Depends on broken yp-tools"
 
 SRC_URI = "http://www.linux-nis.org/download/ypbind-mt/${BP}.tar.bz2 \
-   file://ypbind-yocto.init \
+   file://ypbind.init \
file://ypbind.service \
 "
 SRC_URI[md5sum] = "54e2040d8266ae7d302d081ca310c8a8"
@@ -41,7 +41,7 @@ do_install_append () {
 install -d ${D}${sysconfdir}/init.d
 install -d ${D}${sysconfdir}/rcS.d
 
-install -m 0755 ${WORKDIR}/ypbind-yocto.init 
${D}${sysconfdir}/init.d/ypbind
+install -m 0755 ${WORKDIR}/ypbind.init ${D}${sysconfdir}/init.d/ypbind
 
 install -d ${D}${systemd_unitdir}/system
 install -m 0644 ${WORKDIR}/ypbind.service ${D}${systemd_unitdir}/system
-- 
2.1.4

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH][meta-networking] netcf: align the systemd file path with Makefile

[rongqing.li]

From: Roy Li 

systemd service file is installed under ${prefix}/lib/ which is not same
as ${libdir}, so align the path with Makefile, and remove it if it is not
same as ${libdir}

Signed-off-by: Roy Li 
---
 meta-networking/recipes-support/netcf/netcf_git.bb | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/meta-networking/recipes-support/netcf/netcf_git.bb 
b/meta-networking/recipes-support/netcf/netcf_git.bb
index d47bb3b..19e85a0 100644
--- a/meta-networking/recipes-support/netcf/netcf_git.bb
+++ b/meta-networking/recipes-support/netcf/netcf_git.bb
@@ -11,7 +11,6 @@ PV = "0.2.8+git${SRCPV}"
 
 SRC_URI = "git://git.fedorahosted.org/netcf.git;protocol=git \
 "
-
 DEPENDS += "augeas libnl libxslt libxml2 gnulib"
 
 S = "${WORKDIR}/git"
@@ -32,8 +31,11 @@ do_configure_prepend() {
 do_install_append() {
 if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; 
then
install -d ${D}${systemd_unitdir}/system
-   mv ${D}${libdir}/systemd/system/* ${D}${systemd_unitdir}/system/
-   rm -rf ${D}${libdir}/systemd/
+   mv ${D}${prefix}/lib/systemd/system/* ${D}${systemd_unitdir}/system/
+   rm -rf ${D}${prefix}/lib/systemd
+   if [ $libdir != ${prefix}/lib ]; then
+  rm -rf ${D}${prefix}/lib/
+   fi
 else
mv ${D}${sysconfdir}/rc.d/init.d/ ${D}${sysconfdir}
rm -rf ${D}${sysconfdir}/rc.d/
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH][meta-webserver] apache: upgrade to 2.4.16

[rongqing.li]

From: Roy Li 

2.4.16 includes fixes for CVE-2015-3185, CVE-2015-0253 and CVE-2015-3183
remove a backport patch 0001-SECURITY-CVE-2015-0228-cve.mitre.org.patch

Signed-off-by: Roy Li 
---
 ...2-native_2.4.12.bb => apache2-native_2.4.16.bb} |  4 +-
 ...0001-SECURITY-CVE-2015-0228-cve.mitre.org.patch | 58 --
 .../{apache2_2.4.12.bb => apache2_2.4.16.bb}   |  5 +-
 3 files changed, 4 insertions(+), 63 deletions(-)
 rename meta-webserver/recipes-httpd/apache2/{apache2-native_2.4.12.bb => 
apache2-native_2.4.16.bb} (91%)
 delete mode 100644 
meta-webserver/recipes-httpd/apache2/apache2/0001-SECURITY-CVE-2015-0228-cve.mitre.org.patch
 rename meta-webserver/recipes-httpd/apache2/{apache2_2.4.12.bb => 
apache2_2.4.16.bb} (96%)

diff --git a/meta-webserver/recipes-httpd/apache2/apache2-native_2.4.12.bb 
b/meta-webserver/recipes-httpd/apache2/apache2-native_2.4.16.bb
similarity index 91%
rename from meta-webserver/recipes-httpd/apache2/apache2-native_2.4.12.bb
rename to meta-webserver/recipes-httpd/apache2/apache2-native_2.4.16.bb
index 1704bd9..59109dd 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2-native_2.4.12.bb
+++ b/meta-webserver/recipes-httpd/apache2/apache2-native_2.4.16.bb
@@ -15,8 +15,8 @@ SRC_URI = 
"http://www.apache.org/dist/httpd/httpd-${PV}.tar.bz2 \
 S = "${WORKDIR}/httpd-${PV}"
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=dbff5a2b542fa58854455bf1a0b94b83"
-SRC_URI[md5sum] = "b8dc8367a57a8d548a9b4ce16d264a13"
-SRC_URI[sha256sum] = 
"ad6d39edfe4621d8cc9a2791f6f8d6876943a9da41ac8533d77407a2e630eae4"
+SRC_URI[md5sum] = "2b19cd338fd526dd5a63c57b1e9bfee2"
+SRC_URI[sha256sum] = 
"ac660b47aaa7887779a6430404dcb40c0b04f90ea69e7bd49a40552e9ff13743"
 
 EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \
 --with-apr-util=${STAGING_BINDIR_CROSS}/apu-1-config \
diff --git 
a/meta-webserver/recipes-httpd/apache2/apache2/0001-SECURITY-CVE-2015-0228-cve.mitre.org.patch
 
b/meta-webserver/recipes-httpd/apache2/apache2/0001-SECURITY-CVE-2015-0228-cve.mitre.org.patch
deleted file mode 100644
index 264fde7..000
--- 
a/meta-webserver/recipes-httpd/apache2/apache2/0001-SECURITY-CVE-2015-0228-cve.mitre.org.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 643f0fcf3b8ab09a68f0ecd2aa37aafeda3e63ef Mon Sep 17 00:00:00 2001
-From: Eric Covener 
-Date: Wed, 4 Feb 2015 14:44:23 +
-Subject: [PATCH]   *) SECURITY: CVE-2015-0228 (cve.mitre.org)  mod_lua: A
- maliciously crafted websockets PING after a script  calls r:wsupgrade()
- can cause a child process crash.  [Edward Lu ]
-
-Upstream-Status: BackPort
-
-Discovered by Guido Vranken 
-
-Submitted by: Edward Lu
-Committed by: covener
-
-git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1657261 
13f79535-47bb-0310-9956-ffa450edef68
-
-Signed-off-by: Roy Li 

- modules/lua/lua_request.c | 6 +-
- 2 files changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/modules/lua/lua_request.c b/modules/lua/lua_request.c
-index dded599..1200c55 100644
 a/modules/lua/lua_request.c
-+++ b/modules/lua/lua_request.c
-@@ -2227,6 +2227,7 @@ static int lua_websocket_read(lua_State *L)
- {
- apr_socket_t *sock;
- apr_status_t rv;
-+int do_read = 1;
- int n = 0;
- apr_size_t len = 1;
- apr_size_t plen = 0;
-@@ -2244,6 +2245,8 @@ static int lua_websocket_read(lua_State *L)
- mask_bytes = apr_pcalloc(r->pool, 4);
- sock = ap_get_conn_socket(r->connection);
- 
-+while (do_read) { 
-+do_read = 0;
- /* Get opcode and FIN bit */
- if (plaintext) {
- rv = apr_socket_recv(sock, &byte, &len);
-@@ -2377,10 +2380,11 @@ static int lua_websocket_read(lua_State *L)
- frame[0] = 0x8A;
- frame[1] = 0;
- apr_socket_send(sock, frame, &plen); /* Pong! */
--lua_websocket_read(L); /* read the next frame instead */
-+do_read = 1;
- }
- }
- }
-+}
- return 0;
- }
- 
--- 
-1.9.1
-
diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.12.bb 
b/meta-webserver/recipes-httpd/apache2/apache2_2.4.16.bb
similarity index 96%
rename from meta-webserver/recipes-httpd/apache2/apache2_2.4.12.bb
rename to meta-webserver/recipes-httpd/apache2/apache2_2.4.16.bb
index 7306e88..a44babd 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.12.bb
+++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.16.bb
@@ -21,12 +21,11 @@ SRC_URI = 
"http://www.apache.org/dist/httpd/httpd-${PV}.tar.bz2 \
file://init \
file://apache2-volatile.conf \
file://apache2.service \
-   file://0001-SECURITY-CVE-2015-0228-cve.mitre.org.patch \
   "
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=dbff5a2b542fa58854455bf1a0b94b83"
-SRC_URI[md5sum] = "b8dc8367a57a8d548a9b4ce16d264a13"
-SRC_URI[sha256sum] = 
"ad6d39edfe4621d8cc9a2791f6f8d6876943a9da41ac8533d77407a2e630eae4"
+SRC_URI[md5sum] = "2b19cd338fd526dd5a63c57b1e9bfee2"
+SRC_URI[sha256sum]

[oe] [PATCH][meta-python] python-paste: create recipe

[rongqing.li]

From: Roy Li 

python-paste is a tools for using a Web Server Gateway Interface stack

Signed-off-by: Roy Li 
---
 .../recipes-devtools/python/python-paste_2.0.2.bb  | 18 ++
 1 file changed, 18 insertions(+)
 create mode 100644 meta-python/recipes-devtools/python/python-paste_2.0.2.bb

diff --git a/meta-python/recipes-devtools/python/python-paste_2.0.2.bb 
b/meta-python/recipes-devtools/python/python-paste_2.0.2.bb
new file mode 100644
index 000..6338def
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python-paste_2.0.2.bb
@@ -0,0 +1,18 @@
+SUMMARY = "Tools for using a Web Server Gateway Interface stack"
+HOMEPAGE = "http://pythonpaste.org/";
+SECTION = "devel/python"
+LICENSE = "MIT"
+SRCNAME = "Paste"
+RDEPENDS_${PN} = "python-six"
+
+LIC_FILES_CHKSUM = 
"file://docs/license.txt;md5=1798f29d55080c60365e6283cb49779c"
+
+SRC_URI = 
"http://pypi.python.org/packages/source/P/${SRCNAME}/${SRCNAME}-${PV}.tar.gz;name=paste";
+SRC_URI[paste.md5sum] = "4bfc8a7eaf858f6309d2ac0f40fc951c"
+SRC_URI[paste.sha256sum] = 
"adac3ac893a2dac6b8ffd49901377dd6819e05be3436b374d698641071daba99"
+
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit setuptools
+
+FILES_${PN} += "/usr/lib/*"
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH][meta-oe] numactl: fix the ptest building

[rongqing.li]

From: Roy Li 

after upgrade, binary files are installed into test/.libs/, so
fix the install ptest.
redesign test Makefile rule

Signed-off-by: Roy Li 
---
 .../numactl/0001-define-run-test-target.patch  | 32 ++
 meta-oe/recipes-support/numactl/numactl_2.0.10.bb  | 21 ++
 2 files changed, 48 insertions(+), 5 deletions(-)
 create mode 100644 
meta-oe/recipes-support/numactl/numactl/0001-define-run-test-target.patch

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
new file mode 100644
index 000..78ffb22
--- /dev/null
+++ b/meta-oe/recipes-support/numactl/numactl/0001-define-run-test-target.patch
@@ -0,0 +1,32 @@
+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 
+---
+ 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_2.0.10.bb 
b/meta-oe/recipes-support/numactl/numactl_2.0.10.bb
index 3a10ebb..8f27b15 100644
--- a/meta-oe/recipes-support/numactl/numactl_2.0.10.bb
+++ b/meta-oe/recipes-support/numactl/numactl_2.0.10.bb
@@ -15,6 +15,7 @@ SRC_URI = 
"ftp://oss.sgi.com/www/projects/libnuma/download/${BPN}-${PV}.tar.gz \
   file://Fix-the-test-output-format.patch \
   file://Makefile \
   file://run-ptest \
+  file://0001-define-run-test-target.patch \
   "
 SRC_URI[md5sum] = "682c38305b2596967881f3d77bc3fc9c"
 SRC_URI[sha256sum] = 
"dbdac8fe74f13b2e2864bba352f1597ab1d3345c8c485d7805f58d66f414db61"
@@ -28,19 +29,29 @@ do_install() {
rm -r ${D}${mandir}/man2
 }
 
+do_compile_ptest() {
+   oe_runmake test
+}
+
 do_install_ptest() {
#install tests binaries
-local test_binaries="checkaffinity checktopology distance  \
-   ftok mbind_mig_pages migrate_pages move_pages mynode\
-   nodemap pagesize prefered printcpu randmap realloc_test \
-   regress regress2 runltp shmtest tbitmap tshared bind_range"
+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}/numactl ${D}${PTEST_PATH}/
+   install -m 0755 ${B}/.libs/numactl ${D}${PTEST_PATH}/
 }
 
 RDEPENDS_${PN}-ptest = "bash"
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH][meta-networking] net-snmp: fix mib representation of timeout values

[rongqing.li]

From: Roy Li 

Fix mib representation of timeout values,correct conversion
factor from microseconds to centiseconds.

Signed-off-by: Wenlin Kang 
Signed-off-by: Roy Li 
---
 .../net-snmp-5.7.2-fix-mib-timeout-values.patch| 56 ++
 .../recipes-protocols/net-snmp/net-snmp_5.7.2.1.bb |  1 +
 2 files changed, 57 insertions(+)
 create mode 100644 
meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-5.7.2-fix-mib-timeout-values.patch

diff --git 
a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-5.7.2-fix-mib-timeout-values.patch
 
b/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-5.7.2-fix-mib-timeout-values.patch
new file mode 100644
index 000..324d1c0
--- /dev/null
+++ 
b/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-5.7.2-fix-mib-timeout-values.patch
@@ -0,0 +1,56 @@
+net-snmp: fix mib representation of timeout values
+
+The patch comes from the follow three commits on upstream:
+78dac6e37943d1ad99841898806ea60b0eede636
+390303059fbd98b1ee7621ddd4ad4c11d100fff9
+96302af7fc3108c208227432f0f0b75f3e7b906d
+
+The first commit:
+Fix bug number #a2478: fix mib representation of timeout values.
+The second commit:
+Reverts 78dac6e37943d1ad99841898806ea60b0eede636 and resolve a2478
+in a way that avoids truncating
+The third commit:
+Corrects conversion factor from microseconds to centiseconds.
+
+Upstream-Status: Backport
+
+Signed-off-by: Per Hallsmark 
+Signed-off-by: Wenlin Kang 
+
+diff -uarN net-snmp-5.7.2-org/agent/mibgroup/notification/snmpNotifyTable.c 
net-snmp-5.7.2/agent/mibgroup/notification/snmpNotifyTable.c
+--- net-snmp-5.7.2-org/agent/mibgroup/notification/snmpNotifyTable.c   
2015-04-09 15:24:18.393570318 +0800
 net-snmp-5.7.2/agent/mibgroup/notification/snmpNotifyTable.c   
2015-04-09 15:25:23.547569858 +0800
+@@ -331,7 +331,7 @@
+ ptr->tAddressLen = t->remote_length;
+ ptr->tAddress = t->remote;
+ 
+-ptr->timeout = ss->timeout / 1000;
++ptr->timeout = ss->timeout / 1;
+ ptr->retryCount = ss->retries;
+ SNMP_FREE(ptr->tagList);
+ ptr->tagList = strdup(ptr->name);
+diff -uarN net-snmp-5.7.2-org/agent/mibgroup/target/snmpTargetAddrEntry.h 
net-snmp-5.7.2/agent/mibgroup/target/snmpTargetAddrEntry.h
+--- net-snmp-5.7.2-org/agent/mibgroup/target/snmpTargetAddrEntry.h 
2015-04-09 15:24:18.593570085 +0800
 net-snmp-5.7.2/agent/mibgroup/target/snmpTargetAddrEntry.h 2015-04-09 
15:26:41.250570178 +0800
+@@ -51,7 +51,7 @@
+  int tDomainLen;
+  unsigned char  *tAddress;
+  size_t  tAddressLen;
+- int timeout;
++ int timeout; /* Timeout in centiseconds */
+  int retryCount;
+  char   *tagList;
+  char   *params;
+diff -uarN net-snmp-5.7.2-org/agent/mibgroup/target/target.c 
net-snmp-5.7.2/agent/mibgroup/target/target.c
+--- net-snmp-5.7.2-org/agent/mibgroup/target/target.c  2015-04-09 
15:24:18.592569768 +0800
 net-snmp-5.7.2/agent/mibgroup/target/target.c  2015-04-09 
15:25:52.586569961 +0800
+@@ -240,7 +240,7 @@
+ }
+ #endif
+ memset(&thissess, 0, sizeof(thissess));
+-thissess.timeout = (targaddrs->timeout) * 1000;
++thissess.timeout = (targaddrs->timeout) * 1;
+ thissess.retries = targaddrs->retryCount;
+ DEBUGMSGTL(("target_sessions",
+ "timeout: %d -> %ld\n",
diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.2.1.bb 
b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.2.1.bb
index 2d9d974..464473e 100644
--- a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.2.1.bb
+++ b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.2.1.bb
@@ -22,6 +22,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.zip \
 file://run-ptest \
 file://0001-Fix-CVE-2014-2285.patch \
 file://dont-return-incompletely-parsed-varbinds.patch \
+file://net-snmp-5.7.2-fix-mib-timeout-values.patch \
 "
 
 SRC_URI[md5sum] = "a2c83518648b0f2a5d378625e45c0e18"
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH 1/2] ypbind-mt: get parameters from dhcp

[rongqing.li]

From: Li Wang 

adopt a script nis.sh from
https://git.centos.org/raw/rpms!ypbind.git/5a592e88374f067679276488430ebdf51152c358/SOURCES!nis.sh
it is dhclient-script plugin for NIS settings.

Signed-off-by: Li Wang 
Signed-off-by: Roy Li 
---
 .../recipes-support/nis/ypbind-mt/nis.sh   | 108 +
 .../recipes-support/nis/ypbind-mt_1.38.bb  |   4 +
 .../recipes-support/nis/ypbind-mt_2.2.bb   |   4 +
 3 files changed, 116 insertions(+)
 create mode 100755 meta-networking/recipes-support/nis/ypbind-mt/nis.sh

diff --git a/meta-networking/recipes-support/nis/ypbind-mt/nis.sh 
b/meta-networking/recipes-support/nis/ypbind-mt/nis.sh
new file mode 100755
index 000..a1e338c
--- /dev/null
+++ b/meta-networking/recipes-support/nis/ypbind-mt/nis.sh
@@ -0,0 +1,108 @@
+#!/bin/sh
+#
+# nis.sh: dhclient-script plugin for NIS settings,
+# place in /etc/dhcp/dhclient.d and 'chmod +x nis.sh' to enable
+#
+# Copyright (C) 2008 Red Hat, 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 2 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 .
+#
+# Author(s): David Cantrell 
+
+CONF=/etc/yp.conf
+SAVECONF=${SAVEDIR}/${CONF##*/}.predhclient.${interface}
+
+fix_context() {
+if [ -x /sbin/restorecon ]; then
+/sbin/restorecon ${1} >/dev/null 2>&1
+fi
+}
+
+save_config_file() {
+if [ ! -d ${SAVEDIR} ]; then
+mkdir -p ${SAVEDIR}
+fi
+
+if [ -e ${CONF} ]; then
+# cp+rm instead of mv: preserve SELinux context
+# rhbz#509240
+# Do not rely on restorecon.
+cp -c ${CONF} ${SAVECONF}
+rm ${CONF}
+else
+echo > ${SAVECONF}
+# Try restorecon
+fix_context ${SAVECONF}
+fi
+}
+
+nis_config() {
+if [ ! "${PEERNIS}" = "no" ]; then
+if [ -n "${new_nis_domain}" ]; then
+domainname "${new_nis_domain}"
+save_config_file
+let contents=0
+echo '# generated by /sbin/dhclient-script' > ${CONF}
+fix_context ${CONF}
+
+if [ -n "${new_nis_servers}" ]; then
+for i in ${new_nis_servers} ; do
+echo "domain ${new_nis_domain} server ${i}" >> ${CONF}
+let contents=contents+1
+done
+else
+echo "domain ${new_nis_domain} broadcast" >> ${CONF}
+let contents=contents+1
+fi
+
+if [ ${contents} -gt 0 ]; then
+service ypbind condrestart >/dev/null 2>&1
+fi
+elif [ -n "${new_nis_servers}" ]; then
+save_config_file
+echo '# generated by /sbin/dhclient-script' > ${CONF}
+fix_context ${CONF}
+let contents=0
+
+for i in ${new_nis_servers} ; do
+echo "ypserver ${i}" >> ${CONF}
+let contents=contents+1
+done
+
+if [ $contents -gt 0 ]; then
+service ypbind condrestart >/dev/null 2>&1
+fi
+fi
+fi
+}
+
+nis_restore() {
+if [ ! "${PEERNIS}" = "no" ]; then
+if [ -f ${SAVECONF} ]; then
+rm -f ${CONF}
+# cp+rm instead of mv: preserve SELinux context
+# rhbz#509240
+cp -c ${SAVECONF} ${CONF}
+rm ${SAVECONF}
+fix_context ${CONF} # Restorecon again to be sure.
+service ypbind condrestart >/dev/null 2>&1
+fi
+fi
+}
+
+# Local Variables:
+# indent-tabs-mode: nil
+# sh-basic-offset: 4
+# show-trailing-whitespace: t
+# End:
diff --git a/meta-networking/recipes-support/nis/ypbind-mt_1.38.bb 
b/meta-networking/recipes-support/nis/ypbind-mt_1.38.bb
index d25ef5c..5391b5b 100644
--- a/meta-networking/recipes-support/nis/ypbind-mt_1.38.bb
+++ b/meta-networking/recipes-support/nis/ypbind-mt_1.38.bb
@@ -28,6 +28,7 @@ PROVIDES += "ypbind"
 SRC_URI = "http://www.linux-nis.org/download/ypbind-mt/${BP}.tar.bz2 \
file://ypbind-yocto.init \
file://ypbind.service \
+   file://nis.sh \
 "
 SRC_URI[md5sum] = "094088c0e282fa7f3b3dd6cc51d0a4e1"
 SRC_URI[sha256sum] = 
"1930ce19f6ccfe10400f3497b31867f71690d2bcd3f5b575199fa915559b7746"
@@ -48,6 +49,9 @@ do_install_append () {
 
 install -d ${D}${systemd_unitdir}/system
 install -m 0644 ${WORKDIR}/ypbind.service ${D}${systemd_unitdir}/system
+
+install -d ${D}/${sysconfdir}/dhcp/dhclient.d
+install -m 755 ${WOR

[oe] [PATCH 2/2] ntp: get parameters from dhcp

[rongqing.li]

From: Li Wang 

the script ntp.sh is called by dhcp client,
it can get some parameters from dhcp.

Signed-off-by: Li Wang 
Signed-off-by: Roy Li 
---
 meta-networking/recipes-support/ntp/files/ntp.sh   | 61 ++
 meta-networking/recipes-support/ntp/ntp_4.2.8p2.bb |  5 ++
 2 files changed, 66 insertions(+)
 create mode 100755 meta-networking/recipes-support/ntp/files/ntp.sh

diff --git a/meta-networking/recipes-support/ntp/files/ntp.sh 
b/meta-networking/recipes-support/ntp/files/ntp.sh
new file mode 100755
index 000..ca53a97
--- /dev/null
+++ b/meta-networking/recipes-support/ntp/files/ntp.sh
@@ -0,0 +1,61 @@
+#!/bin/sh
+#
+# ntp.sh: dhclient-script plugin for NTP settings,
+# place in /etc/dhcp/dhclient.d and 'chmod +x ntp.sh' to enable
+#
+# Copyright (C) 2008 Red Hat, 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 2 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 .
+#
+# Author(s): David Cantrell 
+#Miroslav Lichvar 
+#
+
+CONF=/etc/ntp.conf
+SAVECONF=${SAVEDIR}/${CONF##*/}.predhclient.${interface}
+
+ntp_replace_conf() {
+echo "$1" | diff -q ${CONF} - > /dev/null 2>&1
+if [ $? -eq 1 ]; then
+echo "$1" > ${CONF}
+   if [ -x /sbin/restorecon ]; then
+restorecon ${CONF} >/dev/null 2>&1
+fi
+service ntpd restart >/dev/null 2>&1
+fi
+}
+
+ntp_config() {
+if [ ! "${PEERNTP}" = "no" ] && [ -n "${new_ntp_servers}" ] &&
+[ -e ${CONF} ] && [ -d ${SAVEDIR} ]; then
+local conf=$(grep -v '^server .*  # added by /sbin/dhclient-script$' < 
${CONF})
+
+conf=$(echo "$conf"
+for s in ${new_ntp_servers}; do
+echo "server ${s} ${NTPSERVERARGS}  # added by 
/sbin/dhclient-script"
+done)
+
+[ -f ${SAVECONF} ] || touch ${SAVECONF}
+ntp_replace_conf "$conf"
+fi
+}
+
+ntp_restore() {
+if [ -e ${CONF} ] && [ -f ${SAVECONF} ]; then
+local conf=$(grep -v '^server .*  # added by /sbin/dhclient-script$' < 
${CONF})
+
+ntp_replace_conf "$conf"
+rm -f ${SAVECONF}
+fi
+}
diff --git a/meta-networking/recipes-support/ntp/ntp_4.2.8p2.bb 
b/meta-networking/recipes-support/ntp/ntp_4.2.8p2.bb
index c54da43..b963584 100644
--- a/meta-networking/recipes-support/ntp/ntp_4.2.8p2.bb
+++ b/meta-networking/recipes-support/ntp/ntp_4.2.8p2.bb
@@ -21,6 +21,7 @@ SRC_URI = 
"http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${PV}.tar.g
file://sntp.service \
file://sntp \
file://ntpd.list \
+   file://ntp.sh \
 "
 
 SRC_URI[md5sum] = "fa37049383316322d060ec9061ac23a9"
@@ -93,6 +94,9 @@ do_install_append() {
 
 install -d ${D}${systemd_unitdir}/ntp-units.d
 install -m 0644 ${WORKDIR}/ntpd.list 
${D}${systemd_unitdir}/ntp-units.d/60-ntpd.list
+
+install -d ${D}/${sysconfdir}/dhcp/dhclient.d
+install -m 755 ${WORKDIR}/ntp.sh ${D}/${sysconfdir}/dhcp/dhclient.d/
 }
 
 PACKAGES += "ntpdate sntp ${PN}-tickadj ${PN}-utils"
@@ -124,6 +128,7 @@ RSUGGESTS_${PN} = "iana-etc"
 FILES_${PN} = "${sbindir}/ntpd ${sysconfdir}/ntp.conf 
${sysconfdir}/init.d/ntpd ${libdir} \
 ${NTP_USER_HOME} \
 ${systemd_unitdir}/ntp-units.d/60-ntpd.list \
+${sysconfdir}/dhcp/dhclient.d/ntp.sh \
 "
 FILES_${PN}-tickadj = "${sbindir}/tickadj"
 FILES_${PN}-utils = "${sbindir} ${datadir}/ntp/lib"
-- 
2.1.4

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH][meta-networking] tcpslice: fix do_install

[rongqing.li]

From: Roy Li 

replace to run "make install" with directly calling install command,
since "make install" asks "bin" user and group, and maybe fail when
system has not;

Signed-off-by: Roy Li 
---
 meta-networking/recipes-support/tcpdump/tcpslice_1.2a3.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta-networking/recipes-support/tcpdump/tcpslice_1.2a3.bb 
b/meta-networking/recipes-support/tcpdump/tcpslice_1.2a3.bb
index b887fc7..293760f 100644
--- a/meta-networking/recipes-support/tcpdump/tcpslice_1.2a3.bb
+++ b/meta-networking/recipes-support/tcpdump/tcpslice_1.2a3.bb
@@ -29,7 +29,8 @@ do_configure () {
 ac_cv_target=${HOST_SYS}
 }
 
-do_install_prepend () {
+do_install () {
mkdir -p ${D}/usr/sbin
+   install -c -m 555 tcpslice ${D}/usr/sbin
 }
 
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH][meta-networking] strongswan: upgrade to 5.3.2

[rongqing.li]

From: Roy Li 

5.3.2 includes the fixes for CVE-2015-3991 and CVE-2015-4171

Signed-off-by: Roy Li 
---
 .../strongswan/{strongswan_5.3.0.bb => strongswan_5.3.2.bb}   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-networking/recipes-support/strongswan/{strongswan_5.3.0.bb => 
strongswan_5.3.2.bb} (92%)

diff --git a/meta-networking/recipes-support/strongswan/strongswan_5.3.0.bb 
b/meta-networking/recipes-support/strongswan/strongswan_5.3.2.bb
similarity index 92%
rename from meta-networking/recipes-support/strongswan/strongswan_5.3.0.bb
rename to meta-networking/recipes-support/strongswan/strongswan_5.3.2.bb
index d858ca2..a231a90 100644
--- a/meta-networking/recipes-support/strongswan/strongswan_5.3.0.bb
+++ b/meta-networking/recipes-support/strongswan/strongswan_5.3.2.bb
@@ -11,8 +11,8 @@ SRC_URI = 
"http://download.strongswan.org/strongswan-${PV}.tar.bz2 \
 file://fix-funtion-parameter.patch \
 "
 
-SRC_URI[md5sum] = "c52d4228231c2025d9c320d0e9990327"
-SRC_URI[sha256sum] = 
"824da31a1ff89ac2500d56705e6f9ce06fe5260f9caaeb1da35ea13a8691d284"
+SRC_URI[md5sum] = "fab014be1477ef4ebf9a765e10f8802c"
+SRC_URI[sha256sum] = 
"a4a9bc8c4e42bdc4366a87a05a02bf9f425169a7ab0c6f4482d347e44acbf225"
 
 EXTRA_OECONF = "--enable-gmp \
 --enable-openssl \
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH][meta-networking] strongswan: upgrade to 5.3.1

[rongqing.li]

From: Roy Li 

5.3.1 fixed the CVE-2015-4620

Signed-off-by: Roy Li 
---
 .../strongswan/{strongswan_5.3.0.bb => strongswan_5.3.1.bb}   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-networking/recipes-support/strongswan/{strongswan_5.3.0.bb => 
strongswan_5.3.1.bb} (92%)

diff --git a/meta-networking/recipes-support/strongswan/strongswan_5.3.0.bb 
b/meta-networking/recipes-support/strongswan/strongswan_5.3.1.bb
similarity index 92%
rename from meta-networking/recipes-support/strongswan/strongswan_5.3.0.bb
rename to meta-networking/recipes-support/strongswan/strongswan_5.3.1.bb
index d858ca2..abe9141 100644
--- a/meta-networking/recipes-support/strongswan/strongswan_5.3.0.bb
+++ b/meta-networking/recipes-support/strongswan/strongswan_5.3.1.bb
@@ -11,8 +11,8 @@ SRC_URI = 
"http://download.strongswan.org/strongswan-${PV}.tar.bz2 \
 file://fix-funtion-parameter.patch \
 "
 
-SRC_URI[md5sum] = "c52d4228231c2025d9c320d0e9990327"
-SRC_URI[sha256sum] = 
"824da31a1ff89ac2500d56705e6f9ce06fe5260f9caaeb1da35ea13a8691d284"
+SRC_URI[md5sum] = "66f258901a3d6c271da1a0c7fb3e5013"
+SRC_URI[sha256sum] = 
"83fa7b004e65356ff5bb755d9d0e03901d578a99e90b6328a350a4335a32f6de"
 
 EXTRA_OECONF = "--enable-gmp \
 --enable-openssl \
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH][meta-networking][v2] inetutils: fix tcpd path in xinetd configuration file

[rongqing.li]

From: Roy Li 

tcpd from tcp-wrapper is installed into /usr/sbin/, not /usr/bin/
using sed to dynamical update the path to add the robust

Signed-off-by: Roy Li 
---
 .../inetutils/inetutils-1.9.2/rexec.xinetd.inetutils  | 4 ++--
 .../inetutils/inetutils-1.9.2/rlogin.xinetd.inetutils | 4 ++--
 .../inetutils/inetutils-1.9.2/rsh.xinetd.inetutils| 4 ++--
 .../inetutils/inetutils-1.9.2/telnet.xinetd.inetutils | 2 +-
 .../inetutils/inetutils-1.9.2/tftpd.xinetd.inetutils  | 2 +-
 meta-networking/recipes-connectivity/inetutils/inetutils_1.9.2.bb | 3 +++
 6 files changed, 11 insertions(+), 8 deletions(-)

diff --git 
a/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/rexec.xinetd.inetutils
 
b/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/rexec.xinetd.inetutils
index 80aed36..30e81ef 100644
--- 
a/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/rexec.xinetd.inetutils
+++ 
b/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/rexec.xinetd.inetutils
@@ -14,7 +14,7 @@ service exec
group   = root
log_on_success  += USERID
log_on_failure  += USERID
-   server  = /usr/bin/tcpd
-   server_args = /usr/sbin/in.rexecd
+   server  = @SBINDIR@/tcpd
+   server_args = @SBINDIR@/in.rexecd
disable = yes
 }
diff --git 
a/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/rlogin.xinetd.inetutils
 
b/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/rlogin.xinetd.inetutils
index 00dbf93..21b55da 100644
--- 
a/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/rlogin.xinetd.inetutils
+++ 
b/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/rlogin.xinetd.inetutils
@@ -14,8 +14,8 @@ service login
group   = root
log_on_success  += USERID
log_on_failure  += USERID
-   server  = /usr/bin/tcpd
-   server_args = /usr/sbin/in.rlogind -a
+   server  = @SBINDIR@/tcpd
+   server_args = @SBINDIR@/in.rlogind -a
disable = yes
 }

diff --git 
a/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/rsh.xinetd.inetutils
 
b/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/rsh.xinetd.inetutils
index ad59b62..2b894a7 100644
--- 
a/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/rsh.xinetd.inetutils
+++ 
b/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/rsh.xinetd.inetutils
@@ -15,7 +15,7 @@ service shell
group   = root
log_on_success  += USERID
log_on_failure  += USERID
-   server  = /usr/bin/tcpd
-   server_args = /usr/sbin/in.rshd -aL
+   server  = @SBINDIR@/tcpd
+   server_args = @SBINDIR@/in.rshd -aL
disable = yes
 }
diff --git 
a/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/telnet.xinetd.inetutils
 
b/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/telnet.xinetd.inetutils
index 2a2a12e..2d9a040 100644
--- 
a/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/telnet.xinetd.inetutils
+++ 
b/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/telnet.xinetd.inetutils
@@ -8,6 +8,6 @@ service telnet
socket_type = stream
wait= no
user= root
-   server  = /usr/sbin/in.telnetd
+   server  = @SBINDIR@/in.telnetd
log_on_failure  += USERID
 }
diff --git 
a/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/tftpd.xinetd.inetutils
 
b/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/tftpd.xinetd.inetutils
index f549163..67b44c4 100644
--- 
a/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/tftpd.xinetd.inetutils
+++ 
b/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/tftpd.xinetd.inetutils
@@ -13,7 +13,7 @@ service tftp
 wait= yes
 user= root
 group   = root
-server  = /usr/sbin/in.tftpd
+server  = @SBINDIR@/in.tftpd
 server_args = /tftpboot
 }
 
diff --git a/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.2.bb 
b/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.2.bb
index cd7b425..73c90d6 100644
--- a/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.2.bb
+++ b/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.2.bb
@@ -68,6 +68,9 @@ do_install_append () {
 cp ${WORKDIR}/rsh.xinetd.inetutils  ${D}/${sysconfdir}/xinetd.d/rsh
 cp ${WORKDIR}/telnet.xinetd.inetutils  ${D}/${sysconfdir}/xinetd.d/telnet
 cp ${WORKDIR}/tftpd.xinetd.inetutils  ${D}/${sysconfdir}/xinetd.d/tftpd
+
+sed -e 's,@SBINDIR@,${sbindir},g' -i ${D}/${sysconfdir}/xinetd.d/*
+
 rm -rf ${

[oe] [PATCH][v3] znc: upgrade to 1.6.0

[rongqing.li]

From: Roy Li 

Upgrade to fix CVE-2014-9403
Remove backport patch
Add CSocket submodule, which split from znc
Add the dependency on icu

Signed-off-by: Roy Li 
---
 ...-Fix-NULL-pointer-dereference-in-webadmin.patch | 58 --
 meta-networking/recipes-irc/znc/znc_git.bb | 13 ++---
 2 files changed, 7 insertions(+), 64 deletions(-)
 delete mode 100644 
meta-networking/recipes-irc/znc/znc/0001-Fix-NULL-pointer-dereference-in-webadmin.patch

diff --git 
a/meta-networking/recipes-irc/znc/znc/0001-Fix-NULL-pointer-dereference-in-webadmin.patch
 
b/meta-networking/recipes-irc/znc/znc/0001-Fix-NULL-pointer-dereference-in-webadmin.patch
deleted file mode 100644
index 68e4414..000
--- 
a/meta-networking/recipes-irc/znc/znc/0001-Fix-NULL-pointer-dereference-in-webadmin.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Subject: [PATCH] Fix NULL pointer dereference in webadmin.
-
-Upstream-Status: Backport
-
-commit 2bd410ee5570cea127233f1133ea22f25174eb28 upstream
-
-Triggerable by any non-admin, if webadmin is loaded.
-
-The only affected version is 1.0
-
-Thanks to ChauffeR (Simone Esposito) for reporting this.

- modules/webadmin.cpp | 8 
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/modules/webadmin.cpp b/modules/webadmin.cpp
-index b793c02..816f217 100644
 a/modules/webadmin.cpp
-+++ b/modules/webadmin.cpp
-@@ -419,7 +419,7 @@ public:
-   CIRCNetwork* pNetwork = 
SafeGetNetworkFromParam(WebSock);
- 
-   // Admin||Self Check
--  if (!spSession->IsAdmin() && (!spSession->GetUser() || 
spSession->GetUser() != pNetwork->GetUser())) {
-+  if (!spSession->IsAdmin() && (!spSession->GetUser() || 
!pNetwork || spSession->GetUser() != pNetwork->GetUser())) {
-   return false;
-   }
- 
-@@ -448,7 +448,7 @@ public:
-   CIRCNetwork* pNetwork = 
SafeGetNetworkFromParam(WebSock);
- 
-   // Admin||Self Check
--  if (!spSession->IsAdmin() && (!spSession->GetUser() || 
spSession->GetUser() != pNetwork->GetUser())) {
-+  if (!spSession->IsAdmin() && (!spSession->GetUser() || 
!pNetwork || spSession->GetUser() != pNetwork->GetUser())) {
-   return false;
-   }
- 
-@@ -472,7 +472,7 @@ public:
-   CIRCNetwork* pNetwork = 
SafeGetNetworkFromParam(WebSock);
- 
-   // Admin||Self Check
--  if (!spSession->IsAdmin() && (!spSession->GetUser() || 
spSession->GetUser() != pNetwork->GetUser())) {
-+  if (!spSession->IsAdmin() && (!spSession->GetUser() || 
!pNetwork || spSession->GetUser() != pNetwork->GetUser())) {
-   return false;
-   }
- 
-@@ -486,7 +486,7 @@ public:
-   CIRCNetwork* pNetwork = 
SafeGetNetworkFromParam(WebSock);
- 
-   // Admin||Self Check
--  if (!spSession->IsAdmin() && (!spSession->GetUser() || 
spSession->GetUser() != pNetwork->GetUser())) {
-+  if (!spSession->IsAdmin() && (!spSession->GetUser() || 
!pNetwork || spSession->GetUser() != pNetwork->GetUser())) {
-   return false;
-   }
- 
--- 
-1.8.5.2.233.g932f7e4
-
diff --git a/meta-networking/recipes-irc/znc/znc_git.bb 
b/meta-networking/recipes-irc/znc/znc_git.bb
index 2e35e4d..d81c170 100644
--- a/meta-networking/recipes-irc/znc/znc_git.bb
+++ b/meta-networking/recipes-irc/znc/znc_git.bb
@@ -1,16 +1,17 @@
 SUMMARY = "ZNC, an advanced IRC bouncer"
 SECTION = "net"
 LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
-DEPENDS = "openssl"
+DEPENDS = "openssl zlib icu"
 
-PV = "1.0+git"
+PV = "1.6.0"
 
-SRCREV = "ef59c23068547c132cb678092fba9a21317fd5f2"
-SRC_URI = "git://github.com/znc/znc.git \
-   file://0001-Fix-NULL-pointer-dereference-in-webadmin.patch \
+SRC_URI = "git://github.com/znc/znc.git;name=znc \
+   
git://github.com/jimloco/Csocket.git;destsuffix=git/third_party/Csocket;name=Csocket
 \
   "
+SRCREV_znc = "f47e8465efa4e1cd948b9caae93ac401b4355df8"
+SRCREV_Csocket = "07b4437396122650e5b8fb3d014e820a5decf4ee"
 
 S = "${WORKDIR}/git"
 
-- 
2.1.4

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH][meta-oe] mariadb: update for packgeconfig valgrind

[rongqing.li]

From: Kai Kang 

When 'valgrind' is not in PACKAGECONFIG, 'WITHOUT_VALGRIND' is passed to
cmake but it is not a valid cmake macro. Warning messages show in
log.do_configure:

CMake Warning:
  Manually-specified variables were not used by the project:
WITHOUT_VALGRIND

Use -DWITH_VALGRIND=FALSE instead.

Signed-off-by: Kai Kang 
Signed-off-by: Randy MacLeod 
---
 meta-oe/recipes-support/mysql/mariadb.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-support/mysql/mariadb.inc 
b/meta-oe/recipes-support/mysql/mariadb.inc
index 955402a..d2418e7 100644
--- a/meta-oe/recipes-support/mysql/mariadb.inc
+++ b/meta-oe/recipes-support/mysql/mariadb.inc
@@ -41,7 +41,7 @@ EXTRA_OEMAKE = 
"'GEN_LEX_HASH=${STAGING_BINDIR_NATIVE}/gen_lex_hash'"
 PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', 
d)}"
 PACKAGECONFIG_class-native = ""
 PACKAGECONFIG[pam] = ",-DWITHOUT_AUTH_PAM=TRUE,libpam"
-PACKAGECONFIG[valgrind] = 
"-DWITH_VALGRIND=TRUE,-DWITHOUT_VALGRIND=TRUE,valgrind"
+PACKAGECONFIG[valgrind] = "-DWITH_VALGRIND=TRUE,-DWITH_VALGRIND=FALSE,valgrind"
 PACKAGECONFIG[libedit] = 
"-DLIBEDIT_INTERFACE=TRUE,-DLIBEDIT_INTERFACE=FALSE,libedit"
 PACKAGECONFIG[krb5] = ", ,krb5"
 
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH][meta-oe] rsyslog: remove the dependency on valgrind for mips64n32

[rongqing.li]

From: Yue Tao 

valgrind is not supported mips64n32, so remove it

Signed-off-by: Yue Tao 
Signed-off-by: Roy Li 
---
 meta-oe/recipes-extended/rsyslog/rsyslog_7.4.4.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_7.4.4.bb 
b/meta-oe/recipes-extended/rsyslog/rsyslog_7.4.4.bb
index e1dee59..9c85a41 100644
--- a/meta-oe/recipes-extended/rsyslog/rsyslog_7.4.4.bb
+++ b/meta-oe/recipes-extended/rsyslog/rsyslog_7.4.4.bb
@@ -151,6 +151,7 @@ RDEPENDS_${PN} += "logrotate"
 VALGRIND = "valgrind"
 VALGRIND_mips = ""
 VALGRIND_mips64 = ""
+VALGRIND_mips64n32 = ""
 VALGRIND_arm = ""
 VALGRIND_aarch64 = ""
 RDEPENDS_${PN}-ptest += "make diffutils gzip"
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH][meta-oe] hostapd: consider sysroot when search header files

[rongqing.li]

From: Roy Li 

Signed-off-by: Roy Li 
---
 .../hostapd/hostapd-2.2/add-sysroot-to-gcc.patch   | 40 ++
 .../recipes-connectivity/hostapd/hostapd_2.2.bb|  1 +
 2 files changed, 41 insertions(+)
 create mode 100644 
meta-oe/recipes-connectivity/hostapd/hostapd-2.2/add-sysroot-to-gcc.patch

diff --git 
a/meta-oe/recipes-connectivity/hostapd/hostapd-2.2/add-sysroot-to-gcc.patch 
b/meta-oe/recipes-connectivity/hostapd/hostapd-2.2/add-sysroot-to-gcc.patch
new file mode 100644
index 000..d1134b9
--- /dev/null
+++ b/meta-oe/recipes-connectivity/hostapd/hostapd-2.2/add-sysroot-to-gcc.patch
@@ -0,0 +1,40 @@
+Upstream-Status: Pending
+
+We should make sure that sysroot is used by gcc instead of assuming
+hardcoded locations for include paths
+
+Signed-off-by: Roy Li 
+---
+ src/drivers/drivers.mak | 2 +-
+ src/drivers/drivers.mk  | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/drivers/drivers.mak b/src/drivers/drivers.mak
+index 7e175f4..950701f 100644
+--- a/src/drivers/drivers.mak
 b/src/drivers/drivers.mak
+@@ -35,7 +35,7 @@ NEED_RFKILL=y
+ ifdef CONFIG_LIBNL32
+   DRV_LIBS += -lnl-3
+   DRV_LIBS += -lnl-genl-3
+-  DRV_CFLAGS += -DCONFIG_LIBNL20 -I/usr/include/libnl3
++  DRV_CFLAGS += -DCONFIG_LIBNL20 -I=/usr/include/libnl3
+ else
+   ifdef CONFIG_LIBNL_TINY
+ DRV_LIBS += -lnl-tiny
+diff --git a/src/drivers/drivers.mk b/src/drivers/drivers.mk
+index db8561a..c93e88d 100644
+--- a/src/drivers/drivers.mk
 b/src/drivers/drivers.mk
+@@ -30,7 +30,7 @@ NEED_RFKILL=y
+ ifdef CONFIG_LIBNL32
+   DRV_LIBS += -lnl-3
+   DRV_LIBS += -lnl-genl-3
+-  DRV_CFLAGS += -DCONFIG_LIBNL20 -I/usr/include/libnl3
++  DRV_CFLAGS += -DCONFIG_LIBNL20 -I=/usr/include/libnl3
+ else
+   ifdef CONFIG_LIBNL_TINY
+ DRV_LIBS += -lnl-tiny
+-- 
+2.1.2
+
diff --git a/meta-oe/recipes-connectivity/hostapd/hostapd_2.2.bb 
b/meta-oe/recipes-connectivity/hostapd/hostapd_2.2.bb
index b75f2b9..02b78f1 100644
--- a/meta-oe/recipes-connectivity/hostapd/hostapd_2.2.bb
+++ b/meta-oe/recipes-connectivity/hostapd/hostapd_2.2.bb
@@ -18,6 +18,7 @@ SRC_URI = " \
 file://defconfig \
 file://init \
 file://hostapd.service \
+file://add-sysroot-to-gcc.patch;patchdir=.. \
 "
 
 S = "${WORKDIR}/hostapd-${PV}/hostapd"
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH][meta-networking] ntp: get parameters from dhcp

[rongqing.li]

From: Li Wang 

the script ntp.sh is called by dhcp client,
it can get some parameters from dhcp.

Signed-off-by: Li Wang 
Signed-off-by: Roy Li 
---
 meta-networking/recipes-support/ntp/files/ntp.sh   | 59 ++
 meta-networking/recipes-support/ntp/ntp_4.2.8p2.bb |  5 ++
 2 files changed, 64 insertions(+)
 create mode 100755 meta-networking/recipes-support/ntp/files/ntp.sh

diff --git a/meta-networking/recipes-support/ntp/files/ntp.sh 
b/meta-networking/recipes-support/ntp/files/ntp.sh
new file mode 100755
index 000..fc109b5
--- /dev/null
+++ b/meta-networking/recipes-support/ntp/files/ntp.sh
@@ -0,0 +1,59 @@
+#!/bin/bash
+#
+# ntp.sh: dhclient-script plugin for NTP settings,
+# place in /etc/dhcp/dhclient.d and 'chmod +x ntp.sh' to enable
+#
+# Copyright (C) 2008 Red Hat, 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 2 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 .
+#
+# Author(s): David Cantrell 
+#Miroslav Lichvar 
+#
+
+CONF=/etc/ntp.conf
+SAVECONF=${SAVEDIR}/${CONF##*/}.predhclient.${interface}
+
+ntp_replace_conf() {
+echo "$1" | diff -q ${CONF} - > /dev/null 2>&1
+if [ $? -eq 1 ]; then
+echo "$1" > ${CONF}
+#restorecon ${CONF} >/dev/null 2>&1
+service ntpd restart >/dev/null 2>&1
+fi
+}
+
+ntp_config() {
+if [ ! "${PEERNTP}" = "no" ] && [ -n "${new_ntp_servers}" ] &&
+[ -e ${CONF} ] && [ -d ${SAVEDIR} ]; then
+local conf=$(grep -v '^server .*  # added by /sbin/dhclient-script$' < 
${CONF})
+
+conf=$(echo "$conf"
+for s in ${new_ntp_servers}; do
+echo "server ${s} ${NTPSERVERARGS}  # added by 
/sbin/dhclient-script"
+done)
+
+[ -f ${SAVECONF} ] || touch ${SAVECONF}
+ntp_replace_conf "$conf"
+fi
+}
+
+ntp_restore() {
+if [ -e ${CONF} ] && [ -f ${SAVECONF} ]; then
+local conf=$(grep -v '^server .*  # added by /sbin/dhclient-script$' < 
${CONF})
+
+ntp_replace_conf "$conf"
+rm -f ${SAVECONF}
+fi
+}
diff --git a/meta-networking/recipes-support/ntp/ntp_4.2.8p2.bb 
b/meta-networking/recipes-support/ntp/ntp_4.2.8p2.bb
index c54da43..b963584 100644
--- a/meta-networking/recipes-support/ntp/ntp_4.2.8p2.bb
+++ b/meta-networking/recipes-support/ntp/ntp_4.2.8p2.bb
@@ -21,6 +21,7 @@ SRC_URI = 
"http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${PV}.tar.g
file://sntp.service \
file://sntp \
file://ntpd.list \
+   file://ntp.sh \
 "
 
 SRC_URI[md5sum] = "fa37049383316322d060ec9061ac23a9"
@@ -93,6 +94,9 @@ do_install_append() {
 
 install -d ${D}${systemd_unitdir}/ntp-units.d
 install -m 0644 ${WORKDIR}/ntpd.list 
${D}${systemd_unitdir}/ntp-units.d/60-ntpd.list
+
+install -d ${D}/${sysconfdir}/dhcp/dhclient.d
+install -m 755 ${WORKDIR}/ntp.sh ${D}/${sysconfdir}/dhcp/dhclient.d/
 }
 
 PACKAGES += "ntpdate sntp ${PN}-tickadj ${PN}-utils"
@@ -124,6 +128,7 @@ RSUGGESTS_${PN} = "iana-etc"
 FILES_${PN} = "${sbindir}/ntpd ${sysconfdir}/ntp.conf 
${sysconfdir}/init.d/ntpd ${libdir} \
 ${NTP_USER_HOME} \
 ${systemd_unitdir}/ntp-units.d/60-ntpd.list \
+${sysconfdir}/dhcp/dhclient.d/ntp.sh \
 "
 FILES_${PN}-tickadj = "${sbindir}/tickadj"
 FILES_${PN}-utils = "${sbindir} ${datadir}/ntp/lib"
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH][meta-networking] ypbind-mt: get parameters from dhcp

[rongqing.li]

From: Li Wang 

the script nis.sh is called by dhcp client,
it can get some parameters from dhcp.

Signed-off-by: Li Wang 
---
 .../recipes-support/nis/ypbind-mt/nis.sh   | 41 ++
 .../recipes-support/nis/ypbind-mt/yp.conf  |  1 +
 .../recipes-support/nis/ypbind-mt_1.38.bb  |  6 
 3 files changed, 48 insertions(+)
 create mode 100755 meta-networking/recipes-support/nis/ypbind-mt/nis.sh
 create mode 100644 meta-networking/recipes-support/nis/ypbind-mt/yp.conf

diff --git a/meta-networking/recipes-support/nis/ypbind-mt/nis.sh 
b/meta-networking/recipes-support/nis/ypbind-mt/nis.sh
new file mode 100755
index 000..a06a977
--- /dev/null
+++ b/meta-networking/recipes-support/nis/ypbind-mt/nis.sh
@@ -0,0 +1,41 @@
+#!/bin/bash
+#
+# nis.sh: dhclient-script plugin for NIS settings,
+# place in /etc/dhcp/dhclient.d and 'chmod +x nis.sh' to enable
+#
+
+CONF=/etc/yp.conf
+SAVECONF=${SAVEDIR}/${CONF##*/}.predhclient.${interface}
+
+nis_replace_conf() {
+echo "$1" | diff -q ${CONF} - > /dev/null 2>&1
+if [ $? -eq 1 ]; then
+echo "$1" > ${CONF}
+#restorecon ${CONF} >/dev/null 2>&1
+service ypbind restart >/dev/null 2>&1
+fi
+}
+
+nis_config() {
+if [ -n "${new_nis_domain}" ] && [ -n "${new_nis_servers}" ] &&
+[ -e ${CONF} ] && [ -d ${SAVEDIR} ]; then
+local conf=$(grep -v '^domain .*  # added by /sbin/dhclient-script$' < 
${CONF})
+
+conf=$(echo "$conf"
+for s in ${new_nis_servers}; do
+echo "domain ${new_nis_domain} server ${s}  # added by 
/sbin/dhclient-script"
+done)
+
+[ -f ${SAVECONF} ] || touch ${SAVECONF}
+nis_replace_conf "$conf"
+fi
+}
+
+nis_restore() {
+if [ -e ${CONF} ] && [ -f ${SAVECONF} ]; then
+local conf=$(grep -v '^domain .*  # added by /sbin/dhclient-script$' < 
${CONF})
+
+nis_replace_conf "$conf"
+rm -f ${SAVECONF}
+fi
+}
diff --git a/meta-networking/recipes-support/nis/ypbind-mt/yp.conf 
b/meta-networking/recipes-support/nis/ypbind-mt/yp.conf
new file mode 100644
index 000..792d600
--- /dev/null
+++ b/meta-networking/recipes-support/nis/ypbind-mt/yp.conf
@@ -0,0 +1 @@
+#
diff --git a/meta-networking/recipes-support/nis/ypbind-mt_1.38.bb 
b/meta-networking/recipes-support/nis/ypbind-mt_1.38.bb
index d25ef5c..f0c1cea 100644
--- a/meta-networking/recipes-support/nis/ypbind-mt_1.38.bb
+++ b/meta-networking/recipes-support/nis/ypbind-mt_1.38.bb
@@ -28,6 +28,8 @@ PROVIDES += "ypbind"
 SRC_URI = "http://www.linux-nis.org/download/ypbind-mt/${BP}.tar.bz2 \
file://ypbind-yocto.init \
file://ypbind.service \
+   file://yp.conf \
+   file://nis.sh \
 "
 SRC_URI[md5sum] = "094088c0e282fa7f3b3dd6cc51d0a4e1"
 SRC_URI[sha256sum] = 
"1930ce19f6ccfe10400f3497b31867f71690d2bcd3f5b575199fa915559b7746"
@@ -44,10 +46,14 @@ do_install_append () {
 install -d ${D}${sysconfdir}/init.d
 install -d ${D}${sysconfdir}/rcS.d
 
+install -m 0744 ${WORKDIR}/yp.conf ${D}${sysconfdir}/
 install -m 0755 ${WORKDIR}/ypbind-yocto.init 
${D}${sysconfdir}/init.d/ypbind
 
 install -d ${D}${systemd_unitdir}/system
 install -m 0644 ${WORKDIR}/ypbind.service ${D}${systemd_unitdir}/system
+
+install -d ${D}/${sysconfdir}/dhcp/dhclient.d
+install -m 755 ${WORKDIR}/nis.sh ${D}/${sysconfdir}/dhcp/dhclient.d/
 }
 
 
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH][meta-networking][v2] znc: upgrade to 1.6.0

[rongqing.li]

From: Roy Li 

Remove backport patch
Add CSocket submodule
Add the dependency on icu

Signed-off-by: Roy Li 
---
 ...-Fix-NULL-pointer-dereference-in-webadmin.patch | 58 --
 meta-networking/recipes-irc/znc/znc_git.bb | 12 ++---
 2 files changed, 6 insertions(+), 64 deletions(-)
 delete mode 100644 
meta-networking/recipes-irc/znc/znc/0001-Fix-NULL-pointer-dereference-in-webadmin.patch

diff --git 
a/meta-networking/recipes-irc/znc/znc/0001-Fix-NULL-pointer-dereference-in-webadmin.patch
 
b/meta-networking/recipes-irc/znc/znc/0001-Fix-NULL-pointer-dereference-in-webadmin.patch
deleted file mode 100644
index 68e4414..000
--- 
a/meta-networking/recipes-irc/znc/znc/0001-Fix-NULL-pointer-dereference-in-webadmin.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Subject: [PATCH] Fix NULL pointer dereference in webadmin.
-
-Upstream-Status: Backport
-
-commit 2bd410ee5570cea127233f1133ea22f25174eb28 upstream
-
-Triggerable by any non-admin, if webadmin is loaded.
-
-The only affected version is 1.0
-
-Thanks to ChauffeR (Simone Esposito) for reporting this.

- modules/webadmin.cpp | 8 
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/modules/webadmin.cpp b/modules/webadmin.cpp
-index b793c02..816f217 100644
 a/modules/webadmin.cpp
-+++ b/modules/webadmin.cpp
-@@ -419,7 +419,7 @@ public:
-   CIRCNetwork* pNetwork = 
SafeGetNetworkFromParam(WebSock);
- 
-   // Admin||Self Check
--  if (!spSession->IsAdmin() && (!spSession->GetUser() || 
spSession->GetUser() != pNetwork->GetUser())) {
-+  if (!spSession->IsAdmin() && (!spSession->GetUser() || 
!pNetwork || spSession->GetUser() != pNetwork->GetUser())) {
-   return false;
-   }
- 
-@@ -448,7 +448,7 @@ public:
-   CIRCNetwork* pNetwork = 
SafeGetNetworkFromParam(WebSock);
- 
-   // Admin||Self Check
--  if (!spSession->IsAdmin() && (!spSession->GetUser() || 
spSession->GetUser() != pNetwork->GetUser())) {
-+  if (!spSession->IsAdmin() && (!spSession->GetUser() || 
!pNetwork || spSession->GetUser() != pNetwork->GetUser())) {
-   return false;
-   }
- 
-@@ -472,7 +472,7 @@ public:
-   CIRCNetwork* pNetwork = 
SafeGetNetworkFromParam(WebSock);
- 
-   // Admin||Self Check
--  if (!spSession->IsAdmin() && (!spSession->GetUser() || 
spSession->GetUser() != pNetwork->GetUser())) {
-+  if (!spSession->IsAdmin() && (!spSession->GetUser() || 
!pNetwork || spSession->GetUser() != pNetwork->GetUser())) {
-   return false;
-   }
- 
-@@ -486,7 +486,7 @@ public:
-   CIRCNetwork* pNetwork = 
SafeGetNetworkFromParam(WebSock);
- 
-   // Admin||Self Check
--  if (!spSession->IsAdmin() && (!spSession->GetUser() || 
spSession->GetUser() != pNetwork->GetUser())) {
-+  if (!spSession->IsAdmin() && (!spSession->GetUser() || 
!pNetwork || spSession->GetUser() != pNetwork->GetUser())) {
-   return false;
-   }
- 
--- 
-1.8.5.2.233.g932f7e4
-
diff --git a/meta-networking/recipes-irc/znc/znc_git.bb 
b/meta-networking/recipes-irc/znc/znc_git.bb
index 2e35e4d..f5bed08 100644
--- a/meta-networking/recipes-irc/znc/znc_git.bb
+++ b/meta-networking/recipes-irc/znc/znc_git.bb
@@ -1,16 +1,16 @@
 SUMMARY = "ZNC, an advanced IRC bouncer"
 SECTION = "net"
 LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
-DEPENDS = "openssl"
+DEPENDS = "openssl zlib icu"
 
-PV = "1.0+git"
+PV = "1.6.0+git"
 
-SRCREV = "ef59c23068547c132cb678092fba9a21317fd5f2"
-SRC_URI = "git://github.com/znc/znc.git \
-   file://0001-Fix-NULL-pointer-dereference-in-webadmin.patch \
+SRC_URI = 
"git://github.com/znc/znc.git;rev=f47e8465efa4e1cd948b9caae93ac401b4355df8  \
+   
git://github.com/jimloco/Csocket.git;destsuffix=git/third_party/Csocket;name=Csocket
 \
   "
+SRCREV_Csocket = "07b4437396122650e5b8fb3d014e820a5decf4ee"
 
 S = "${WORKDIR}/git"
 
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH][meta-networking][v3] squid: upgrade to 3.5.5

[rongqing.li]

From: Roy Li 

1. Remove the squid-change-ksh-referen*.patch which is not needed, since
   3.5.5 did not use ksh by default.
2. Update the checksum of COPYING,since the date in it has been changed.
3. Define BUILDCXXFLAGS, otherwise the target gcc options -std=c++11 will
   add into it, and lead to building failure since host gcc maybe not
   support "-std=c++11"
4. Assume to support GNU atomic operations by default, the running check
   on cross-compile setup does not work
5. Add the dependency on libpam

Signed-off-by: Roy Li 
---
 ...ge-ksh-reference-in-krb-ldap-helper-to-sh.patch | 39 --
 .../squid/{squid_3.4.7.bb => squid_3.5.5.bb}   | 11 +++---
 2 files changed, 6 insertions(+), 44 deletions(-)
 delete mode 100644 
meta-networking/recipes-daemons/squid/files/squid-change-ksh-reference-in-krb-ldap-helper-to-sh.patch
 rename meta-networking/recipes-daemons/squid/{squid_3.4.7.bb => 
squid_3.5.5.bb} (86%)

diff --git 
a/meta-networking/recipes-daemons/squid/files/squid-change-ksh-reference-in-krb-ldap-helper-to-sh.patch
 
b/meta-networking/recipes-daemons/squid/files/squid-change-ksh-reference-in-krb-ldap-helper-to-sh.patch
deleted file mode 100644
index 8e03860..000
--- 
a/meta-networking/recipes-daemons/squid/files/squid-change-ksh-reference-in-krb-ldap-helper-to-sh.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-squid: change ksh reference in krb ldap helper to sh
-
-Very simple cert_tool script with no ksh specifics.
-Change it to use sh so a package dependency doesn't
-get created to ksh.
-
-Upstream-Status: Pending
-
-Signed-off-by: Jim Somerville 
-Signed-off-by: Chong Lu 

- helpers/external_acl/kerberos_ldap_group/cert_tool | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/helpers/external_acl/kerberos_ldap_group/cert_tool 
b/helpers/external_acl/kerberos_ldap_group/cert_tool
-index 9f14959..8c4ea11 100644
 a/helpers/external_acl/kerberos_ldap_group/cert_tool
-+++ b/helpers/external_acl/kerberos_ldap_group/cert_tool
-@@ -1,4 +1,4 @@
--#!/bin/ksh
-+#!/bin/sh
- #
- #  
-
- # 
-@@ -64,9 +64,9 @@ QUIT
- # Create database for Sun ldap and pem file for Openldap 
- #
- rm ${server}_[0-9]*.pem 2>/dev/null
--let i=0
-+i=0
-  ls ${server}_[0-9]*.cert | while read file; do
-- let i=i+1
-+ i=`expr $i + 1`
-  cat  $file  >> ${server}_$i.pem
-  CA=`openssl x509 -noout -text -in  ${server}_$i.pem | grep -i "CA:.*true"`
-  if [ -n "$CA" ]; then
--- 
-1.9.1
-
diff --git a/meta-networking/recipes-daemons/squid/squid_3.4.7.bb 
b/meta-networking/recipes-daemons/squid/squid_3.5.5.bb
similarity index 86%
rename from meta-networking/recipes-daemons/squid/squid_3.4.7.bb
rename to meta-networking/recipes-daemons/squid/squid_3.5.5.bb
index 7b00dfc..198319d 100644
--- a/meta-networking/recipes-daemons/squid/squid_3.4.7.bb
+++ b/meta-networking/recipes-daemons/squid/squid_3.5.5.bb
@@ -16,19 +16,18 @@ SRC_URI = 
"http://www.squid-cache.org/Versions/v${MAJ_VER}/${MIN_VER}/${BPN}-${P
file://Set-up-for-cross-compilation.patch \
file://Skip-AC_RUN_IFELSE-tests.patch \
file://Fix-flawed-dynamic-ldb-link-test-in-configure.patch \
-   file://squid-change-ksh-reference-in-krb-ldap-helper-to-sh.patch \
file://squid-use-serial-tests-config-needed-by-ptest.patch \
file://run-ptest \
file://volatiles.03_squid \
 "
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=c492e2d6d32ec5c1aad0e0609a141ce9 \
-file://COPYRIGHT;md5=2900f50789c498be8e9f1eb23b55cbe9 \
+
file://errors/COPYRIGHT;md5=0fed8f1462f6fdbc62bb431bcb618f46 \
"
-SRC_URI[md5sum] = "9951034b10f7ee0f45a95cfae61c57c2"
-SRC_URI[sha256sum] = 
"7b423f3d3495a317503ca559ea535f80445fd7c4e3c3e268cb7a8c97c61af2b6"
+SRC_URI[md5sum] = "6aac5c2e9cbbeabcbf2e9e49a178a931"
+SRC_URI[sha256sum] = 
"741c24a307c50f0d845d53cabb66b36d91ce9a73c8a165eae5def5e4d11e6a0d"
 
-DEPENDS = "libtool krb5 openldap db cyrus-sasl"
+DEPENDS = "libtool krb5 openldap db cyrus-sasl libpam"
 
 inherit autotools useradd ptest
 
@@ -38,6 +37,8 @@ USERADD_PARAM_${PN} = "--system --no-create-home --home-dir 
/var/run/squid --she
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[libnetfilter-conntrack] = 
"--with-netfilter-conntrack=${includedir}, --without-netfilter-conntrack, 
libnetfilter-conntrack"
 EXTRA_OECONF += "--with-default-user=squid"
+export BUILDCXXFLAGS="${BUILD_CXXFLAGS}"
+CACHED_CONFIGUREVARS += "squid_cv_gnu_atomics=yes"
 
 TESTDIR = "test-suite"
 do_compile_ptest() {
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH][meta-networking] net-snmp: don't return incompletely parsed varbinds

[rongqing.li]

From: Jian Liu 

the snmp_pdu_parse() function could leave incompletely parsed varBind
variables in the list of variables in case the parsing of the SNMP
PDU failed. If later processing tries to operate on the stale and
incompletely processed varBind (e.g. when printing the variables),
this can lead to e.g. crashes or, possibly, execution of arbitrary
code.

The snmp_pdu_parse() function stores varBind variables in a list of
netsnmp_variable_list structures. Each time the function parses a new
varBind, a new netsnmp_variable_list item is allocated on the heap
and linked to the list of variables. The problem is that this item
is not removed from the list, even if snmp_pdu_parse() fails to
complete the parsing.

The "type" member of the stale netsnmp_variable_list is not
properly initialized in case snmp_pdu_parse() returns early from the
parsing. However, the "type" member is used to determine later code
paths, which is why we see crashes in a variety of functions,
although the root cause for all of these is the same.

This patch come from
http://sourceforge.net/p/net-snmp/code/ci/f23bcd3ac6ddee5d0a48f9703007ccc738914791/

Written-by: Robert Story
Signed-off-by: Jian Liu 
---
 ...donnt-return-incompletely-parsed-varbinds.patch | 128 +
 .../recipes-protocols/net-snmp/net-snmp_5.7.2.1.bb |   1 +
 2 files changed, 129 insertions(+)
 create mode 100644 
meta-networking/recipes-protocols/net-snmp/net-snmp/donnt-return-incompletely-parsed-varbinds.patch

diff --git 
a/meta-networking/recipes-protocols/net-snmp/net-snmp/donnt-return-incompletely-parsed-varbinds.patch
 
b/meta-networking/recipes-protocols/net-snmp/net-snmp/donnt-return-incompletely-parsed-varbinds.patch
new file mode 100644
index 000..04f2110
--- /dev/null
+++ 
b/meta-networking/recipes-protocols/net-snmp/net-snmp/donnt-return-incompletely-parsed-varbinds.patch
@@ -0,0 +1,128 @@
+the snmp_pdu_parse() function could leave
+incompletely parsed varBind variables in the list of variables in
+case the parsing of the SNMP PDU failed. If later processing tries to
+operate on the stale and incompletely processed varBind (e.g. when
+printing the variables), this can lead to e.g. crashes or, possibly,
+execution of arbitrary code
+
+Upstream-Status: Backport [net-snmp]
+
+Written-by: Robert Story
+
+diff -Nur net-snmp-5.7.2.1.orig/snmplib/snmp_api.c 
net-snmp-5.7.2.1/snmplib/snmp_api.c
+--- net-snmp-5.7.2.1.orig/snmplib/snmp_api.c   2015-05-27 11:25:11.563747471 
+0800
 net-snmp-5.7.2.1/snmplib/snmp_api.c2015-05-27 13:27:27.724748201 
+0800
+@@ -4345,10 +4345,9 @@
+ u_char  type;
+ u_char  msg_type;
+ u_char *var_val;
+-int badtype = 0;
+ size_t  len;
+ size_t  four;
+-netsnmp_variable_list *vp = NULL;
++netsnmp_variable_list *vp = NULL, *vplast = NULL;
+ oid objid[MAX_OID_LEN];
+ 
+ /*
+@@ -4487,38 +4486,24 @@
+   (ASN_SEQUENCE | ASN_CONSTRUCTOR),
+   "varbinds");
+ if (data == NULL)
+-return -1;
++goto fail;
+ 
+ /*
+  * get each varBind sequence 
+  */
+ while ((int) *length > 0) {
+-netsnmp_variable_list *vptemp;
+-vptemp = (netsnmp_variable_list *) malloc(sizeof(*vptemp));
+-if (NULL == vptemp) {
+-return -1;
+-}
+-if (NULL == vp) {
+-pdu->variables = vptemp;
+-} else {
+-vp->next_variable = vptemp;
+-}
+-vp = vptemp;
++vp = SNMP_MALLOC_TYPEDEF(netsnmp_variable_list);
++if (NULL == vp)
++goto fail;
+ 
+-vp->next_variable = NULL;
+-vp->val.string = NULL;
+ vp->name_length = MAX_OID_LEN;
+-vp->name = NULL;
+-vp->index = 0;
+-vp->data = NULL;
+-vp->dataFreeHook = NULL;
+ DEBUGDUMPSECTION("recv", "VarBind");
+ data = snmp_parse_var_op(data, objid, &vp->name_length, &vp->type,
+  &vp->val_len, &var_val, length);
+ if (data == NULL)
+-return -1;
++goto fail;
+ if (snmp_set_var_objid(vp, objid, vp->name_length))
+-return -1;
++goto fail;
+ 
+ len = MAX_PACKET_LENGTH;
+ DEBUGDUMPHEADER("recv", "Value");
+@@ -4583,7 +4568,7 @@
+ vp->val.string = (u_char *) malloc(vp->val_len);
+ }
+ if (vp->val.string == NULL) {
+-return -1;
++goto fail;
+ }
+ asn_parse_string(var_val, &len, &vp->type, vp->val.string,
+  &vp->val_len);
+@@ -4594,7 +4579,7 @@
+ vp->val_len *= sizeof(oid);
+ vp->val.objid = (oid *) malloc(vp->val_len);
+ if (vp->val.objid == NULL) {
+-return -1;
++goto fail;
+ }
+ memmove(vp->val.objid, objid, vp->val_

[oe] [PATCH][meta-networking] inetutils: Fix deadlock in telnetd when cleanup

[rongqing.li]

From: Li Wang 

the patch comes from:
https://bugs.launchpad.net/ubuntu/+source/netkit-telnet/+bug/507455
https://launchpadlibrarian.net/37882973/0001-telnetd-Fix-deadlock-on-cleanup.patch

The cleanup function in telnetd is called both directly and on SIGCHLD
signals. This, unfortunately, triggered a deadlock in eglibc 2.9 while
running on a 2.6.31.11 kernel.

What we were seeing is hangs like these:

  (gdb) bt
  #0  0xb7702424 in __kernel_vsyscall ()
  #1  0xb7658e61 in __lll_lock_wait_private () from ./lib/libc.so.6
  #2  0xb767e7b5 in _L_lock_15 () from ./lib/libc.so.6
  #3  0xb767e6e0 in utmpname () from ./lib/libc.so.6
  #4  0xb76bcde7 in logout () from ./lib/libutil.so.1
  #5  0x0804c827 in cleanup ()
  #6  
  #7  0xb7702424 in __kernel_vsyscall ()
  #8  0xb7641003 in __fcntl_nocancel () from ./lib/libc.so.6
  #9  0xb767e0c3 in getutline_r_file () from ./lib/libc.so.6
  #10 0xb767d675 in getutline_r () from ./lib/libc.so.6
  #11 0xb76bce42 in logout () from ./lib/libutil.so.1
  #12 0x0804c827 in cleanup ()
  #13 0x0804a0b5 in telnet ()
  #14 0x0804a9c3 in main ()

and what has happened here is that the user closes the telnet session
via the escape character. This causes telnetd to call cleanup in frame
the SIGCHLD signal is delivered while telnetd is executing cleanup.

Telnetd then calls the signal handler for SIGCHLD, which is cleanup().
Ouch. The actual deadlock is in libc. getutline_r in frame #10 gets the
__libc_utmp_lock lock, and utmpname above does the same thing in frame

The fix registers the SIGCHLD handler as cleanup_sighandler, and makes
cleanup disable the SIGCHLD signal before calling cleanup_sighandler.

Signed-off-by: Simon Kagstrom 
Signed-off-by: Li Wang 
---
 .../telnetd-Fix-deadlock-on-cleanup.patch  | 108 +
 .../inetutils/inetutils_1.9.2.bb   |   1 +
 2 files changed, 109 insertions(+)
 create mode 100644 
meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/telnetd-Fix-deadlock-on-cleanup.patch

diff --git 
a/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/telnetd-Fix-deadlock-on-cleanup.patch
 
b/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/telnetd-Fix-deadlock-on-cleanup.patch
new file mode 100644
index 000..3ec7613
--- /dev/null
+++ 
b/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/telnetd-Fix-deadlock-on-cleanup.patch
@@ -0,0 +1,108 @@
+telnetd: Fix deadlock on cleanup
+
+the patch comes from:
+https://bugs.launchpad.net/ubuntu/+source/netkit-telnet/+bug/507455
+https://launchpadlibrarian.net/37882973/0001-telnetd-Fix-deadlock-on-cleanup.patch
+
+The cleanup function in telnetd is called both directly and on SIGCHLD
+signals. This, unfortunately, triggered a deadlock in eglibc 2.9 while
+running on a 2.6.31.11 kernel.
+
+What we were seeing is hangs like these:
+
+  (gdb) bt
+  #0  0xb7702424 in __kernel_vsyscall ()
+  #1  0xb7658e61 in __lll_lock_wait_private () from ./lib/libc.so.6
+  #2  0xb767e7b5 in _L_lock_15 () from ./lib/libc.so.6
+  #3  0xb767e6e0 in utmpname () from ./lib/libc.so.6
+  #4  0xb76bcde7 in logout () from ./lib/libutil.so.1
+  #5  0x0804c827 in cleanup ()
+  #6  
+  #7  0xb7702424 in __kernel_vsyscall ()
+  #8  0xb7641003 in __fcntl_nocancel () from ./lib/libc.so.6
+  #9  0xb767e0c3 in getutline_r_file () from ./lib/libc.so.6
+  #10 0xb767d675 in getutline_r () from ./lib/libc.so.6
+  #11 0xb76bce42 in logout () from ./lib/libutil.so.1
+  #12 0x0804c827 in cleanup ()
+  #13 0x0804a0b5 in telnet ()
+  #14 0x0804a9c3 in main ()
+
+and what has happened here is that the user closes the telnet session
+via the escape character. This causes telnetd to call cleanup in frame
+the SIGCHLD signal is delivered while telnetd is executing cleanup.
+
+Telnetd then calls the signal handler for SIGCHLD, which is cleanup().
+Ouch. The actual deadlock is in libc. getutline_r in frame #10 gets the
+__libc_utmp_lock lock, and utmpname above does the same thing in frame
+
+The fix registers the SIGCHLD handler as cleanup_sighandler, and makes
+cleanup disable the SIGCHLD signal before calling cleanup_sighandler.
+
+Signed-off-by: Simon Kagstrom 
+Signed-off-by: Li Wang 
+---
+ telnetd/pty.c |   17 -
+ telnetd/telnetd.c |2 +-
+ telnetd/telnetd.h |1 +
+ 3 files changed, 18 insertions(+), 2 deletions(-)
+
+diff --git a/telnetd/pty.c b/telnetd/pty.c
+index 21b0b69..22a17c5 100644
+--- a/telnetd/pty.c
 b/telnetd/pty.c
+@@ -145,7 +145,7 @@ start_login (char *host, int autologin, char *name)
+  * reported exit code.
+  */
+ void
+-cleanup (int sig)
++cleanup_sighandler (int sig)
+ {
+   int status = EXIT_FAILURE;
+   char *p;
+@@ -168,3 +168,18 @@ cleanup (int sig)
+   shutdown (net, 2);
+   exit (status);
+ }
++
++void cleanup(int sig) {
++sigset_t mask, oldmask;
++
++/* Set up the mask of signals to temporarily block. */
++sigemptyset (&mask);
++sigaddset (&mask, SIGCHLD);
++
++/* Block SIGCHLD while running cleanup */

[oe] [PATCH][meta-networking] inetutils: move daemon servers from bin to sbin directory

[rongqing.li]

From: Li Wang 

move daemon servers from bin to sbin directory:
tftpd, telnetd, rshd, rexecd and rlogind

Signed-off-by: Li Wang 
---
 .../recipes-connectivity/inetutils/inetutils_1.9.2.bb  | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.2.bb 
b/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.2.bb
index cd7b425..9bb9fe8 100644
--- a/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.2.bb
+++ b/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.2.bb
@@ -97,21 +97,21 @@ ALTERNATIVE_${PN}-ftp = "ftp"
 ALTERNATIVE_${PN}-ftpd = "ftpd"
 ALTERNATIVE_${PN}-tftp = "tftp"
 ALTERNATIVE_${PN}-tftpd = "tftpd"
-ALTERNATIVE_LINK_NAME[tftpd] = "${bindir}/tftpd"
+ALTERNATIVE_LINK_NAME[tftpd] = "${sbindir}/tftpd"
 ALTERNATIVE_TARGET[tftpd]  = "${sbindir}/in.tftpd"
 
 ALTERNATIVE_${PN}-telnet = "telnet"
 ALTERNATIVE_${PN}-telnetd = "telnetd"
-ALTERNATIVE_LINK_NAME[telnetd] = "${bindir}/telnetd"
+ALTERNATIVE_LINK_NAME[telnetd] = "${sbindir}/telnetd"
 ALTERNATIVE_TARGET[telnetd] = "${sbindir}/in.telnetd"
 
 ALTERNATIVE_${PN}-rsh = "rcp rexec rlogin rsh"
 ALTERNATIVE_${PN}-rshd = "rshd rexecd rlogind"
-ALTERNATIVE_LINK_NAME[rshd] = "${bindir}/rshd"
+ALTERNATIVE_LINK_NAME[rshd] = "${sbindir}/rshd"
 ALTERNATIVE_TARGET[rshd] = "${sbindir}/in.rshd"
-ALTERNATIVE_LINK_NAME[rexecd] = "${bindir}/rexecd"
+ALTERNATIVE_LINK_NAME[rexecd] = "${sbindir}/rexecd"
 ALTERNATIVE_TARGET[rexecd] = "${sbindir}/in.rexecd"
-ALTERNATIVE_LINK_NAME[rlogind] = "${bindir}/rlogind"
+ALTERNATIVE_LINK_NAME[rlogind] = "${sbindir}/rlogind"
 ALTERNATIVE_TARGET[rlogind] = "${sbindir}/in.rlogind"
 
 ALTERNATIVE_${PN}-inetd= "inetd"
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH][meta-networking] inetutils: fix tcpd path of rlogin rsh and rexec

[rongqing.li]

From: Jian Liu 

rlogin, rsh and rexec xinet.d script, a wrong path is
being referenced under the server section.

server = /usr/bin/tcpd
instead of
server = /usr/sbin/tcpd

tcpd is provided by tcp-wrappers

Written-by: Herve.Patriarche 
Signed-off-by: Jian Liu 
---
 .../inetutils/inetutils-1.9.2/rexec.xinetd.inetutils| 2 +-
 .../inetutils/inetutils-1.9.2/rlogin.xinetd.inetutils   | 2 +-
 .../recipes-connectivity/inetutils/inetutils-1.9.2/rsh.xinetd.inetutils | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/rexec.xinetd.inetutils
 
b/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/rexec.xinetd.inetutils
index 80aed36..7354360 100644
--- 
a/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/rexec.xinetd.inetutils
+++ 
b/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/rexec.xinetd.inetutils
@@ -14,7 +14,7 @@ service exec
group   = root
log_on_success  += USERID
log_on_failure  += USERID
-   server  = /usr/bin/tcpd
+   server  = /usr/sbin/tcpd
server_args = /usr/sbin/in.rexecd
disable = yes
 }
diff --git 
a/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/rlogin.xinetd.inetutils
 
b/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/rlogin.xinetd.inetutils
index 00dbf93..70493e6 100644
--- 
a/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/rlogin.xinetd.inetutils
+++ 
b/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/rlogin.xinetd.inetutils
@@ -14,7 +14,7 @@ service login
group   = root
log_on_success  += USERID
log_on_failure  += USERID
-   server  = /usr/bin/tcpd
+   server  = /usr/sbin/tcpd
server_args = /usr/sbin/in.rlogind -a
disable = yes
 }
diff --git 
a/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/rsh.xinetd.inetutils
 
b/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/rsh.xinetd.inetutils
index ad59b62..a842eb9 100644
--- 
a/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/rsh.xinetd.inetutils
+++ 
b/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/rsh.xinetd.inetutils
@@ -15,7 +15,7 @@ service shell
group   = root
log_on_success  += USERID
log_on_failure  += USERID
-   server  = /usr/bin/tcpd
+   server  = /usr/sbin/tcpd
server_args = /usr/sbin/in.rshd -aL
disable = yes
 }
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH] ypbind-yocto.init: add status command

[rongqing.li]

From: Zhu Yanjun 

Add the "status" command to check the status of ypbind.

Signed-off-by: Zhu Yanjun 
---
 meta-networking/recipes-support/nis/files/ypbind-yocto.init | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/meta-networking/recipes-support/nis/files/ypbind-yocto.init 
b/meta-networking/recipes-support/nis/files/ypbind-yocto.init
index 5f50a53..da533a1 100644
--- a/meta-networking/recipes-support/nis/files/ypbind-yocto.init
+++ b/meta-networking/recipes-support/nis/files/ypbind-yocto.init
@@ -21,6 +21,9 @@
 #  the NIS binding information.
 ### END INIT INFO
 
+# Need to use status function
+. /etc/init.d/functions
+
 YPBIND_BIN=/usr/sbin/ypbind
 pidfile=/var/run/ypbind.pid
 
@@ -92,6 +95,10 @@ case "$1" in
echo -n "Reload service ypbind"
start-stop-daemon --stop --quiet --signal 1 --pidfile $pidfile
;;
+status)
+   echo -n "Checking for ypbind: "
+   status $YPBIND_BIN
+   ;;
 *)
echo "Usage: $0 
{start|stop|status|try-restart|restart|force-reload|reload|probe}"
exit 1
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH] hiawatha: fix the installation failure due to no /var/run dir

[rongqing.li]

From: Roy Li 

after cmake is upgrade to 3.2.2, the /var/run dir is not created, so
not need to remove it.

Signed-off-by: Roy Li 
---
 meta-webserver/recipes-httpd/hiawatha/hiawatha_9.2.bb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/meta-webserver/recipes-httpd/hiawatha/hiawatha_9.2.bb 
b/meta-webserver/recipes-httpd/hiawatha/hiawatha_9.2.bb
index b9fa5cd..31293e4 100644
--- a/meta-webserver/recipes-httpd/hiawatha/hiawatha_9.2.bb
+++ b/meta-webserver/recipes-httpd/hiawatha/hiawatha_9.2.bb
@@ -53,7 +53,6 @@ do_install_append() {
 install -m 644 ${WORKDIR}/hiawatha.service 
${D}/${systemd_unitdir}/system
 fi
 
-rmdir "${D}${localstatedir}/run"
 rmdir --ignore-fail-on-non-empty "${D}${localstatedir}"
 }
 
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH] php: fix a building failure on aarch64

[rongqing.li]

From: Roy Li 

When -O0 of gcc is used to compile the macro ZEND_SIGNED_MULTIPLY_LONG
in Zend/zend_multiply.h, the compiling will fail with the below error:
  : Assembler messages:
  :3113: Error: operand 2 should be an integer register -- `mul 
x1,[x29,200],[x29,192]'
  :3114: Error: operand 2 should be an integer register -- `smulh 
x0,[x29,200],[x29,192]'

Signed-off-by: Roy Li 
---
 meta-oe/recipes-devtools/php/php_5.5.26.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-oe/recipes-devtools/php/php_5.5.26.bb 
b/meta-oe/recipes-devtools/php/php_5.5.26.bb
index 8b64b2b..85fdccb 100644
--- a/meta-oe/recipes-devtools/php/php_5.5.26.bb
+++ b/meta-oe/recipes-devtools/php/php_5.5.26.bb
@@ -101,6 +101,7 @@ PACKAGECONFIG[imap] = "--with-imap=${STAGING_DIR_HOST} \
 export PHP_NATIVE_DIR = "${STAGING_BINDIR_NATIVE}"
 export PHP_PEAR_PHP_BIN = "${STAGING_BINDIR_NATIVE}/php"
 CFLAGS += " -D_GNU_SOURCE -g -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED 
-I${STAGING_INCDIR}/apache2"
+CFLAGS_append_aarch64 = " -O2"
 
 EXTRA_OEMAKE = "INSTALL_ROOT=${D}"
 
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH][v2] squid: upgrade to 3.5.5

[rongqing.li]

From: Roy Li 

1. Remove the squid-change-ksh-referen*.patch which is not needed, since
   3.5.5 did not use ksh by default.
2. Update the checksum of COPYING,since the date in it has been changed.
3. Define BUILDCXXFLAGS, otherwise the target gcc options -std=c++11 will
   add into it, and lead to building failure since host gcc maybe not
   support "-std=c++11"
4. Assume to support GNU atomic operations by default, the running check
   on cross-compile setup does not work

Signed-off-by: Roy Li 
---
 ...ge-ksh-reference-in-krb-ldap-helper-to-sh.patch | 39 --
 .../squid/{squid_3.4.7.bb => squid_3.5.5.bb}   |  9 ++---
 2 files changed, 5 insertions(+), 43 deletions(-)
 delete mode 100644 
meta-networking/recipes-daemons/squid/files/squid-change-ksh-reference-in-krb-ldap-helper-to-sh.patch
 rename meta-networking/recipes-daemons/squid/{squid_3.4.7.bb => 
squid_3.5.5.bb} (88%)

diff --git 
a/meta-networking/recipes-daemons/squid/files/squid-change-ksh-reference-in-krb-ldap-helper-to-sh.patch
 
b/meta-networking/recipes-daemons/squid/files/squid-change-ksh-reference-in-krb-ldap-helper-to-sh.patch
deleted file mode 100644
index 8e03860..000
--- 
a/meta-networking/recipes-daemons/squid/files/squid-change-ksh-reference-in-krb-ldap-helper-to-sh.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-squid: change ksh reference in krb ldap helper to sh
-
-Very simple cert_tool script with no ksh specifics.
-Change it to use sh so a package dependency doesn't
-get created to ksh.
-
-Upstream-Status: Pending
-
-Signed-off-by: Jim Somerville 
-Signed-off-by: Chong Lu 

- helpers/external_acl/kerberos_ldap_group/cert_tool | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/helpers/external_acl/kerberos_ldap_group/cert_tool 
b/helpers/external_acl/kerberos_ldap_group/cert_tool
-index 9f14959..8c4ea11 100644
 a/helpers/external_acl/kerberos_ldap_group/cert_tool
-+++ b/helpers/external_acl/kerberos_ldap_group/cert_tool
-@@ -1,4 +1,4 @@
--#!/bin/ksh
-+#!/bin/sh
- #
- #  
-
- # 
-@@ -64,9 +64,9 @@ QUIT
- # Create database for Sun ldap and pem file for Openldap 
- #
- rm ${server}_[0-9]*.pem 2>/dev/null
--let i=0
-+i=0
-  ls ${server}_[0-9]*.cert | while read file; do
-- let i=i+1
-+ i=`expr $i + 1`
-  cat  $file  >> ${server}_$i.pem
-  CA=`openssl x509 -noout -text -in  ${server}_$i.pem | grep -i "CA:.*true"`
-  if [ -n "$CA" ]; then
--- 
-1.9.1
-
diff --git a/meta-networking/recipes-daemons/squid/squid_3.4.7.bb 
b/meta-networking/recipes-daemons/squid/squid_3.5.5.bb
similarity index 88%
rename from meta-networking/recipes-daemons/squid/squid_3.4.7.bb
rename to meta-networking/recipes-daemons/squid/squid_3.5.5.bb
index 7b00dfc..ac18e0f 100644
--- a/meta-networking/recipes-daemons/squid/squid_3.4.7.bb
+++ b/meta-networking/recipes-daemons/squid/squid_3.5.5.bb
@@ -16,17 +16,16 @@ SRC_URI = 
"http://www.squid-cache.org/Versions/v${MAJ_VER}/${MIN_VER}/${BPN}-${P
file://Set-up-for-cross-compilation.patch \
file://Skip-AC_RUN_IFELSE-tests.patch \
file://Fix-flawed-dynamic-ldb-link-test-in-configure.patch \
-   file://squid-change-ksh-reference-in-krb-ldap-helper-to-sh.patch \
file://squid-use-serial-tests-config-needed-by-ptest.patch \
file://run-ptest \
file://volatiles.03_squid \
 "
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=c492e2d6d32ec5c1aad0e0609a141ce9 \
-file://COPYRIGHT;md5=2900f50789c498be8e9f1eb23b55cbe9 \
+
file://errors/COPYRIGHT;md5=0fed8f1462f6fdbc62bb431bcb618f46 \
"
-SRC_URI[md5sum] = "9951034b10f7ee0f45a95cfae61c57c2"
-SRC_URI[sha256sum] = 
"7b423f3d3495a317503ca559ea535f80445fd7c4e3c3e268cb7a8c97c61af2b6"
+SRC_URI[md5sum] = "6aac5c2e9cbbeabcbf2e9e49a178a931"
+SRC_URI[sha256sum] = 
"741c24a307c50f0d845d53cabb66b36d91ce9a73c8a165eae5def5e4d11e6a0d"
 
 DEPENDS = "libtool krb5 openldap db cyrus-sasl"
 
@@ -38,6 +37,8 @@ USERADD_PARAM_${PN} = "--system --no-create-home --home-dir 
/var/run/squid --she
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[libnetfilter-conntrack] = 
"--with-netfilter-conntrack=${includedir}, --without-netfilter-conntrack, 
libnetfilter-conntrack"
 EXTRA_OECONF += "--with-default-user=squid"
+export BUILDCXXFLAGS="${BUILD_CXXFLAGS}"
+CACHED_CONFIGUREVARS += "squid_cv_gnu_atomics=yes"
 
 TESTDIR = "test-suite"
 do_compile_ptest() {
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH][meta-oe][v2] php: fix native php when it is from sstate

[rongqing.li]

From: Roy Li 

the native php is used to install the target pear, and native php
has hard-code path, so make wrapper to override the hard-code path

the configuration format of pear.conf for native php is like:
"type:path length:path", path will be replaced when populate sysroot
setscene, but the path length is not changed, and make php unable to
work, add a task to SSTATEPOSTINSTFUNCS to fix the path length

Signed-off-by: Roy Li 
---
 meta-oe/recipes-devtools/php/php_5.5.24.bb | 18 ++
 1 file changed, 18 insertions(+)

diff --git a/meta-oe/recipes-devtools/php/php_5.5.24.bb 
b/meta-oe/recipes-devtools/php/php_5.5.24.bb
index 3e656af..52c0227 100644
--- a/meta-oe/recipes-devtools/php/php_5.5.24.bb
+++ b/meta-oe/recipes-devtools/php/php_5.5.24.bb
@@ -245,3 +245,21 @@ MODPHP_OLDPACKAGE = "${@bb.utils.contains('PACKAGECONFIG', 
'apache2', 'modphp',
 RPROVIDES_${PN}-modphp = "${MODPHP_OLDPACKAGE}"
 RREPLACES_${PN}-modphp = "${MODPHP_OLDPACKAGE}"
 RCONFLICTS_${PN}-modphp = "${MODPHP_OLDPACKAGE}"
+
+do_install_append_class-native() {
+create_wrapper ${D}${bindir}/php \
+PHP_PEAR_SYSCONF_DIR=${sysconfdir}/
+}
+
+SSTATEPOSTINSTFUNCS_append_class-native = " php_sstate_postinst "
+
+php_sstate_postinst() {
+if [ "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ]
+then
+head -n1 ${sysconfdir}/pear.conf > ${sysconfdir}/pear.tmp.conf
+for p in `tail -n1  ${sysconfdir}/pear.conf | sed -s 's/;/ /g'`; do
+echo $p | awk -F: 'BEGIN {OFS = ":"; ORS = ";"}{if(NF==3){print 
$1, length($3)-2*match($3, /^"/), $3} else {print $0}}';
+done >> ${sysconfdir}/pear.tmp.conf
+mv -f ${sysconfdir}/pear.tmp.conf ${sysconfdir}/pear.conf
+fi
+}
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH][meta-webserver] phpmyadmin: upgrade 4.4.9

[rongqing.li]

From: Roy Li 

upgrade to include CVE fixes:
CVE-2015-3903
CVE-2015-3902

Signed-off-by: Roy Li 
---
 .../phpmyadmin/{phpmyadmin_4.4.4.bb => phpmyadmin_4.4.9.bb}   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-webserver/recipes-php/phpmyadmin/{phpmyadmin_4.4.4.bb => 
phpmyadmin_4.4.9.bb} (88%)

diff --git a/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_4.4.4.bb 
b/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_4.4.9.bb
similarity index 88%
rename from meta-webserver/recipes-php/phpmyadmin/phpmyadmin_4.4.4.bb
rename to meta-webserver/recipes-php/phpmyadmin/phpmyadmin_4.4.9.bb
index c021c92..91a1cbf 100644
--- a/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_4.4.4.bb
+++ b/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_4.4.9.bb
@@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = 
"file://LICENSE;md5=eb723b61539feef013de476e68b5c50a \
 SRC_URI = 
"${SOURCEFORGE_MIRROR}/phpmyadmin/phpMyAdmin/${PV}/phpMyAdmin-${PV}-all-languages.tar.xz
 \
file://apache.conf"
 
-SRC_URI[md5sum] = "912eeb8634bf99a7538a6fb4cad9135c"
-SRC_URI[sha256sum] = 
"bad1583fa3ef9534bc412822f873635c4b7f90488f17567d7ab0e2ea9bbd338c"
+SRC_URI[md5sum] = "d60d80fabe1b2702318dcf7ee73e"
+SRC_URI[sha256sum] = 
"b9a31d6ec3e7abe708160ce8dbc364c029015256766bac6f68134b84a836d766"
 
 S = "${WORKDIR}/phpMyAdmin-${PV}-all-languages"
 
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH][meta-networking] znc: upgrade to 1.6.0

[rongqing.li]

From: Roy Li 

Remove backport patch
Add CSocket submodule

Signed-off-by: Roy Li 
---
 ...-Fix-NULL-pointer-dereference-in-webadmin.patch | 58 --
 meta-networking/recipes-irc/znc/znc_git.bb | 12 ++---
 2 files changed, 6 insertions(+), 64 deletions(-)
 delete mode 100644 
meta-networking/recipes-irc/znc/znc/0001-Fix-NULL-pointer-dereference-in-webadmin.patch

diff --git 
a/meta-networking/recipes-irc/znc/znc/0001-Fix-NULL-pointer-dereference-in-webadmin.patch
 
b/meta-networking/recipes-irc/znc/znc/0001-Fix-NULL-pointer-dereference-in-webadmin.patch
deleted file mode 100644
index 68e4414..000
--- 
a/meta-networking/recipes-irc/znc/znc/0001-Fix-NULL-pointer-dereference-in-webadmin.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Subject: [PATCH] Fix NULL pointer dereference in webadmin.
-
-Upstream-Status: Backport
-
-commit 2bd410ee5570cea127233f1133ea22f25174eb28 upstream
-
-Triggerable by any non-admin, if webadmin is loaded.
-
-The only affected version is 1.0
-
-Thanks to ChauffeR (Simone Esposito) for reporting this.

- modules/webadmin.cpp | 8 
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/modules/webadmin.cpp b/modules/webadmin.cpp
-index b793c02..816f217 100644
 a/modules/webadmin.cpp
-+++ b/modules/webadmin.cpp
-@@ -419,7 +419,7 @@ public:
-   CIRCNetwork* pNetwork = 
SafeGetNetworkFromParam(WebSock);
- 
-   // Admin||Self Check
--  if (!spSession->IsAdmin() && (!spSession->GetUser() || 
spSession->GetUser() != pNetwork->GetUser())) {
-+  if (!spSession->IsAdmin() && (!spSession->GetUser() || 
!pNetwork || spSession->GetUser() != pNetwork->GetUser())) {
-   return false;
-   }
- 
-@@ -448,7 +448,7 @@ public:
-   CIRCNetwork* pNetwork = 
SafeGetNetworkFromParam(WebSock);
- 
-   // Admin||Self Check
--  if (!spSession->IsAdmin() && (!spSession->GetUser() || 
spSession->GetUser() != pNetwork->GetUser())) {
-+  if (!spSession->IsAdmin() && (!spSession->GetUser() || 
!pNetwork || spSession->GetUser() != pNetwork->GetUser())) {
-   return false;
-   }
- 
-@@ -472,7 +472,7 @@ public:
-   CIRCNetwork* pNetwork = 
SafeGetNetworkFromParam(WebSock);
- 
-   // Admin||Self Check
--  if (!spSession->IsAdmin() && (!spSession->GetUser() || 
spSession->GetUser() != pNetwork->GetUser())) {
-+  if (!spSession->IsAdmin() && (!spSession->GetUser() || 
!pNetwork || spSession->GetUser() != pNetwork->GetUser())) {
-   return false;
-   }
- 
-@@ -486,7 +486,7 @@ public:
-   CIRCNetwork* pNetwork = 
SafeGetNetworkFromParam(WebSock);
- 
-   // Admin||Self Check
--  if (!spSession->IsAdmin() && (!spSession->GetUser() || 
spSession->GetUser() != pNetwork->GetUser())) {
-+  if (!spSession->IsAdmin() && (!spSession->GetUser() || 
!pNetwork || spSession->GetUser() != pNetwork->GetUser())) {
-   return false;
-   }
- 
--- 
-1.8.5.2.233.g932f7e4
-
diff --git a/meta-networking/recipes-irc/znc/znc_git.bb 
b/meta-networking/recipes-irc/znc/znc_git.bb
index 2e35e4d..834c3de 100644
--- a/meta-networking/recipes-irc/znc/znc_git.bb
+++ b/meta-networking/recipes-irc/znc/znc_git.bb
@@ -1,16 +1,16 @@
 SUMMARY = "ZNC, an advanced IRC bouncer"
 SECTION = "net"
 LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
-DEPENDS = "openssl"
+DEPENDS = "openssl zlib"
 
-PV = "1.0+git"
+PV = "1.6.0+git"
 
-SRCREV = "ef59c23068547c132cb678092fba9a21317fd5f2"
-SRC_URI = "git://github.com/znc/znc.git \
-   file://0001-Fix-NULL-pointer-dereference-in-webadmin.patch \
+SRC_URI = 
"git://github.com/znc/znc.git;rev=f47e8465efa4e1cd948b9caae93ac401b4355df8  \
+   
git://github.com/jimloco/Csocket.git;destsuffix=git/third_party/Csocket;name=Csocket
 \
   "
+SRCREV_Csocket = "07b4437396122650e5b8fb3d014e820a5decf4ee"
 
 S = "${WORKDIR}/git"
 
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH][meta-networking] squid: upgrade to 3.5.5

[rongqing.li]

From: Roy Li 

remove the squid-change-ksh-referen*.patch which is not needed,
since 3.5.5 did not use ksh by default.
update the checksum of COPYING,since the date in it has been changed.

Signed-off-by: Roy Li 
---
 ...ge-ksh-reference-in-krb-ldap-helper-to-sh.patch | 39 --
 .../squid/{squid_3.4.7.bb => squid_3.5.5.bb}   |  8 ++---
 2 files changed, 4 insertions(+), 43 deletions(-)
 delete mode 100644 
meta-networking/recipes-daemons/squid/files/squid-change-ksh-reference-in-krb-ldap-helper-to-sh.patch
 rename meta-networking/recipes-daemons/squid/{squid_3.4.7.bb => 
squid_3.5.5.bb} (88%)

diff --git 
a/meta-networking/recipes-daemons/squid/files/squid-change-ksh-reference-in-krb-ldap-helper-to-sh.patch
 
b/meta-networking/recipes-daemons/squid/files/squid-change-ksh-reference-in-krb-ldap-helper-to-sh.patch
deleted file mode 100644
index 8e03860..000
--- 
a/meta-networking/recipes-daemons/squid/files/squid-change-ksh-reference-in-krb-ldap-helper-to-sh.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-squid: change ksh reference in krb ldap helper to sh
-
-Very simple cert_tool script with no ksh specifics.
-Change it to use sh so a package dependency doesn't
-get created to ksh.
-
-Upstream-Status: Pending
-
-Signed-off-by: Jim Somerville 
-Signed-off-by: Chong Lu 

- helpers/external_acl/kerberos_ldap_group/cert_tool | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/helpers/external_acl/kerberos_ldap_group/cert_tool 
b/helpers/external_acl/kerberos_ldap_group/cert_tool
-index 9f14959..8c4ea11 100644
 a/helpers/external_acl/kerberos_ldap_group/cert_tool
-+++ b/helpers/external_acl/kerberos_ldap_group/cert_tool
-@@ -1,4 +1,4 @@
--#!/bin/ksh
-+#!/bin/sh
- #
- #  
-
- # 
-@@ -64,9 +64,9 @@ QUIT
- # Create database for Sun ldap and pem file for Openldap 
- #
- rm ${server}_[0-9]*.pem 2>/dev/null
--let i=0
-+i=0
-  ls ${server}_[0-9]*.cert | while read file; do
-- let i=i+1
-+ i=`expr $i + 1`
-  cat  $file  >> ${server}_$i.pem
-  CA=`openssl x509 -noout -text -in  ${server}_$i.pem | grep -i "CA:.*true"`
-  if [ -n "$CA" ]; then
--- 
-1.9.1
-
diff --git a/meta-networking/recipes-daemons/squid/squid_3.4.7.bb 
b/meta-networking/recipes-daemons/squid/squid_3.5.5.bb
similarity index 88%
rename from meta-networking/recipes-daemons/squid/squid_3.4.7.bb
rename to meta-networking/recipes-daemons/squid/squid_3.5.5.bb
index 7b00dfc..1f445e5 100644
--- a/meta-networking/recipes-daemons/squid/squid_3.4.7.bb
+++ b/meta-networking/recipes-daemons/squid/squid_3.5.5.bb
@@ -16,17 +16,16 @@ SRC_URI = 
"http://www.squid-cache.org/Versions/v${MAJ_VER}/${MIN_VER}/${BPN}-${P
file://Set-up-for-cross-compilation.patch \
file://Skip-AC_RUN_IFELSE-tests.patch \
file://Fix-flawed-dynamic-ldb-link-test-in-configure.patch \
-   file://squid-change-ksh-reference-in-krb-ldap-helper-to-sh.patch \
file://squid-use-serial-tests-config-needed-by-ptest.patch \
file://run-ptest \
file://volatiles.03_squid \
 "
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=c492e2d6d32ec5c1aad0e0609a141ce9 \
-file://COPYRIGHT;md5=2900f50789c498be8e9f1eb23b55cbe9 \
+
file://errors/COPYRIGHT;md5=0fed8f1462f6fdbc62bb431bcb618f46 \
"
-SRC_URI[md5sum] = "9951034b10f7ee0f45a95cfae61c57c2"
-SRC_URI[sha256sum] = 
"7b423f3d3495a317503ca559ea535f80445fd7c4e3c3e268cb7a8c97c61af2b6"
+SRC_URI[md5sum] = "6aac5c2e9cbbeabcbf2e9e49a178a931"
+SRC_URI[sha256sum] = 
"741c24a307c50f0d845d53cabb66b36d91ce9a73c8a165eae5def5e4d11e6a0d"
 
 DEPENDS = "libtool krb5 openldap db cyrus-sasl"
 
@@ -38,6 +37,7 @@ USERADD_PARAM_${PN} = "--system --no-create-home --home-dir 
/var/run/squid --she
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[libnetfilter-conntrack] = 
"--with-netfilter-conntrack=${includedir}, --without-netfilter-conntrack, 
libnetfilter-conntrack"
 EXTRA_OECONF += "--with-default-user=squid"
+CACHED_CONFIGUREVARS += "squid_cv_gnu_atomics=no"
 
 TESTDIR = "test-suite"
 do_compile_ptest() {
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH][mete-oe] mariadb: fix floating dependency on krb5

[rongqing.li]

From: Roy Li 

Mariadb depends on openssl, openssl conditionally depends on krb5 by
checking if OPENSSL_NO_KRB5 is defined, but cmake can not handle "ifndef"
and always ask krb5.h if krb5.h exist when cmake make_depend;

Faking a kssl.h if krb5 is not in PACKAGECONF, which does not include
krb5 related declaration, install the faked kssl.h into build dir to
be searched firstly

Signed-off-by: Roy Li 
---
 meta-oe/recipes-support/mysql/mariadb.inc | 9 +
 1 file changed, 9 insertions(+)

diff --git a/meta-oe/recipes-support/mysql/mariadb.inc 
b/meta-oe/recipes-support/mysql/mariadb.inc
index 00fa965..ddc0644 100644
--- a/meta-oe/recipes-support/mysql/mariadb.inc
+++ b/meta-oe/recipes-support/mysql/mariadb.inc
@@ -42,6 +42,7 @@ PACKAGECONFIG_class-native = ""
 PACKAGECONFIG[pam] = ",-DWITHOUT_AUTH_PAM=TRUE,libpam"
 PACKAGECONFIG[valgrind] = 
"-DWITH_VALGRIND=TRUE,-DWITHOUT_VALGRIND=TRUE,valgrind"
 PACKAGECONFIG[libedit] = 
"-DLIBEDIT_INTERFACE=TRUE,-DLIBEDIT_INTERFACE=FALSE,libedit"
+PACKAGECONFIG[krb5] = ", ,krb5"
 
 # MariaDB doesn't link properly with gold
 # https://mariadb.atlassian.net/browse/MDEV-5982
@@ -84,6 +85,14 @@ do_compile_prepend_class-target () {
 # and since we're cross-compiling that is disabled
 cp ${STAGING_BINDIR_NATIVE}/comp_err ${S}/extra
 cp ${STAGING_BINDIR_NATIVE}/comp_sql ${S}/scripts
+
+if [ "${@bb.utils.contains('PACKAGECONFIG', 'krb5', 'yes', 'no', d)}" = 
"no" ]; then
+mkdir ${B}/include/openssl
+echo "#ifndef KSSL_H" >${B}/include/openssl/kssl.h
+echo "#define KSSL_H" >>${B}/include/openssl/kssl.h
+echo "#include ">>${B}/include/openssl/kssl.h
+echo "#endif" >>${B}/include/openssl/kssl.h
+fi
 }
 
 SYSROOT_PREPROCESS_FUNCS += "mariadb_sysroot_preprocess"
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH][meta-oe] php: fix native php when it is from sstate

[rongqing.li]

From: Roy Li 

the native php is used to install the target pear, and native php
has hard-code path, so make wrapper to override the hard-code path

the configuration format of pear.conf for native php is like:
"type:path length:path", path will be replaced when populate sysroot
setscene, but the path length is not changed, and make php unable to
work, add a task to SSTATEPOSTINSTFUNCS to fix the path length

Signed-off-by: Roy Li 
---
 meta-oe/recipes-devtools/php/php_5.5.24.bb | 18 ++
 1 file changed, 18 insertions(+)

diff --git a/meta-oe/recipes-devtools/php/php_5.5.24.bb 
b/meta-oe/recipes-devtools/php/php_5.5.24.bb
index 3e656af..ced3904 100644
--- a/meta-oe/recipes-devtools/php/php_5.5.24.bb
+++ b/meta-oe/recipes-devtools/php/php_5.5.24.bb
@@ -245,3 +245,21 @@ MODPHP_OLDPACKAGE = "${@bb.utils.contains('PACKAGECONFIG', 
'apache2', 'modphp',
 RPROVIDES_${PN}-modphp = "${MODPHP_OLDPACKAGE}"
 RREPLACES_${PN}-modphp = "${MODPHP_OLDPACKAGE}"
 RCONFLICTS_${PN}-modphp = "${MODPHP_OLDPACKAGE}"
+
+do_install_append_virtclass-native() {
+create_wrapper ${D}${bindir}/php \
+PHP_PEAR_SYSCONF_DIR=${sysconfdir}/
+}
+
+SSTATEPOSTINSTFUNCS_append_virtclass-native += " php_sstate_postinst"
+
+php_sstate_postinst() {
+if [ "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ]
+then
+head -n1 ${sysconfdir}/pear.conf > ${sysconfdir}/pear.tmp.conf
+for p in `tail -n1  ${sysconfdir}/pear.conf | sed -s 's/;/ /g'`; do
+echo $p | awk -F: 'BEGIN {OFS = ":"; ORS = ";"}{if(NF==3){print 
$1, length($3)-2*match($3, /^"/), $3} else {print $0}}';
+done >> ${sysconfdir}/pear.tmp.conf
+mv -f ${sysconfdir}/pear.tmp.conf ${sysconfdir}/pear.conf
+fi
+}
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH][meta-networking][v2] proftpd: upgrade to 1.3.5a

[rongqing.li]

From: Roy Li 

1. 1.3.5a includes the fix for CVE-2015-3306:
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2015-3306
2. replace the proftpd generated libtool with the native libtool
which support the sysroot

Signed-off-by: Roy Li 
---
 .../recipes-daemons/proftpd/{proftpd_1.3.5.bb => proftpd_1.3.5a.bb}  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
 rename meta-networking/recipes-daemons/proftpd/{proftpd_1.3.5.bb => 
proftpd_1.3.5a.bb} (95%)

diff --git a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.5.bb 
b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.5a.bb
similarity index 95%
rename from meta-networking/recipes-daemons/proftpd/proftpd_1.3.5.bb
rename to meta-networking/recipes-daemons/proftpd/proftpd_1.3.5a.bb
index 00291c6..5bed85b 100644
--- a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.5.bb
+++ b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.5a.bb
@@ -14,8 +14,8 @@ SRC_URI = 
"ftp://ftp.proftpd.org/distrib/source/${BPN}-${PV}.tar.gz \
file://proftpd.service \
"
 
-SRC_URI[md5sum] = "aff1bff40e675244d72c4667f203e5bb"
-SRC_URI[sha256sum] = 
"c10316fb003bd25eccbc08c77dd9057e053693e6527ffa2ea2cc4e08ccb87715"
+SRC_URI[md5sum] = "b9d3092411478415b31d435f8e26d173"
+SRC_URI[sha256sum] = 
"a1f48df8539c414ec56e0cea63dcf4b8e16e606c05f10156f030a4a67fae5696"
 
 inherit autotools-brokensep useradd update-rc.d systemd
 
@@ -64,6 +64,7 @@ PACKAGECONFIG[auth] = "--enable-auth-file, 
--disable-auth-file"
 # autotools.bbclass a pain...
 do_configure () {
 oe_runconf
+cp ${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool ${S}/libtool
 }
 
 FTPUSER = "ftp"
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH][meta-networking] ipsec-tools: Security Advisory - CVE-2015-4047

[rongqing.li]

From: Roy Li 

This fixed the CVE-2015-4047:
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2015-4047

Signed-off-by: Roy Li 
---
 .../ipsec-tools/fix-CVE-2015-4047.patch| 36 ++
 .../ipsec-tools/ipsec-tools_0.8.2.bb   |  1 +
 2 files changed, 37 insertions(+)
 create mode 100644 
meta-networking/recipes-support/ipsec-tools/ipsec-tools/fix-CVE-2015-4047.patch

diff --git 
a/meta-networking/recipes-support/ipsec-tools/ipsec-tools/fix-CVE-2015-4047.patch
 
b/meta-networking/recipes-support/ipsec-tools/ipsec-tools/fix-CVE-2015-4047.patch
new file mode 100644
index 000..5286376
--- /dev/null
+++ 
b/meta-networking/recipes-support/ipsec-tools/ipsec-tools/fix-CVE-2015-4047.patch
@@ -0,0 +1,36 @@
+[PATCH] fix CVE-2015-4047
+
+Upstream-Status: Backport
+
+http://www.openwall.com/lists/oss-security/2015/05/20/1
+
+racoon/gssapi.c in IPsec-Tools 0.8.2 allows remote attackers to cause
+a denial of service (NULL pointer dereference and IKE daemon crash) via
+a series of crafted UDP requests.
+
+https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2015-4047
+
+Signed-off-by: Roy Li 
+---
+ src/racoon/gssapi.c | 5 +
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/racoon/gssapi.c b/src/racoon/gssapi.c
+index e64b201..1ad3b42 100644
+--- a/src/racoon/gssapi.c
 b/src/racoon/gssapi.c
+@@ -192,6 +192,11 @@ gssapi_init(struct ph1handle *iph1)
+   gss_name_t princ, canon_princ;
+   OM_uint32 maj_stat, min_stat;
+ 
++  if (iph1->rmconf == NULL) {
++  plog(LLV_ERROR, LOCATION, NULL, "no remote config\n");
++  return -1;
++  }
++
+   gps = racoon_calloc(1, sizeof (struct gssapi_ph1_state));
+   if (gps == NULL) {
+   plog(LLV_ERROR, LOCATION, NULL, "racoon_calloc failed\n");
+-- 
+1.9.1
+
diff --git a/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.2.bb 
b/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.2.bb
index 67b70d0..bb6fe84 100644
--- a/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.2.bb
+++ b/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.2.bb
@@ -18,6 +18,7 @@ SRC_URI = 
"ftp://ftp.netbsd.org/pub/NetBSD/misc/ipsec-tools/0.8/ipsec-tools-${PV
file://racoon.conf.sample \
file://racoon.conf \
file://racoon.service \
+   file://fix-CVE-2015-4047.patch \
   "
 SRC_URI[md5sum] = "d53ec14a0a3ece64e09e5e34b3350b41"
 SRC_URI[sha256sum] = 
"8eb6b38716e2f3a8a72f1f549c9444c2bc28d52c9536792690564c74fe722f2d"
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH][meta-networking] proftpd: upgrade to 1.3.5a

[rongqing.li]

From: Roy Li 

1.3.5a includes the fix for CVE-2015-3306:
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2015-3306

Signed-off-by: Roy Li 
---
 .../recipes-daemons/proftpd/{proftpd_1.3.5.bb => proftpd_1.3.5a.bb}   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-networking/recipes-daemons/proftpd/{proftpd_1.3.5.bb => 
proftpd_1.3.5a.bb} (96%)

diff --git a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.5.bb 
b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.5a.bb
similarity index 96%
rename from meta-networking/recipes-daemons/proftpd/proftpd_1.3.5.bb
rename to meta-networking/recipes-daemons/proftpd/proftpd_1.3.5a.bb
index 13c9410..9a1852c 100644
--- a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.5.bb
+++ b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.5a.bb
@@ -14,8 +14,8 @@ SRC_URI = 
"ftp://ftp.proftpd.org/distrib/source/${BPN}-${PV}.tar.gz \
file://proftpd.service \
"
 
-SRC_URI[md5sum] = "aff1bff40e675244d72c4667f203e5bb"
-SRC_URI[sha256sum] = 
"c10316fb003bd25eccbc08c77dd9057e053693e6527ffa2ea2cc4e08ccb87715"
+SRC_URI[md5sum] = "b9d3092411478415b31d435f8e26d173"
+SRC_URI[sha256sum] = 
"a1f48df8539c414ec56e0cea63dcf4b8e16e606c05f10156f030a4a67fae5696"
 
 inherit autotools-brokensep useradd update-rc.d systemd
 
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH][meta-oe][V2] php: add a vardeps for configure on sysconfdir

[rongqing.li]

From: Roy Li 

Installing target file will fail when sstate is used, since native php is used
to install these files, makefile rule is in php-5.5.24/pear/Makefile.frag
|--
|install-pear-installer: $(SAPI_CLI_PATH)
|   @$(PHP_NATIVE_DIR)/php $(PEAR_INSTALL_FLAGS) 
$(builddir)/install-pear-nozlib.phar \
|-d "$(peardir)" -b "$(bindir)" ${PEAR_PREFIX} ${PEAR_SUFFIX}
|--
But if sstate is used, native php from sstate has some obsolete path, lead to
that config file is installed into obsolete path. 

Other packages fixed this kinds of issue by calling create_wrapper, like
in openssl, rpm; but test show it does not work for php.

only php depends on php-native, so add a vardeps for configure on sysconfdir
to force php-native to build always.

Signed-off-by: Roy Li 
---
 meta-oe/recipes-devtools/php/php_5.5.24.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-oe/recipes-devtools/php/php_5.5.24.bb 
b/meta-oe/recipes-devtools/php/php_5.5.24.bb
index 3e656af..9c0dd7f 100644
--- a/meta-oe/recipes-devtools/php/php_5.5.24.bb
+++ b/meta-oe/recipes-devtools/php/php_5.5.24.bb
@@ -106,6 +106,8 @@ EXTRA_OEMAKE = "INSTALL_ROOT=${D}"
 
 acpaths = ""
 
+do_configure[vardeps] += "${sysconfdir}"
+
 do_configure_prepend () {
 rm -f ${S}/build/libtool.m4 ${S}/ltmain.sh ${S}/aclocal.m4
 find ${S} -name config.m4 | xargs -n1 sed -i 
's!APXS_HTTPD=.*!APXS_HTTPD=${STAGING_BINDIR_NATIVE}/httpd!'
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH][meta-oe] php: add a vardeps for configure on sysconfdir

[rongqing.li]

From: Roy Li 

building php will fail when sstatus is used, since some hardcode paths
in php-native will make the wrong path, and try to fix it like below:
do_install_append_virtclass-native() {
   create_wrapper ${D}${bindir}/php \
   PHP_PEAR_SYSCONF_DIR=${sysconfdir}/ \
}
but php-native does not work for a 64bit target(qemuarm64) and if sstat is
from a 32bit(qemuppc) on the host same machine.

Consider no too much package depends on php-native, so add a vardeps for
configure on sysconfdir to force php-native to build always.

Signed-off-by: Roy Li 
---
 meta-oe/recipes-devtools/php/php_5.5.24.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-oe/recipes-devtools/php/php_5.5.24.bb 
b/meta-oe/recipes-devtools/php/php_5.5.24.bb
index 3e656af..9c0dd7f 100644
--- a/meta-oe/recipes-devtools/php/php_5.5.24.bb
+++ b/meta-oe/recipes-devtools/php/php_5.5.24.bb
@@ -106,6 +106,8 @@ EXTRA_OEMAKE = "INSTALL_ROOT=${D}"
 
 acpaths = ""
 
+do_configure[vardeps] += "${sysconfdir}"
+
 do_configure_prepend () {
 rm -f ${S}/build/libtool.m4 ${S}/ltmain.sh ${S}/aclocal.m4
 find ${S} -name config.m4 | xargs -n1 sed -i 
's!APXS_HTTPD=.*!APXS_HTTPD=${STAGING_BINDIR_NATIVE}/httpd!'
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH 1/2][meta-networking] libnftnl: create recipe under meta-networking

[rongqing.li]

From: Roy Li 

libnftnl is needed by nftable, so add it

Signed-off-by: Roy Li 
---
 meta-networking/recipes-filter/libnftnl/libnftnl_1.0.3.bb | 13 +
 1 file changed, 13 insertions(+)
 create mode 100644 meta-networking/recipes-filter/libnftnl/libnftnl_1.0.3.bb

diff --git a/meta-networking/recipes-filter/libnftnl/libnftnl_1.0.3.bb 
b/meta-networking/recipes-filter/libnftnl/libnftnl_1.0.3.bb
new file mode 100644
index 000..eea71e2
--- /dev/null
+++ b/meta-networking/recipes-filter/libnftnl/libnftnl_1.0.3.bb
@@ -0,0 +1,13 @@
+SUMMARY = "Library for low-level interaction with nftables Netlink's API over 
libmnl"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=79808397c3355f163c012616125c9e26"
+SECTION = "libs/network"
+DEPENDS = "libmnl"
+
+SRC_URI = "http://netfilter.org/projects/libnftnl/files/${BP}.tar.bz2  \
+  "
+
+SRC_URI[md5sum] = "203701a73cc3c51ca751d7cb2e176250"
+SRC_URI[sha256sum] = 
"cf0ae7eab6a6866192a1fbd6b370a8a2cbe2066fe3975ab44939fd50747c27f7"
+
+inherit autotools pkgconfig
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH 2/2][meta-networking] nftables: create nftables recipe under meta-networking

[rongqing.li]

From: Roy Li 

http://netfilter.org/projects/nftables/index.html

Signed-off-by: Roy Li 
---
 .../nftables/files/fix-to-generate-ntf.8.patch | 26 ++
 .../recipes-filter/nftables/nftables_0.4.bb| 17 ++
 2 files changed, 43 insertions(+)
 create mode 100644 
meta-networking/recipes-filter/nftables/files/fix-to-generate-ntf.8.patch
 create mode 100644 meta-networking/recipes-filter/nftables/nftables_0.4.bb

diff --git 
a/meta-networking/recipes-filter/nftables/files/fix-to-generate-ntf.8.patch 
b/meta-networking/recipes-filter/nftables/files/fix-to-generate-ntf.8.patch
new file mode 100644
index 000..f5d7438
--- /dev/null
+++ b/meta-networking/recipes-filter/nftables/files/fix-to-generate-ntf.8.patch
@@ -0,0 +1,26 @@
+[PATCH] disable to make ntf.8 man
+
+Upstream-Statue: Pending
+
+$DB2MAN do not support the xinclude parameter whether it is
+docbook2x-man or other, so disable to make ntf.8 man
+
+Signed-off-by: Roy Li 
+---
+ doc/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index a92de7f..537c36b 100644
+--- a/doc/Makefile.am
 b/doc/Makefile.am
+@@ -1,5 +1,5 @@
+ if BUILD_MAN
+-man_MANS = nft.8
++#man_MANS = nft.8
+ endif
+ 
+ if BUILD_PDF
+-- 
+1.9.1
+
diff --git a/meta-networking/recipes-filter/nftables/nftables_0.4.bb 
b/meta-networking/recipes-filter/nftables/nftables_0.4.bb
new file mode 100644
index 000..d183d91
--- /dev/null
+++ b/meta-networking/recipes-filter/nftables/nftables_0.4.bb
@@ -0,0 +1,17 @@
+SUMMARY = "Netfilter Tables userspace utillites"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d1a78fdd879a263a5e0b42d1fc565e79"
+SECTION = "console/network"
+
+DEPENDS = "libmnl libnftnl readline gmp"
+RRECOMMENDS_${PN} += "kernel-module-nf-tables \
+"
+
+SRC_URI = "http://www.netfilter.org/projects/nftables/files/${BP}.tar.bz2 \
+   file://fix-to-generate-ntf.8.patch \
+  "
+
+SRC_URI[md5sum] = "09b686c489ff10db670ca60dbed7ff43"
+SRC_URI[sha256sum] = 
"f6ca69b75c68915f9f3a3972274ec68354dfbbcfc0b9fc55c813a0525c351d3c"
+
+inherit autotools pkgconfig
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH][meta-oe] mariadb: Security Advisory -CVE-2015-2305

[rongqing.li]

From: Roy Li 

https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2015-2305

Signed-off-by: Roy Li 
---
 meta-oe/recipes-support/mysql/mariadb.inc  |  1 +
 .../mysql/mariadb/fix-CVE-2015-2305.patch  | 43 ++
 2 files changed, 44 insertions(+)
 create mode 100644 
meta-oe/recipes-support/mysql/mariadb/fix-CVE-2015-2305.patch

diff --git a/meta-oe/recipes-support/mysql/mariadb.inc 
b/meta-oe/recipes-support/mysql/mariadb.inc
index 00fa965..540b159 100644
--- a/meta-oe/recipes-support/mysql/mariadb.inc
+++ b/meta-oe/recipes-support/mysql/mariadb.inc
@@ -12,6 +12,7 @@ SRC_URI = 
"http://mirror.stshosting.co.uk/mariadb/mariadb-${PV}/source/mariadb-$
file://mysqld.service \
file://configure.cmake-fix-valgrind.patch \
file://fix-a-building-failure.patch \
+   file://fix-CVE-2015-2305.patch \
   "
 
 SRC_URI[md5sum] = "c8760d6b5890fc1de76c07af48092c88"
diff --git a/meta-oe/recipes-support/mysql/mariadb/fix-CVE-2015-2305.patch 
b/meta-oe/recipes-support/mysql/mariadb/fix-CVE-2015-2305.patch
new file mode 100644
index 000..2d1b467
--- /dev/null
+++ b/meta-oe/recipes-support/mysql/mariadb/fix-CVE-2015-2305.patch
@@ -0,0 +1,43 @@
+From f5c1d00a9ceb61acfe038dcf2ec0236c2939328c Mon Sep 17 00:00:00 2001
+From: Roy Li 
+Date: Mon, 1 Jun 2015 15:31:48 +0800
+Subject: [PATCH] From 70bc2965604b6b8aaf260049e64c708dddf85334 Mon Sep 17
+ 00:00:00 2001 From: Gary Houston  Date: Wed, 25 Feb
+ 2015 13:29:03 +1100 Subject: [PATCH] Bug fix for integer overflow in regcomp
+ for excessively long  pattern strings. CERT Vulnerability Note VU#695940.
+ Found by Guido Vranken.
+
+Upsteam-Status: Backport
+
+https://bugzilla.suse.com/attachment.cgi?id=627001
+
+Signed-off-by: Roy Li 
+---
+ regex/regcomp.c | 11 ++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/regex/regcomp.c b/regex/regcomp.c
+index abc1817..31e57c1 100644
+--- a/regex/regcomp.c
 b/regex/regcomp.c
+@@ -138,7 +138,16 @@ struct cclass cclasses[CCLASS_LAST+1]= {
+   (NC-1)*sizeof(cat_t));
+   if (g == NULL)
+   return(REG_ESPACE);
+-  p->ssize = (long) (len/(size_t)2*(size_t)3 + (size_t)1); /* ugh */
++  {
++/* Patched for CERT Vulnerability Note VU#695940, Feb 2015. */
++size_t new_ssize = len/(size_t)2*(size_t)3 + (size_t)1; /* ugh */
++if (new_ssize < len || new_ssize > LONG_MAX / sizeof(sop)) {
++  free((char *) g);
++  return REG_INVARG;
++}
++p->ssize = new_ssize;
++  }
++
+   p->strip = (sop *)malloc(p->ssize * sizeof(sop));
+   p->slen = 0;
+   if (p->strip == NULL) {
+-- 
+1.9.1
+
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH][meta-networking] znc: upgrade to 1.6.0

[rongqing.li]

From: Roy Li 

1. upgrade to 1.6.0 to fix CVE-2014-9403
2. Remove the backup patch
3. not git version, otherwise it requires "git submodule" command,
since Csocket is moved into git submodule
4. update the checksum of LICENSE, since the date in it was changed

Signed-off-by: Roy Li 
---
 ...-Fix-NULL-pointer-dereference-in-webadmin.patch | 58 --
 .../recipes-irc/znc/{znc_git.bb => znc_1.6.0.bb}   | 14 ++
 2 files changed, 5 insertions(+), 67 deletions(-)
 delete mode 100644 
meta-networking/recipes-irc/znc/znc/0001-Fix-NULL-pointer-dereference-in-webadmin.patch
 rename meta-networking/recipes-irc/znc/{znc_git.bb => znc_1.6.0.bb} (47%)

diff --git 
a/meta-networking/recipes-irc/znc/znc/0001-Fix-NULL-pointer-dereference-in-webadmin.patch
 
b/meta-networking/recipes-irc/znc/znc/0001-Fix-NULL-pointer-dereference-in-webadmin.patch
deleted file mode 100644
index 68e4414..000
--- 
a/meta-networking/recipes-irc/znc/znc/0001-Fix-NULL-pointer-dereference-in-webadmin.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Subject: [PATCH] Fix NULL pointer dereference in webadmin.
-
-Upstream-Status: Backport
-
-commit 2bd410ee5570cea127233f1133ea22f25174eb28 upstream
-
-Triggerable by any non-admin, if webadmin is loaded.
-
-The only affected version is 1.0
-
-Thanks to ChauffeR (Simone Esposito) for reporting this.

- modules/webadmin.cpp | 8 
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/modules/webadmin.cpp b/modules/webadmin.cpp
-index b793c02..816f217 100644
 a/modules/webadmin.cpp
-+++ b/modules/webadmin.cpp
-@@ -419,7 +419,7 @@ public:
-   CIRCNetwork* pNetwork = 
SafeGetNetworkFromParam(WebSock);
- 
-   // Admin||Self Check
--  if (!spSession->IsAdmin() && (!spSession->GetUser() || 
spSession->GetUser() != pNetwork->GetUser())) {
-+  if (!spSession->IsAdmin() && (!spSession->GetUser() || 
!pNetwork || spSession->GetUser() != pNetwork->GetUser())) {
-   return false;
-   }
- 
-@@ -448,7 +448,7 @@ public:
-   CIRCNetwork* pNetwork = 
SafeGetNetworkFromParam(WebSock);
- 
-   // Admin||Self Check
--  if (!spSession->IsAdmin() && (!spSession->GetUser() || 
spSession->GetUser() != pNetwork->GetUser())) {
-+  if (!spSession->IsAdmin() && (!spSession->GetUser() || 
!pNetwork || spSession->GetUser() != pNetwork->GetUser())) {
-   return false;
-   }
- 
-@@ -472,7 +472,7 @@ public:
-   CIRCNetwork* pNetwork = 
SafeGetNetworkFromParam(WebSock);
- 
-   // Admin||Self Check
--  if (!spSession->IsAdmin() && (!spSession->GetUser() || 
spSession->GetUser() != pNetwork->GetUser())) {
-+  if (!spSession->IsAdmin() && (!spSession->GetUser() || 
!pNetwork || spSession->GetUser() != pNetwork->GetUser())) {
-   return false;
-   }
- 
-@@ -486,7 +486,7 @@ public:
-   CIRCNetwork* pNetwork = 
SafeGetNetworkFromParam(WebSock);
- 
-   // Admin||Self Check
--  if (!spSession->IsAdmin() && (!spSession->GetUser() || 
spSession->GetUser() != pNetwork->GetUser())) {
-+  if (!spSession->IsAdmin() && (!spSession->GetUser() || 
!pNetwork || spSession->GetUser() != pNetwork->GetUser())) {
-   return false;
-   }
- 
--- 
-1.8.5.2.233.g932f7e4
-
diff --git a/meta-networking/recipes-irc/znc/znc_git.bb 
b/meta-networking/recipes-irc/znc/znc_1.6.0.bb
similarity index 47%
rename from meta-networking/recipes-irc/znc/znc_git.bb
rename to meta-networking/recipes-irc/znc/znc_1.6.0.bb
index 77db25b..ca3c606 100644
--- a/meta-networking/recipes-irc/znc/znc_git.bb
+++ b/meta-networking/recipes-irc/znc/znc_1.6.0.bb
@@ -1,17 +1,13 @@
 SUMMARY = "ZNC, an advanced IRC bouncer"
 LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
-DEPENDS = "openssl"
+DEPENDS = "openssl zlib"
 
-PV = "1.0+git"
-
-SRCREV = "ef59c23068547c132cb678092fba9a21317fd5f2"
-SRC_URI = "git://github.com/znc/znc.git \
-   file://0001-Fix-NULL-pointer-dereference-in-webadmin.patch \
+SRC_URI = "http://znc.in/releases/${BP}.tar.gz \
   "
-
-S = "${WORKDIR}/git"
+SRC_URI[md5sum]="674d8c1277752dcc627b96e33a63376e"
+SRC_URI[sha256sum]="df622aeae34d26193c738dff6499e56ad669ec654484e19623738d84cc80aba7"
 
 inherit autotools-brokensep pkgconfig
 
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH][meta-webserver] webmin: upgrade to 1.750

[rongqing.li]

From: Roy Li 

1. Upgrade to fix the CVE:
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2015-1377
2. update the patch remove-startup-option.patch

Signed-off-by: Roy Li 
---
 .../recipes-webadmin/webmin/files/remove-startup-option.patch | 2 +-
 .../recipes-webadmin/webmin/{webmin_1.700.bb => webmin_1.750.bb}  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename meta-webserver/recipes-webadmin/webmin/{webmin_1.700.bb => 
webmin_1.750.bb} (97%)

diff --git 
a/meta-webserver/recipes-webadmin/webmin/files/remove-startup-option.patch 
b/meta-webserver/recipes-webadmin/webmin/files/remove-startup-option.patch
index 8493af8..d957f4a 100644
--- a/meta-webserver/recipes-webadmin/webmin/files/remove-startup-option.patch
+++ b/meta-webserver/recipes-webadmin/webmin/files/remove-startup-option.patch
@@ -11,7 +11,7 @@
  &get_miniserv_config(\%miniserv);
  
 -if (&foreign_check("init")) {
--  &foreign_require("init", "init-lib.pl");
+-  &foreign_require("init");
 -  my $starting = &init::action_status("webmin");
 -  print &ui_buttons_row("bootup.cgi",
 -$text{'index_boot'},
diff --git a/meta-webserver/recipes-webadmin/webmin/webmin_1.700.bb 
b/meta-webserver/recipes-webadmin/webmin/webmin_1.750.bb
similarity index 97%
rename from meta-webserver/recipes-webadmin/webmin/webmin_1.700.bb
rename to meta-webserver/recipes-webadmin/webmin/webmin_1.750.bb
index c6523c5..b6fbb0a 100644
--- a/meta-webserver/recipes-webadmin/webmin/webmin_1.700.bb
+++ b/meta-webserver/recipes-webadmin/webmin/webmin_1.750.bb
@@ -19,8 +19,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/webadmin/webmin-${PV}.tar.gz 
\
file://remove-python2.3.patch \
 "
 
-SRC_URI[md5sum] = "e5261114a6a6ed10caf570d3239ed5b7"
-SRC_URI[sha256sum] = 
"1a6a8aa62c32c04932b902d17fc1864ee8f3fba03012bd25f709aa65e7e9b0f2"
+SRC_URI[md5sum] = "4007c390323d840f26c2e0f43c5c81a3"
+SRC_URI[sha256sum] = 
"5111f820adc6fbca997a58d4b2fa186dac6cded9cff0e70724f8cae6021123d9"
 
 inherit perlnative update-rc.d
 
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH][meta-networking] stunnel: upgrade to 5.17

[rongqing.li]

From: Roy Li 

upgrade to include the fix for CVE-2015-3644:
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2015-3644

Signed-off-by: Roy Li 
---
 .../recipes-support/stunnel/{stunnel_5.10.bb => stunnel_5.17.bb}  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-networking/recipes-support/stunnel/{stunnel_5.10.bb => 
stunnel_5.17.bb} (82%)

diff --git a/meta-networking/recipes-support/stunnel/stunnel_5.10.bb 
b/meta-networking/recipes-support/stunnel/stunnel_5.17.bb
similarity index 82%
rename from meta-networking/recipes-support/stunnel/stunnel_5.10.bb
rename to meta-networking/recipes-support/stunnel/stunnel_5.17.bb
index 5753198..4cf529a 100644
--- a/meta-networking/recipes-support/stunnel/stunnel_5.10.bb
+++ b/meta-networking/recipes-support/stunnel/stunnel_5.17.bb
@@ -9,8 +9,8 @@ RDEPENDS_${PN} += "perl"
 
 SRC_URI = "ftp://ftp.stunnel.org/stunnel/archive/5.x/${BP}.tar.gz";
 
-SRC_URI[md5sum] = "a0edda805eb7d6ea600a230fb0979ea1"
-SRC_URI[sha256sum] = 
"032bfc1854f8a0b9e452343c36ec6b52c7e0daef0863423c6b13a61a7c92eb23"
+SRC_URI[md5sum] = "e70f001ee190105c5a10a74f4bd54901"
+SRC_URI[sha256sum] = 
"c3e79e582621a0827125e35e1c00450190104fc02dc3c5274cb02b05859fd472"
 
 inherit autotools
 
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH][meta-oe] openldap: upgrade to 2.4.20

[rongqing.li]

From: Roy Li 

1. upgrade to 2.4.20
2. remove two backup patches
2. integrate two patches to fix CVE-2015-1545 and CVE-2015-1546
3. disable bdb/hdb backend, since BerkeleyDB 6.0.20+ license is
   incompatible with LDAP

Signed-off-by: Roy Li 
---
 .../ITS-7723-fix-reference-counting.patch  | 38 ---
 .../gnutls-Avoid-use-of-deprecated-function.patch  | 44 --
 ...-ITS-8027-require-non-empty-AttributeList.patch | 30 +++
 .../0001-ITS-8046-fix-vrFilter_free.patch  | 38 +++
 .../initscript |  0
 .../install-strip.patch|  0
 .../kill-icu.patch |  0
 .../openldap-2.4.28-gnutls-gcrypt.patch|  0
 .../openldap-m4-pthread.patch  |  0
 .../slapd.service  |  0
 .../thread_stub.patch  |  0
 .../use-urandom.patch  |  0
 .../{openldap_2.4.39.bb => openldap_2.4.40.bb} | 10 ++---
 13 files changed, 73 insertions(+), 87 deletions(-)
 delete mode 100644 
meta-oe/recipes-support/openldap/openldap-2.4.39/ITS-7723-fix-reference-counting.patch
 delete mode 100644 
meta-oe/recipes-support/openldap/openldap-2.4.39/gnutls-Avoid-use-of-deprecated-function.patch
 create mode 100644 
meta-oe/recipes-support/openldap/openldap-2.4.40/0001-ITS-8027-require-non-empty-AttributeList.patch
 create mode 100644 
meta-oe/recipes-support/openldap/openldap-2.4.40/0001-ITS-8046-fix-vrFilter_free.patch
 rename meta-oe/recipes-support/openldap/{openldap-2.4.39 => 
openldap-2.4.40}/initscript (100%)
 rename meta-oe/recipes-support/openldap/{openldap-2.4.39 => 
openldap-2.4.40}/install-strip.patch (100%)
 rename meta-oe/recipes-support/openldap/{openldap-2.4.39 => 
openldap-2.4.40}/kill-icu.patch (100%)
 rename meta-oe/recipes-support/openldap/{openldap-2.4.39 => 
openldap-2.4.40}/openldap-2.4.28-gnutls-gcrypt.patch (100%)
 rename meta-oe/recipes-support/openldap/{openldap-2.4.39 => 
openldap-2.4.40}/openldap-m4-pthread.patch (100%)
 rename meta-oe/recipes-support/openldap/{openldap-2.4.39 => 
openldap-2.4.40}/slapd.service (100%)
 rename meta-oe/recipes-support/openldap/{openldap-2.4.39 => 
openldap-2.4.40}/thread_stub.patch (100%)
 rename meta-oe/recipes-support/openldap/{openldap-2.4.39 => 
openldap-2.4.40}/use-urandom.patch (100%)
 rename meta-oe/recipes-support/openldap/{openldap_2.4.39.bb => 
openldap_2.4.40.bb} (96%)

diff --git 
a/meta-oe/recipes-support/openldap/openldap-2.4.39/ITS-7723-fix-reference-counting.patch
 
b/meta-oe/recipes-support/openldap/openldap-2.4.39/ITS-7723-fix-reference-counting.patch
deleted file mode 100644
index 9a0f4cb..000
--- 
a/meta-oe/recipes-support/openldap/openldap-2.4.39/ITS-7723-fix-reference-counting.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 59688044386dfeee0c837a15133f4e878f1bb661 Mon Sep 17 00:00:00 2001
-From: Jan Synacek 
-Date: Wed, 13 Nov 2013 09:06:54 +0100
-Subject: [PATCH] ITS#7723 fix reference counting
-
-Upstream-Status: Backport
-
-Commit 59688044386dfeee0c837a15133f4e878f1bb661 upstream
-
-Signed-off-by: Yue Tao 
-Signed-off-by: Jackie Huang 

- libraries/librewrite/session.c |2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/libraries/librewrite/session.c b/libraries/librewrite/session.c
-index fcc7698..02fc054 100644
 a/libraries/librewrite/session.c
-+++ b/libraries/librewrite/session.c
-@@ -161,6 +161,7 @@ rewrite_session_find(
- #ifdef USE_REWRITE_LDAP_PVT_THREADS
-   if ( session ) {
-   ldap_pvt_thread_mutex_lock( &session->ls_mutex );
-+  session->ls_count++;
-   }
-   ldap_pvt_thread_rdwr_runlock( &info->li_cookies_mutex );
- #endif /* USE_REWRITE_LDAP_PVT_THREADS */
-@@ -178,6 +179,7 @@ rewrite_session_return(
- )
- {
-   assert( session != NULL );
-+  session->ls_count--;
-   ldap_pvt_thread_mutex_unlock( &session->ls_mutex );
- }
- 
--- 
-1.7.5.4
-
diff --git 
a/meta-oe/recipes-support/openldap/openldap-2.4.39/gnutls-Avoid-use-of-deprecated-function.patch
 
b/meta-oe/recipes-support/openldap/openldap-2.4.39/gnutls-Avoid-use-of-deprecated-function.patch
deleted file mode 100644
index dffd3ca..000
--- 
a/meta-oe/recipes-support/openldap/openldap-2.4.39/gnutls-Avoid-use-of-deprecated-function.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 0205e83f4670d10ad3c6ae4b8fc5ec1d0c7020c0 Mon Sep 17 00:00:00 2001
-From: Howard Chu 
-Date: Sat, 7 Sep 2013 09:39:24 -0700
-Subject: [PATCH] ITS#7430 GnuTLS: Avoid use of deprecated function
-
-Upstream-status: Backport
-

- libraries/libldap/tls_g.c |   12 
- 1 files changed, 12 insertions(+), 0 deletions(-)
-
-diff --git a/libraries/libldap/tls_g.c b/libraries/libldap/tls_g.c
-index 9acffaf..c793828 100644
 a/libraries/libldap/tls_g.c
-+++ b/libraries/libldap/tls_g.c
-@@ -368,6 +368,17 @@ tlsg_ctx_init( struct ldapoptions *lo, struct ldaptls 
*lt, int 

[oe] [PATCH][meta-networking] mbedtls: upgrade to 1.3.10

[rongqing.li]

From: Roy Li 

1. PolarSSL is now rebranded as mbed TLS.
2. upgrade to include CVE-2015-1182 fix:
   http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2015-1182

Signed-off-by: Roy Li 
---
 .../polarssl/{polarssl_1.3.8.bb => mbedtls_1.3.10.bb} | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
 rename meta-networking/recipes-connectivity/polarssl/{polarssl_1.3.8.bb => 
mbedtls_1.3.10.bb} (82%)

diff --git a/meta-networking/recipes-connectivity/polarssl/polarssl_1.3.8.bb 
b/meta-networking/recipes-connectivity/polarssl/mbedtls_1.3.10.bb
similarity index 82%
rename from meta-networking/recipes-connectivity/polarssl/polarssl_1.3.8.bb
rename to meta-networking/recipes-connectivity/polarssl/mbedtls_1.3.10.bb
index 8adc0b1..f956b6d 100644
--- a/meta-networking/recipes-connectivity/polarssl/polarssl_1.3.8.bb
+++ b/meta-networking/recipes-connectivity/polarssl/mbedtls_1.3.10.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Lightweight crypto and SSL/TLS library"
-DESCRIPTION = "PolarSSL is a lean open source crypto library \
+DESCRIPTION = "mbedtls is a lean open source crypto library \
 for providing SSL and TLS support in your programs. It offers\
 an intuitive API and documented header files, so you can actually\
 understand what the code does. It features:  \
@@ -23,10 +23,10 @@ LIC_FILES_CHKSUM = 
"file://LICENSE;md5=751419260aa954499f7abaabaa882bbe"
 
 SECTION = "net"
 
-SRC_URI = "https://polarssl.org/download/polarssl-${PV}-gpl.tgz";
+SRC_URI = "https://tls.mbed.org/download/mbedtls-${PV}-gpl.tgz";
 
-SRC_URI[md5sum] = "d1a2b4f21727e888f143414d2e3144e6"
-SRC_URI[sha256sum] = 
"318171db41335cacbb5b0047c94f1faf91442ab70a223b5223436703c9406ff1"
+SRC_URI[md5sum] = "19ebbc96feceb430ad958dfe89cb633f"
+SRC_URI[sha256sum] = 
"746fd88e0c6623691fc56c4eed52e40a57b2da0ac80f6dd8995094aa6adb407e"
 
 DEPENDS = "openssl"
 RDEPENDS_${PN} += "libcrypto"
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH][meta-networking] autofs: fix a building failure

[rongqing.li]

From: Roy Li 

Signed-off-by: Roy Li 
---
 ...x-the-YACC-rule-to-fix-a-building-failure.patch | 62 ++
 meta-networking/recipes-daemons/autofs/autofs_5.1.0.bb |  1 +
 2 files changed, 63 insertions(+)
 create mode 100644 
meta-networking/recipes-daemons/autofs/autofs-5.1.0/fix-the-YACC-rule-to-fix-a-building-failure.patch

diff --git 
a/meta-networking/recipes-daemons/autofs/autofs-5.1.0/fix-the-YACC-rule-to-fix-a-building-failure.patch
 
b/meta-networking/recipes-daemons/autofs/autofs-5.1.0/fix-the-YACC-rule-to-fix-a-building-failure.patch
new file mode 100644
index 000..9b64183
--- /dev/null
+++ 
b/meta-networking/recipes-daemons/autofs/autofs-5.1.0/fix-the-YACC-rule-to-fix-a-building-failure.patch
@@ -0,0 +1,62 @@
+[PATCH] fix the YACC rule to fix a building failure
+
+Upstream-Statu: Pending
+
+The original rule will create the header file twice, one is that the header
+file as the object file is created, other time is when create the C source 
file.
+since YACC always has "-d" parameter.
+
+This lead to a race when compile amd_tok.o, the header file maybe rewritten.
+  |--
+  |amd_tok.l:359:10: error: 'RBRACKET' undeclared (first use in this function)
+  |  ")" { return RBRACKET; }
+  |  ^
+  |../Makefile.rules:64: recipe for target 'amd_tok.o' failed
+  |--
+Signed-off-by: Roy Li 
+---
+ lib/Makefile | 6 --
+ modules/Makefile | 3 ++-
+ 2 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/lib/Makefile b/lib/Makefile
+index 4798a4b..c40cf86 100644
+--- a/lib/Makefile
 b/lib/Makefile
+@@ -57,7 +57,8 @@ mount_xdr.o: mount_xdr.c
+ master_tok.c: master_tok.l
+   $(LEX) -o$@ -Pmaster_ $?
+ 
+-master_parse.tab.c master_parse.tab.h: master_parse.y
++master_parse.tab.h: master_parse.tab.c
++master_parse.tab.c: master_parse.y
+   $(YACC) -v -d -p master_ -b master_parse $?
+ 
+ master_tok.o: master_tok.c master_parse.tab.h
+@@ -67,7 +68,8 @@ master_parse.tab.o: master_parse.tab.c master_parse.tab.h
+ nss_tok.c: nss_tok.l
+   $(LEX) -o$@ -Pnss_ $?
+ 
+-nss_parse.tab.c nss_parse.tab.h: nss_parse.y
++nss_parse.tab.h: nss_parse.tab.c
++nss_parse.tab.c: nss_parse.y
+   $(YACC) -v -d -p nss_ -b nss_parse $?
+ 
+ nss_tok.o: nss_tok.c nss_parse.tab.h
+diff --git a/modules/Makefile b/modules/Makefile
+index 237b70b..71415d0 100644
+--- a/modules/Makefile
 b/modules/Makefile
+@@ -103,7 +103,8 @@ amd_tok.c: amd_tok.l
+ 
+ amd_tok.o: amd_tok.c amd_parse.tab.h
+ 
+-amd_parse.tab.c amd_parse.tab.h: amd_parse.y
++amd_parse.tab.h: amd_parse.tab.c
++amd_parse.tab.c: amd_parse.y
+   $(YACC) -v -d -p amd_ -b amd_parse $?
+ 
+ amd_parse.tab.o: amd_parse.tab.c amd_parse.tab.h
+-- 
+1.9.1
+
diff --git a/meta-networking/recipes-daemons/autofs/autofs_5.1.0.bb 
b/meta-networking/recipes-daemons/autofs/autofs_5.1.0.bb
index 13af2fe..9540f92 100644
--- a/meta-networking/recipes-daemons/autofs/autofs_5.1.0.bb
+++ b/meta-networking/recipes-daemons/autofs/autofs_5.1.0.bb
@@ -20,6 +20,7 @@ SRC_URI = 
"${KERNELORG_MIRROR}/linux/daemons/autofs/v5/autofs-${PV}.tar.gz \
file://using-pkg-config-to-detect-libxml-2.0-and-krb5.patch \
file://force-STRIP-to-emtpy.patch \
file://remove-bashism.patch \
+   file://fix-the-YACC-rule-to-fix-a-building-failure.patch \
 "
 
 SRC_URI[md5sum] = "b7724a9a55923f3c06933a8dfd1e79d3"
-- 
1.9.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH][meta-oe] krb5: upgrade to 1.13.2

[rongqing.li]

From: Roy Li 

Upgrade to include the CVE fixes: [CVE-2014-5354] [CVE-2014-5353]...
Remove the 0001-Return-only-new-keys-in-randkey-CVE-2014-5351.patch
Regenerate the /var/run/krb5kdc dir

Signed-off-by: Roy Li 
---
 ...rn-only-new-keys-in-randkey-CVE-2014-5351.patch | 92 --
 .../krb5/{krb5_1.12.2.bb => krb5_1.13.2.bb}| 28 ++-
 2 files changed, 24 insertions(+), 96 deletions(-)
 delete mode 100644 
meta-oe/recipes-connectivity/krb5/krb5/0001-Return-only-new-keys-in-randkey-CVE-2014-5351.patch
 rename meta-oe/recipes-connectivity/krb5/{krb5_1.12.2.bb => krb5_1.13.2.bb} 
(75%)

diff --git 
a/meta-oe/recipes-connectivity/krb5/krb5/0001-Return-only-new-keys-in-randkey-CVE-2014-5351.patch
 
b/meta-oe/recipes-connectivity/krb5/krb5/0001-Return-only-new-keys-in-randkey-CVE-2014-5351.patch
deleted file mode 100644
index 0852661..000
--- 
a/meta-oe/recipes-connectivity/krb5/krb5/0001-Return-only-new-keys-in-randkey-CVE-2014-5351.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From af0ed4df4dfae762ab5fb605f5a0c8f59cb4f6ca Mon Sep 17 00:00:00 2001
-From: Greg Hudson 
-Date: Thu, 21 Aug 2014 13:52:07 -0400
-Subject: [PATCH] Return only new keys in randkey [CVE-2014-5351]
-
-In kadmind's randkey operation, if a client specifies the keepold
-flag, do not include the preserved old keys in the response.
-
-CVE-2014-5351:
-
-An authenticated remote attacker can retrieve the current keys for a
-service principal when generating a new set of keys for that
-principal.  The attacker needs to be authenticated as a user who has
-the elevated privilege for randomizing the keys of other principals.
-
-Normally, when a Kerberos administrator randomizes the keys of a
-service principal, kadmind returns only the new keys.  This prevents
-an administrator who lacks legitimate privileged access to a service
-from forging tickets to authenticate to that service.  If the
-"keepold" flag to the kadmin randkey RPC operation is true, kadmind
-retains the old keys in the KDC database as intended, but also
-unexpectedly returns the old keys to the client, which exposes the
-service to ticket forgery attacks from the administrator.
-
-A mitigating factor is that legitimate clients of the affected service
-will start failing to authenticate to the service once they begin to
-receive service tickets encrypted in the new keys.  The affected
-service will be unable to decrypt the newly issued tickets, possibly
-alerting the legitimate administrator of the affected service.
-
-CVSSv2: AV:N/AC:H/Au:S/C:P/I:N/A:N/E:POC/RL:OF/RC:C
-
-[t...@mit.edu: CVE description and CVSS score]
-
-ticket: 8018 (new)
-target_version: 1.13
-tags: pullup
-
-Upstream-Status: Backport

- src/lib/kadm5/srv/svr_principal.c |   21 ++---
- 1 files changed, 18 insertions(+), 3 deletions(-)
-
-diff --git a/lib/kadm5/srv/svr_principal.c b/lib/kadm5/srv/svr_principal.c
-index 5d358bd..d4e74cc 100644
 a/lib/kadm5/srv/svr_principal.c
-+++ b/lib/kadm5/srv/svr_principal.c
-@@ -344,6 +344,20 @@ check_1_6_dummy(kadm5_principal_ent_t entry, long mask,
- *passptr = NULL;
- }
- 
-+/* Return the number of keys with the newest kvno.  Assumes that all key data
-+ * with the newest kvno are at the front of the key data array. */
-+static int
-+count_new_keys(int n_key_data, krb5_key_data *key_data)
-+{
-+int n;
-+
-+for (n = 1; n < n_key_data; n++) {
-+if (key_data[n - 1].key_data_kvno != key_data[n].key_data_kvno)
-+return n;
-+}
-+return n_key_data;
-+}
-+
- kadm5_ret_t
- kadm5_create_principal(void *server_handle,
-kadm5_principal_ent_t entry, long mask,
-@@ -1593,7 +1607,7 @@ kadm5_randkey_principal_3(void *server_handle,
- osa_princ_ent_rec   adb;
- krb5_int32  now;
- kadm5_policy_ent_recpol;
--int ret, last_pwd;
-+int ret, last_pwd, n_new_keys;
- krb5_booleanhave_pol = FALSE;
- kadm5_server_handle_t   handle = server_handle;
- krb5_keyblock   *act_mkey;
-@@ -1686,8 +1700,9 @@ kadm5_randkey_principal_3(void *server_handle,
- kdb->fail_auth_count = 0;
- 
- if (keyblocks) {
--ret = decrypt_key_data(handle->context,
--   kdb->n_key_data, kdb->key_data,
-+/* Return only the new keys added by krb5_dbe_crk. */
-+n_new_keys = count_new_keys(kdb->n_key_data, kdb->key_data);
-+ret = decrypt_key_data(handle->context, n_new_keys, kdb->key_data,
-keyblocks, n_keys);
- if (ret)
- goto done;
--- 
-1.7.4.1
-
diff --git a/meta-oe/recipes-connectivity/krb5/krb5_1.12.2.bb 
b/meta-oe/recipes-connectivity/krb5/krb5_1.13.2.bb
similarity index 75%
rename from meta-oe/recipes-connectivity/krb5/krb5_1.12.2.bb
rename to meta-oe/recipes-connectivity/krb5/krb5_1.13.2.bb
index c492496..ec88296 100644
--- a/meta-oe/recipes-connectivity/krb5/krb