* [PATCH 00/10] Package Upgrades
@ 2015-04-07 11:24 Robert Yang
2015-04-07 11:24 ` [PATCH 01/10] strace: 4.9 -> 4.10 Robert Yang
` (9 more replies)
0 siblings, 10 replies; 17+ messages in thread
From: Robert Yang @ 2015-04-07 11:24 UTC (permalink / raw)
To: openembedded-core
The following changes since commit fbaddd724855a829698d853a70eee86118d6a5e7:
package_manager: call createrepo with --dbpath pointing inside WORKDIR (2015-04-02 12:00:55 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib rbt/PU
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/PU
Robert Yang (10):
strace: 4.9 -> 4.10
libuser: 0.60 -> 0.61
patch: 2.7.1 -> 2.7.5
libgcrypt: 1.6.2 -> 1.6.3
gnupg: 2.1.1 -> 2.1.2
socat: 1.7.2.4 -> 1.7.3.0
dhcp: 4.3.1 -> 4.3.2
groff: 1.22.2 -> 1.22.3
man-pages: 3.76 -> 3.82
glib-2.0: 2.42.1 -> 2.44.0
.../dhcp/dhcp/dhcp-xen-checksum.patch | 307 --------------------
.../dhcp/{dhcp_4.3.1.bb => dhcp_4.3.2.bb} | 5 +-
.../socat/socat/fix-cross-compiling-failed.patch | 36 ---
.../socat/socat/socat-1.7.2.4-linux-3.17.patch | 29 --
.../socat/{socat_1.7.2.4.bb => socat_1.7.3.0.bb} | 8 +-
.../{glib-2.0_2.42.1.bb => glib-2.0_2.44.0.bb} | 4 +-
meta/recipes-devtools/patch/patch.inc | 1 +
.../patch/patch/patch-CVE-2015-1196.patch | 200 -------------
.../patch/{patch_2.7.1.bb => patch_2.7.5.bb} | 6 +-
.../{strace-4.9 => strace}/Makefile-ptest.patch | 8 +-
.../strace/{strace-4.9 => strace}/git-version-gen | 0
.../strace/{strace-4.9 => strace}/run-ptest | 0
.../strace-add-configure-options.patch | 24 +-
.../strace/{strace_4.9.bb => strace_4.10.bb} | 8 +-
...off-1.22.2-correct-man.local-install-path.patch | 36 +--
.../groff/{groff_1.22.2.bb => groff_1.22.3.bb} | 7 +-
.../libuser/libuser/fixsepbuild.patch | 35 ---
.../libuser/{libuser_0.60.bb => libuser_0.61.bb} | 6 +-
.../{man-pages_3.76.bb => man-pages_3.82.bb} | 4 +-
.../gnupg/{gnupg_2.1.1.bb => gnupg_2.1.2.bb} | 4 +-
meta/recipes-support/libgcrypt/libgcrypt_1.6.2.bb | 4 -
meta/recipes-support/libgcrypt/libgcrypt_1.6.3.bb | 4 +
22 files changed, 59 insertions(+), 677 deletions(-)
delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/dhcp-xen-checksum.patch
rename meta/recipes-connectivity/dhcp/{dhcp_4.3.1.bb => dhcp_4.3.2.bb} (64%)
delete mode 100644 meta/recipes-connectivity/socat/socat/fix-cross-compiling-failed.patch
delete mode 100644 meta/recipes-connectivity/socat/socat/socat-1.7.2.4-linux-3.17.patch
rename meta/recipes-connectivity/socat/{socat_1.7.2.4.bb => socat_1.7.3.0.bb} (78%)
rename meta/recipes-core/glib-2.0/{glib-2.0_2.42.1.bb => glib-2.0_2.44.0.bb} (83%)
delete mode 100644 meta/recipes-devtools/patch/patch/patch-CVE-2015-1196.patch
rename meta/recipes-devtools/patch/{patch_2.7.1.bb => patch_2.7.5.bb} (60%)
rename meta/recipes-devtools/strace/{strace-4.9 => strace}/Makefile-ptest.patch (90%)
rename meta/recipes-devtools/strace/{strace-4.9 => strace}/git-version-gen (100%)
rename meta/recipes-devtools/strace/{strace-4.9 => strace}/run-ptest (100%)
rename meta/recipes-devtools/strace/{strace-4.9 => strace}/strace-add-configure-options.patch (70%)
rename meta/recipes-devtools/strace/{strace_4.9.bb => strace_4.10.bb} (84%)
rename meta/recipes-extended/groff/{groff-1.22.2 => groff-1.22.3}/groff-1.22.2-correct-man.local-install-path.patch (40%)
rename meta/recipes-extended/groff/{groff_1.22.2.bb => groff_1.22.3.bb} (92%)
delete mode 100644 meta/recipes-extended/libuser/libuser/fixsepbuild.patch
rename meta/recipes-extended/libuser/{libuser_0.60.bb => libuser_0.61.bb} (85%)
rename meta/recipes-extended/man-pages/{man-pages_3.76.bb => man-pages_3.82.bb} (86%)
rename meta/recipes-support/gnupg/{gnupg_2.1.1.bb => gnupg_2.1.2.bb} (89%)
delete mode 100644 meta/recipes-support/libgcrypt/libgcrypt_1.6.2.bb
create mode 100644 meta/recipes-support/libgcrypt/libgcrypt_1.6.3.bb
--
1.7.9.5
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 01/10] strace: 4.9 -> 4.10
2015-04-07 11:24 [PATCH 00/10] Package Upgrades Robert Yang
@ 2015-04-07 11:24 ` Robert Yang
2015-04-07 11:24 ` [PATCH 02/10] libuser: 0.60 -> 0.61 Robert Yang
` (8 subsequent siblings)
9 siblings, 0 replies; 17+ messages in thread
From: Robert Yang @ 2015-04-07 11:24 UTC (permalink / raw)
To: openembedded-core
Updated patches:
Makefile-ptest.patch
strace-add-configure-options.patch
Fixed:
debugedit: netlink_unix_diag: canonicalization unexpectedly shrank by one character
It was because oe_runmake -C ${TESTDIR} buildtest-TESTS didn't set OS
and ARCH, which caused "-I<foo>//" in gcc options, and would cause
debugedit error.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
.../{strace-4.9 => strace}/Makefile-ptest.patch | 8 +++----
.../strace/{strace-4.9 => strace}/git-version-gen | 0
.../strace/{strace-4.9 => strace}/run-ptest | 0
.../strace-add-configure-options.patch | 24 +++++++-------------
.../strace/{strace_4.9.bb => strace_4.10.bb} | 8 +++----
5 files changed, 15 insertions(+), 25 deletions(-)
rename meta/recipes-devtools/strace/{strace-4.9 => strace}/Makefile-ptest.patch (90%)
rename meta/recipes-devtools/strace/{strace-4.9 => strace}/git-version-gen (100%)
rename meta/recipes-devtools/strace/{strace-4.9 => strace}/run-ptest (100%)
rename meta/recipes-devtools/strace/{strace-4.9 => strace}/strace-add-configure-options.patch (70%)
rename meta/recipes-devtools/strace/{strace_4.9.bb => strace_4.10.bb} (84%)
diff --git a/meta/recipes-devtools/strace/strace-4.9/Makefile-ptest.patch b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch
similarity index 90%
rename from meta/recipes-devtools/strace/strace-4.9/Makefile-ptest.patch
rename to meta/recipes-devtools/strace/strace/Makefile-ptest.patch
index df01310..f360301 100644
--- a/meta/recipes-devtools/strace/strace-4.9/Makefile-ptest.patch
+++ b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch
@@ -10,7 +10,7 @@ Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
-index 054f85b..9aec566 100644
+index e73958c..5f0dfee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ AC_INIT([strace],
@@ -23,11 +23,11 @@ index 054f85b..9aec566 100644
AC_CANONICAL_HOST
diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 922452a..b17837f 100644
+index ff5e136..984bdb6 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
-@@ -37,3 +37,21 @@ TEST_LOG_COMPILER = $(srcdir)/run.sh
- EXTRA_DIST = init.sh run.sh sigaction.awk $(TESTS)
+@@ -101,3 +101,21 @@ EXTRA_DIST = init.sh run.sh \
+ $(TESTS)
CLEANFILES = $(TESTS:=.tmp)
+
diff --git a/meta/recipes-devtools/strace/strace-4.9/git-version-gen b/meta/recipes-devtools/strace/strace/git-version-gen
similarity index 100%
rename from meta/recipes-devtools/strace/strace-4.9/git-version-gen
rename to meta/recipes-devtools/strace/strace/git-version-gen
diff --git a/meta/recipes-devtools/strace/strace-4.9/run-ptest b/meta/recipes-devtools/strace/strace/run-ptest
similarity index 100%
rename from meta/recipes-devtools/strace/strace-4.9/run-ptest
rename to meta/recipes-devtools/strace/strace/run-ptest
diff --git a/meta/recipes-devtools/strace/strace-4.9/strace-add-configure-options.patch b/meta/recipes-devtools/strace/strace/strace-add-configure-options.patch
similarity index 70%
rename from meta/recipes-devtools/strace/strace-4.9/strace-add-configure-options.patch
rename to meta/recipes-devtools/strace/strace/strace-add-configure-options.patch
index 15e37bc..e48e4b3 100644
--- a/meta/recipes-devtools/strace/strace-4.9/strace-add-configure-options.patch
+++ b/meta/recipes-devtools/strace/strace/strace-add-configure-options.patch
@@ -5,24 +5,16 @@ Upstream-Status: Pending
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
---
- configure.ac | 27 ++++++++++++++++++++++++++-
- 1 file changed, 26 insertions(+), 1 deletion(-)
+ configure.ac | 26 ++++++++++++++++++++++++++
+ 1 file changed, 26 insertions(+)
diff --git a/configure.ac b/configure.ac
-index 054f85b..8ed49f1 100644
+index e73958c..9099370 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -238,7 +238,6 @@ AC_CHECK_HEADERS(m4_normalize([
- poll.h
- scsi/sg.h
- stropts.h
-- sys/acl.h
- sys/asynch.h
- sys/conf.h
- sys/epoll.h
-@@ -250,6 +249,18 @@ AC_CHECK_HEADERS(m4_normalize([
- sys/uio.h
+@@ -270,6 +270,18 @@ AC_CHECK_HEADERS(m4_normalize([
sys/vfs.h
+ sys/xattr.h
]))
+
+AC_ARG_ENABLE([acl],
@@ -39,9 +31,9 @@ index 054f85b..8ed49f1 100644
AC_CHECK_HEADERS([linux/icmp.h linux/in6.h linux/netlink.h linux/if_packet.h],
[], [], [#include <stddef.h>
#include <sys/socket.h>
-@@ -649,6 +660,20 @@ if test "x$st_cv_have___builtin_popcount" = xyes; then
- [Define to 1 if the system provides __builtin_popcount function])
+@@ -745,6 +757,20 @@ if test "x$ac_cv_lib_dl_dladdr" = xyes; then
fi
+ AC_SUBST(dl_LIBS)
+AC_ARG_ENABLE([aio],
+ [AS_HELP_STRING([--enable-aio], [turn on libaio support])],
@@ -60,6 +52,6 @@ index 054f85b..8ed49f1 100644
AC_PATH_PROG([PERL], [perl])
dnl stack trace with libunwind
---
+--
1.9.1
diff --git a/meta/recipes-devtools/strace/strace_4.9.bb b/meta/recipes-devtools/strace/strace_4.10.bb
similarity index 84%
rename from meta/recipes-devtools/strace/strace_4.9.bb
rename to meta/recipes-devtools/strace/strace_4.10.bb
index cce130d..416c387 100644
--- a/meta/recipes-devtools/strace/strace_4.9.bb
+++ b/meta/recipes-devtools/strace/strace_4.10.bb
@@ -11,8 +11,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.xz \
file://run-ptest \
"
-SRC_URI[md5sum] = "885eafadb10f6c60464a266d3929a2a4"
-SRC_URI[sha256sum] = "095bfea5c540b91d297ccac73b21b92fd54a24599fd70395db87ff9eb7fd6f65"
+SRC_URI[md5sum] = "107a5be455493861189e9b57a3a51912"
+SRC_URI[sha256sum] = "e6180d866ef9e76586b96e2ece2bfeeb3aa23f5cc88153f76e9caedd65e40ee2"
inherit autotools ptest
RDEPENDS_${PN}-ptest += "make coreutils grep gawk"
@@ -23,8 +23,6 @@ PACKAGECONFIG[libaio] = "--enable-aio,--disable-aio,libaio"
PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl"
PACKAGECONFIG[libunwind] = "--with-libunwind, --without-libunwind, libunwind"
-export INCLUDES = "-I. -I./linux"
-
TESTDIR = "tests"
do_configure_prepend() {
@@ -37,7 +35,7 @@ do_install_append() {
}
do_compile_ptest() {
- oe_runmake -C ${TESTDIR} buildtest-TESTS
+ oe_runmake -C ${TESTDIR} buildtest-TESTS OS=linux ARCH="${TARGET_ARCH}"
}
do_install_ptest() {
--
1.7.9.5
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 02/10] libuser: 0.60 -> 0.61
2015-04-07 11:24 [PATCH 00/10] Package Upgrades Robert Yang
2015-04-07 11:24 ` [PATCH 01/10] strace: 4.9 -> 4.10 Robert Yang
@ 2015-04-07 11:24 ` Robert Yang
2015-04-07 11:24 ` [PATCH 03/10] patch: 2.7.1 -> 2.7.5 Robert Yang
` (7 subsequent siblings)
9 siblings, 0 replies; 17+ messages in thread
From: Robert Yang @ 2015-04-07 11:24 UTC (permalink / raw)
To: openembedded-core
Removed fixsepbuild.patch since it is not needed any more.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
.../libuser/libuser/fixsepbuild.patch | 35 --------------------
.../libuser/{libuser_0.60.bb => libuser_0.61.bb} | 6 ++--
2 files changed, 3 insertions(+), 38 deletions(-)
delete mode 100644 meta/recipes-extended/libuser/libuser/fixsepbuild.patch
rename meta/recipes-extended/libuser/{libuser_0.60.bb => libuser_0.61.bb} (85%)
diff --git a/meta/recipes-extended/libuser/libuser/fixsepbuild.patch b/meta/recipes-extended/libuser/libuser/fixsepbuild.patch
deleted file mode 100644
index 893ca14..0000000
--- a/meta/recipes-extended/libuser/libuser/fixsepbuild.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Fix out of tree build errors and parallel make issues. The mkdir commands
-can race each other. The srcdir variable is a complete path so a ../ prefix makes
-no sense.
-
-Upstream-Status: Pending
-
-RP 2013/03/21
-
-Index: libuser-0.58/docs/Makefile.am
-===================================================================
---- libuser-0.58.orig/docs/Makefile.am 2012-11-07 18:25:58.000000000 -0800
-+++ libuser-0.58/docs/Makefile.am 2013-03-22 23:32:06.843518069 -0700
-@@ -8,14 +8,14 @@
-
- all: sgml/libuser.txt sgml/libuser.html
-
--libuser.conf.5: $(srcdir)/libuser.conf.5.in Makefile
-+libuser.conf.5: $(abs_srcdir)/libuser.conf.5.in Makefile
- sed 's,@sysconfdir\@,$(sysconfdir),g' \
-- < $(srcdir)/libuser.conf.5.in > $@
-+ < $(abs_srcdir)/libuser.conf.5.in > $@
-
--sgml/libuser.txt: $(srcdir)/sgml/libuser.sgml
-- [ -d sgml ] || mkdir sgml
-- cd sgml; sgml2txt ../$(srcdir)/sgml/libuser.sgml
-+sgml/libuser.txt: $(abs_srcdir)/sgml/libuser.sgml
-+ [ -d sgml ] || mkdir sgml || true
-+ cd sgml; sgml2txt $(abs_srcdir)/sgml/libuser.sgml
-
--sgml/libuser.html: $(srcdir)/sgml/libuser.sgml
-- [ -d sgml ] || mkdir sgml
-- cd sgml; sgml2html ../$(srcdir)/sgml/libuser.sgml
-+sgml/libuser.html: $(abs_srcdir)/sgml/libuser.sgml
-+ [ -d sgml ] || mkdir sgml || true
-+ cd sgml; sgml2html $(abs_srcdir)/sgml/libuser.sgml
diff --git a/meta/recipes-extended/libuser/libuser_0.60.bb b/meta/recipes-extended/libuser/libuser_0.61.bb
similarity index 85%
rename from meta/recipes-extended/libuser/libuser_0.60.bb
rename to meta/recipes-extended/libuser/libuser_0.61.bb
index e6316ef..f2b9ddb 100644
--- a/meta/recipes-extended/libuser/libuser_0.60.bb
+++ b/meta/recipes-extended/libuser/libuser_0.61.bb
@@ -12,10 +12,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
SECTION = "base"
SRC_URI = "https://fedorahosted.org/releases/l/i/libuser/libuser-${PV}.tar.xz \
- file://fixsepbuild.patch"
+ "
-SRC_URI[md5sum] = "5c549724999ccca65ceaaecc4eb8cb98"
-SRC_URI[sha256sum] = "b1f73408ebfee79eb01a47c5879a2cdef6a00b75ee24870de7df1b816ff483eb"
+SRC_URI[md5sum] = "d977dc59161272c1491edd9ca7ba22f2"
+SRC_URI[sha256sum] = "0a114a52446e12781e2ffdf26f59df0d14e7809c7db5e551d3cf61c4e398751d"
DEPENDS = "popt libpam glib-2.0 xz-native docbook-utils-native linuxdoc-tools-native python"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 03/10] patch: 2.7.1 -> 2.7.5
2015-04-07 11:24 [PATCH 00/10] Package Upgrades Robert Yang
2015-04-07 11:24 ` [PATCH 01/10] strace: 4.9 -> 4.10 Robert Yang
2015-04-07 11:24 ` [PATCH 02/10] libuser: 0.60 -> 0.61 Robert Yang
@ 2015-04-07 11:24 ` Robert Yang
2015-04-07 11:24 ` [PATCH 04/10] libgcrypt: 1.6.2 -> 1.6.3 Robert Yang
` (6 subsequent siblings)
9 siblings, 0 replies; 17+ messages in thread
From: Robert Yang @ 2015-04-07 11:24 UTC (permalink / raw)
To: openembedded-core
* Removed backport patch patch-CVE-2015-1196.patch
* Add HOMEPAGE
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
meta/recipes-devtools/patch/patch.inc | 1 +
.../patch/patch/patch-CVE-2015-1196.patch | 200 --------------------
.../patch/{patch_2.7.1.bb => patch_2.7.5.bb} | 6 +-
3 files changed, 3 insertions(+), 204 deletions(-)
delete mode 100644 meta/recipes-devtools/patch/patch/patch-CVE-2015-1196.patch
rename meta/recipes-devtools/patch/{patch_2.7.1.bb => patch_2.7.5.bb} (60%)
diff --git a/meta/recipes-devtools/patch/patch.inc b/meta/recipes-devtools/patch/patch.inc
index 332b97a..cbfb8cf 100644
--- a/meta/recipes-devtools/patch/patch.inc
+++ b/meta/recipes-devtools/patch/patch.inc
@@ -3,6 +3,7 @@ DESCRIPTION = "patch takes a patch file containing a difference listing \
produced by the diff program and applies those differences to one or more \
original files, producing patched versions."
SECTION = "utils"
+HOMEPAGE = "http://savannah.gnu.org/projects/patch/"
SRC_URI = "${GNU_MIRROR}/patch/patch-${PV}.tar.gz"
S = "${WORKDIR}/patch-${PV}"
diff --git a/meta/recipes-devtools/patch/patch/patch-CVE-2015-1196.patch b/meta/recipes-devtools/patch/patch/patch-CVE-2015-1196.patch
deleted file mode 100644
index d408346..0000000
--- a/meta/recipes-devtools/patch/patch/patch-CVE-2015-1196.patch
+++ /dev/null
@@ -1,200 +0,0 @@
-From 4e9269a5fc1fe80a1095a92593dd85db871e1fd3 Mon Sep 17 00:00:00 2001
-From: Andreas Gruenbacher <andreas.gruenbacher@gmail.com>
-Date: Mon, 19 Jan 2015 23:18:30 +0100
-Subject: [PATCH] Make sure symlinks don't point outside working directory
- (CVE-2015-1196)
-
-When creating symlinks from git-style patches, make sure the symlinks don't
-point above the current working directory. Otherwise, a subsequent patch could
-use the symlink to write outside the working directory.
-
-* src/pch.c (symlink_target_is_valid): New function to check for valid symlink
-targets.
-* src/util.c (move_file): Use symlink_target_is_valid() here.
-* tests/symlinks: Add valid and invalid symlink test cases.
-
-Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
-
-Upstream-Status: Backport
-
----
- NEWS | 3 ++
- src/pch.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
- src/pch.h | 1 +
- src/util.c | 7 +++++++
- tests/symlinks | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
- 5 files changed, 117 insertions(+)
-
-diff --git a/NEWS b/NEWS
-index 42afed7..d3f1c2d 100644
---- a/NEWS
-+++ b/NEWS
-@@ -1,3 +1,6 @@
-+* With git-style patches, symlinks that point outside the working directory
-+ will no longer be created.
-+
- Changes in version 2.7.1:
-
- * Two critical bug fixes in the "diff --git" format support.
-diff --git a/src/pch.c b/src/pch.c
-index 55e1504..f05ef83 100644
---- a/src/pch.c
-+++ b/src/pch.c
-@@ -454,6 +454,60 @@ name_is_valid (char const *name)
- return is_valid;
- }
-
-+bool
-+symlink_target_is_valid (char const *target, char const *to)
-+{
-+ bool is_valid;
-+
-+ if (IS_ABSOLUTE_FILE_NAME (to))
-+ is_valid = true;
-+ else if (IS_ABSOLUTE_FILE_NAME (target))
-+ is_valid = false;
-+ else
-+ {
-+ unsigned int depth = 0;
-+ char const *t;
-+
-+ is_valid = true;
-+ t = to;
-+ while (*t)
-+ {
-+ while (*t && ! ISSLASH (*t))
-+ t++;
-+ if (ISSLASH (*t))
-+ {
-+ while (ISSLASH (*t))
-+ t++;
-+ depth++;
-+ }
-+ }
-+
-+ t = target;
-+ while (*t)
-+ {
-+ if (*t == '.' && *++t == '.' && (! *++t || ISSLASH (*t)))
-+ {
-+ if (! depth--)
-+ {
-+ is_valid = false;
-+ break;
-+ }
-+ }
-+ else
-+ {
-+ while (*t && ! ISSLASH (*t))
-+ t++;
-+ depth++;
-+ }
-+ while (ISSLASH (*t))
-+ t++;
-+ }
-+ }
-+
-+ /* Allow any symlink target if we are in the filesystem root. */
-+ return is_valid || cwd_is_root (to);
-+}
-+
- /* Determine what kind of diff is in the remaining part of the patch file. */
-
- static enum diff
-diff --git a/src/pch.h b/src/pch.h
-index 0c7ff62..58861b0 100644
---- a/src/pch.h
-+++ b/src/pch.h
-@@ -37,6 +37,7 @@ bool pch_write_line (lin, FILE *);
- bool there_is_another_patch (bool, mode_t *);
- char *pfetch (lin) _GL_ATTRIBUTE_PURE;
- char pch_char (lin) _GL_ATTRIBUTE_PURE;
-+bool symlink_target_is_valid (char const *, char const *);
- int another_hunk (enum diff, bool);
- int pch_says_nonexistent (bool) _GL_ATTRIBUTE_PURE;
- size_t pch_line_len (lin) _GL_ATTRIBUTE_PURE;
-diff --git a/src/util.c b/src/util.c
-index 66ae90f..636eded 100644
---- a/src/util.c
-+++ b/src/util.c
-@@ -470,6 +470,13 @@ move_file (char const *from, bool *from_needs_removal,
- read_fatal ();
- buffer[size] = 0;
-
-+ if (! symlink_target_is_valid (buffer, to))
-+ {
-+ fprintf (stderr, "symbolic link target '%s' is invalid\n",
-+ buffer);
-+ fatal_exit (0);
-+ }
-+
- if (! backup)
- {
- if (unlink (to) == 0)
-diff --git a/tests/symlinks b/tests/symlinks
-index 96626b3..6211026 100644
---- a/tests/symlinks
-+++ b/tests/symlinks
-@@ -146,6 +146,59 @@ ncheck 'test ! -L symlink'
-
- # --------------------------------------------------------------
-
-+# Patch should not create symlinks which point outside the working directory.
-+
-+cat > symlink-target.diff <<EOF
-+diff --git a/dir/foo b/dir/foo
-+new file mode 120000
-+index 0000000..cad2309
-+--- /dev/null
-++++ b/dir/foo
-+@@ -0,0 +1 @@
-++../foo
-+\ No newline at end of file
-+EOF
-+
-+check 'patch -p1 < symlink-target.diff || echo "Status: $?"' <<EOF
-+patching symbolic link dir/foo
-+EOF
-+
-+cat > bad-symlink-target1.diff <<EOF
-+diff --git a/bar b/bar
-+new file mode 120000
-+index 0000000..cad2309
-+--- /dev/null
-++++ b/bar
-+@@ -0,0 +1 @@
-++/bar
-+\ No newline at end of file
-+EOF
-+
-+check 'patch -p1 < bad-symlink-target1.diff || echo "Status: $?"' <<EOF
-+patching symbolic link bar
-+symbolic link target '/bar' is invalid
-+Status: 2
-+EOF
-+
-+cat > bad-symlink-target2.diff <<EOF
-+diff --git a/baz b/baz
-+new file mode 120000
-+index 0000000..cad2309
-+--- /dev/null
-++++ b/baz
-+@@ -0,0 +1 @@
-++../baz
-+\ No newline at end of file
-+EOF
-+
-+check 'patch -p1 < bad-symlink-target2.diff || echo "Status: $?"' <<EOF
-+patching symbolic link baz
-+symbolic link target '../baz' is invalid
-+Status: 2
-+EOF
-+
-+# --------------------------------------------------------------
-+
- # The backup file of a new symlink is an empty regular file.
-
- check 'patch -p1 --backup < create-symlink.diff || echo "Status: $?"' <<EOF
---
-2.1.4
-
diff --git a/meta/recipes-devtools/patch/patch_2.7.1.bb b/meta/recipes-devtools/patch/patch_2.7.5.bb
similarity index 60%
rename from meta/recipes-devtools/patch/patch_2.7.1.bb
rename to meta/recipes-devtools/patch/patch_2.7.5.bb
index 1a3b9b1..20ed6c8 100644
--- a/meta/recipes-devtools/patch/patch_2.7.1.bb
+++ b/meta/recipes-devtools/patch/patch_2.7.5.bb
@@ -1,10 +1,8 @@
require patch.inc
LICENSE = "GPLv3"
-SRC_URI += "file://patch-CVE-2015-1196.patch"
-
-SRC_URI[md5sum] = "95dd8d7e41dcbcecdd5cd88ef915378d"
-SRC_URI[sha256sum] = "c05f28668c3474bc63adcd48abae921d15e71c254fbebdbaeda40456d64039d5"
+SRC_URI[md5sum] = "ed4d5674ef4543b4eb463db168886dc7"
+SRC_URI[sha256sum] = "7436f5a19f93c3ca83153ce9c5cbe4847e97c5d956e57a220121e741f6e7968f"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 04/10] libgcrypt: 1.6.2 -> 1.6.3
2015-04-07 11:24 [PATCH 00/10] Package Upgrades Robert Yang
` (2 preceding siblings ...)
2015-04-07 11:24 ` [PATCH 03/10] patch: 2.7.1 -> 2.7.5 Robert Yang
@ 2015-04-07 11:24 ` Robert Yang
2015-04-07 11:24 ` [PATCH 05/10] gnupg: 2.1.1 -> 2.1.2 Robert Yang
` (5 subsequent siblings)
9 siblings, 0 replies; 17+ messages in thread
From: Robert Yang @ 2015-04-07 11:24 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
meta/recipes-support/libgcrypt/libgcrypt_1.6.2.bb | 4 ----
meta/recipes-support/libgcrypt/libgcrypt_1.6.3.bb | 4 ++++
2 files changed, 4 insertions(+), 4 deletions(-)
delete mode 100644 meta/recipes-support/libgcrypt/libgcrypt_1.6.2.bb
create mode 100644 meta/recipes-support/libgcrypt/libgcrypt_1.6.3.bb
diff --git a/meta/recipes-support/libgcrypt/libgcrypt_1.6.2.bb b/meta/recipes-support/libgcrypt/libgcrypt_1.6.2.bb
deleted file mode 100644
index c49c0e7..0000000
--- a/meta/recipes-support/libgcrypt/libgcrypt_1.6.2.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require libgcrypt.inc
-
-SRC_URI[md5sum] = "d19adc062edff0ebc7e887212733ef1f"
-SRC_URI[sha256sum] = "936921644b9c81e2395e18a554a9a5f9252aae3976f8afc3e4229ee9d785e627"
diff --git a/meta/recipes-support/libgcrypt/libgcrypt_1.6.3.bb b/meta/recipes-support/libgcrypt/libgcrypt_1.6.3.bb
new file mode 100644
index 0000000..cd06ce7
--- /dev/null
+++ b/meta/recipes-support/libgcrypt/libgcrypt_1.6.3.bb
@@ -0,0 +1,4 @@
+require libgcrypt.inc
+
+SRC_URI[md5sum] = "de03b867d02fdf115a1bac8bb8b5c3a3"
+SRC_URI[sha256sum] = "69e94e1a7084d94e1a6ca26d436068cb74862d10a7353cfae579a2d88674ff09"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 05/10] gnupg: 2.1.1 -> 2.1.2
2015-04-07 11:24 [PATCH 00/10] Package Upgrades Robert Yang
` (3 preceding siblings ...)
2015-04-07 11:24 ` [PATCH 04/10] libgcrypt: 1.6.2 -> 1.6.3 Robert Yang
@ 2015-04-07 11:24 ` Robert Yang
2015-04-07 11:24 ` [PATCH 06/10] socat: 1.7.2.4 -> 1.7.3.0 Robert Yang
` (4 subsequent siblings)
9 siblings, 0 replies; 17+ messages in thread
From: Robert Yang @ 2015-04-07 11:24 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
.../gnupg/{gnupg_2.1.1.bb => gnupg_2.1.2.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-support/gnupg/{gnupg_2.1.1.bb => gnupg_2.1.2.bb} (89%)
diff --git a/meta/recipes-support/gnupg/gnupg_2.1.1.bb b/meta/recipes-support/gnupg/gnupg_2.1.2.bb
similarity index 89%
rename from meta/recipes-support/gnupg/gnupg_2.1.1.bb
rename to meta/recipes-support/gnupg/gnupg_2.1.2.bb
index a7c4254..4784869 100644
--- a/meta/recipes-support/gnupg/gnupg_2.1.1.bb
+++ b/meta/recipes-support/gnupg/gnupg_2.1.2.bb
@@ -14,8 +14,8 @@ SRC_URI = "ftp://ftp.gnupg.org/gcrypt/${BPN}/${BPN}-${PV}.tar.bz2 \
file://dirmngr-uses-libgpg-error.patch \
"
-SRC_URI[md5sum] = "9a314c3dcef0a091de90b6aa4d467db5"
-SRC_URI[sha256sum] = "70ecd01d2875db62624c911c2fd815742f50aef5492698eb3bfc09a08690ce49"
+SRC_URI[md5sum] = "156fbd6566f4c51caac741c858d30d96"
+SRC_URI[sha256sum] = "404f5a43d591dfe41f0ffb204b49a1533b67d77bc1fd68febd7e447575616792"
EXTRA_OECONF = "--disable-ldap \
--disable-ccid-driver \
--
1.7.9.5
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 06/10] socat: 1.7.2.4 -> 1.7.3.0
2015-04-07 11:24 [PATCH 00/10] Package Upgrades Robert Yang
` (4 preceding siblings ...)
2015-04-07 11:24 ` [PATCH 05/10] gnupg: 2.1.1 -> 2.1.2 Robert Yang
@ 2015-04-07 11:24 ` Robert Yang
2015-04-07 11:24 ` [PATCH 07/10] dhcp: 4.3.1 -> 4.3.2 Robert Yang
` (3 subsequent siblings)
9 siblings, 0 replies; 17+ messages in thread
From: Robert Yang @ 2015-04-07 11:24 UTC (permalink / raw)
To: openembedded-core
Removed fix-cross-compiling-failed.patch and
socat-1.7.2.4-linux-3.17.patch since upstream has fixed them.
Updated README's LIC_FILES_CHKSUM, there is a word changed (GPL ->
GPLv2, it should be GPLv2 as COPYING shows), its license is already
"GPL-2.0+-with-OpenSSL-exception", so we just update the md5 is OK.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
.../socat/socat/fix-cross-compiling-failed.patch | 36 --------------------
.../socat/socat/socat-1.7.2.4-linux-3.17.patch | 29 ----------------
.../socat/{socat_1.7.2.4.bb => socat_1.7.3.0.bb} | 8 ++---
3 files changed, 3 insertions(+), 70 deletions(-)
delete mode 100644 meta/recipes-connectivity/socat/socat/fix-cross-compiling-failed.patch
delete mode 100644 meta/recipes-connectivity/socat/socat/socat-1.7.2.4-linux-3.17.patch
rename meta/recipes-connectivity/socat/{socat_1.7.2.4.bb => socat_1.7.3.0.bb} (78%)
diff --git a/meta/recipes-connectivity/socat/socat/fix-cross-compiling-failed.patch b/meta/recipes-connectivity/socat/socat/fix-cross-compiling-failed.patch
deleted file mode 100644
index b9d3ca3..0000000
--- a/meta/recipes-connectivity/socat/socat/fix-cross-compiling-failed.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Fix build during cross-compilation as it fails to detect that our prefixed
-compiler is gcc, and falls back to executing code to determine type sizes:
-
-| configure: using code run method to find basic types
-| checking for equivalent simple type of size_t...
-| configure: error: in `/data/poky-master/tmp/work/core2-32-poky-linux/socat/1.7.2.4-r0/build':
-| configure: error: cannot run test program while cross compiling
-
-This is caused by configure.in assuming that $CC can be literally compared with
-"gcc" to determine if the compiler is GCC. Our gcc is host-prefixed so this
-test fails, however autoconf provides $GCC for this purpose (which was used up
-to 1.7.2.3).
-
-Upstream-Status: Submitted (via email)
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
----
- configure.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.in b/configure.in
---- a/configure.in
-+++ b/configure.in
-@@ -41,7 +41,7 @@ AC_CHECK_PROG(AR, ar, ar, gar)
- # fail
- AC_LANG_COMPILER_REQUIRE()
-
--if test "$CC" = "gcc"; then
-+if test "$GCC" = yes; then
- CFLAGS="$CFLAGS -D_GNU_SOURCE -Wall -Wno-parentheses"
- ERRONWARN="-Werror -O0"
- elif test "$CC" = "clang"; then
---
-1.8.1.2
-
diff --git a/meta/recipes-connectivity/socat/socat/socat-1.7.2.4-linux-3.17.patch b/meta/recipes-connectivity/socat/socat/socat-1.7.2.4-linux-3.17.patch
deleted file mode 100644
index 9152df5..0000000
--- a/meta/recipes-connectivity/socat/socat/socat-1.7.2.4-linux-3.17.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-socat: fix compile erorr against 3.17+ kernel headers
-
-With the linux 3.17 kernel socat's configure detects the wrong include for errqueue.h
-which results in a compilation error.
-
-By backporting the gentoo patch from:
-
- http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-misc/socat/files/socat-1.7.2.4-linux-3.17.patch
-
-Fixes the build issue
-
-Upstream-status: backport
-
-Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
-
---- a/configure.in
-+++ b/configure.in
-@@ -80,7 +80,10 @@
- AC_CHECK_HEADERS(termios.h linux/if_tun.h)
- AC_CHECK_HEADERS(net/if_dl.h)
- AC_CHECK_HEADERS(linux/types.h)
--AC_CHECK_HEADER(linux/errqueue.h, AC_DEFINE(HAVE_LINUX_ERRQUEUE_H), [], [#include <linux/types.h>])
-+AC_CHECK_HEADER(linux/errqueue.h, AC_DEFINE(HAVE_LINUX_ERRQUEUE_H), [], [AC_INCLUDES_DEFAULT
-+ #if HAVE_LINUX_TYPES_H
-+ #include <linux/types.h>
-+ #endif])
- AC_CHECK_HEADERS(sys/utsname.h sys/select.h sys/file.h)
- AC_CHECK_HEADERS(util.h bsd/libutil.h libutil.h sys/stropts.h regex.h)
- AC_CHECK_HEADERS(linux/fs.h linux/ext2_fs.h)
diff --git a/meta/recipes-connectivity/socat/socat_1.7.2.4.bb b/meta/recipes-connectivity/socat/socat_1.7.3.0.bb
similarity index 78%
rename from meta/recipes-connectivity/socat/socat_1.7.2.4.bb
rename to meta/recipes-connectivity/socat/socat_1.7.3.0.bb
index 9e43e16..8923f41 100644
--- a/meta/recipes-connectivity/socat/socat_1.7.2.4.bb
+++ b/meta/recipes-connectivity/socat/socat_1.7.3.0.bb
@@ -9,16 +9,14 @@ DEPENDS = "openssl readline"
LICENSE = "GPL-2.0+-with-OpenSSL-exception"
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
- file://README;beginline=257;endline=287;md5=79246f11a1db0b6ccec54d1fb711c01e"
+ file://README;beginline=257;endline=287;md5=338c05eadd013872abb1d6e198e10a3f"
SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2 \
- file://fix-cross-compiling-failed.patch \
- file://socat-1.7.2.4-linux-3.17.patch \
"
-SRC_URI[md5sum] = "69b8155dd442a6f24e28ef5407d868eb"
-SRC_URI[sha256sum] = "4b7739901c6fad1e460f3e5b1868fb4c2a1427febbba7a510cd2e42fd4941e09"
+SRC_URI[md5sum] = "b607edb65bc6c57f4a43f06247504274"
+SRC_URI[sha256sum] = "0767e850c0329b9fdf711c6cd468565cbbb28786ba1a8a1cbd5531d4016b3e04"
inherit autotools
--
1.7.9.5
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 07/10] dhcp: 4.3.1 -> 4.3.2
2015-04-07 11:24 [PATCH 00/10] Package Upgrades Robert Yang
` (5 preceding siblings ...)
2015-04-07 11:24 ` [PATCH 06/10] socat: 1.7.2.4 -> 1.7.3.0 Robert Yang
@ 2015-04-07 11:24 ` Robert Yang
2015-04-07 11:24 ` [PATCH 08/10] groff: 1.22.2 -> 1.22.3 Robert Yang
` (2 subsequent siblings)
9 siblings, 0 replies; 17+ messages in thread
From: Robert Yang @ 2015-04-07 11:24 UTC (permalink / raw)
To: openembedded-core
Removed dhcp-xen-checksum.patch since already merged.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
.../dhcp/dhcp/dhcp-xen-checksum.patch | 307 --------------------
.../dhcp/{dhcp_4.3.1.bb => dhcp_4.3.2.bb} | 5 +-
2 files changed, 2 insertions(+), 310 deletions(-)
delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/dhcp-xen-checksum.patch
rename meta/recipes-connectivity/dhcp/{dhcp_4.3.1.bb => dhcp_4.3.2.bb} (64%)
diff --git a/meta/recipes-connectivity/dhcp/dhcp/dhcp-xen-checksum.patch b/meta/recipes-connectivity/dhcp/dhcp/dhcp-xen-checksum.patch
deleted file mode 100644
index 62c279d..0000000
--- a/meta/recipes-connectivity/dhcp/dhcp/dhcp-xen-checksum.patch
+++ /dev/null
@@ -1,307 +0,0 @@
-dhcp-client: Ignore partial checksums
-
-dhclient will fail to get an IP address if run inside a guest when traffic is
-flowing over a virtual network interface. The user will see the error
-message:
-
- 5 bad udp checksums in 5 packets
- No DHCPOFFERS received.
- Unable to obtain a lease on first try. Exiting.
- Failed to bring up eth0.
-
-This is because Linux only uses partial checksums for packets that go over
-virtual network interfaces and dhclient does not like this.
-
- See linux kernel commit 78ea85f17b15390e30d8b47488ec7b6cf0790663
- ("net: skbuff: improve comment on checksumming")
-
-An application can detect this behaviour by checking for the
-TP_STATUS_CSUMNOTREADY flag in the tp_status field.
-
- See linux kernel commit 8dc4194474159660d7f37c495e3fc3f10d0db8cc
- ("Add optional checksum computation for recvmsg")
-
-An extra parameter is added to decode_udp_ip_header() in dhclient to indicate
-whether or not dhclient should ignore partial checksums. This is used
-when the TP_STATUS_CSUMNOTREADY bit is set by the guest kernel.
-
-This fix has been included in Fedora and Ubuntu, however it has not yet been
-accepted by ISC upstream. Likely because it is specific to behaviour in Linux
-and other UNIX variants do not seem to be affected.
-
-The patch was imported from the dhcp source RPM in Fedora 21
- (http://pkgs.fedoraproject.org/cgit/dhcp.git/tree/dhcp-xen-checksum.patch?h=f21)
-
-Originally contributed to fedora-cvs-commit by David Cantrell on Jan 30 2007
- (https://www.redhat.com/archives/fedora-cvs-commits/2007-January/msg01442.html)
-
-Submitted to dhcp-bugs@isc.org - [ISC-Bugs #22806] - by Michael S. Tsirkin
- (http://comments.gmane.org/gmane.comp.emulators.kvm.devel/65236)
- (https://lists.isc.org/pipermail/dhcp-hackers/2010-April/001835.html)
-
-Upstream-Status: Submitted [dhcp-bugs@isc.org]
-Signed-off-by: Rob Woolley <rob.woolley@windriver.com>
---
- common/bpf.c | 2 -
- common/dlpi.c | 2 -
- common/lpf.c | 83 +++++++++++++++++++++++++++++++++++++++++--------------
- common/nit.c | 2 -
- common/packet.c | 4 +-
- common/upf.c | 2 -
- includes/dhcpd.h | 2 -
- 7 files changed, 70 insertions(+), 27 deletions(-)
-
-diff --git a/common/bpf.c b/common/bpf.c
---- a/common/bpf.c
-+++ b/common/bpf.c
-@@ -481,7 +481,7 @@ ssize_t receive_packet (interface, buf,
- /* Decode the IP and UDP headers... */
- offset = decode_udp_ip_header(interface, interface->rbuf,
- interface->rbuf_offset,
-- from, hdr.bh_caplen, &paylen);
-+ from, hdr.bh_caplen, &paylen, 0);
-
- /* If the IP or UDP checksum was bad, skip the packet... */
- if (offset < 0) {
-diff --git a/common/dlpi.c b/common/dlpi.c
---- a/common/dlpi.c
-+++ b/common/dlpi.c
-@@ -691,7 +691,7 @@ ssize_t receive_packet (interface, buf,
- length -= offset;
- #endif
- offset = decode_udp_ip_header (interface, dbuf, bufix,
-- from, length, &paylen);
-+ from, length, &paylen, 0);
-
- /*
- * If the IP or UDP checksum was bad, skip the packet...
-diff --git a/common/lpf.c b/common/lpf.c
---- a/common/lpf.c
-+++ b/common/lpf.c
-@@ -29,14 +29,15 @@
-
- #include "dhcpd.h"
- #if defined (USE_LPF_SEND) || defined (USE_LPF_RECEIVE)
-+#include <sys/socket.h>
- #include <sys/uio.h>
- #include <errno.h>
-
- #include <asm/types.h>
- #include <linux/filter.h>
- #include <linux/if_ether.h>
-+#include <linux/if_packet.h>
- #include <netinet/in_systm.h>
--#include <net/if_packet.h>
- #include "includes/netinet/ip.h"
- #include "includes/netinet/udp.h"
- #include "includes/netinet/if_ether.h"
-@@ -51,6 +52,19 @@
- /* Reinitializes the specified interface after an address change. This
- is not required for packet-filter APIs. */
-
-+#ifndef PACKET_AUXDATA
-+#define PACKET_AUXDATA 8
-+
-+struct tpacket_auxdata
-+{
-+ __u32 tp_status;
-+ __u32 tp_len;
-+ __u32 tp_snaplen;
-+ __u16 tp_mac;
-+ __u16 tp_net;
-+};
-+#endif
-+
- #ifdef USE_LPF_SEND
- void if_reinitialize_send (info)
- struct interface_info *info;
-@@ -73,10 +87,14 @@ int if_register_lpf (info)
- struct interface_info *info;
- {
- int sock;
-- struct sockaddr sa;
-+ union {
-+ struct sockaddr_ll ll;
-+ struct sockaddr common;
-+ } sa;
-+ struct ifreq ifr;
-
- /* Make an LPF socket. */
-- if ((sock = socket(PF_PACKET, SOCK_PACKET,
-+ if ((sock = socket(PF_PACKET, SOCK_RAW,
- htons((short)ETH_P_ALL))) < 0) {
- if (errno == ENOPROTOOPT || errno == EPROTONOSUPPORT ||
- errno == ESOCKTNOSUPPORT || errno == EPFNOSUPPORT ||
-@@ -91,11 +109,17 @@ int if_register_lpf (info)
- log_fatal ("Open a socket for LPF: %m");
- }
-
-+ memset (&ifr, 0, sizeof ifr);
-+ strncpy (ifr.ifr_name, (const char *)info -> ifp, sizeof ifr.ifr_name);
-+ ifr.ifr_name[IFNAMSIZ-1] = '\0';
-+ if (ioctl (sock, SIOCGIFINDEX, &ifr))
-+ log_fatal ("Failed to get interface index: %m");
-+
- /* Bind to the interface name */
- memset (&sa, 0, sizeof sa);
-- sa.sa_family = AF_PACKET;
-- strncpy (sa.sa_data, (const char *)info -> ifp, sizeof sa.sa_data);
-- if (bind (sock, &sa, sizeof sa)) {
-+ sa.ll.sll_family = AF_PACKET;
-+ sa.ll.sll_ifindex = ifr.ifr_ifindex;
-+ if (bind (sock, &sa.common, sizeof sa)) {
- if (errno == ENOPROTOOPT || errno == EPROTONOSUPPORT ||
- errno == ESOCKTNOSUPPORT || errno == EPFNOSUPPORT ||
- errno == EAFNOSUPPORT || errno == EINVAL) {
-@@ -177,9 +201,18 @@ static void lpf_gen_filter_setup (struct
- void if_register_receive (info)
- struct interface_info *info;
- {
-+ int val;
-+
- /* Open a LPF device and hang it on this interface... */
- info -> rfdesc = if_register_lpf (info);
-
-+ val = 1;
-+ if (setsockopt (info -> rfdesc, SOL_PACKET, PACKET_AUXDATA, &val,
-+ sizeof val) < 0) {
-+ if (errno != ENOPROTOOPT)
-+ log_fatal ("Failed to set auxiliary packet data: %m");
-+ }
-+
- #if defined (HAVE_TR_SUPPORT)
- if (info -> hw_address.hbuf [0] == HTYPE_IEEE802)
- lpf_tr_filter_setup (info);
-@@ -301,7 +334,6 @@ ssize_t send_packet (interface, packet,
- double hh [16];
- double ih [1536 / sizeof (double)];
- unsigned char *buf = (unsigned char *)ih;
-- struct sockaddr_pkt sa;
- int result;
- int fudge;
-
-@@ -322,17 +354,7 @@ ssize_t send_packet (interface, packet,
- (unsigned char *)raw, len);
- memcpy (buf + ibufp, raw, len);
-
-- /* For some reason, SOCK_PACKET sockets can't be connected,
-- so we have to do a sentdo every time. */
-- memset (&sa, 0, sizeof sa);
-- sa.spkt_family = AF_PACKET;
-- strncpy ((char *)sa.spkt_device,
-- (const char *)interface -> ifp, sizeof sa.spkt_device);
-- sa.spkt_protocol = htons(ETH_P_IP);
--
-- result = sendto (interface -> wfdesc,
-- buf + fudge, ibufp + len - fudge, 0,
-- (const struct sockaddr *)&sa, sizeof sa);
-+ result = write (interface -> wfdesc, buf + fudge, ibufp + len - fudge);
- if (result < 0)
- log_error ("send_packet: %m");
- return result;
-@@ -349,14 +371,35 @@ ssize_t receive_packet (interface, buf,
- {
- int length = 0;
- int offset = 0;
-+ int nocsum = 0;
- unsigned char ibuf [1536];
- unsigned bufix = 0;
- unsigned paylen;
-+ unsigned char cmsgbuf[CMSG_LEN(sizeof(struct tpacket_auxdata))];
-+ struct iovec iov = {
-+ .iov_base = ibuf,
-+ .iov_len = sizeof ibuf,
-+ };
-+ struct msghdr msg = {
-+ .msg_iov = &iov,
-+ .msg_iovlen = 1,
-+ .msg_control = cmsgbuf,
-+ .msg_controllen = sizeof(cmsgbuf),
-+ };
-+ struct cmsghdr *cmsg;
-
-- length = read (interface -> rfdesc, ibuf, sizeof ibuf);
-+ length = recvmsg (interface -> rfdesc, &msg, 0);
- if (length <= 0)
- return length;
-
-+ for (cmsg = CMSG_FIRSTHDR(&msg); cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) {
-+ if (cmsg->cmsg_level == SOL_PACKET &&
-+ cmsg->cmsg_type == PACKET_AUXDATA) {
-+ struct tpacket_auxdata *aux = (void *)CMSG_DATA(cmsg);
-+ nocsum = aux->tp_status & TP_STATUS_CSUMNOTREADY;
-+ }
-+ }
-+
- bufix = 0;
- /* Decode the physical header... */
- offset = decode_hw_header (interface, ibuf, bufix, hfrom);
-@@ -373,7 +416,7 @@ ssize_t receive_packet (interface, buf,
-
- /* Decode the IP and UDP headers... */
- offset = decode_udp_ip_header (interface, ibuf, bufix, from,
-- (unsigned)length, &paylen);
-+ (unsigned)length, &paylen, nocsum);
-
- /* If the IP or UDP checksum was bad, skip the packet... */
- if (offset < 0)
-diff --git a/common/nit.c b/common/nit.c
---- a/common/nit.c
-+++ b/common/nit.c
-@@ -363,7 +363,7 @@ ssize_t receive_packet (interface, buf,
-
- /* Decode the IP and UDP headers... */
- offset = decode_udp_ip_header (interface, ibuf, bufix,
-- from, length, &paylen);
-+ from, length, &paylen, 0);
-
- /* If the IP or UDP checksum was bad, skip the packet... */
- if (offset < 0)
-diff --git a/common/packet.c b/common/packet.c
---- a/common/packet.c
-+++ b/common/packet.c
-@@ -226,7 +226,7 @@ ssize_t
- decode_udp_ip_header(struct interface_info *interface,
- unsigned char *buf, unsigned bufix,
- struct sockaddr_in *from, unsigned buflen,
-- unsigned *rbuflen)
-+ unsigned *rbuflen, int nocsum)
- {
- unsigned char *data;
- struct ip ip;
-@@ -337,7 +337,7 @@ decode_udp_ip_header(struct interface_in
- 8, IPPROTO_UDP + ulen))));
-
- udp_packets_seen++;
-- if (usum && usum != sum) {
-+ if (!nocsum && usum && usum != sum) {
- udp_packets_bad_checksum++;
- if (udp_packets_seen > 4 &&
- (udp_packets_seen / udp_packets_bad_checksum) < 2) {
-diff --git a/common/upf.c b/common/upf.c
---- a/common/upf.c
-+++ b/common/upf.c
-@@ -314,7 +314,7 @@ ssize_t receive_packet (interface, buf,
-
- /* Decode the IP and UDP headers... */
- offset = decode_udp_ip_header (interface, ibuf, bufix,
-- from, length, &paylen);
-+ from, length, &paylen, 0);
-
- /* If the IP or UDP checksum was bad, skip the packet... */
- if (offset < 0)
-diff --git a/includes/dhcpd.h b/includes/dhcpd.h
---- a/includes/dhcpd.h
-+++ b/includes/dhcpd.h
-@@ -2857,7 +2857,7 @@ ssize_t decode_hw_header (struct interfa
- unsigned, struct hardware *);
- ssize_t decode_udp_ip_header (struct interface_info *, unsigned char *,
- unsigned, struct sockaddr_in *,
-- unsigned, unsigned *);
-+ unsigned, unsigned *, int);
-
- /* ethernet.c */
- void assemble_ethernet_header (struct interface_info *, unsigned char *,
---
-1.8.1.2
-
diff --git a/meta/recipes-connectivity/dhcp/dhcp_4.3.1.bb b/meta/recipes-connectivity/dhcp/dhcp_4.3.2.bb
similarity index 64%
rename from meta/recipes-connectivity/dhcp/dhcp_4.3.1.bb
rename to meta/recipes-connectivity/dhcp/dhcp_4.3.2.bb
index d4414cc..b4a05fc 100644
--- a/meta/recipes-connectivity/dhcp/dhcp_4.3.1.bb
+++ b/meta/recipes-connectivity/dhcp/dhcp_4.3.2.bb
@@ -6,8 +6,7 @@ SRC_URI += "file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \
file://fixsepbuild.patch \
file://dhclient-script-drop-resolv.conf.dhclient.patch \
file://replace-ifconfig-route.patch \
- file://dhcp-xen-checksum.patch \
"
-SRC_URI[md5sum] = "b3a42ece3c7f2cd2e74a3e12ca881d20"
-SRC_URI[sha256sum] = "266cbca8a7a6bb8f9ccc5765da0d2b04099329314a54a4fc1022d510ad3e9af0"
+SRC_URI[md5sum] = "5a284875dd2c12ddd388416d69156a67"
+SRC_URI[sha256sum] = "6246c9b358759f6cdcc45104caaf76e732a211dbbbbf64a21f499c8db1298165"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 08/10] groff: 1.22.2 -> 1.22.3
2015-04-07 11:24 [PATCH 00/10] Package Upgrades Robert Yang
` (6 preceding siblings ...)
2015-04-07 11:24 ` [PATCH 07/10] dhcp: 4.3.1 -> 4.3.2 Robert Yang
@ 2015-04-07 11:24 ` Robert Yang
2015-04-08 9:40 ` Richard Purdie
2015-04-07 11:24 ` [PATCH 09/10] man-pages: 3.76 -> 3.82 Robert Yang
2015-04-07 11:24 ` [PATCH 10/10] glib-2.0: 2.42.1 -> 2.44.0 Robert Yang
9 siblings, 1 reply; 17+ messages in thread
From: Robert Yang @ 2015-04-07 11:24 UTC (permalink / raw)
To: openembedded-core
* Updated groff-1.22.2-correct-man.local-install-path.patch
* Add perl to RDEPENDS_groff since /usr/bin/perf is a perl script now.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
...off-1.22.2-correct-man.local-install-path.patch | 36 +++++++++++---------
.../groff/{groff_1.22.2.bb => groff_1.22.3.bb} | 7 ++--
2 files changed, 23 insertions(+), 20 deletions(-)
rename meta/recipes-extended/groff/{groff-1.22.2 => groff-1.22.3}/groff-1.22.2-correct-man.local-install-path.patch (40%)
rename meta/recipes-extended/groff/{groff_1.22.2.bb => groff_1.22.3.bb} (92%)
diff --git a/meta/recipes-extended/groff/groff-1.22.2/groff-1.22.2-correct-man.local-install-path.patch b/meta/recipes-extended/groff/groff-1.22.3/groff-1.22.2-correct-man.local-install-path.patch
similarity index 40%
rename from meta/recipes-extended/groff/groff-1.22.2/groff-1.22.2-correct-man.local-install-path.patch
rename to meta/recipes-extended/groff/groff-1.22.3/groff-1.22.2-correct-man.local-install-path.patch
index f7e9a74..c73328a 100644
--- a/meta/recipes-extended/groff/groff-1.22.2/groff-1.22.2-correct-man.local-install-path.patch
+++ b/meta/recipes-extended/groff/groff-1.22.3/groff-1.22.2-correct-man.local-install-path.patch
@@ -4,29 +4,31 @@ Correct the install path of man.local to fix following error:
Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>
Upstream-Status: Pending
---- groff-1.22.2/tmac/Makefile.sub.orig 2013-02-07 20:06:08.000000000 +0800
-+++ groff-1.22.2/tmac/Makefile.sub 2013-06-26 19:11:23.572259001 +0800
-@@ -114,9 +114,9 @@
- rm -f $(DESTDIR)$(mdocdir)/$$f; \
+diff --git a/tmac/Makefile.sub b/tmac/Makefile.sub
+index 1506232..f1468c5 100644
+--- a/tmac/Makefile.sub
++++ b/tmac/Makefile.sub
+@@ -121,9 +121,9 @@ install_data: $(NORMALFILES) $(SPECIALFILES) man.local \
+ $(RM) $(DESTDIR)$(mdocdir)/$$f; \
$(INSTALL_DATA) $$f-s $(DESTDIR)$(mdocdir)/$$f; \
done
-- -test -f $(DESTDIR)$(localtmacdir)/man.local || \
-+ -test -f $(DESTDIR)$(tmacdir)/man.local || \
- $(INSTALL_DATA) $(srcdir)/man.local \
-- $(DESTDIR)$(localtmacdir)/man.local
-+ $(DESTDIR)$(tmacdir)/man.local
- -test -f $(DESTDIR)$(localtmacdir)/mdoc.local || \
- $(INSTALL_DATA) mdoc.local-s $(DESTDIR)$(localtmacdir)/mdoc.local
+- -test -f $(DESTDIR)$(localtmacdir)/man.local \
++ -test -f $(DESTDIR)$(tmacdir)/man.local \
+ || $(INSTALL_DATA) $(srcdir)/man.local \
+- $(DESTDIR)$(localtmacdir)/man.local
++ $(DESTDIR)$(tmacdir)/man.local
+ -test -f $(DESTDIR)$(localtmacdir)/mdoc.local \
+ || $(INSTALL_DATA) mdoc.local-s $(DESTDIR)$(localtmacdir)/mdoc.local
-@@ -158,9 +158,9 @@
- -rm -f $(DESTDIR)$(tmacdir)/$(tmac_s_prefix)s.tmac
- -rm -f $(DESTDIR)$(tmacdir)/$(tmac_an_prefix)an.tmac
- -rm -f $(DESTDIR)$(tmacdir)/www.tmac
+@@ -164,9 +164,9 @@ uninstall_sub:
+ $(RM) $(DESTDIR)$(tmacdir)/$(tmac_s_prefix)s.tmac
+ $(RM) $(DESTDIR)$(tmacdir)/$(tmac_an_prefix)an.tmac
+ $(RM) $(DESTDIR)$(tmacdir)/www.tmac
- -if cmp -s $(DESTDIR)$(localtmacdir)/man.local \
+ -if cmp -s $(DESTDIR)$(tmacdir)/man.local \
$(srcdir)/man.local; then \
-- rm -f $(DESTDIR)$(localtmacdir)/man.local; \
-+ rm -f $(DESTDIR)$(tmacdir)/man.local; \
+- $(RM) $(DESTDIR)$(localtmacdir)/man.local; \
++ $(RM) $(DESTDIR)$(tmacdir)/man.local; \
fi
-if cmp -s $(DESTDIR)$(localtmacdir)/mdoc.local \
$(srcdir)/mdoc.local; then \
diff --git a/meta/recipes-extended/groff/groff_1.22.2.bb b/meta/recipes-extended/groff/groff_1.22.3.bb
similarity index 92%
rename from meta/recipes-extended/groff/groff_1.22.2.bb
rename to meta/recipes-extended/groff/groff_1.22.3.bb
index 6e84587..d89e747 100644
--- a/meta/recipes-extended/groff/groff_1.22.2.bb
+++ b/meta/recipes-extended/groff/groff_1.22.3.bb
@@ -4,7 +4,6 @@ formatting commands and produces formatted output."
SECTION = "base"
HOMEPAGE = "http://www.gnu.org/software/groff/"
LICENSE = "GPLv3"
-PR = "r1"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
@@ -12,12 +11,14 @@ SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz \
file://groff-1.22.2-correct-man.local-install-path.patch \
"
-SRC_URI[md5sum] = "9f4cd592a5efc7e36481d8d8d8af6d16"
-SRC_URI[sha256sum] = "380864dac4772e0c0d7b1282d25d0c5fd7f63baf45c87c4657afed22a13d2076"
+SRC_URI[md5sum] = "cc825fa64bc7306a885f2fb2268d3ec5"
+SRC_URI[sha256sum] = "3a48a9d6c97750bfbd535feeb5be0111db6406ddb7bb79fc680809cda6d828a5"
DEPENDS = "groff-native"
DEPENDS_class-native = ""
+RDEPENDS_${PN} = "perl"
+
inherit autotools texinfo
EXTRA_OECONF = "--without-x"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 09/10] man-pages: 3.76 -> 3.82
2015-04-07 11:24 [PATCH 00/10] Package Upgrades Robert Yang
` (7 preceding siblings ...)
2015-04-07 11:24 ` [PATCH 08/10] groff: 1.22.2 -> 1.22.3 Robert Yang
@ 2015-04-07 11:24 ` Robert Yang
2015-04-07 11:24 ` [PATCH 10/10] glib-2.0: 2.42.1 -> 2.44.0 Robert Yang
9 siblings, 0 replies; 17+ messages in thread
From: Robert Yang @ 2015-04-07 11:24 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
.../{man-pages_3.76.bb => man-pages_3.82.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-extended/man-pages/{man-pages_3.76.bb => man-pages_3.82.bb} (86%)
diff --git a/meta/recipes-extended/man-pages/man-pages_3.76.bb b/meta/recipes-extended/man-pages/man-pages_3.82.bb
similarity index 86%
rename from meta/recipes-extended/man-pages/man-pages_3.76.bb
rename to meta/recipes-extended/man-pages/man-pages_3.82.bb
index ed8a15f..7c1a7dc 100644
--- a/meta/recipes-extended/man-pages/man-pages_3.76.bb
+++ b/meta/recipes-extended/man-pages/man-pages_3.82.bb
@@ -7,8 +7,8 @@ LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://README;md5=8f2a3d43057d458e5066714980567a60"
SRC_URI = "${KERNELORG_MIRROR}/linux/docs/${BPN}/Archive/${BP}.tar.gz"
-SRC_URI[md5sum] = "d00cf09677caefc3e827737afc565583"
-SRC_URI[sha256sum] = "eff558c13b61a46136994514b3ec00a74dcf00414d3bde4f0edca80a36d36359"
+SRC_URI[md5sum] = "ce4bffb9982d197bf35b59d0a12453ca"
+SRC_URI[sha256sum] = "9c22781f485d00e6b258dcaaf1efd220fee9f8d4ce59cd881b062be06be5efe8"
RDEPENDS_${PN} = "man"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 10/10] glib-2.0: 2.42.1 -> 2.44.0
2015-04-07 11:24 [PATCH 00/10] Package Upgrades Robert Yang
` (8 preceding siblings ...)
2015-04-07 11:24 ` [PATCH 09/10] man-pages: 3.76 -> 3.82 Robert Yang
@ 2015-04-07 11:24 ` Robert Yang
2015-04-07 21:39 ` Richard Purdie
9 siblings, 1 reply; 17+ messages in thread
From: Robert Yang @ 2015-04-07 11:24 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
.../{glib-2.0_2.42.1.bb => glib-2.0_2.44.0.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-core/glib-2.0/{glib-2.0_2.42.1.bb => glib-2.0_2.44.0.bb} (83%)
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.42.1.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.44.0.bb
similarity index 83%
rename from meta/recipes-core/glib-2.0/glib-2.0_2.42.1.bb
rename to meta/recipes-core/glib-2.0/glib-2.0_2.44.0.bb
index 69b3ef8..100799e 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.42.1.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.44.0.bb
@@ -18,5 +18,5 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
SRC_URI_append_class-native = " file://glib-gettextize-dir.patch"
-SRC_URI[md5sum] = "89c4119e50e767d3532158605ee9121a"
-SRC_URI[sha256sum] = "8f3f0865280e45b8ce840e176ef83bcfd511148918cc8d39df2ee89b67dcf89a"
+SRC_URI[md5sum] = "74cf7b4ea200b76e42a4c22c8daf0f93"
+SRC_URI[sha256sum] = "f2d362b106a08fa801770d41829a06fcfe287a00421018869eebf5efc796f5b9"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [PATCH 10/10] glib-2.0: 2.42.1 -> 2.44.0
2015-04-07 11:24 ` [PATCH 10/10] glib-2.0: 2.42.1 -> 2.44.0 Robert Yang
@ 2015-04-07 21:39 ` Richard Purdie
2015-04-08 2:23 ` Robert Yang
0 siblings, 1 reply; 17+ messages in thread
From: Richard Purdie @ 2015-04-07 21:39 UTC (permalink / raw)
To: Robert Yang; +Cc: openembedded-core
On Tue, 2015-04-07 at 04:24 -0700, Robert Yang wrote:
> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> ---
> .../{glib-2.0_2.42.1.bb => glib-2.0_2.44.0.bb} | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
> rename meta/recipes-core/glib-2.0/{glib-2.0_2.42.1.bb => glib-2.0_2.44.0.bb} (83%)
>
> diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.42.1.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.44.0.bb
> similarity index 83%
> rename from meta/recipes-core/glib-2.0/glib-2.0_2.42.1.bb
> rename to meta/recipes-core/glib-2.0/glib-2.0_2.44.0.bb
> index 69b3ef8..100799e 100644
> --- a/meta/recipes-core/glib-2.0/glib-2.0_2.42.1.bb
> +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.44.0.bb
> @@ -18,5 +18,5 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
>
> SRC_URI_append_class-native = " file://glib-gettextize-dir.patch"
>
> -SRC_URI[md5sum] = "89c4119e50e767d3532158605ee9121a"
> -SRC_URI[sha256sum] = "8f3f0865280e45b8ce840e176ef83bcfd511148918cc8d39df2ee89b67dcf89a"
> +SRC_URI[md5sum] = "74cf7b4ea200b76e42a4c22c8daf0f93"
> +SRC_URI[sha256sum] = "f2d362b106a08fa801770d41829a06fcfe287a00421018869eebf5efc796f5b9"
This blew up badly on the autobuilder:
http://errors.yoctoproject.org/Errors/Search/?items=10&query=c8da6d7390ad626c03d5b9b431a97adeaeb60a89
Cheers,
Richard
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH 10/10] glib-2.0: 2.42.1 -> 2.44.0
2015-04-07 21:39 ` Richard Purdie
@ 2015-04-08 2:23 ` Robert Yang
2015-04-08 7:42 ` Jussi Kukkonen
0 siblings, 1 reply; 17+ messages in thread
From: Robert Yang @ 2015-04-08 2:23 UTC (permalink / raw)
To: Richard Purdie; +Cc: openembedded-core
On 04/08/2015 05:39 AM, Richard Purdie wrote:
> On Tue, 2015-04-07 at 04:24 -0700, Robert Yang wrote:
>> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
>> ---
>> .../{glib-2.0_2.42.1.bb => glib-2.0_2.44.0.bb} | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>> rename meta/recipes-core/glib-2.0/{glib-2.0_2.42.1.bb => glib-2.0_2.44.0.bb} (83%)
>>
>> diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.42.1.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.44.0.bb
>> similarity index 83%
>> rename from meta/recipes-core/glib-2.0/glib-2.0_2.42.1.bb
>> rename to meta/recipes-core/glib-2.0/glib-2.0_2.44.0.bb
>> index 69b3ef8..100799e 100644
>> --- a/meta/recipes-core/glib-2.0/glib-2.0_2.42.1.bb
>> +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.44.0.bb
>> @@ -18,5 +18,5 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
>>
>> SRC_URI_append_class-native = " file://glib-gettextize-dir.patch"
>>
>> -SRC_URI[md5sum] = "89c4119e50e767d3532158605ee9121a"
>> -SRC_URI[sha256sum] = "8f3f0865280e45b8ce840e176ef83bcfd511148918cc8d39df2ee89b67dcf89a"
>> +SRC_URI[md5sum] = "74cf7b4ea200b76e42a4c22c8daf0f93"
>> +SRC_URI[sha256sum] = "f2d362b106a08fa801770d41829a06fcfe287a00421018869eebf5efc796f5b9"
>
> This blew up badly on the autobuilder:
>
> http://errors.yoctoproject.org/Errors/Search/?items=10&query=c8da6d7390ad626c03d5b9b431a97adeaeb60a89
Sorry, the failures are on CentOS 6.6, please ignore this upgrade atm, I will
find a CentOS 6.x to fix the problem.
>
> Cheers,
>
> Richard
>
>
>
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH 10/10] glib-2.0: 2.42.1 -> 2.44.0
2015-04-08 2:23 ` Robert Yang
@ 2015-04-08 7:42 ` Jussi Kukkonen
2015-04-08 9:05 ` Robert Yang
0 siblings, 1 reply; 17+ messages in thread
From: Jussi Kukkonen @ 2015-04-08 7:42 UTC (permalink / raw)
To: Robert Yang; +Cc: openembedded-core
On 8 April 2015 at 05:23, Robert Yang <liezhi.yang@windriver.com> wrote:
> On 04/08/2015 05:39 AM, Richard Purdie wrote:
>> This blew up badly on the autobuilder:
>>
>> http://errors.yoctoproject.org/Errors/Search/?items=10&query=c8da6d7390ad626c03d5b9b431a97adeaeb60a89
>
> Sorry, the failures are on CentOS 6.6, please ignore this upgrade atm, I
> will
> find a CentOS 6.x to fix the problem.
That's typedef redefinition (C11 feature and supported by gcc for
quite a while). Why does CentOS specifically choke on that?
Anyway, upstream has decided to roll this back: apparently some gcc
versions that are still in use do not support the feature.
GLib commit 4a292721bc should help.
Jussi
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH 10/10] glib-2.0: 2.42.1 -> 2.44.0
2015-04-08 7:42 ` Jussi Kukkonen
@ 2015-04-08 9:05 ` Robert Yang
2015-04-08 9:32 ` Robert Yang
0 siblings, 1 reply; 17+ messages in thread
From: Robert Yang @ 2015-04-08 9:05 UTC (permalink / raw)
To: Jussi Kukkonen; +Cc: openembedded-core
On 04/08/2015 03:42 PM, Jussi Kukkonen wrote:
> On 8 April 2015 at 05:23, Robert Yang <liezhi.yang@windriver.com> wrote:
>> On 04/08/2015 05:39 AM, Richard Purdie wrote:
>>> This blew up badly on the autobuilder:
>>>
>>> http://errors.yoctoproject.org/Errors/Search/?items=10&query=c8da6d7390ad626c03d5b9b431a97adeaeb60a89
>>
>> Sorry, the failures are on CentOS 6.6, please ignore this upgrade atm, I
>> will
>> find a CentOS 6.x to fix the problem.
>
> That's typedef redefinition (C11 feature and supported by gcc for
> quite a while). Why does CentOS specifically choke on that?
>
> Anyway, upstream has decided to roll this back: apparently some gcc
> versions that are still in use do not support the feature.
> GLib commit 4a292721bc should help.
Thank you very much, I will backport it to fix the problem.
// Robert
>
> Jussi
>
>
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH 10/10] glib-2.0: 2.42.1 -> 2.44.0
2015-04-08 9:05 ` Robert Yang
@ 2015-04-08 9:32 ` Robert Yang
0 siblings, 0 replies; 17+ messages in thread
From: Robert Yang @ 2015-04-08 9:32 UTC (permalink / raw)
To: Jussi Kukkonen; +Cc: openembedded-core
I've updated the patch in the repo:
git://git.openembedded.org/openembedded-core-contrib rbt/PU
glib-2.0: 2.42.1 -> 2.44.0
Backported a patch to fix build on CentOS' gcc 4.4.7:
0001-GListModel-roll-back-use-of-type-redefinition.patch
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
diff --git
a/meta/recipes-core/glib-2.0/glib-2.0/0001-GListModel-roll-back-use-of-type-redefinition.patch
b/meta/recipes-core/glib-2.0/glib-2.0/0001-GListModel-roll-back-use-of-type-redefinit
new file mode 100644
index 0000000..7d95743
--- /dev/null
+++
b/meta/recipes-core/glib-2.0/glib-2.0/0001-GListModel-roll-back-use-of-type-redefinition.patch
@@ -0,0 +1,42 @@
+From 4a292721bcf2943bfc05c6a1c859992f28e3efec Mon Sep 17 00:00:00 2001
+From: Ryan Lortie <desrt@desrt.ca>
+Date: Wed, 25 Mar 2015 09:29:49 -0400
+Subject: [PATCH] GListModel: roll back use of type redefinition
+
+We declare the typedefs for GListModel and GListStore in giotypes.h, as
+a matter of convention. This is not actually required, since the
+typedef is emitted as part of the G_DECLARE_* macros.
+
+The giotypes.h approach is only used to avoid cyclic dependencies
+between headers, which is not a problem in this case.
+
+Type redefinition is a C11 feature, and although it was around in some
+compilers before then, gcc 4.2.1 (from 2007) is apparently still in wide
+use, being the default compiler for OpenBSD.
+
+Eventually, we will probably hit a case where we actually need to
+redefine a type, but since we're not there yet, let's back off a bit.
+
+Upstream-Status: Backport
+
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
// RObert
On 04/08/2015 05:05 PM, Robert Yang wrote:
>
>
> On 04/08/2015 03:42 PM, Jussi Kukkonen wrote:
>> On 8 April 2015 at 05:23, Robert Yang <liezhi.yang@windriver.com> wrote:
>>> On 04/08/2015 05:39 AM, Richard Purdie wrote:
>>>> This blew up badly on the autobuilder:
>>>>
>>>> http://errors.yoctoproject.org/Errors/Search/?items=10&query=c8da6d7390ad626c03d5b9b431a97adeaeb60a89
>>>>
>>>
>>> Sorry, the failures are on CentOS 6.6, please ignore this upgrade atm, I
>>> will
>>> find a CentOS 6.x to fix the problem.
>>
>> That's typedef redefinition (C11 feature and supported by gcc for
>> quite a while). Why does CentOS specifically choke on that?
>>
>> Anyway, upstream has decided to roll this back: apparently some gcc
>> versions that are still in use do not support the feature.
>> GLib commit 4a292721bc should help.
>
> Thank you very much, I will backport it to fix the problem.
>
> // Robert
>
>>
>> Jussi
>>
>>
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH 08/10] groff: 1.22.2 -> 1.22.3
2015-04-07 11:24 ` [PATCH 08/10] groff: 1.22.2 -> 1.22.3 Robert Yang
@ 2015-04-08 9:40 ` Richard Purdie
0 siblings, 0 replies; 17+ messages in thread
From: Richard Purdie @ 2015-04-08 9:40 UTC (permalink / raw)
To: Robert Yang; +Cc: openembedded-core
On Tue, 2015-04-07 at 04:24 -0700, Robert Yang wrote:
> * Updated groff-1.22.2-correct-man.local-install-path.patch
> * Add perl to RDEPENDS_groff since /usr/bin/perf is a perl script now.
perf -> perl
and this caused failures on some build machines due to /bin/perl rather
than /usr/bin/perl:
http://errors.yoctoproject.org/Errors/Search/?items=10&query=54290cf402fcf85d2b596316666b62045bf534f2
We'll need to ensure the header on the file is correct as we do in some
other recipes.
Cheers,
Richard
^ permalink raw reply [flat|nested] 17+ messages in thread
end of thread, other threads:[~2015-04-08 9:41 UTC | newest]
Thread overview: 17+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-04-07 11:24 [PATCH 00/10] Package Upgrades Robert Yang
2015-04-07 11:24 ` [PATCH 01/10] strace: 4.9 -> 4.10 Robert Yang
2015-04-07 11:24 ` [PATCH 02/10] libuser: 0.60 -> 0.61 Robert Yang
2015-04-07 11:24 ` [PATCH 03/10] patch: 2.7.1 -> 2.7.5 Robert Yang
2015-04-07 11:24 ` [PATCH 04/10] libgcrypt: 1.6.2 -> 1.6.3 Robert Yang
2015-04-07 11:24 ` [PATCH 05/10] gnupg: 2.1.1 -> 2.1.2 Robert Yang
2015-04-07 11:24 ` [PATCH 06/10] socat: 1.7.2.4 -> 1.7.3.0 Robert Yang
2015-04-07 11:24 ` [PATCH 07/10] dhcp: 4.3.1 -> 4.3.2 Robert Yang
2015-04-07 11:24 ` [PATCH 08/10] groff: 1.22.2 -> 1.22.3 Robert Yang
2015-04-08 9:40 ` Richard Purdie
2015-04-07 11:24 ` [PATCH 09/10] man-pages: 3.76 -> 3.82 Robert Yang
2015-04-07 11:24 ` [PATCH 10/10] glib-2.0: 2.42.1 -> 2.44.0 Robert Yang
2015-04-07 21:39 ` Richard Purdie
2015-04-08 2:23 ` Robert Yang
2015-04-08 7:42 ` Jussi Kukkonen
2015-04-08 9:05 ` Robert Yang
2015-04-08 9:32 ` Robert Yang
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.