[oe] [meta-oe][PATCH] syslog-ng: Fix multilib header conflict - syslog-ng-config.h
Header file conflict between 32-bit and 64-bit versions.
Signed-off-by: Zhang Xiao
---
meta-oe/recipes-support/syslog-ng/syslog-ng.inc | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
index 3aba4473d..8e5368953 100644
--- a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
+++ b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
@@ -27,7 +27,7 @@ SRC_URI =
"https://github.com/balabit/syslog-ng/releases/download/${BP}/${BP}.ta
UPSTREAM_CHECK_URI = "https://github.com/balabit/syslog-ng/releases";
-inherit autotools gettext systemd pkgconfig update-rc.d
+inherit autotools gettext systemd pkgconfig update-rc.d multilib_header
EXTRA_OECONF = " \
--enable-dynamic-linking \
@@ -103,6 +103,8 @@ do_install_append() {
else
install ${WORKDIR}/syslog-ng.conf.sysvinit
${D}${sysconfdir}/${BPN}/${BPN}.conf
fi
+
+oe_multilib_header syslog-ng/syslog-ng-config.h
}
FILES_${PN} += "${datadir}/include/scl/ ${datadir}/xsd ${datadir}/tools
${systemd_unitdir}/system/multi-user.target.wants/*"
--
2.23.0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [oe-core][recipes-extended][PATCH] diffutils-ptest: add runtime dependency on make
Signed-off-by: Zhang Xiao
---
meta/recipes-extended/diffutils/diffutils_3.6.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/recipes-extended/diffutils/diffutils_3.6.bb
b/meta/recipes-extended/diffutils/diffutils_3.6.bb
index deadd62c65..8ba897d18f 100644
--- a/meta/recipes-extended/diffutils/diffutils_3.6.bb
+++ b/meta/recipes-extended/diffutils/diffutils_3.6.bb
@@ -19,6 +19,8 @@ acpaths = "-I ./m4"
inherit ptest
+RDEPENDS_${PN}-ptest += "make"
+
do_install_ptest() {
t=${D}${PTEST_PATH}
install -D ${S}/build-aux/test-driver $t/build-aux/test-driver
--
2.17.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [oe-core][recipes-extended][PATCH] diffutils-ptest: add runtime dependency on make
Signed-off-by: Zhang Xiao
---
meta/recipes-extended/diffutils/diffutils_3.6.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/recipes-extended/diffutils/diffutils_3.6.bb
b/meta/recipes-extended/diffutils/diffutils_3.6.bb
index deadd62c65..8ba897d18f 100644
--- a/meta/recipes-extended/diffutils/diffutils_3.6.bb
+++ b/meta/recipes-extended/diffutils/diffutils_3.6.bb
@@ -19,6 +19,8 @@ acpaths = "-I ./m4"
inherit ptest
+RDEPENDS_${PN}-ptest += "make"
+
do_install_ptest() {
t=${D}${PTEST_PATH}
install -D ${S}/build-aux/test-driver $t/build-aux/test-driver
--
2.17.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 3/3] libgpg-error: Fix multilib header conflict - pg-error.h and gpgrt.h
Header file conflict between 32-bit and 64-bit versions.
Signed-off-by: Zhang Xiao
---
meta/recipes-support/libgpg-error/libgpg-error_1.27.bb | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.27.bb
b/meta/recipes-support/libgpg-error/libgpg-error_1.27.bb
index b2e2d507c9..b74f079f5d 100644
--- a/meta/recipes-support/libgpg-error/libgpg-error_1.27.bb
+++ b/meta/recipes-support/libgpg-error/libgpg-error_1.27.bb
@@ -21,7 +21,7 @@ SRC_URI[sha256sum] =
"4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a2
BINCONFIG = "${bindir}/gpg-error-config"
-inherit autotools binconfig-disabled pkgconfig gettext
+inherit autotools binconfig-disabled pkgconfig gettext multilib_header
CPPFLAGS += "-P"
do_compile_prepend() {
TARGET_FILE=linux-gnu
@@ -53,6 +53,7 @@ do_compile_prepend() {
do_install_append() {
# we don't have common lisp in OE
rm -rf "${D}${datadir}/common-lisp/"
+ oe_multilib_header gpg-error.h gpgrt.h
}
FILES_${PN}-dev += "${bindir}/gpg-error"
--
2.11.0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 1/3] valgrind: Fix multilib header conflict - valgrind/config.h
Header file conflict between 32-bit and 64-bit versions.
Signed-off-by: Zhang Xiao
---
meta/recipes-devtools/valgrind/valgrind_3.13.0.bb | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/valgrind/valgrind_3.13.0.bb
b/meta/recipes-devtools/valgrind/valgrind_3.13.0.bb
index 5bd315aff0..9390d30444 100644
--- a/meta/recipes-devtools/valgrind/valgrind_3.13.0.bb
+++ b/meta/recipes-devtools/valgrind/valgrind_3.13.0.bb
@@ -58,7 +58,7 @@ COMPATIBLE_HOST_linux-muslx32 = 'null'
COMPATIBLE_HOST_mipsarchn32 = 'null'
COMPATIBLE_HOST_mipsarchr6 = 'null'
-inherit autotools ptest
+inherit autotools ptest multilib_header
EXTRA_OECONF = "--enable-tls --without-mpicc"
EXTRA_OECONF +=
"${@['--enable-only32bit','--enable-only64bit'][d.getVar('SITEINFO_BITS') !=
'32']}"
@@ -91,6 +91,7 @@ do_configure_prepend () {
do_install_append () {
install -m 644 ${B}/default.supp ${D}/${libdir}/valgrind/
+oe_multilib_header valgrind/config.h
}
TUNE = "${@strip_mcpu(d)}"
--
2.11.0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 2/3] tiff: Fix multilib header conflict - tiffconf.h
Header file conflict between 32-bit and 64-bit versions.
Signed-off-by: Zhang Xiao
---
meta/recipes-multimedia/libtiff/tiff_4.0.9.bb | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-multimedia/libtiff/tiff_4.0.9.bb
b/meta/recipes-multimedia/libtiff/tiff_4.0.9.bb
index 57bf7408d0..b8f895b143 100644
--- a/meta/recipes-multimedia/libtiff/tiff_4.0.9.bb
+++ b/meta/recipes-multimedia/libtiff/tiff_4.0.9.bb
@@ -14,7 +14,7 @@ SRC_URI[sha256sum] =
"6e7bdeec2c310734e734d19aae3a71ebe37a4d842e0e23dbb1b8921c00
# exclude betas
UPSTREAM_CHECK_REGEX = "tiff-(?P\d+(\.\d+)+).tar"
-inherit autotools
+inherit autotools multilib_header
CACHED_CONFIGUREVARS = "ax_cv_check_gl_libgl=no"
@@ -45,4 +45,8 @@ PACKAGES =+ "tiffxx tiff-utils"
FILES_tiffxx = "${libdir}/libtiffxx.so.*"
FILES_tiff-utils = "${bindir}/*"
+do_install_append() {
+oe_multilib_header tiffconf.h
+}
+
BBCLASSEXTEND = "native"
--
2.11.0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [oc-core][PATCH] libnfsidmap: Set the path of plugin libraries
By default, plugin libraries wil be installed in
$(libdir)/libnfsidmap in build stage while in run time,
they will be looked in /usr/lib/libnfsidmap. This will cause
error in 64 bits systems. Add a configure option to avoid it.
Signed-off-by: Zhang Xiao
---
meta/recipes-connectivity/nfs-utils/libnfsidmap_0.25.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-connectivity/nfs-utils/libnfsidmap_0.25.bb
b/meta/recipes-connectivity/nfs-utils/libnfsidmap_0.25.bb
index 2565771006..28c670d6d0 100644
--- a/meta/recipes-connectivity/nfs-utils/libnfsidmap_0.25.bb
+++ b/meta/recipes-connectivity/nfs-utils/libnfsidmap_0.25.bb
@@ -18,7 +18,7 @@ UPSTREAM_CHECK_URI =
"http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap
inherit autotools
-EXTRA_OECONF = "--disable-ldap"
+EXTRA_OECONF = "--disable-ldap --with-pluginpath=${libdir}/libnfsidmap"
do_install_append () {
install -d ${D}${sysconfdir}/
--
2.11.0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [recipes-extended][PATCH] pax: strip off file name's trailing slash
When extracting packaes, the trailing slash of the file name
has no means but may cause some issue on system call lstat.
Remove it.
Upstream-Status: Pending
Signed-off-by: Zhang Xiao
---
.../pax-strip-off-file-name-s-trailing-slash.patch | 48 ++
meta/recipes-extended/pax/pax_3.4.bb | 4 +-
2 files changed, 51 insertions(+), 1 deletion(-)
create mode 100644
meta/recipes-extended/pax/pax/pax-strip-off-file-name-s-trailing-slash.patch
diff --git
a/meta/recipes-extended/pax/pax/pax-strip-off-file-name-s-trailing-slash.patch
b/meta/recipes-extended/pax/pax/pax-strip-off-file-name-s-trailing-slash.patch
new file mode 100644
index 000..a602b30
--- /dev/null
+++
b/meta/recipes-extended/pax/pax/pax-strip-off-file-name-s-trailing-slash.patch
@@ -0,0 +1,48 @@
+From aa8ba118869b75a2a9cd681b2f0362d9d8f1c7ec Mon Sep 17 00:00:00 2001
+From: Zhang Xiao
+Date: Tue, 12 Jul 2016 11:34:45 +0800
+Subject: [PATCH] pax: strip off file name's trailing slash
+
+When extracting packaes, the trailing slash of the file name
+has no means but may cause some issue on system call lstat.
+Remove it.
+
+Upstream-Status: Pending
+
+Signed-off-by: Zhang Xiao
+---
+ src/pat_rep.c | 11 ++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/src/pat_rep.c b/src/pat_rep.c
+index b9a4636..4cbf6bf 100644
+--- a/src/pat_rep.c
b/src/pat_rep.c
+@@ -605,7 +605,7 @@ int
+ mod_name(ARCHD *arcn)
+ {
+ int res = 0;
+-
++ char *pt;
+ /*
+* Strip off leading '/' if appropriate.
+* Currently, this option is only set for the tar format.
+@@ -639,6 +639,15 @@ mod_name(ARCHD *arcn)
+ }
+
+ /*
++ * strip off trailing slash.
++ */
++ pt = &(arcn->name[strlen(arcn->name) - 1]);
++ if (*pt == '/') {
++ *pt = '\0';
++ arcn->nlen = strlen(arcn->name);
++ }
++
++ /*
+* IMPORTANT: We have a problem. what do we do with symlinks?
+* Modifying a hard link name makes sense, as we know the file it
+* points at should have been seen already in the archive (and if it
+--
+1.8.5.2.233.g932f7e4
+
diff --git a/meta/recipes-extended/pax/pax_3.4.bb
b/meta/recipes-extended/pax/pax_3.4.bb
index 9d1abfb..7ce43ce 100644
--- a/meta/recipes-extended/pax/pax_3.4.bb
+++ b/meta/recipes-extended/pax/pax_3.4.bb
@@ -16,7 +16,9 @@ DEPENDS_append_libc-musl = " fts "
SRC_URI =
"http://pkgs.fedoraproject.org/repo/pkgs/${BPN}/${BP}.tar.bz2/fbd9023b590b45ac3ade95870702a0d6/${BP}.tar.bz2
\
file://fix_for_compile_with_gcc-4.6.0.patch \
- file://pax-3.4_fix_for_x32.patch"
+ file://pax-3.4_fix_for_x32.patch \
+ file://pax-strip-off-file-name-s-trailing-slash.patch \
+"
SRC_URI_append_libc-musl = " file://0001-Fix-build-with-musl.patch \
file://0001-use-strtoll-instead-of-strtoq.patch \
--
2.1.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] bind: bug fix for CVE-2015-8704 CVE-2015-8705
CVE-2015-8704: Specific APL RR data could cause a server to exit
due to an INSIST failure in apl_42.c when performing certain string
formatting operations. All versions since 9.3.0 are affected.
CVE-2015-8704:Printing or logging some problem EDNS0 OPT pseudo-records
or ECS options could crash named with a REQUIRE assertion or other
misbehavior. This affects 9.10.0 and newer versions.
Signed-off-by: Zhang Xiao
---
.../bind/bind/bind-CVE-2015-8704.patch | 43 +++
.../bind/bind/bind-CVE-2015-8705.patch | 83 ++
meta/recipes-connectivity/bind/bind_9.10.3-P2.bb | 2 +
3 files changed, 128 insertions(+)
create mode 100644 meta/recipes-connectivity/bind/bind/bind-CVE-2015-8704.patch
create mode 100644 meta/recipes-connectivity/bind/bind/bind-CVE-2015-8705.patch
diff --git a/meta/recipes-connectivity/bind/bind/bind-CVE-2015-8704.patch
b/meta/recipes-connectivity/bind/bind/bind-CVE-2015-8704.patch
new file mode 100644
index 000..26fca05
--- /dev/null
+++ b/meta/recipes-connectivity/bind/bind/bind-CVE-2015-8704.patch
@@ -0,0 +1,43 @@
+From 690e895a5c66433803d5a36cafce83fc1775b022 Mon Sep 17 00:00:00 2001
+From: Mark Andrews
+Date: Thu, 31 Dec 2015 13:43:21 +1100
+Subject: [PATCH 1/2] bind: bug fix for CVE-2015-8704
+
+commit 1b3d21180244529f0099894fe9d29beb3f11efb3 upstream
+https://source.isc.org/git/bind9.git
+
+4285. [security] Specific APL data could trigger a INSIST. (CVE-2015-8704) [RT
#41396]
+
+Upstream Status: Backport
+CVE: CVE-2015-8704
+
+Signed-off-by: Zhang Xiao
+---
+ lib/dns/rdata/in_1/apl_42.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/dns/rdata/in_1/apl_42.c b/lib/dns/rdata/in_1/apl_42.c
+index 94133ba..f2d58bc 100644
+--- a/lib/dns/rdata/in_1/apl_42.c
b/lib/dns/rdata/in_1/apl_42.c
+@@ -116,7 +116,7 @@ totext_in_apl(ARGS_TOTEXT) {
+ isc_uint8_t len;
+ isc_boolean_t neg;
+ unsigned char buf[16];
+- char txt[sizeof(" !64000")];
++ char txt[sizeof(" !64000:")];
+ const char *sep = "";
+ int n;
+
+@@ -140,7 +140,7 @@ totext_in_apl(ARGS_TOTEXT) {
+ isc_region_consume(&sr, 1);
+ INSIST(len <= sr.length);
+ n = snprintf(txt, sizeof(txt), "%s%s%u:", sep,
+- neg ? "!": "", afi);
++ neg ? "!" : "", afi);
+ INSIST(n < (int)sizeof(txt));
+ RETERR(str_totext(txt, target));
+ switch (afi) {
+--
+1.9.1
+
diff --git a/meta/recipes-connectivity/bind/bind/bind-CVE-2015-8705.patch
b/meta/recipes-connectivity/bind/bind/bind-CVE-2015-8705.patch
new file mode 100644
index 000..1ea498d
--- /dev/null
+++ b/meta/recipes-connectivity/bind/bind/bind-CVE-2015-8705.patch
@@ -0,0 +1,83 @@
+From beb1c3e568e11efb0d080351ce2694a6df576574 Mon Sep 17 00:00:00 2001
+From: Mark Andrews
+Date: Thu, 31 Dec 2015 22:17:37 +1100
+Subject: [PATCH] bind: bug fix for CVE-2015-8705
+
+commit 3e0c1603a835c678b07f1147909bf196988ee0d3 upstream
+https://source.isc.org/git/bind9.git
+
+4286. [security] render_ecs errors were mishandled when
+printing out a OPT record resulting in a assertion
+failure. (CVE-2015-8705) [RT #41397]
+
+Upstream Status: Backport
+CVE: CVE-2015-8705
+
+Signed-off-by: Zhang Xiao
+---
+ lib/dns/message.c | 25 +
+ 1 file changed, 17 insertions(+), 8 deletions(-)
+
+diff --git a/lib/dns/message.c b/lib/dns/message.c
+index ea7b93a..e4456dc 100644
+--- a/lib/dns/message.c
b/lib/dns/message.c
+@@ -3245,7 +3245,7 @@ dns_message_sectiontotext(dns_message_t *msg,
dns_section_t section,
+ }
+
+ static isc_result_t
+-render_ecs(isc_buffer_t *optbuf, isc_buffer_t *target) {
++render_ecs(isc_buffer_t *ecsbuf, isc_buffer_t *target) {
+ int i;
+ char addr[16], addr_text[64];
+ isc_uint16_t family;
+@@ -3255,20 +3255,20 @@ render_ecs(isc_buffer_t *optbuf, isc_buffer_t *target)
{
+* Note: This routine needs to handle malformed ECS options.
+*/
+
+- if (isc_buffer_remaininglength(optbuf) < 4)
++ if (isc_buffer_remaininglength(ecsbuf) < 4)
+ return (DNS_R_OPTERR);
+- family = isc_buffer_getuint16(optbuf);
+- addrlen = isc_buffer_getuint8(optbuf);
+- scopelen = isc_buffer_getuint8(optbuf);
++ family = isc_buffer_getuint16(ecsbuf);
++ addrlen = isc_buffer_getuint8(ecsbuf);
++ scopelen = isc_buffer_getuint8(ecsbuf);
+
+ addrbytes = (addrlen + 7) / 8;
+- if (isc_buffer_remaininglength(optbuf) < addrbytes)
++ if (isc_buffer_remaininglength(ecsbuf) < addrbytes)
+ return (DNS_R_OPTERR);
+
+ ADD_STRING(target, ": ");
+ memset(addr, 0, sizeof(addr));
+ for (i = 0; i < addrbytes; i ++)
+- addr[i] = isc_buffer_getuint8(optbuf);
++ addr[i] = isc_buffer
[oe] [oe-core][PATCH] libtool: remove the hostname on which libtool was build
Upstream-Status: pending
Signed-off-by: Zhang Xiao
---
meta/recipes-devtools/libtool/libtool_2.4.6.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-devtools/libtool/libtool_2.4.6.bb
b/meta/recipes-devtools/libtool/libtool_2.4.6.bb
index 45f1b2f..65972b0 100644
--- a/meta/recipes-devtools/libtool/libtool_2.4.6.bb
+++ b/meta/recipes-devtools/libtool/libtool_2.4.6.bb
@@ -15,6 +15,7 @@ do_install_append () {
-e 's@^\(compiler_lib_search_path="\).*@\1${libdir}
${base_libdir}"@' \
-e 's@^\(predep_objects="\).*@\1"@' \
-e 's@^\(postdep_objects="\).*@\1"@' \
+-e 's/configured on host.*/configured on buildserver/' \
-i ${D}${bindir}/libtool
}
--
1.8.5.2.233.g932f7e4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH] tftp-hpa: bug fix on empty file put error
With the feature that checking the disk filled up, the return value of
function write_behind was checked and used to detect the disk status.
While for empty file, without data being written, this function will
return -1 thus the disk filled up error was miss-raised. Fix it.
Signed-off-by: Zhang Xiao
---
.../tftp-hpa-bug-fix-on-empty-file-put-error.patch | 33 ++
.../recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb | 1 +
2 files changed, 34 insertions(+)
create mode 100644
meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-bug-fix-on-empty-file-put-error.patch
diff --git
a/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-bug-fix-on-empty-file-put-error.patch
b/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-bug-fix-on-empty-file-put-error.patch
new file mode 100644
index 000..aa29d9c
--- /dev/null
+++
b/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-bug-fix-on-empty-file-put-error.patch
@@ -0,0 +1,33 @@
+tftp-hpa: bug fix on empty file put error
+
+With the feature that checking the disk filled up, the return value of
+function write_behind was checked and used to detect the disk status.
+While for empty file, without data being written, this function will
+return -1 thus the disk filled up error was miss-raised. Fix it.
+
+Upstream-Status: pending
+
+Signed-off-by: Zhang Xiao
+---
+ tftpd/tftpd.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+--- a/tftpd/tftpd.c
b/tftpd/tftpd.c
+@@ -1692,7 +1692,7 @@ static void tftp_recvfile(const struct f
+ syslog(LOG_WARNING, "tftpd: write(ack): %m");
+ goto abort;
+ }
+-if(write_behind(file, pf->f_convert) < 0) {
++if(write_behind(file, pf->f_convert) < -1) {
+ nak(ENOSPACE, NULL);
+ (void)fclose(file);
+ goto abort;
+@@ -1727,7 +1727,7 @@ static void tftp_recvfile(const struct f
+ goto abort;
+ }
+ } while (size == segsize);
+-if(write_behind(file, pf->f_convert) < 0) {
++if(write_behind(file, pf->f_convert) < -1) {
+ nak(ENOSPACE, NULL);
+ (void)fclose(file);
+ goto abort;
diff --git a/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb
b/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb
index 1951747..e58a4b1 100644
--- a/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb
+++ b/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb
@@ -25,6 +25,7 @@ SRC_URI =
"http://kernel.org/pub/software/network/tftp/tftp-hpa/tftp-hpa-${PV}.t
file://init \
file://add-error-check-for-disk-filled-up.patch \
file://tftp-hpa-bug-fix-on-separated-CR-and-LF.patch \
+ file://tftp-hpa-bug-fix-on-empty-file-put-error.patch \
"
SRC_URI[md5sum] = "46c9bd20bbffa62f79c958c7b99aac21"
--
1.8.5.2.233.g932f7e4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH] beecrypt: add config option --with-dev-dsp
Add this configure option for developer to control if the
/dev/dsp should be used on target. Instead of judging it
based on the very device file of build server.
Signed-off-by: Zhang Xiao
---
.../beecrypt/beecrypt/add-option-dev-dsp.patch | 34 ++
meta/recipes-support/beecrypt/beecrypt_4.2.1.bb| 1 +
2 files changed, 35 insertions(+)
create mode 100644
meta/recipes-support/beecrypt/beecrypt/add-option-dev-dsp.patch
diff --git a/meta/recipes-support/beecrypt/beecrypt/add-option-dev-dsp.patch
b/meta/recipes-support/beecrypt/beecrypt/add-option-dev-dsp.patch
new file mode 100644
index 000..83b6f7a
--- /dev/null
+++ b/meta/recipes-support/beecrypt/beecrypt/add-option-dev-dsp.patch
@@ -0,0 +1,34 @@
+Upstream-Status: Pending
+
+---
+ configure.ac | 12 +++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+--- a/configure.ac
b/configure.ac
+@@ -106,6 +106,16 @@ AC_ARG_WITH(python,[ --with-python[[=AR
+ fi
+ ])
+
++AC_ARG_WITH(dev-dsp,[ --with-dev-dsp enables dev/dsp for entropy
producing. auto for auto-detecting dev/dep on host. [[default=no]]],[
++ if test "$withval" = yes; then
++AC_DEFINE([HAVE_DEV_DSP], 1)
++ else
++if test "$withval" = auto; then
++ ac_detect_dev_dsp=yes
++fi
++ fi
++ ],[ac_detect_dev_dsp=no])
++
+ # Check for expert mode
+ if test "$ac_enable_expert_mode" = yes; then
+ BEE_EXPERT_MODE
+@@ -464,7 +474,7 @@ linux*)
+ ac_cv_have_dev_dsp=no
+ fi
+ ])
+- if test "$ac_cv_have_dev_dsp" = yes; then
++ if test "$ac_cv_have_dev_dsp" = yes && test "$ac_detect_dev_dsp" = yes; then
+ AC_DEFINE([HAVE_DEV_DSP], 1)
+ fi
+ ;;
diff --git a/meta/recipes-support/beecrypt/beecrypt_4.2.1.bb
b/meta/recipes-support/beecrypt/beecrypt_4.2.1.bb
index 209b92e..1e626f1 100644
--- a/meta/recipes-support/beecrypt/beecrypt_4.2.1.bb
+++ b/meta/recipes-support/beecrypt/beecrypt_4.2.1.bb
@@ -11,6 +11,7 @@ SRC_URI =
"${SOURCEFORGE_MIRROR}/beecrypt/beecrypt-${PV}.tar.gz \
file://fix-for-gcc-4.7.patch \
file://run-ptest \
file://beecrypt-enable-ptest-support.patch \
+ file://add-option-dev-dsp.patch \
"
SRC_URI[md5sum] = "8441c014170823f2dff97e33df55af1e"
--
1.8.5.2.233.g932f7e4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH] tftp-hpa: bug fix on separated CR and LF
In ascii mode, if the CR and LF was separated into different transfer
blocks, This LF will be just dropped instead of replacing the previous
CR. Add a checking on the first character to fix it.
Signed-off-by: Zhang Xiao
---
.../tftp-hpa-bug-fix-on-separated-CR-and-LF.patch | 38
.../recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb |1 +
2 files changed, 39 insertions(+), 0 deletions(-)
create mode 100644
meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-bug-fix-on-separated-CR-and-LF.patch
diff --git
a/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-bug-fix-on-separated-CR-and-LF.patch
b/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-bug-fix-on-separated-CR-and-LF.patch
new file mode 100644
index 000..3e220ec
--- /dev/null
+++
b/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-bug-fix-on-separated-CR-and-LF.patch
@@ -0,0 +1,38 @@
+From 6ed1eb8829dee351b54e183bc42c007cb306aaa5 Mon Sep 17 00:00:00 2001
+From: Zhang Xiao
+Date: Wed, 11 Jun 2014 14:01:16 +0800
+Subject: [PATCH] tftp-hpa: bug fix on separated CR and LF
+
+In ascii mode, if the CR and LF was separated into different transfer
+blocks, LF will be just dropped instead of replacing the previous CR.
+Add a checking on the first character to fix it.
+
+Upstream-Status: pending
+
+Signed-off-by: Zhang Xiao
+---
+ common/tftpsubs.c | 8
+ 1 file changed, 8 insertions(+)
+
+diff --git a/common/tftpsubs.c b/common/tftpsubs.c
+index b4d4ffe..b4ea3f2 100644
+--- a/common/tftpsubs.c
b/common/tftpsubs.c
+@@ -207,6 +207,14 @@ int write_behind(FILE * file, int convert)
+ p = buf;
+ ct = count;
+ count = 0;
++
++/* Check the first character together with prevchar */
++c = *p;
++if ((prevchar == '\r') && (c == '\n')) {
++lseek(fileno(file), -1, SEEK_CUR);
++count++;
++}
++
+ while (ct--) { /* loop over the buffer */
+ c = *p++; /* pick up a character */
+ if (prevchar == '\r') { /* if prev char was cr */
+--
+1.8.5.2.233.g932f7e4
+
diff --git a/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb
b/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb
index 6978e06..eb8d00e 100644
--- a/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb
+++ b/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb
@@ -24,6 +24,7 @@ SRC_URI =
"http://kernel.org/pub/software/network/tftp/tftp-hpa/tftp-hpa-${PV}.t
file://default \
file://init \
file://add-error-check-for-disk-filled-up.patch \
+ file://tftp-hpa-bug-fix-on-separated-CR-and-LF.patch \
"
SRC_URI[md5sum] = "46c9bd20bbffa62f79c958c7b99aac21"
--
1.7.0.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
