* [PATCH 00/19] Initial package upgrades for 1.8
@ 2014-11-07 0:19 Saul Wold
2014-11-07 0:19 ` [PATCH 01/19] libcap: Upgrade to 2.24 Saul Wold
` (18 more replies)
0 siblings, 19 replies; 20+ messages in thread
From: Saul Wold @ 2014-11-07 0:19 UTC (permalink / raw)
To: openembedded-core
Richard, Ross:
Here is a set of updates that I have tested on the Autobuilder and
done local touch test with also.
Thanks
Sau!
The following changes since commit dd93b3a950d063f4e3020362c636006f51fb5782:
image_types.bbclass: whitespace and reorder (2014-11-06 16:41:38 +0000)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib sgw/updates
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/updates
Saul Wold (19):
libcap: Upgrade to 2.24
btrfs: Update to 3.17 version
npth: Upgrade to 1.0
liburcu: Ugrade to 0.8.5
libgcrypt: Ugrade to 1.6.2
libksba: Ugrade to 1.3.1
curl Ugrade to 7.38
systemtap: Upgrade to 2.6 Git Version
babeltrace: Upgrade to 1.2.3
libxkbcommon: Upgrade to 0.5.0
resolvconf: Upgrade to 1.76
at: Upgrade to 3.1.16
cups: Upgrade to 2.0.0
help2man: Upgrade to 1.46.4
hdparm: Upgrade to 9.45
less: Upgrade to 470
lsbinitscripts: Upgrade to 9.56.1
man-pages: Upgrade to 3.75
watchdog: Upgrade to 5.14
.../{resolvconf_1.75.bb => resolvconf_1.76.bb} | 4 +-
.../btrfs-tools/btrfs-tools_git.bb | 6 +-
...-native_1.46.1.bb => help2man-native_1.46.4.bb} | 4 +-
.../at/{at_3.1.15.bb => at_3.1.16.bb} | 4 +-
meta/recipes-extended/cups/cups.inc | 1 -
.../0001-don-t-try-to-run-generated-binaries.patch | 35 ++-
.../cups/cups/cups-no-gcrypt.patch | 49 ----
meta/recipes-extended/cups/cups_1.7.5.bb | 6 -
meta/recipes-extended/cups/cups_2.0.0.bb | 6 +
.../hdparm/{hdparm_9.43.bb => hdparm_9.45.bb} | 4 +-
.../less/{less_466.bb => less_470.bb} | 4 +-
...nitscripts_9.55.bb => lsbinitscripts_9.56.1.bb} | 6 +-
.../{man-pages_3.71.bb => man-pages_3.75.bb} | 4 +-
.../{files => watchdog}/fix-ping-failure.patch | 56 +++--
.../watchdog/{files => watchdog}/fixsepbuild.patch | 0
.../{watchdog_5.13.bb => watchdog_5.14.bb} | 5 +-
...libxkbcommon_0.4.3.bb => libxkbcommon_0.5.0.bb} | 6 +-
...-Support-out-of-tree-builds-in-babeltrace.patch | 17 --
...uffers-from-objstack_alloc-on-sizeof-void.patch | 54 -----
.../{babeltrace_1.2.1.bb => babeltrace_1.2.3.bb} | 9 +-
.../systemtap/tapset-linux-sendfile-syscall.patch | 22 --
meta/recipes-kernel/systemtap/systemtap_git.inc | 5 +-
meta/recipes-support/curl/curl/CVE-2014-3613.patch | 269 ---------------------
meta/recipes-support/curl/curl/CVE-2014-3620.patch | 69 ------
.../curl/{curl_7.37.1.bb => curl_7.38.0.bb} | 8 +-
.../libcap/libcap/fix-CAP_LAST_CAP.patch | 39 ---
meta/recipes-support/libcap/libcap_2.22.bb | 6 -
.../libcap/{libcap.inc => libcap_2.24.bb} | 12 +-
...ibgcrypt-1.6.1-make-arm-asm-fPIC-friendly.patch | 169 -------------
meta/recipes-support/libgcrypt/libgcrypt_1.6.1.bb | 6 -
meta/recipes-support/libgcrypt/libgcrypt_1.6.2.bb | 4 +
.../libksba/{libksba_1.3.0.bb => libksba_1.3.1.bb} | 5 +-
.../liburcu/{liburcu_0.8.4.bb => liburcu_0.8.5.bb} | 4 +-
.../npth/{npth_0.91.bb => npth_1.0.bb} | 5 +-
34 files changed, 108 insertions(+), 795 deletions(-)
rename meta/recipes-connectivity/resolvconf/{resolvconf_1.75.bb => resolvconf_1.76.bb} (92%)
rename meta/recipes-devtools/help2man/{help2man-native_1.46.1.bb => help2man-native_1.46.4.bb} (79%)
rename meta/recipes-extended/at/{at_3.1.15.bb => at_3.1.16.bb} (93%)
delete mode 100644 meta/recipes-extended/cups/cups/cups-no-gcrypt.patch
delete mode 100644 meta/recipes-extended/cups/cups_1.7.5.bb
create mode 100644 meta/recipes-extended/cups/cups_2.0.0.bb
rename meta/recipes-extended/hdparm/{hdparm_9.43.bb => hdparm_9.45.bb} (88%)
rename meta/recipes-extended/less/{less_466.bb => less_470.bb} (88%)
rename meta/recipes-extended/lsb/{lsbinitscripts_9.55.bb => lsbinitscripts_9.56.1.bb} (78%)
rename meta/recipes-extended/man-pages/{man-pages_3.71.bb => man-pages_3.75.bb} (86%)
rename meta/recipes-extended/watchdog/{files => watchdog}/fix-ping-failure.patch (58%)
rename meta/recipes-extended/watchdog/{files => watchdog}/fixsepbuild.patch (100%)
rename meta/recipes-extended/watchdog/{watchdog_5.13.bb => watchdog_5.14.bb} (81%)
rename meta/recipes-graphics/xorg-lib/{libxkbcommon_0.4.3.bb => libxkbcommon_0.5.0.bb} (73%)
delete mode 100644 meta/recipes-kernel/lttng/babeltrace/0001-Fix-Support-out-of-tree-builds-in-babeltrace.patch
delete mode 100644 meta/recipes-kernel/lttng/babeltrace/Fix-Align-buffers-from-objstack_alloc-on-sizeof-void.patch
rename meta/recipes-kernel/lttng/{babeltrace_1.2.1.bb => babeltrace_1.2.3.bb} (73%)
delete mode 100644 meta/recipes-kernel/systemtap/systemtap/tapset-linux-sendfile-syscall.patch
delete mode 100644 meta/recipes-support/curl/curl/CVE-2014-3613.patch
delete mode 100644 meta/recipes-support/curl/curl/CVE-2014-3620.patch
rename meta/recipes-support/curl/{curl_7.37.1.bb => curl_7.38.0.bb} (90%)
delete mode 100644 meta/recipes-support/libcap/libcap/fix-CAP_LAST_CAP.patch
delete mode 100644 meta/recipes-support/libcap/libcap_2.22.bb
rename meta/recipes-support/libcap/{libcap.inc => libcap_2.24.bb} (80%)
delete mode 100644 meta/recipes-support/libgcrypt/files/libgcrypt-1.6.1-make-arm-asm-fPIC-friendly.patch
delete mode 100644 meta/recipes-support/libgcrypt/libgcrypt_1.6.1.bb
create mode 100644 meta/recipes-support/libgcrypt/libgcrypt_1.6.2.bb
rename meta/recipes-support/libksba/{libksba_1.3.0.bb => libksba_1.3.1.bb} (85%)
rename meta/recipes-support/liburcu/{liburcu_0.8.4.bb => liburcu_0.8.5.bb} (83%)
rename meta/recipes-support/npth/{npth_0.91.bb => npth_1.0.bb} (78%)
--
1.8.3.1
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH 01/19] libcap: Upgrade to 2.24
2014-11-07 0:19 [PATCH 00/19] Initial package upgrades for 1.8 Saul Wold
@ 2014-11-07 0:19 ` Saul Wold
2014-11-07 0:19 ` [PATCH 02/19] btrfs: Update to 3.17 version Saul Wold
` (17 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: Saul Wold @ 2014-11-07 0:19 UTC (permalink / raw)
To: openembedded-core
Tarballs moved to kernel.org
Deleted upstream'ed patch
merged minimal .bb with .inc
Check for security dir before moving it when pam is enabled.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../libcap/libcap/fix-CAP_LAST_CAP.patch | 39 ----------------------
meta/recipes-support/libcap/libcap_2.22.bb | 6 ----
.../libcap/{libcap.inc => libcap_2.24.bb} | 12 ++++---
3 files changed, 7 insertions(+), 50 deletions(-)
delete mode 100644 meta/recipes-support/libcap/libcap/fix-CAP_LAST_CAP.patch
delete mode 100644 meta/recipes-support/libcap/libcap_2.22.bb
rename meta/recipes-support/libcap/{libcap.inc => libcap_2.24.bb} (80%)
diff --git a/meta/recipes-support/libcap/libcap/fix-CAP_LAST_CAP.patch b/meta/recipes-support/libcap/libcap/fix-CAP_LAST_CAP.patch
deleted file mode 100644
index a557188..0000000
--- a/meta/recipes-support/libcap/libcap/fix-CAP_LAST_CAP.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-fix CAP_LAST_CAP
-
-Upstream-Status: pending
-
-Two new capability CAP_BLOCK_SUSPEND and CAP_WAKE_ALARM have been added into
-kernel, but libcap did not update them.
-Once libcap uses its capability.h (the default value of KERNEL_HEADERS), and
-application always use capability.h from kernel, that will make cap_get_flag
-return wrong value.
-
-Signed-off-by: Roy Li <rongqing.li@windriver.com>
----
- libcap/include/linux/capability.h | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/libcap/include/linux/capability.h b/libcap/include/linux/capability.h
-index 4924f2a..57026be 100644
---- a/libcap/include/linux/capability.h
-+++ b/libcap/include/linux/capability.h
-@@ -360,7 +360,15 @@ struct cpu_vfs_cap_data {
- CAP_SYS_ADMIN is not acceptable anymore. */
- #define CAP_SYSLOG 34
-
--#define CAP_LAST_CAP CAP_SYSLOG
-+/* Allow triggering something that will wake the system */
-+
-+#define CAP_WAKE_ALARM 35
-+
-+/* Allow preventing system suspends */
-+
-+#define CAP_BLOCK_SUSPEND 36
-+
-+#define CAP_LAST_CAP CAP_BLOCK_SUSPEND
-
- #define cap_valid(x) ((x) >= 0 && (x) <= CAP_LAST_CAP)
-
---
-1.7.10.4
-
diff --git a/meta/recipes-support/libcap/libcap_2.22.bb b/meta/recipes-support/libcap/libcap_2.22.bb
deleted file mode 100644
index a989bb6..0000000
--- a/meta/recipes-support/libcap/libcap_2.22.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require libcap.inc
-
-PR = "r6"
-
-SRC_URI[md5sum] = "b4896816b626bea445f0b3849bdd4077"
-SRC_URI[sha256sum] = "e1cae65d8febf2579be37c255d2e058715785ead481a4e6a4357a06aff84721f"
diff --git a/meta/recipes-support/libcap/libcap.inc b/meta/recipes-support/libcap/libcap_2.24.bb
similarity index 80%
rename from meta/recipes-support/libcap/libcap.inc
rename to meta/recipes-support/libcap/libcap_2.24.bb
index 0e28ea0..75cf5d4 100644
--- a/meta/recipes-support/libcap/libcap.inc
+++ b/meta/recipes-support/libcap/libcap_2.24.bb
@@ -7,10 +7,10 @@ LIC_FILES_CHKSUM = "file://License;md5=3f84fd6f29d453a56514cb7e4ead25f1"
DEPENDS = "perl-native-runtime"
-SRC_URI = "${DEBIAN_MIRROR}/main/libc/libcap2/${BPN}2_${PV}.orig.tar.gz \
- file://fix-CAP_LAST_CAP.patch"
+SRC_URI = "${KERNELORG_MIRROR}/linux/libs/security/linux-privs/${BPN}2/${BPN}-${PV}.tar.xz"
-PR = "r1"
+SRC_URI[md5sum] = "d43ab9f680435a7fff35b4ace8d45b80"
+SRC_URI[sha256sum] = "cee4568f78dc851d726fc93f25f4ed91cc223b1fe8259daa4a77158d174e6c65"
inherit lib_package
@@ -56,8 +56,10 @@ do_install_append() {
# Move the library to base_libdir
install -d ${D}${base_libdir}
if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then
- mv ${D}${libdir}/* ${D}${base_libdir}
- rmdir ${D}${libdir}
+ mv ${D}${libdir}/libcap* ${D}${base_libdir}
+ if [ -d ${D}${libdir}/security ]; then
+ mv ${D}${libdir}/security ${D}${base_libdir}
+ fi
fi
}
--
1.8.3.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 02/19] btrfs: Update to 3.17 version
2014-11-07 0:19 [PATCH 00/19] Initial package upgrades for 1.8 Saul Wold
2014-11-07 0:19 ` [PATCH 01/19] libcap: Upgrade to 2.24 Saul Wold
@ 2014-11-07 0:19 ` Saul Wold
2014-11-07 0:19 ` [PATCH 03/19] npth: Upgrade to 1.0 Saul Wold
` (16 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: Saul Wold @ 2014-11-07 0:19 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb
index 0eed13b..ef85057 100644
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb
@@ -12,13 +12,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fcb02dc552a041dee27e4b85c7396067"
SECTION = "base"
DEPENDS = "util-linux attr e2fsprogs lzo acl"
-SRCREV = "24cf4d8c3ee924b474f68514e0167cc2e602a48d"
-SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git \
- file://nodocs.patch"
+SRCREV = "44cdb62d3478c834f41c87ea79d261b9c8982dce"
+SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git"
S = "${WORKDIR}/git"
PV = "3.14.2+git${SRCPV}"
+EXTRA_OEMAKE += "DISABLE_DOCUMENTATION=1"
do_install () {
oe_runmake 'DESTDIR=${D}' install
--
1.8.3.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 03/19] npth: Upgrade to 1.0
2014-11-07 0:19 [PATCH 00/19] Initial package upgrades for 1.8 Saul Wold
2014-11-07 0:19 ` [PATCH 01/19] libcap: Upgrade to 2.24 Saul Wold
2014-11-07 0:19 ` [PATCH 02/19] btrfs: Update to 3.17 version Saul Wold
@ 2014-11-07 0:19 ` Saul Wold
2014-11-07 0:19 ` [PATCH 04/19] liburcu: Ugrade to 0.8.5 Saul Wold
` (15 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: Saul Wold @ 2014-11-07 0:19 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-support/npth/{npth_0.91.bb => npth_1.0.bb} | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
rename meta/recipes-support/npth/{npth_0.91.bb => npth_1.0.bb} (78%)
diff --git a/meta/recipes-support/npth/npth_0.91.bb b/meta/recipes-support/npth/npth_1.0.bb
similarity index 78%
rename from meta/recipes-support/npth/npth_0.91.bb
rename to meta/recipes-support/npth/npth_1.0.bb
index 7105b94..3356ba0 100644
--- a/meta/recipes-support/npth/npth_0.91.bb
+++ b/meta/recipes-support/npth/npth_1.0.bb
@@ -8,8 +8,9 @@ LIC_FILES_CHKSUM = "\
"
SRC_URI = "ftp://ftp.gnupg.org/gcrypt/npth/npth-${PV}.tar.bz2 \
"
-SRC_URI[md5sum] = "87712f0cee656c390b49773923e26e7f"
-SRC_URI[sha256sum] = "caef86ced4a331e162897818a5b924860c8d6003e52da5bdf76da00e8e0dfae1"
+
+SRC_URI[md5sum] = "36869bf10378ea08c155cd5c3580a1dd"
+SRC_URI[sha256sum] = "9ad49de376310effab7fdad69581054b0fa9023d062032d06e73058146c8f76e"
BINCONFIG = "${bindir}/npth-config"
--
1.8.3.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 04/19] liburcu: Ugrade to 0.8.5
2014-11-07 0:19 [PATCH 00/19] Initial package upgrades for 1.8 Saul Wold
` (2 preceding siblings ...)
2014-11-07 0:19 ` [PATCH 03/19] npth: Upgrade to 1.0 Saul Wold
@ 2014-11-07 0:19 ` Saul Wold
2014-11-07 0:19 ` [PATCH 05/19] libgcrypt: Ugrade to 1.6.2 Saul Wold
` (14 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: Saul Wold @ 2014-11-07 0:19 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-support/liburcu/{liburcu_0.8.4.bb => liburcu_0.8.5.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-support/liburcu/{liburcu_0.8.4.bb => liburcu_0.8.5.bb} (83%)
diff --git a/meta/recipes-support/liburcu/liburcu_0.8.4.bb b/meta/recipes-support/liburcu/liburcu_0.8.5.bb
similarity index 83%
rename from meta/recipes-support/liburcu/liburcu_0.8.4.bb
rename to meta/recipes-support/liburcu/liburcu_0.8.5.bb
index 963029e..04c990e 100644
--- a/meta/recipes-support/liburcu/liburcu_0.8.4.bb
+++ b/meta/recipes-support/liburcu/liburcu_0.8.5.bb
@@ -11,8 +11,8 @@ SRC_URI = "http://lttng.org/files/urcu/userspace-rcu-${PV}.tar.bz2 \
file://Revert-Blacklist-ARM-gcc-4.8.0-4.8.1-4.8.2.patch \
"
-SRC_URI[md5sum] = "2ca6671b20a550aa0e8020a1a9a96fd4"
-SRC_URI[sha256sum] = "96c0a157e94a15b1506efe9aedd98145e6eb41a3fbcf5b0d118b7a783b22fe12"
+SRC_URI[md5sum] = "24ba9e03542b747d3378434eb0041acf"
+SRC_URI[sha256sum] = "a2562eaca107ec6eca2856632b6035c6aaf38df79020195ed8955a7b4773312a"
S = "${WORKDIR}/userspace-rcu-${PV}"
CFLAGS_append_libc-uclibc = " -D_GNU_SOURCE"
--
1.8.3.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 05/19] libgcrypt: Ugrade to 1.6.2
2014-11-07 0:19 [PATCH 00/19] Initial package upgrades for 1.8 Saul Wold
` (3 preceding siblings ...)
2014-11-07 0:19 ` [PATCH 04/19] liburcu: Ugrade to 0.8.5 Saul Wold
@ 2014-11-07 0:19 ` Saul Wold
2014-11-07 0:19 ` [PATCH 06/19] libksba: Ugrade to 1.3.1 Saul Wold
` (13 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: Saul Wold @ 2014-11-07 0:19 UTC (permalink / raw)
To: openembedded-core
Remove backported patch
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
...ibgcrypt-1.6.1-make-arm-asm-fPIC-friendly.patch | 169 ---------------------
meta/recipes-support/libgcrypt/libgcrypt_1.6.1.bb | 6 -
meta/recipes-support/libgcrypt/libgcrypt_1.6.2.bb | 4 +
3 files changed, 4 insertions(+), 175 deletions(-)
delete mode 100644 meta/recipes-support/libgcrypt/files/libgcrypt-1.6.1-make-arm-asm-fPIC-friendly.patch
delete mode 100644 meta/recipes-support/libgcrypt/libgcrypt_1.6.1.bb
create mode 100644 meta/recipes-support/libgcrypt/libgcrypt_1.6.2.bb
diff --git a/meta/recipes-support/libgcrypt/files/libgcrypt-1.6.1-make-arm-asm-fPIC-friendly.patch b/meta/recipes-support/libgcrypt/files/libgcrypt-1.6.1-make-arm-asm-fPIC-friendly.patch
deleted file mode 100644
index 3400872..0000000
--- a/meta/recipes-support/libgcrypt/files/libgcrypt-1.6.1-make-arm-asm-fPIC-friendly.patch
+++ /dev/null
@@ -1,169 +0,0 @@
-Fix ARM assembly when building __PIC__
-
-* cipher/camellia-arm.S (GET_DATA_POINTER): New.
-(_gcry_camellia_arm_encrypt_block): Use GET_DATA_POINTER.
-(_gcry_camellia_arm_decrypt_block): Ditto.
-* cipher/cast5-arm.S (GET_DATA_POINTER): New.
-(_gcry_cast5_arm_encrypt_block, _gcry_cast5_arm_decrypt_block)
-(_gcry_cast5_arm_enc_blk2, _gcry_cast5_arm_dec_blk2): Use
-GET_DATA_POINTER.
-* cipher/rijndael-arm.S (GET_DATA_POINTER): New.
-(_gcry_aes_arm_encrypt_block, _gcry_aes_arm_decrypt_block): Use
-GET_DATA_POINTER.
---
-
-Signed-off-by: Jussi Kivilinna <jussi.kivilinna@iki.fi>
-
-Upstream-Status: Backport
-
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
----
- cipher/camellia-arm.S | 17 +++++++++++++++--
- cipher/cast5-arm.S | 21 +++++++++++++++++----
- cipher/rijndael-arm.S | 17 +++++++++++++++--
- 3 files changed, 47 insertions(+), 8 deletions(-)
-
-diff --git a/cipher/camellia-arm.S b/cipher/camellia-arm.S
-index c30d194..cdeaf8b 100644
---- a/cipher/camellia-arm.S
-+++ b/cipher/camellia-arm.S
-@@ -28,6 +28,19 @@
- .syntax unified
- .arm
-
-+#ifdef __PIC__
-+# define GET_DATA_POINTER(reg, name, rtmp) \
-+ ldr reg, 1f; \
-+ ldr rtmp, 2f; \
-+ b 3f; \
-+ 1: .word _GLOBAL_OFFSET_TABLE_-(3f+8); \
-+ 2: .word name(GOT); \
-+ 3: add reg, pc, reg; \
-+ ldr reg, [reg, rtmp];
-+#else
-+# define GET_DATA_POINTER(reg, name, rtmp) ldr reg, =name
-+#endif
-+
- /* struct camellia_ctx: */
- #define key_table 0
-
-@@ -261,7 +274,7 @@ _gcry_camellia_arm_encrypt_block:
- */
- push {%r1, %r4-%r11, %ip, %lr};
-
-- ldr RTAB1, =.Lcamellia_sp1110;
-+ GET_DATA_POINTER(RTAB1, .Lcamellia_sp1110, RTAB3);
- mov RMASK, #0xff;
- add RTAB3, RTAB1, #(2 * 4);
- push {%r3};
-@@ -309,7 +322,7 @@ _gcry_camellia_arm_decrypt_block:
- */
- push {%r1, %r4-%r11, %ip, %lr};
-
-- ldr RTAB1, =.Lcamellia_sp1110;
-+ GET_DATA_POINTER(RTAB1, .Lcamellia_sp1110, RTAB3);
- mov RMASK, #0xff;
- add RTAB3, RTAB1, #(2 * 4);
- mov RMASK, RMASK, lsl#4 /* byte mask */
-diff --git a/cipher/cast5-arm.S b/cipher/cast5-arm.S
-index ce7fa93..db96db4 100644
---- a/cipher/cast5-arm.S
-+++ b/cipher/cast5-arm.S
-@@ -30,6 +30,19 @@
-
- .extern _gcry_cast5_s1to4;
-
-+#ifdef __PIC__
-+# define GET_DATA_POINTER(reg, name, rtmp) \
-+ ldr reg, 1f; \
-+ ldr rtmp, 2f; \
-+ b 3f; \
-+ 1: .word _GLOBAL_OFFSET_TABLE_-(3f+8); \
-+ 2: .word name(GOT); \
-+ 3: add reg, pc, reg; \
-+ ldr reg, [reg, rtmp];
-+#else
-+# define GET_DATA_POINTER(reg, name, rtmp) ldr reg, =name
-+#endif
-+
- /* structure of crypto context */
- #define Km 0
- #define Kr (Km + (16 * 4))
-@@ -260,7 +273,7 @@ _gcry_cast5_arm_encrypt_block:
- */
- push {%r1, %r4-%r11, %ip, %lr};
-
-- ldr Rs1, =_gcry_cast5_s1to4;
-+ GET_DATA_POINTER(Rs1, _gcry_cast5_s1to4, Rs2);
- mov RMASK, #(0xff << 2);
- add Rs2, Rs1, #(0x100*4);
- add Rs3, Rs1, #(0x100*4*2);
-@@ -306,7 +319,7 @@ _gcry_cast5_arm_decrypt_block:
- */
- push {%r1, %r4-%r11, %ip, %lr};
-
-- ldr Rs1, =_gcry_cast5_s1to4;
-+ GET_DATA_POINTER(Rs1, _gcry_cast5_s1to4, Rs2);
- mov RMASK, #(0xff << 2);
- add Rs2, Rs1, #(0x100 * 4);
- add Rs3, Rs1, #(0x100 * 4 * 2);
-@@ -500,7 +513,7 @@ _gcry_cast5_arm_enc_blk2:
- */
- push {%lr};
-
-- ldr Rs1, =_gcry_cast5_s1to4;
-+ GET_DATA_POINTER(Rs1, _gcry_cast5_s1to4, Rs2);
- mov RMASK, #(0xff << 2);
- add Rs2, Rs1, #(0x100 * 4);
-
-@@ -631,7 +644,7 @@ _gcry_cast5_arm_dec_blk2:
- * [RR0, RL0], [RR1, RL1]: dst
- */
-
-- ldr Rs1, =_gcry_cast5_s1to4;
-+ GET_DATA_POINTER(Rs1, _gcry_cast5_s1to4, Rs2);
- mov RMASK, #(0xff << 2);
- add Rs2, Rs1, #(0x100 * 4);
-
-diff --git a/cipher/rijndael-arm.S b/cipher/rijndael-arm.S
-index 22c350c..421c3b4 100644
---- a/cipher/rijndael-arm.S
-+++ b/cipher/rijndael-arm.S
-@@ -28,6 +28,19 @@
- .syntax unified
- .arm
-
-+#ifdef __PIC__
-+# define GET_DATA_POINTER(reg, name, rtmp) \
-+ ldr reg, 1f; \
-+ ldr rtmp, 2f; \
-+ b 3f; \
-+ 1: .word _GLOBAL_OFFSET_TABLE_-(3f+8); \
-+ 2: .word name(GOT); \
-+ 3: add reg, pc, reg; \
-+ ldr reg, [reg, rtmp];
-+#else
-+# define GET_DATA_POINTER(reg, name, rtmp) ldr reg, =name
-+#endif
-+
- /* register macros */
- #define CTX %r0
- #define RTAB %lr
-@@ -249,7 +262,7 @@ _gcry_aes_arm_encrypt_block:
- 2:
- sub %sp, #16;
-
-- ldr RTAB, =.LtableE0;
-+ GET_DATA_POINTER(RTAB, .LtableE0, RMASK);
-
- str %r1, [%sp, #4]; /* dst */
- mov RMASK, #0xff;
-@@ -503,7 +516,7 @@ _gcry_aes_arm_decrypt_block:
- 2:
- sub %sp, #16;
-
-- ldr RTAB, =.LtableD0;
-+ GET_DATA_POINTER(RTAB, .LtableD0, RMASK);
-
- mov RMASK, #0xff;
- str %r1, [%sp, #4]; /* dst */
diff --git a/meta/recipes-support/libgcrypt/libgcrypt_1.6.1.bb b/meta/recipes-support/libgcrypt/libgcrypt_1.6.1.bb
deleted file mode 100644
index 903ed66..0000000
--- a/meta/recipes-support/libgcrypt/libgcrypt_1.6.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require libgcrypt.inc
-
-SRC_URI += "file://libgcrypt-1.6.1-make-arm-asm-fPIC-friendly.patch"
-
-SRC_URI[md5sum] = "d155aa1b06fa879175922ba28f6a6509"
-SRC_URI[sha256sum] = "7c1007197bef49c3b8740cf6af8b4eb4eb74c7a69796ebcf555d928c287255de"
diff --git a/meta/recipes-support/libgcrypt/libgcrypt_1.6.2.bb b/meta/recipes-support/libgcrypt/libgcrypt_1.6.2.bb
new file mode 100644
index 0000000..c49c0e7
--- /dev/null
+++ b/meta/recipes-support/libgcrypt/libgcrypt_1.6.2.bb
@@ -0,0 +1,4 @@
+require libgcrypt.inc
+
+SRC_URI[md5sum] = "d19adc062edff0ebc7e887212733ef1f"
+SRC_URI[sha256sum] = "936921644b9c81e2395e18a554a9a5f9252aae3976f8afc3e4229ee9d785e627"
--
1.8.3.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 06/19] libksba: Ugrade to 1.3.1
2014-11-07 0:19 [PATCH 00/19] Initial package upgrades for 1.8 Saul Wold
` (4 preceding siblings ...)
2014-11-07 0:19 ` [PATCH 05/19] libgcrypt: Ugrade to 1.6.2 Saul Wold
@ 2014-11-07 0:19 ` Saul Wold
2014-11-07 0:19 ` [PATCH 07/19] curl Ugrade to 7.38 Saul Wold
` (12 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: Saul Wold @ 2014-11-07 0:19 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-support/libksba/{libksba_1.3.0.bb => libksba_1.3.1.bb} | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
rename meta/recipes-support/libksba/{libksba_1.3.0.bb => libksba_1.3.1.bb} (85%)
diff --git a/meta/recipes-support/libksba/libksba_1.3.0.bb b/meta/recipes-support/libksba/libksba_1.3.1.bb
similarity index 85%
rename from meta/recipes-support/libksba/libksba_1.3.0.bb
rename to meta/recipes-support/libksba/libksba_1.3.1.bb
index 13ad437..6950dbb 100644
--- a/meta/recipes-support/libksba/libksba_1.3.0.bb
+++ b/meta/recipes-support/libksba/libksba_1.3.1.bb
@@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fd541d83f75d038c4e0617b672ed8bda \
file://COPYING.GPLv3;md5=2f31b266d3440dd7ee50f92cf67d8e6c \
file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
"
-PR = "r1"
DEPENDS = "libgpg-error"
@@ -17,8 +16,8 @@ inherit autotools binconfig-disabled pkgconfig texinfo
SRC_URI = "ftp://ftp.gnupg.org/gcrypt/${BPN}/${BPN}-${PV}.tar.bz2 \
file://ksba-add-pkgconfig-support.patch"
-SRC_URI[md5sum] = "cd86fad9c9d360b2cf80449f8a4a4075"
-SRC_URI[sha256sum] = "5a61eed50550d4d0dcb47457ce7b6a90f8e719d42a3b25f7e79333e8cd721971"
+SRC_URI[md5sum] = "9be95245fcfa9d56f56853078ef2650b"
+SRC_URI[sha256sum] = "bc96b95516bd2b67f413bc8b5cc5a75a2583c6e666d24dfd0d5bcc6b1aab46f9"
do_configure_prepend () {
# Else these could be used in preference to those in aclocal-copy
--
1.8.3.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 07/19] curl Ugrade to 7.38
2014-11-07 0:19 [PATCH 00/19] Initial package upgrades for 1.8 Saul Wold
` (5 preceding siblings ...)
2014-11-07 0:19 ` [PATCH 06/19] libksba: Ugrade to 1.3.1 Saul Wold
@ 2014-11-07 0:19 ` Saul Wold
2014-11-07 0:19 ` [PATCH 08/19] systemtap: Upgrade to 2.6 Git Version Saul Wold
` (11 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: Saul Wold @ 2014-11-07 0:19 UTC (permalink / raw)
To: openembedded-core
Remove backported CVE patches
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-support/curl/curl/CVE-2014-3613.patch | 269 ---------------------
meta/recipes-support/curl/curl/CVE-2014-3620.patch | 69 ------
.../curl/{curl_7.37.1.bb => curl_7.38.0.bb} | 8 +-
3 files changed, 3 insertions(+), 343 deletions(-)
delete mode 100644 meta/recipes-support/curl/curl/CVE-2014-3613.patch
delete mode 100644 meta/recipes-support/curl/curl/CVE-2014-3620.patch
rename meta/recipes-support/curl/{curl_7.37.1.bb => curl_7.38.0.bb} (90%)
diff --git a/meta/recipes-support/curl/curl/CVE-2014-3613.patch b/meta/recipes-support/curl/curl/CVE-2014-3613.patch
deleted file mode 100644
index 3e2fee0..0000000
--- a/meta/recipes-support/curl/curl/CVE-2014-3613.patch
+++ /dev/null
@@ -1,269 +0,0 @@
-From 545e322cc8c383ccdfb4ad85a1634c2b719a1adf Mon Sep 17 00:00:00 2001
-From: Tim Ruehsen <tim.ruehsen@gmx.de>
-Date: Tue, 19 Aug 2014 21:01:28 +0200
-Subject: [PATCH] cookies: only use full host matches for hosts used as IP
- address
-
-By not detecting and rejecting domain names for partial literal IP
-addresses properly when parsing received HTTP cookies, libcurl can be
-fooled to both send cookies to wrong sites and to allow arbitrary sites
-to set cookies for others.
-
-CVE-2014-3613
-
-Bug: http://curl.haxx.se/docs/adv_20140910A.html
-
-Upstream-Status: Backport
-
-Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
----
- lib/cookie.c | 50 ++++++++++++++++++++++++++++++++++++++----------
- tests/data/test1105 | 3 +--
- tests/data/test31 | 55 +++++++++++++++++++++++++++--------------------------
- tests/data/test8 | 3 ++-
- 4 files changed, 71 insertions(+), 40 deletions(-)
-
-diff --git a/lib/cookie.c b/lib/cookie.c
-index 0590643..46904ac 100644
---- a/lib/cookie.c
-+++ b/lib/cookie.c
-@@ -93,10 +93,11 @@ Example set of cookies:
- #include "curl_memory.h"
- #include "share.h"
- #include "strtoofft.h"
- #include "rawstr.h"
- #include "curl_memrchr.h"
-+#include "inet_pton.h"
-
- /* The last #include file should be: */
- #include "memdebug.h"
-
- static void freecookie(struct Cookie *co)
-@@ -317,10 +318,32 @@ static void remove_expired(struct CookieInfo *cookies)
- }
- co = nx;
- }
- }
-
-+/*
-+ * Return true if the given string is an IP(v4|v6) address.
-+ */
-+static bool isip(const char *domain)
-+{
-+ struct in_addr addr;
-+#ifdef ENABLE_IPV6
-+ struct in6_addr addr6;
-+#endif
-+
-+ if(Curl_inet_pton(AF_INET, domain, &addr)
-+#ifdef ENABLE_IPV6
-+ || Curl_inet_pton(AF_INET6, domain, &addr6)
-+#endif
-+ ) {
-+ /* domain name given as IP address */
-+ return TRUE;
-+ }
-+
-+ return FALSE;
-+}
-+
- /****************************************************************************
- *
- * Curl_cookie_add()
- *
- * Add a single cookie line to the cookie keeping object.
-@@ -437,28 +460,31 @@ Curl_cookie_add(struct SessionHandle *data,
- badcookie = TRUE; /* out of memory bad */
- break;
- }
- }
- else if(Curl_raw_equal("domain", name)) {
-+ bool is_ip;
-+
- /* Now, we make sure that our host is within the given domain,
- or the given domain is not valid and thus cannot be set. */
-
- if('.' == whatptr[0])
- whatptr++; /* ignore preceding dot */
-
-- if(!domain || tailmatch(whatptr, domain)) {
-- const char *tailptr=whatptr;
-- if(tailptr[0] == '.')
-- tailptr++;
-- strstore(&co->domain, tailptr); /* don't prefix w/dots
-- internally */
-+ is_ip = isip(domain ? domain : whatptr);
-+
-+ if(!domain
-+ || (is_ip && !strcmp(whatptr, domain))
-+ || (!is_ip && tailmatch(whatptr, domain))) {
-+ strstore(&co->domain, whatptr);
- if(!co->domain) {
- badcookie = TRUE;
- break;
- }
-- co->tailmatch=TRUE; /* we always do that if the domain name was
-- given */
-+ if(!is_ip)
-+ co->tailmatch=TRUE; /* we always do that if the domain name was
-+ given */
- }
- else {
- /* we did not get a tailmatch and then the attempted set domain
- is not a domain to which the current host belongs. Mark as
- bad. */
-@@ -966,17 +992,21 @@ struct Cookie *Curl_cookie_getlist(struct CookieInfo *c,
- struct Cookie *newco;
- struct Cookie *co;
- time_t now = time(NULL);
- struct Cookie *mainco=NULL;
- size_t matches = 0;
-+ bool is_ip;
-
- if(!c || !c->cookies)
- return NULL; /* no cookie struct or no cookies in the struct */
-
- /* at first, remove expired cookies */
- remove_expired(c);
-
-+ /* check if host is an IP(v4|v6) address */
-+ is_ip = isip(host);
-+
- co = c->cookies;
-
- while(co) {
- /* only process this cookie if it is not expired or had no expire
- date AND that if the cookie requires we're secure we must only
-@@ -984,12 +1014,12 @@ struct Cookie *Curl_cookie_getlist(struct CookieInfo *c,
- if((!co->expires || (co->expires > now)) &&
- (co->secure?secure:TRUE)) {
-
- /* now check if the domain is correct */
- if(!co->domain ||
-- (co->tailmatch && tailmatch(co->domain, host)) ||
-- (!co->tailmatch && Curl_raw_equal(host, co->domain)) ) {
-+ (co->tailmatch && !is_ip && tailmatch(co->domain, host)) ||
-+ ((!co->tailmatch || is_ip) && Curl_raw_equal(host, co->domain)) ) {
- /* the right part of the host matches the domain stuff in the
- cookie data */
-
- /* now check the left part of the path with the cookies path
- requirement */
-diff --git a/tests/data/test1105 b/tests/data/test1105
-index 25f194c..9564775 100644
---- a/tests/data/test1105
-+++ b/tests/data/test1105
-@@ -57,10 +57,9 @@ userid=myname&password=mypassword
- # Netscape HTTP Cookie File
- # http://curl.haxx.se/docs/http-cookies.html
- # This file was generated by libcurl! Edit at your own risk.
-
- 127.0.0.1 FALSE /we/want/ FALSE 0 foobar name
--.127.0.0.1 TRUE "/silly/" FALSE 0 mismatch this
--.0.0.1 TRUE / FALSE 0 partmatch present
-+127.0.0.1 FALSE "/silly/" FALSE 0 mismatch this
- </file>
- </verify>
- </testcase>
-diff --git a/tests/data/test31 b/tests/data/test31
-index 38af83b..dfcac04 100644
---- a/tests/data/test31
-+++ b/tests/data/test31
-@@ -49,11 +49,12 @@ Set-Cookie: nodomainnovalue
- Set-Cookie: nodomain=value; expires=Fri Feb 2 11:56:27 GMT 2035
- Set-Cookie: novalue; domain=reallysilly
- Set-Cookie: test=yes; domain=foo.com; expires=Sat Feb 2 11:56:27 GMT 2030
- Set-Cookie: test2=yes; domain=se; expires=Sat Feb 2 11:56:27 GMT 2030
- Set-Cookie: magic=yessir; path=/silly/; HttpOnly
--Set-Cookie: blexp=yesyes; domain=.0.0.1; domain=.0.0.1; expiry=totally bad;
-+Set-Cookie: blexp=yesyes; domain=127.0.0.1; domain=127.0.0.1; expiry=totally bad;
-+Set-Cookie: partialip=nono; domain=.0.0.1;
-
- boo
- </data>
- </reply>
-
-@@ -93,36 +94,36 @@ Accept: */*
- <file name="log/jar31.txt" mode="text">
- # Netscape HTTP Cookie File
- # http://curl.haxx.se/docs/http-cookies.html
- # This file was generated by libcurl! Edit at your own risk.
-
--.127.0.0.1 TRUE /silly/ FALSE 0 ismatch this
--.127.0.0.1 TRUE /overwrite FALSE 0 overwrite this2
--.127.0.0.1 TRUE /secure1/ TRUE 0 sec1value secure1
--.127.0.0.1 TRUE /secure2/ TRUE 0 sec2value secure2
--.127.0.0.1 TRUE /secure3/ TRUE 0 sec3value secure3
--.127.0.0.1 TRUE /secure4/ TRUE 0 sec4value secure4
--.127.0.0.1 TRUE /secure5/ TRUE 0 sec5value secure5
--.127.0.0.1 TRUE /secure6/ TRUE 0 sec6value secure6
--.127.0.0.1 TRUE /secure7/ TRUE 0 sec7value secure7
--.127.0.0.1 TRUE /secure8/ TRUE 0 sec8value secure8
--.127.0.0.1 TRUE /secure9/ TRUE 0 secure very1
--#HttpOnly_.127.0.0.1 TRUE /p1/ FALSE 0 httpo1 value1
--#HttpOnly_.127.0.0.1 TRUE /p2/ FALSE 0 httpo2 value2
--#HttpOnly_.127.0.0.1 TRUE /p3/ FALSE 0 httpo3 value3
--#HttpOnly_.127.0.0.1 TRUE /p4/ FALSE 0 httpo4 value4
--#HttpOnly_.127.0.0.1 TRUE /p4/ FALSE 0 httponly myvalue1
--#HttpOnly_.127.0.0.1 TRUE /p4/ TRUE 0 httpandsec myvalue2
--#HttpOnly_.127.0.0.1 TRUE /p4/ TRUE 0 httpandsec2 myvalue3
--#HttpOnly_.127.0.0.1 TRUE /p4/ TRUE 0 httpandsec3 myvalue4
--#HttpOnly_.127.0.0.1 TRUE /p4/ TRUE 0 httpandsec4 myvalue5
--#HttpOnly_.127.0.0.1 TRUE /p4/ TRUE 0 httpandsec5 myvalue6
--#HttpOnly_.127.0.0.1 TRUE /p4/ TRUE 0 httpandsec6 myvalue7
--#HttpOnly_.127.0.0.1 TRUE /p4/ TRUE 0 httpandsec7 myvalue8
--#HttpOnly_.127.0.0.1 TRUE /p4/ TRUE 0 httpandsec8 myvalue9
--.127.0.0.1 TRUE / FALSE 0 partmatch present
-+127.0.0.1 FALSE /silly/ FALSE 0 ismatch this
-+127.0.0.1 FALSE /overwrite FALSE 0 overwrite this2
-+127.0.0.1 FALSE /secure1/ TRUE 0 sec1value secure1
-+127.0.0.1 FALSE /secure2/ TRUE 0 sec2value secure2
-+127.0.0.1 FALSE /secure3/ TRUE 0 sec3value secure3
-+127.0.0.1 FALSE /secure4/ TRUE 0 sec4value secure4
-+127.0.0.1 FALSE /secure5/ TRUE 0 sec5value secure5
-+127.0.0.1 FALSE /secure6/ TRUE 0 sec6value secure6
-+127.0.0.1 FALSE /secure7/ TRUE 0 sec7value secure7
-+127.0.0.1 FALSE /secure8/ TRUE 0 sec8value secure8
-+127.0.0.1 FALSE /secure9/ TRUE 0 secure very1
-+#HttpOnly_127.0.0.1 FALSE /p1/ FALSE 0 httpo1 value1
-+#HttpOnly_127.0.0.1 FALSE /p2/ FALSE 0 httpo2 value2
-+#HttpOnly_127.0.0.1 FALSE /p3/ FALSE 0 httpo3 value3
-+#HttpOnly_127.0.0.1 FALSE /p4/ FALSE 0 httpo4 value4
-+#HttpOnly_127.0.0.1 FALSE /p4/ FALSE 0 httponly myvalue1
-+#HttpOnly_127.0.0.1 FALSE /p4/ TRUE 0 httpandsec myvalue2
-+#HttpOnly_127.0.0.1 FALSE /p4/ TRUE 0 httpandsec2 myvalue3
-+#HttpOnly_127.0.0.1 FALSE /p4/ TRUE 0 httpandsec3 myvalue4
-+#HttpOnly_127.0.0.1 FALSE /p4/ TRUE 0 httpandsec4 myvalue5
-+#HttpOnly_127.0.0.1 FALSE /p4/ TRUE 0 httpandsec5 myvalue6
-+#HttpOnly_127.0.0.1 FALSE /p4/ TRUE 0 httpandsec6 myvalue7
-+#HttpOnly_127.0.0.1 FALSE /p4/ TRUE 0 httpandsec7 myvalue8
-+#HttpOnly_127.0.0.1 FALSE /p4/ TRUE 0 httpandsec8 myvalue9
-+127.0.0.1 FALSE / FALSE 0 partmatch present
- 127.0.0.1 FALSE /we/want/ FALSE 2054030187 nodomain value
- #HttpOnly_127.0.0.1 FALSE /silly/ FALSE 0 magic yessir
--.0.0.1 TRUE /we/want/ FALSE 0 blexp yesyes
-+127.0.0.1 FALSE /we/want/ FALSE 0 blexp yesyes
- </file>
- </verify>
- </testcase>
-diff --git a/tests/data/test8 b/tests/data/test8
-index 4d54541..030fd55 100644
---- a/tests/data/test8
-+++ b/tests/data/test8
-@@ -40,11 +40,12 @@ Set-Cookie: mismatch=this; domain=%HOSTIP; path="/silly/";
- Set-Cookie: partmatch=present; domain=.0.0.1; path=/w;
- Set-Cookie: duplicate=test; domain=.0.0.1; domain=.0.0.1; path=/donkey;
- Set-Cookie: cookie=yes; path=/we;
- Set-Cookie: cookie=perhaps; path=/we/want;
- Set-Cookie: nocookie=yes; path=/WE;
--Set-Cookie: blexp=yesyes; domain=.0.0.1; domain=.0.0.1; expiry=totally bad;
-+Set-Cookie: blexp=yesyes; domain=%HOSTIP; domain=%HOSTIP; expiry=totally bad;
-+Set-Cookie: partialip=nono; domain=.0.0.1;
-
- </file>
- <precheck>
- perl -e 'if ("%HOSTIP" !~ /\.0\.0\.1$/) {print "Test only works for HOSTIPs ending with .0.0.1"; exit(1)}'
- </precheck>
---
-2.1.0
-
diff --git a/meta/recipes-support/curl/curl/CVE-2014-3620.patch b/meta/recipes-support/curl/curl/CVE-2014-3620.patch
deleted file mode 100644
index d11f190..0000000
--- a/meta/recipes-support/curl/curl/CVE-2014-3620.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From fd7ae600adf23a9a1ed619165c5058bdec216e9c Mon Sep 17 00:00:00 2001
-From: Daniel Stenberg <daniel@haxx.se>
-Date: Tue, 19 Aug 2014 21:11:20 +0200
-Subject: [PATCH] cookies: reject incoming cookies set for TLDs
-
-Test 61 was modified to verify this.
-
-CVE-2014-3620
-
-Reported-by: Tim Ruehsen
-URL: http://curl.haxx.se/docs/adv_20140910B.html
-
-Upstream-Status: Backport
-
-Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
----
- lib/cookie.c | 6 ++++++
- tests/data/test61 | 1 +
- 2 files changed, 7 insertions(+)
-
-diff --git a/lib/cookie.c b/lib/cookie.c
-index 46904ac..375485f 100644
---- a/lib/cookie.c
-+++ b/lib/cookie.c
-@@ -461,19 +461,25 @@ Curl_cookie_add(struct SessionHandle *data,
- break;
- }
- }
- else if(Curl_raw_equal("domain", name)) {
- bool is_ip;
-+ const char *dotp;
-
- /* Now, we make sure that our host is within the given domain,
- or the given domain is not valid and thus cannot be set. */
-
- if('.' == whatptr[0])
- whatptr++; /* ignore preceding dot */
-
- is_ip = isip(domain ? domain : whatptr);
-
-+ /* check for more dots */
-+ dotp = strchr(whatptr, '.');
-+ if(!dotp)
-+ domain=":";
-+
- if(!domain
- || (is_ip && !strcmp(whatptr, domain))
- || (!is_ip && tailmatch(whatptr, domain))) {
- strstore(&co->domain, whatptr);
- if(!co->domain) {
-diff --git a/tests/data/test61 b/tests/data/test61
-index d2de279..e6dbbb9 100644
---- a/tests/data/test61
-+++ b/tests/data/test61
-@@ -21,10 +21,11 @@ Set-Cookie: test=yes; httponly; domain=foo.com; expires=Fri Feb 2 11:56:27 GMT 2
- SET-COOKIE: test2=yes; domain=host.foo.com; expires=Fri Feb 2 11:56:27 GMT 2035
- Set-Cookie: test3=maybe; domain=foo.com; path=/moo; secure
- Set-Cookie: test4=no; domain=nope.foo.com; path=/moo; secure
- Set-Cookie: test5=name; domain=anything.com; path=/ ; secure
- Set-Cookie: fake=fooledyou; domain=..com; path=/;
-+Set-Cookie: supercookie=fooledyou; domain=.com; path=/;^M
- Content-Length: 4
-
- boo
- </data>
- </reply>
---
-2.1.0
-
diff --git a/meta/recipes-support/curl/curl_7.37.1.bb b/meta/recipes-support/curl/curl_7.38.0.bb
similarity index 90%
rename from meta/recipes-support/curl/curl_7.37.1.bb
rename to meta/recipes-support/curl/curl_7.38.0.bb
index 8b854d7..85bd3be 100644
--- a/meta/recipes-support/curl/curl_7.37.1.bb
+++ b/meta/recipes-support/curl/curl_7.38.0.bb
@@ -7,17 +7,15 @@ LIC_FILES_CHKSUM = "file://COPYING;beginline=7;md5=3a34942f4ae3fbf1a303160714e66
SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
file://pkgconfig_fix.patch \
- file://CVE-2014-3613.patch \
- file://CVE-2014-3620.patch \
-"
+ "
# curl likes to set -g0 in CFLAGS, so we stop it
# from mucking around with debug options
#
SRC_URI += " file://configure_ac.patch"
-SRC_URI[md5sum] = "95c627abcf6494f5abe55effe7cd6a57"
-SRC_URI[sha256sum] = "c3ef3cd148f3778ddbefb344117d7829db60656efe1031f9e3065fc0faa25136"
+SRC_URI[md5sum] = "af6b3c299bd891f43cb5f76c4091b7b4"
+SRC_URI[sha256sum] = "035bd41e99aa1a4e64713f4cea5ccdf366ca8199e9be1b53d5a043d5165f9eba"
inherit autotools pkgconfig binconfig multilib_header
--
1.8.3.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 08/19] systemtap: Upgrade to 2.6 Git Version
2014-11-07 0:19 [PATCH 00/19] Initial package upgrades for 1.8 Saul Wold
` (6 preceding siblings ...)
2014-11-07 0:19 ` [PATCH 07/19] curl Ugrade to 7.38 Saul Wold
@ 2014-11-07 0:19 ` Saul Wold
2014-11-07 0:19 ` [PATCH 09/19] babeltrace: Upgrade to 1.2.3 Saul Wold
` (10 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: Saul Wold @ 2014-11-07 0:19 UTC (permalink / raw)
To: openembedded-core
Remove backported patch
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../systemtap/tapset-linux-sendfile-syscall.patch | 22 ----------------------
meta/recipes-kernel/systemtap/systemtap_git.inc | 5 ++---
2 files changed, 2 insertions(+), 25 deletions(-)
delete mode 100644 meta/recipes-kernel/systemtap/systemtap/tapset-linux-sendfile-syscall.patch
diff --git a/meta/recipes-kernel/systemtap/systemtap/tapset-linux-sendfile-syscall.patch b/meta/recipes-kernel/systemtap/systemtap/tapset-linux-sendfile-syscall.patch
deleted file mode 100644
index f945760..0000000
--- a/meta/recipes-kernel/systemtap/systemtap/tapset-linux-sendfile-syscall.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-systemtap: Fixed probe syscall.sendfile failure
-
-compat_sendfile syscall is unavailable in kernels starting version 3.8.
-Hence systemtap scripts like 'probe syscall.* { if (target()==pid()) log(name." ".argstr) }' fail.
-This problem is solved by marking __syscall.compat_sendfile as optional in tapset/linux/syscalls2.stp
-
-Upstream-Status: Pending
-
-Signed-off-by: Mikhail Durnev <mikhail_durnev@mentor.com>
-
-diff -Naur old/tapset/linux/syscalls2.stp new/tapset/linux/syscalls2.stp
---- old/tapset/linux/syscalls2.stp 2014-04-21 01:28:41.000000000 -0500
-+++ new/tapset/linux/syscalls2.stp 2014-04-21 01:38:14.961233914 -0500
-@@ -1953,7 +1953,7 @@
- # COMPAT_SYSCALL_DEFINE4(sendfile64, int, out_fd, int, in_fd,
- # compat_loff_t __user *, offset, compat_size_t, count)
- #
--probe syscall.sendfile = __syscall.sendfile, __syscall.compat_sendfile
-+probe syscall.sendfile = __syscall.sendfile, __syscall.compat_sendfile ?
- {
- name = "sendfile"
- out_fd = __int32($out_fd)
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/meta/recipes-kernel/systemtap/systemtap_git.inc
index f81e8ba..f9a19d9 100644
--- a/meta/recipes-kernel/systemtap/systemtap_git.inc
+++ b/meta/recipes-kernel/systemtap/systemtap_git.inc
@@ -1,13 +1,12 @@
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-SRCREV = "8f0fcd995f7f650a2ee0a94539f90c99e6d19e1d"
-PV = "2.5+git${SRCPV}"
+SRCREV = "7682e51d2e11a35b2977ba9a85ab42f326b8ff8f"
+PV = "2.6+git${SRCPV}"
SRC_URI = "git://sourceware.org/git/systemtap.git \
file://docproc-build-fix.patch \
file://obsolete_automake_macros.patch \
file://system_map_location.patch \
- file://tapset-linux-sendfile-syscall.patch \
file://configure-allow-to-disable-libvirt.patch \
"
--
1.8.3.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 09/19] babeltrace: Upgrade to 1.2.3
2014-11-07 0:19 [PATCH 00/19] Initial package upgrades for 1.8 Saul Wold
` (7 preceding siblings ...)
2014-11-07 0:19 ` [PATCH 08/19] systemtap: Upgrade to 2.6 Git Version Saul Wold
@ 2014-11-07 0:19 ` Saul Wold
2014-11-07 0:19 ` [PATCH 10/19] libxkbcommon: Upgrade to 0.5.0 Saul Wold
` (9 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: Saul Wold @ 2014-11-07 0:19 UTC (permalink / raw)
To: openembedded-core
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=y, Size: 4876 bytes --]
Remove backported patches
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
...-Support-out-of-tree-builds-in-babeltrace.patch | 17 -------
...uffers-from-objstack_alloc-on-sizeof-void.patch | 54 ----------------------
.../{babeltrace_1.2.1.bb => babeltrace_1.2.3.bb} | 9 ++--
3 files changed, 3 insertions(+), 77 deletions(-)
delete mode 100644 meta/recipes-kernel/lttng/babeltrace/0001-Fix-Support-out-of-tree-builds-in-babeltrace.patch
delete mode 100644 meta/recipes-kernel/lttng/babeltrace/Fix-Align-buffers-from-objstack_alloc-on-sizeof-void.patch
rename meta/recipes-kernel/lttng/{babeltrace_1.2.1.bb => babeltrace_1.2.3.bb} (73%)
diff --git a/meta/recipes-kernel/lttng/babeltrace/0001-Fix-Support-out-of-tree-builds-in-babeltrace.patch b/meta/recipes-kernel/lttng/babeltrace/0001-Fix-Support-out-of-tree-builds-in-babeltrace.patch
deleted file mode 100644
index 258eedd..0000000
--- a/meta/recipes-kernel/lttng/babeltrace/0001-Fix-Support-out-of-tree-builds-in-babeltrace.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Upstream-Status: backport
-
-babeltrace: Fix support out of tree builds in babeltrace
-
-Signed-off-by: Lars Persson <larper@axis.com>
-
-diff --git a/formats/lttng-live/Makefile.am b/formats/lttng-live/Makefile.am
-index c834699..2c6b0bd 100644
---- a/formats/lttng-live/Makefile.am
-+++ b/formats/lttng-live/Makefile.am
-@@ -1,4 +1,4 @@
--AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -I$(top_builddir)/include
-+AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)
-
- lib_LTLIBRARIES = libbabeltrace-lttng-live.la
-
-
diff --git a/meta/recipes-kernel/lttng/babeltrace/Fix-Align-buffers-from-objstack_alloc-on-sizeof-void.patch b/meta/recipes-kernel/lttng/babeltrace/Fix-Align-buffers-from-objstack_alloc-on-sizeof-void.patch
deleted file mode 100644
index 8e81d2d..0000000
--- a/meta/recipes-kernel/lttng/babeltrace/Fix-Align-buffers-from-objstack_alloc-on-sizeof-void.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From cae67efbd9ddf2cee6bbefec076dc8933ababc43 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fredrik=20Markstr=C3=B6m?= <fredrik.markstrom@gmail.com>
-Date: Fri, 16 May 2014 10:10:38 +0800
-Subject: [PATCH] Fix: Align buffers from objstack_alloc on sizeof(void *)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Backport
-
-The buffers from objstack_alloc will store pointers, so they must
-be aligned on a pointer's size, or else it will cause issues on the
-CPUs which do not support unaligned addresses access.
-
-Signed-off-by: Fredrik Markstrom <fredrik.markstrom@gmail.com>
-Signed-off-by: Roy Li <rongqing.li@windriver.com>
-Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
----
- formats/ctf/metadata/objstack.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/formats/ctf/metadata/objstack.c b/formats/ctf/metadata/objstack.c
-index 9e264a4..14d9252 100644
---- a/formats/ctf/metadata/objstack.c
-+++ b/formats/ctf/metadata/objstack.c
-@@ -27,6 +27,7 @@
- #include <stdlib.h>
- #include <babeltrace/list.h>
- #include <babeltrace/babeltrace-internal.h>
-+#include <babeltrace/align.h>
-
- #define OBJSTACK_INIT_LEN 128
- #define OBJSTACK_POISON 0xcc
-@@ -39,7 +40,7 @@ struct objstack_node {
- struct bt_list_head node;
- size_t len;
- size_t used_len;
-- char data[];
-+ char __attribute__ ((aligned (sizeof(void *)))) data[];
- };
-
- BT_HIDDEN
-@@ -118,6 +119,8 @@ void *objstack_alloc(struct objstack *objstack, size_t len)
- struct objstack_node *last_node;
- void *p;
-
-+ len = ALIGN(len, sizeof(void *));
-+
- /* Get last node */
- last_node = bt_list_entry(objstack->head.prev,
- struct objstack_node, node);
---
-1.7.10.4
-
diff --git a/meta/recipes-kernel/lttng/babeltrace_1.2.1.bb b/meta/recipes-kernel/lttng/babeltrace_1.2.3.bb
similarity index 73%
rename from meta/recipes-kernel/lttng/babeltrace_1.2.1.bb
rename to meta/recipes-kernel/lttng/babeltrace_1.2.3.bb
index dd9961c..c62589c 100644
--- a/meta/recipes-kernel/lttng/babeltrace_1.2.1.bb
+++ b/meta/recipes-kernel/lttng/babeltrace_1.2.3.bb
@@ -10,13 +10,10 @@ inherit autotools pkgconfig
DEPENDS = "glib-2.0 util-linux popt bison-native flex-native"
-SRCREV = "66c2a20b4391fb5c7f870aeb0dde854f0ae1fc79"
-PV = "1.2.1+git${SRCPV}"
+SRCREV = "753a40ead9fa4f6bd5e29d5765e2021122df9c1c"
+PV = "1.2.3+git${SRCPV}"
-SRC_URI = "git://git.efficios.com/babeltrace.git;branch=stable-1.2 \
- file://0001-Fix-Support-out-of-tree-builds-in-babeltrace.patch \
- file://Fix-Align-buffers-from-objstack_alloc-on-sizeof-void.patch \
-"
+SRC_URI = "git://git.efficios.com/babeltrace.git;branch=stable-1.2"
S = "${WORKDIR}/git"
--
1.8.3.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 10/19] libxkbcommon: Upgrade to 0.5.0
2014-11-07 0:19 [PATCH 00/19] Initial package upgrades for 1.8 Saul Wold
` (8 preceding siblings ...)
2014-11-07 0:19 ` [PATCH 09/19] babeltrace: Upgrade to 1.2.3 Saul Wold
@ 2014-11-07 0:19 ` Saul Wold
2014-11-07 0:19 ` [PATCH 11/19] resolvconf: Upgrade to 1.76 Saul Wold
` (8 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: Saul Wold @ 2014-11-07 0:19 UTC (permalink / raw)
To: openembedded-core
COPYING has additional MIT section
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../xorg-lib/{libxkbcommon_0.4.3.bb => libxkbcommon_0.5.0.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-graphics/xorg-lib/{libxkbcommon_0.4.3.bb => libxkbcommon_0.5.0.bb} (73%)
diff --git a/meta/recipes-graphics/xorg-lib/libxkbcommon_0.4.3.bb b/meta/recipes-graphics/xorg-lib/libxkbcommon_0.5.0.bb
similarity index 73%
rename from meta/recipes-graphics/xorg-lib/libxkbcommon_0.4.3.bb
rename to meta/recipes-graphics/xorg-lib/libxkbcommon_0.5.0.bb
index 0dd2956..a166b57 100644
--- a/meta/recipes-graphics/xorg-lib/libxkbcommon_0.4.3.bb
+++ b/meta/recipes-graphics/xorg-lib/libxkbcommon_0.5.0.bb
@@ -2,15 +2,15 @@ SUMMARY = "Generic XKB keymap library"
DESCRIPTION = "libxkbcommon is a keymap compiler and support library which \
processes a reduced subset of keymaps as defined by the XKB specification."
HOMEPAGE = "http://www.xkbcommon.org"
-LIC_FILES_CHKSUM = "file://COPYING;md5=9c0b824e72a22f9d2c40b9c93b1f0ddc"
+LIC_FILES_CHKSUM = "file://COPYING;md5=09457b156e3155972abebcaaaa0cb434"
LICENSE = "MIT & MIT-style"
DEPENDS = "util-macros flex-native bison-native"
SRC_URI = "http://xkbcommon.org/download/${BPN}-${PV}.tar.xz"
-SRC_URI[md5sum] = "26c57ff21438ed45de2a4ca609177db9"
-SRC_URI[sha256sum] = "9a52d5d0419e76c49c0ece86208c205ffacb1cf0ff8ffbaba98d3d4dd40c4e41"
+SRC_URI[md5sum] = "2e1faeafcc609c30af3a561a91e84158"
+SRC_URI[sha256sum] = "90bd7824742b9a6f52a6cf80e2cadd6f5349cf600a358d08260772615b89d19c"
inherit autotools pkgconfig
--
1.8.3.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 11/19] resolvconf: Upgrade to 1.76
2014-11-07 0:19 [PATCH 00/19] Initial package upgrades for 1.8 Saul Wold
` (9 preceding siblings ...)
2014-11-07 0:19 ` [PATCH 10/19] libxkbcommon: Upgrade to 0.5.0 Saul Wold
@ 2014-11-07 0:19 ` Saul Wold
2014-11-07 0:19 ` [PATCH 12/19] at: Upgrade to 3.1.16 Saul Wold
` (7 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: Saul Wold @ 2014-11-07 0:19 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../resolvconf/{resolvconf_1.75.bb => resolvconf_1.76.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-connectivity/resolvconf/{resolvconf_1.75.bb => resolvconf_1.76.bb} (92%)
diff --git a/meta/recipes-connectivity/resolvconf/resolvconf_1.75.bb b/meta/recipes-connectivity/resolvconf/resolvconf_1.76.bb
similarity index 92%
rename from meta/recipes-connectivity/resolvconf/resolvconf_1.75.bb
rename to meta/recipes-connectivity/resolvconf/resolvconf_1.76.bb
index 7310c83..eb29a2a 100644
--- a/meta/recipes-connectivity/resolvconf/resolvconf_1.75.bb
+++ b/meta/recipes-connectivity/resolvconf/resolvconf_1.76.bb
@@ -13,8 +13,8 @@ RDEPENDS_${PN} = "bash"
SRC_URI = "${DEBIAN_MIRROR}/main/r/resolvconf/resolvconf_${PV}.tar.xz"
-SRC_URI[md5sum] = "4b8bc86a3cf070e3fd0e9aff7eaaba56"
-SRC_URI[sha256sum] = "16167f37a77ef4bc4596dcbefece269b6a10d10fa448594ec55ed3303193086e"
+SRC_URI[md5sum] = "d78ce30ea068999cd3e0523300b27255"
+SRC_URI[sha256sum] = "c9f40f7405b37399ddbf29ca4205b4911ee35cb9ffd9be7671faa2385b1fa573"
inherit allarch
--
1.8.3.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 12/19] at: Upgrade to 3.1.16
2014-11-07 0:19 [PATCH 00/19] Initial package upgrades for 1.8 Saul Wold
` (10 preceding siblings ...)
2014-11-07 0:19 ` [PATCH 11/19] resolvconf: Upgrade to 1.76 Saul Wold
@ 2014-11-07 0:19 ` Saul Wold
2014-11-07 0:19 ` [PATCH 13/19] cups: Upgrade to 2.0.0 Saul Wold
` (6 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: Saul Wold @ 2014-11-07 0:19 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-extended/at/{at_3.1.15.bb => at_3.1.16.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-extended/at/{at_3.1.15.bb => at_3.1.16.bb} (93%)
diff --git a/meta/recipes-extended/at/at_3.1.15.bb b/meta/recipes-extended/at/at_3.1.16.bb
similarity index 93%
rename from meta/recipes-extended/at/at_3.1.15.bb
rename to meta/recipes-extended/at/at_3.1.16.bb
index 0c37d6d..f16edba 100644
--- a/meta/recipes-extended/at/at_3.1.15.bb
+++ b/meta/recipes-extended/at/at_3.1.16.bb
@@ -27,8 +27,8 @@ SRC_URI = "${DEBIAN_MIRROR}/main/a/at/at_${PV}.orig.tar.gz \
PAM_SRC_URI = "file://pam.conf.patch \
file://configure-add-enable-pam.patch"
-SRC_URI[md5sum] = "f0f96db22e3a174b53ce4beeeb848839"
-SRC_URI[sha256sum] = "03a84f5293d5a95ef4231b7faf5578f141f0c76a2b304dd655bc7e90e97bf7fc"
+SRC_URI[md5sum] = "d05da75d9b75d93917ffb16ab48b1e19"
+SRC_URI[sha256sum] = "cb9af59c6a54edce9536ba629841055409d1f89d8ae26494727a97141fb4d5c1"
EXTRA_OECONF += "ac_cv_path_SENDMAIL=/bin/true \
--with-daemon_username=root \
--
1.8.3.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 13/19] cups: Upgrade to 2.0.0
2014-11-07 0:19 [PATCH 00/19] Initial package upgrades for 1.8 Saul Wold
` (11 preceding siblings ...)
2014-11-07 0:19 ` [PATCH 12/19] at: Upgrade to 3.1.16 Saul Wold
@ 2014-11-07 0:19 ` Saul Wold
2014-11-07 0:19 ` [PATCH 14/19] help2man: Upgrade to 1.46.4 Saul Wold
` (5 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: Saul Wold @ 2014-11-07 0:19 UTC (permalink / raw)
To: openembedded-core
Remove backported patch and rebase gcrypt patch
Licence change updates the date and removes the OpenSSL exception
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-extended/cups/cups.inc | 1 -
.../0001-don-t-try-to-run-generated-binaries.patch | 35 ++++++++--------
.../cups/cups/cups-no-gcrypt.patch | 49 ----------------------
meta/recipes-extended/cups/cups_1.7.5.bb | 6 ---
meta/recipes-extended/cups/cups_2.0.0.bb | 6 +++
5 files changed, 23 insertions(+), 74 deletions(-)
delete mode 100644 meta/recipes-extended/cups/cups/cups-no-gcrypt.patch
delete mode 100644 meta/recipes-extended/cups/cups_1.7.5.bb
create mode 100644 meta/recipes-extended/cups/cups_2.0.0.bb
diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc
index fbdc48e..70041c3 100644
--- a/meta/recipes-extended/cups/cups.inc
+++ b/meta/recipes-extended/cups/cups.inc
@@ -7,7 +7,6 @@ SRC_URI = "http://www.cups.org/software/${PV}/${BP}-source.tar.bz2 \
file://use_echo_only_in_init.patch \
file://0001-don-t-try-to-run-generated-binaries.patch \
file://cups_serverbin.patch \
- file://cups-no-gcrypt.patch \
file://cups.socket \
file://cups.path \
file://cups.service \
diff --git a/meta/recipes-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch b/meta/recipes-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch
index e6544b5..5379eb6 100644
--- a/meta/recipes-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch
+++ b/meta/recipes-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch
@@ -10,13 +10,13 @@ Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
ppdc/Makefile | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
-diff --git a/ppdc/Makefile b/ppdc/Makefile
-index 0288d47..fc87f1b 100644
---- a/ppdc/Makefile
-+++ b/ppdc/Makefile
-@@ -243,8 +243,8 @@ genstrings: genstrings.o libcupsppdc.a ../cups/libcups.a \
+Index: cups-2.0.0/ppdc/Makefile
+===================================================================
+--- cups-2.0.0.orig/ppdc/Makefile
++++ cups-2.0.0/ppdc/Makefile
+@@ -242,8 +242,8 @@ genstrings: genstrings.o libcupsppdc.a
$(CXX) $(ARCHFLAGS) $(LDFLAGS) -o genstrings genstrings.o \
- libcupsppdc.a ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) \
+ libcupsppdc.a ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) \
$(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
- echo Generating localization strings...
- ./genstrings >sample.c
@@ -25,9 +25,9 @@ index 0288d47..fc87f1b 100644
#
-@@ -261,9 +261,9 @@ ppdc-static: ppdc.o libcupsppdc.a ../cups/libcups.a foo.drv foo-fr.po
+@@ -260,9 +260,9 @@ ppdc-static: ppdc.o libcupsppdc.a ../cu
$(CXX) $(ARCHFLAGS) $(LDFLAGS) -o ppdc-static ppdc.o libcupsppdc.a \
- ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
+ ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
$(COMMONLIBS) $(LIBZ)
- echo Testing PPD compiler...
- ./ppdc-static -l en,fr -I ../data foo.drv
@@ -38,24 +38,26 @@ index 0288d47..fc87f1b 100644
#
-@@ -290,16 +290,16 @@ ppdi-static: ppdc-static ppdi.o libcupsppdc.a ../cups/libcups.a
- ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
+@@ -288,17 +288,17 @@ ppdi-static: ppdc-static ppdi.o libcups
+ $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o ppdi-static ppdi.o libcupsppdc.a \
+ ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
$(COMMONLIBS) $(LIBZ)
- echo Testing PPD importer...
+- echo Testing PPD importer...
- $(RM) -r ppd ppd2 sample-import.drv
-- ./ppdc-static -I ../data sample.drv
+- ./ppdc-static -l en -I ../data sample.drv
- ./ppdi-static -I ../data -o sample-import.drv ppd/*
-- ./ppdc-static -I ../data -d ppd2 sample-import.drv
+- ./ppdc-static -l en -I ../data -d ppd2 sample-import.drv
- if diff -r ppd ppd2 >/dev/null; then \
- echo PPD import OK; \
- else \
- echo PPD import FAILED; \
- exit 1; \
- fi
++# echo Testing PPD importer...
+# $(RM) -r ppd ppd2 sample-import.drv
-+# ./ppdc-static -I ../data sample.drv
++# ./ppdc-static -l en -I ../data sample.drv
+# ./ppdi-static -I ../data -o sample-import.drv ppd/*
-+# ./ppdc-static -I ../data -d ppd2 sample-import.drv
++# ./ppdc-static -l en -I ../data -d ppd2 sample-import.drv
+# if diff -r ppd ppd2 >/dev/null; then \
+# echo PPD import OK; \
+# else \
@@ -65,6 +67,3 @@ index 0288d47..fc87f1b 100644
#
---
-1.6.6.1
-
diff --git a/meta/recipes-extended/cups/cups/cups-no-gcrypt.patch b/meta/recipes-extended/cups/cups/cups-no-gcrypt.patch
deleted file mode 100644
index 8bbcf39..0000000
--- a/meta/recipes-extended/cups/cups/cups-no-gcrypt.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Description: Don't build-depend on libgcrypt, as nothing is used from it
-Author: Didier Raboud <odyx@debian.org>
-Bug-Debian: https://bugs.debian.org/638416
-Bug: http://www.cups.org/str.php?L????
-
-[CUPS Ticket #4399] -- http://www.cups.org/str.php?L4399
-
-Backported from http://www.cups.org/strfiles.php/3308/cups-no-gcrypt.patch
-
-Upstream-Status: Backport
-
-Signed-off-by: Armin Kuster <akuster@mvista.com>
-
-Last-Update: 2014-04-07
---- a/config-scripts/cups-ssl.m4
-+++ b/config-scripts/cups-ssl.m4
-@@ -66,7 +66,6 @@
- dnl Then look for GNU TLS...
- if test $have_ssl = 0 -a "x$enable_gnutls" != "xno" -a "x$PKGCONFIG" != x; then
- AC_PATH_PROG(LIBGNUTLSCONFIG,libgnutls-config)
-- AC_PATH_PROG(LIBGCRYPTCONFIG,libgcrypt-config)
- if $PKGCONFIG --exists gnutls; then
- have_ssl=1
- SSLLIBS=`$PKGCONFIG --libs gnutls`
-@@ -84,14 +83,6 @@
- if test $have_ssl = 1; then
- CUPS_SERVERCERT="ssl/server.crt"
- CUPS_SERVERKEY="ssl/server.key"
--
-- if $PKGCONFIG --exists gcrypt; then
-- SSLLIBS="$SSLLIBS `$PKGCONFIG --libs gcrypt`"
-- SSLFLAGS="$SSLFLAGS `$PKGCONFIG --cflags gcrypt`"
-- elif test "x$LIBGCRYPTCONFIG" != x; then
-- SSLLIBS="$SSLLIBS `$LIBGCRYPTCONFIG --libs`"
-- SSLFLAGS="$SSLFLAGS `$LIBGCRYPTCONFIG --cflags`"
-- fi
- fi
- fi
-
---- a/cups/http-private.h
-+++ b/cups/http-private.h
-@@ -80,7 +80,6 @@
- # elif defined HAVE_GNUTLS
- # include <gnutls/gnutls.h>
- # include <gnutls/x509.h>
--# include <gcrypt.h>
- # elif defined(HAVE_CDSASSL)
- # include <CoreFoundation/CoreFoundation.h>
- # include <Security/Security.h>
diff --git a/meta/recipes-extended/cups/cups_1.7.5.bb b/meta/recipes-extended/cups/cups_1.7.5.bb
deleted file mode 100644
index 5538cec..0000000
--- a/meta/recipes-extended/cups/cups_1.7.5.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require cups.inc
-
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c5e50cb4b8f24b04636b719683a9102d"
-
-SRC_URI[md5sum] = "5d893edc2957005f78e2b2423fdace2e"
-SRC_URI[sha256sum] = "18cb4c6847dbaaaa05c8b35af787f19dd5c7686970b46548e72c711c6f26bd02"
diff --git a/meta/recipes-extended/cups/cups_2.0.0.bb b/meta/recipes-extended/cups/cups_2.0.0.bb
new file mode 100644
index 0000000..384cd0b
--- /dev/null
+++ b/meta/recipes-extended/cups/cups_2.0.0.bb
@@ -0,0 +1,6 @@
+require cups.inc
+
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=6c5a350596fba02754bd96eb6df3afd0"
+
+SRC_URI[md5sum] = "2cdd81fea23e9e29555c24bdfd0d7c89"
+SRC_URI[sha256sum] = "83fdbbcb4ac4d82949bbde6d5dce7a4b6a62557da8f3d46c5e34b951110f5be2"
--
1.8.3.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 14/19] help2man: Upgrade to 1.46.4
2014-11-07 0:19 [PATCH 00/19] Initial package upgrades for 1.8 Saul Wold
` (12 preceding siblings ...)
2014-11-07 0:19 ` [PATCH 13/19] cups: Upgrade to 2.0.0 Saul Wold
@ 2014-11-07 0:19 ` Saul Wold
2014-11-07 0:19 ` [PATCH 15/19] hdparm: Upgrade to 9.45 Saul Wold
` (4 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: Saul Wold @ 2014-11-07 0:19 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../help2man/{help2man-native_1.46.1.bb => help2man-native_1.46.4.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/help2man/{help2man-native_1.46.1.bb => help2man-native_1.46.4.bb} (79%)
diff --git a/meta/recipes-devtools/help2man/help2man-native_1.46.1.bb b/meta/recipes-devtools/help2man/help2man-native_1.46.4.bb
similarity index 79%
rename from meta/recipes-devtools/help2man/help2man-native_1.46.1.bb
rename to meta/recipes-devtools/help2man/help2man-native_1.46.4.bb
index a51c81f..5b90da9 100644
--- a/meta/recipes-devtools/help2man/help2man-native_1.46.1.bb
+++ b/meta/recipes-devtools/help2man/help2man-native_1.46.4.bb
@@ -6,8 +6,8 @@ DEPENDS = "autoconf-native automake-native"
SRC_URI = "${GNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.xz"
-SRC_URI[md5sum] = "63b8f14a81ce28ba119d588d00c63f43"
-SRC_URI[sha256sum] = "3dfd02a026149aad06887c1cb6062471779c100e00aecb79b8f9d01cf1581c47"
+SRC_URI[md5sum] = "a1b7fe49eddae8a2537ed74ee9ef11cb"
+SRC_URI[sha256sum] = "1ae7f15f53b0cc55b070ae49df2ee5caa942c71529054e157599427bba3c5633"
inherit autotools native
--
1.8.3.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 15/19] hdparm: Upgrade to 9.45
2014-11-07 0:19 [PATCH 00/19] Initial package upgrades for 1.8 Saul Wold
` (13 preceding siblings ...)
2014-11-07 0:19 ` [PATCH 14/19] help2man: Upgrade to 1.46.4 Saul Wold
@ 2014-11-07 0:19 ` Saul Wold
2014-11-07 0:19 ` [PATCH 16/19] less: Upgrade to 470 Saul Wold
` (3 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: Saul Wold @ 2014-11-07 0:19 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-extended/hdparm/{hdparm_9.43.bb => hdparm_9.45.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-extended/hdparm/{hdparm_9.43.bb => hdparm_9.45.bb} (88%)
diff --git a/meta/recipes-extended/hdparm/hdparm_9.43.bb b/meta/recipes-extended/hdparm/hdparm_9.45.bb
similarity index 88%
rename from meta/recipes-extended/hdparm/hdparm_9.43.bb
rename to meta/recipes-extended/hdparm/hdparm_9.45.bb
index 805f76a..d11412d 100644
--- a/meta/recipes-extended/hdparm/hdparm_9.43.bb
+++ b/meta/recipes-extended/hdparm/hdparm_9.45.bb
@@ -18,8 +18,8 @@ RDEPENDS_wiper = "bash gawk stat"
SRC_URI = "${SOURCEFORGE_MIRROR}/hdparm/hdparm-${PV}.tar.gz "
-SRC_URI[md5sum] = "f73233be118d86c779a8463d8b6a3cdb"
-SRC_URI[sha256sum] = "2bbe92274971182192901ab220e94bd2e4896f924fa6b225d0cffd7d8c16b52a"
+SRC_URI[md5sum] = "1c75d0751a44928b6c4bc81fb16d7fe8"
+SRC_URI[sha256sum] = "23b01caa56a995cf0897877b6aff98ea622a5df255bc2894b1a7693387f38669"
EXTRA_OEMAKE += 'STRIP="echo"'
--
1.8.3.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 16/19] less: Upgrade to 470
2014-11-07 0:19 [PATCH 00/19] Initial package upgrades for 1.8 Saul Wold
` (14 preceding siblings ...)
2014-11-07 0:19 ` [PATCH 15/19] hdparm: Upgrade to 9.45 Saul Wold
@ 2014-11-07 0:19 ` Saul Wold
2014-11-07 0:19 ` [PATCH 17/19] lsbinitscripts: Upgrade to 9.56.1 Saul Wold
` (2 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: Saul Wold @ 2014-11-07 0:19 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-extended/less/{less_466.bb => less_470.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-extended/less/{less_466.bb => less_470.bb} (88%)
diff --git a/meta/recipes-extended/less/less_466.bb b/meta/recipes-extended/less/less_470.bb
similarity index 88%
rename from meta/recipes-extended/less/less_466.bb
rename to meta/recipes-extended/less/less_470.bb
index c5b8a3f..5668329 100644
--- a/meta/recipes-extended/less/less_466.bb
+++ b/meta/recipes-extended/less/less_470.bb
@@ -26,8 +26,8 @@ DEPENDS = "ncurses"
SRC_URI = "http://www.greenwoodsoftware.com/${BPN}/${BPN}-${PV}.tar.gz"
-SRC_URI[md5sum] = "7bc444bdb751bcf80ed0c39c17b4fcf4"
-SRC_URI[sha256sum] = "8305f5a06764ff094ed3428f94f29059541e2483eae201991f90823da6557212"
+SRC_URI[md5sum] = "abf7c37b1a2c3d83865eba3ab2eb369f"
+SRC_URI[sha256sum] = "f191dc51144e7ea0e7f116118d0ee7a5fe50d1ce330257e1ae5ee4c9d35d86ef"
inherit autotools update-alternatives
--
1.8.3.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 17/19] lsbinitscripts: Upgrade to 9.56.1
2014-11-07 0:19 [PATCH 00/19] Initial package upgrades for 1.8 Saul Wold
` (15 preceding siblings ...)
2014-11-07 0:19 ` [PATCH 16/19] less: Upgrade to 470 Saul Wold
@ 2014-11-07 0:19 ` Saul Wold
2014-11-07 0:19 ` [PATCH 18/19] man-pages: Upgrade to 3.75 Saul Wold
2014-11-07 0:19 ` [PATCH 19/19] watchdog: Upgrade to 5.14 Saul Wold
18 siblings, 0 replies; 20+ messages in thread
From: Saul Wold @ 2014-11-07 0:19 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../lsb/{lsbinitscripts_9.55.bb => lsbinitscripts_9.56.1.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-extended/lsb/{lsbinitscripts_9.55.bb => lsbinitscripts_9.56.1.bb} (78%)
diff --git a/meta/recipes-extended/lsb/lsbinitscripts_9.55.bb b/meta/recipes-extended/lsb/lsbinitscripts_9.56.1.bb
similarity index 78%
rename from meta/recipes-extended/lsb/lsbinitscripts_9.55.bb
rename to meta/recipes-extended/lsb/lsbinitscripts_9.56.1.bb
index 6ab52e3..cf3a863 100644
--- a/meta/recipes-extended/lsb/lsbinitscripts_9.55.bb
+++ b/meta/recipes-extended/lsb/lsbinitscripts_9.56.1.bb
@@ -6,12 +6,12 @@ DEPENDS = "popt glib-2.0"
LIC_FILES_CHKSUM = "file://COPYING;md5=ebf4e8b49780ab187d51bd26aaa022c6"
S="${WORKDIR}/initscripts-${PV}"
-SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/initscripts/initscripts-9.55.tar.bz2/0672f648a9ee8607a2df65835c54f5e5/initscripts-9.55.tar.bz2 \
+SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/initscripts/initscripts-9.56.1.tar.bz2/8ca2abb3877e8019a5e726c25501e8e3/initscripts-9.56.1.tar.bz2 \
file://functions.patch \
"
-SRC_URI[md5sum] = "0672f648a9ee8607a2df65835c54f5e5"
-SRC_URI[sha256sum] = "546d4403a4efa3c4fa6de06a195013d4e64738799c2c779e56d900e7b232a9fa"
+SRC_URI[md5sum] = "8ca2abb3877e8019a5e726c25501e8e3"
+SRC_URI[sha256sum] = "e6fbe1daa5cbfc6fab12ccac2955bde0c16ec8d9fbdb9f7c6c33fadc81da6574"
inherit update-alternatives
--
1.8.3.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 18/19] man-pages: Upgrade to 3.75
2014-11-07 0:19 [PATCH 00/19] Initial package upgrades for 1.8 Saul Wold
` (16 preceding siblings ...)
2014-11-07 0:19 ` [PATCH 17/19] lsbinitscripts: Upgrade to 9.56.1 Saul Wold
@ 2014-11-07 0:19 ` Saul Wold
2014-11-07 0:19 ` [PATCH 19/19] watchdog: Upgrade to 5.14 Saul Wold
18 siblings, 0 replies; 20+ messages in thread
From: Saul Wold @ 2014-11-07 0:19 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../man-pages/{man-pages_3.71.bb => man-pages_3.75.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-extended/man-pages/{man-pages_3.71.bb => man-pages_3.75.bb} (86%)
diff --git a/meta/recipes-extended/man-pages/man-pages_3.71.bb b/meta/recipes-extended/man-pages/man-pages_3.75.bb
similarity index 86%
rename from meta/recipes-extended/man-pages/man-pages_3.71.bb
rename to meta/recipes-extended/man-pages/man-pages_3.75.bb
index 225b256..18e2bca 100644
--- a/meta/recipes-extended/man-pages/man-pages_3.71.bb
+++ b/meta/recipes-extended/man-pages/man-pages_3.75.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] = "a853ef29d835e8522c04f832919139f1"
-SRC_URI[sha256sum] = "307c9ac65b98a3a3d377050f0dc62d40b7a5995e6e6e6049d63fd9cc4fc27059"
+SRC_URI[md5sum] = "74ad4aef657a046fe214bf981a9a2b30"
+SRC_URI[sha256sum] = "ba23f57a98d032a742ff506f32550dfa2c3076c8bf8d5f6b59305c6b015077d3"
RDEPENDS_${PN} = "man"
--
1.8.3.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 19/19] watchdog: Upgrade to 5.14
2014-11-07 0:19 [PATCH 00/19] Initial package upgrades for 1.8 Saul Wold
` (17 preceding siblings ...)
2014-11-07 0:19 ` [PATCH 18/19] man-pages: Upgrade to 3.75 Saul Wold
@ 2014-11-07 0:19 ` Saul Wold
18 siblings, 0 replies; 20+ messages in thread
From: Saul Wold @ 2014-11-07 0:19 UTC (permalink / raw)
To: openembedded-core
Move the patches from generic files to watchdog
Rebased the fix-ping due to code reorg on the source
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../{files => watchdog}/fix-ping-failure.patch | 56 ++++++++++++++--------
.../watchdog/{files => watchdog}/fixsepbuild.patch | 0
.../{watchdog_5.13.bb => watchdog_5.14.bb} | 5 +-
3 files changed, 38 insertions(+), 23 deletions(-)
rename meta/recipes-extended/watchdog/{files => watchdog}/fix-ping-failure.patch (58%)
rename meta/recipes-extended/watchdog/{files => watchdog}/fixsepbuild.patch (100%)
rename meta/recipes-extended/watchdog/{watchdog_5.13.bb => watchdog_5.14.bb} (81%)
diff --git a/meta/recipes-extended/watchdog/files/fix-ping-failure.patch b/meta/recipes-extended/watchdog/watchdog/fix-ping-failure.patch
similarity index 58%
rename from meta/recipes-extended/watchdog/files/fix-ping-failure.patch
rename to meta/recipes-extended/watchdog/watchdog/fix-ping-failure.patch
index f5976eb..14ab9c5 100644
--- a/meta/recipes-extended/watchdog/files/fix-ping-failure.patch
+++ b/meta/recipes-extended/watchdog/watchdog/fix-ping-failure.patch
@@ -33,11 +33,11 @@ Signed-off-by: Roy.Li <rongqing.li@windriver.com>
src/watchdog.c | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
-Index: watchdog-5.13/src/watchdog.c
+Index: watchdog-5.14/src/watchdog.c
===================================================================
---- watchdog-5.13.orig/src/watchdog.c 2013-02-01 03:15:44.000000000 -0800
-+++ watchdog-5.13/src/watchdog.c 2013-03-11 22:27:48.741657881 -0700
-@@ -28,6 +28,7 @@
+--- watchdog-5.14.orig/src/watchdog.c
++++ watchdog-5.14/src/watchdog.c
+@@ -24,6 +24,7 @@
#include <sys/types.h>
#include <sys/ioctl.h>
#include <linux/oom.h>
@@ -45,21 +45,35 @@ Index: watchdog-5.13/src/watchdog.c
#include <linux/watchdog.h>
#include <string.h>
-@@ -567,6 +568,8 @@
- pid_t child_pid;
- int oom_adjusted = 0;
- struct stat s;
-+ struct icmp_filter filt;
-+ filt.data = ~(1<<ICMP_ECHOREPLY);
+Index: watchdog-5.14/src/net.c
+===================================================================
+--- watchdog-5.14.orig/src/net.c
++++ watchdog-5.14/src/net.c
+@@ -11,7 +11,8 @@
+ #include <errno.h>
+ #include <sys/time.h>
+ #include <netinet/ip.h>
+-#include <netinet/ip_icmp.h>
++#include <linux/icmp.h>
++//#include <netinet/ip_icmp.h>
+ #include <fcntl.h>
+ #include <string.h>
+ #include <unistd.h> /* for gethostname() etc */
+@@ -179,6 +180,9 @@ int open_netcheck(struct list *tlist)
+ {
+ struct list *act;
+ int hold = 0;
++ struct icmp_filter filt;
++ filt.data = ~(1<<ICMP_ECHOREPLY);
++
+
+ if (tlist != NULL) {
+ for (act = tlist; act != NULL; act = act->next) {
+@@ -202,6 +206,7 @@ int open_netcheck(struct list *tlist)
+ fatal_error(EX_SYSERR, "error opening socket (%s)", strerror(errno));
+ }
+
++ setsockopt(net->sock_fp, SOL_RAW, ICMP_FILTER, (char*)&filt, sizeof(filt));
+ /* this is necessary for broadcast pings to work */
+ (void)setsockopt(net->sock_fp, SOL_SOCKET, SO_BROADCAST, (char *)&hold, sizeof(hold));
- #if USE_SYSLOG
- char *opts = "d:i:n:Ffsvbql:p:t:c:r:m:a:";
-@@ -703,7 +706,7 @@
- perror(progname);
- exit(1);
- }
--
-+ setsockopt(net->sock_fp, SOL_RAW, ICMP_FILTER, (char*)&filt, sizeof(filt));
- /* this is necessary for broadcast pings to work */
- (void) setsockopt(net->sock_fp, SOL_SOCKET, SO_BROADCAST, (char *)&hold, sizeof(hold));
-
diff --git a/meta/recipes-extended/watchdog/files/fixsepbuild.patch b/meta/recipes-extended/watchdog/watchdog/fixsepbuild.patch
similarity index 100%
rename from meta/recipes-extended/watchdog/files/fixsepbuild.patch
rename to meta/recipes-extended/watchdog/watchdog/fixsepbuild.patch
diff --git a/meta/recipes-extended/watchdog/watchdog_5.13.bb b/meta/recipes-extended/watchdog/watchdog_5.14.bb
similarity index 81%
rename from meta/recipes-extended/watchdog/watchdog_5.13.bb
rename to meta/recipes-extended/watchdog/watchdog_5.14.bb
index b9e29d2..c77d91d 100644
--- a/meta/recipes-extended/watchdog/watchdog_5.13.bb
+++ b/meta/recipes-extended/watchdog/watchdog_5.14.bb
@@ -11,8 +11,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ecc0551bf54ad97f6b541720f84d6569"
SRC_URI = "${SOURCEFORGE_MIRROR}/watchdog/watchdog-${PV}.tar.gz \
file://fixsepbuild.patch \
file://fix-ping-failure.patch"
-SRC_URI[md5sum] = "153455f008f1cf8f65f6ad9586a21ff1"
-SRC_URI[sha256sum] = "141e0faf3ee4d8187a6ff4e00b18ef7b7a4ce432a2d4c8a6e6fdc62507fc6eb0"
+
+SRC_URI[md5sum] = "5b2dba0c593942f4acc100bca0d560c4"
+SRC_URI[sha256sum] = "620b2f49e9879f2e85c73d4c1f422f9101e6b38e824fea2414befd8bb6866ad1"
inherit autotools
--
1.8.3.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
end of thread, other threads:[~2014-11-07 0:19 UTC | newest]
Thread overview: 20+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-11-07 0:19 [PATCH 00/19] Initial package upgrades for 1.8 Saul Wold
2014-11-07 0:19 ` [PATCH 01/19] libcap: Upgrade to 2.24 Saul Wold
2014-11-07 0:19 ` [PATCH 02/19] btrfs: Update to 3.17 version Saul Wold
2014-11-07 0:19 ` [PATCH 03/19] npth: Upgrade to 1.0 Saul Wold
2014-11-07 0:19 ` [PATCH 04/19] liburcu: Ugrade to 0.8.5 Saul Wold
2014-11-07 0:19 ` [PATCH 05/19] libgcrypt: Ugrade to 1.6.2 Saul Wold
2014-11-07 0:19 ` [PATCH 06/19] libksba: Ugrade to 1.3.1 Saul Wold
2014-11-07 0:19 ` [PATCH 07/19] curl Ugrade to 7.38 Saul Wold
2014-11-07 0:19 ` [PATCH 08/19] systemtap: Upgrade to 2.6 Git Version Saul Wold
2014-11-07 0:19 ` [PATCH 09/19] babeltrace: Upgrade to 1.2.3 Saul Wold
2014-11-07 0:19 ` [PATCH 10/19] libxkbcommon: Upgrade to 0.5.0 Saul Wold
2014-11-07 0:19 ` [PATCH 11/19] resolvconf: Upgrade to 1.76 Saul Wold
2014-11-07 0:19 ` [PATCH 12/19] at: Upgrade to 3.1.16 Saul Wold
2014-11-07 0:19 ` [PATCH 13/19] cups: Upgrade to 2.0.0 Saul Wold
2014-11-07 0:19 ` [PATCH 14/19] help2man: Upgrade to 1.46.4 Saul Wold
2014-11-07 0:19 ` [PATCH 15/19] hdparm: Upgrade to 9.45 Saul Wold
2014-11-07 0:19 ` [PATCH 16/19] less: Upgrade to 470 Saul Wold
2014-11-07 0:19 ` [PATCH 17/19] lsbinitscripts: Upgrade to 9.56.1 Saul Wold
2014-11-07 0:19 ` [PATCH 18/19] man-pages: Upgrade to 3.75 Saul Wold
2014-11-07 0:19 ` [PATCH 19/19] watchdog: Upgrade to 5.14 Saul Wold
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.