Skip to contentSkip to conversation

Recipe upgrades

PATCH In review Paul Eggleton 2 participants 5 messages Oct 28, 2013

lore
Share & tools
lore

Paul Eggleton

author
#0 lore raw

cover Recipe upgrades

The following changes since commit 8081dcb03f54efd551d1c8fe8a0484f8270053e0:

pigz: bump to 2.3.1 (2013-10-26 16:08:30 +0100)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib paule/upgrades
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/upgrades

Paul Eggleton (3):
ethtool: upgrade to 3.11
openssh: upgrade to 6.3p1
cmake: upgrade to 2.8.12

 .../openssh/openssh-6.2p2/mac.patch                | 76 ----------------------
 .../openssh/{openssh-6.2p2 => openssh-6.3p1}/init  |  0
 .../{openssh-6.2p2 => openssh-6.3p1}/nostrip.patch |  0
 .../openssh-CVE-2011-4327.patch                    |  0
 .../{openssh-6.2p2 => openssh-6.3p1}/ssh_config    |  0
 .../openssh/{openssh-6.2p2 => openssh-6.3p1}/sshd  |  0
 .../{openssh-6.2p2 => openssh-6.3p1}/sshd.socket   |  0
 .../{openssh-6.2p2 => openssh-6.3p1}/[email protected] |  0
 .../{openssh-6.2p2 => openssh-6.3p1}/sshd_config   |  0
 .../sshdgenkeys.service                            |  0
 .../volatiles.99_sshd                              |  0
 .../openssh/{openssh_6.2p2.bb => openssh_6.3p1.bb} |  6 +-
 ...e-native_2.8.11.2.bb => cmake-native_2.8.12.bb} |  4 +-
 .../cmake/{cmake_2.8.11.2.bb => cmake_2.8.12.bb}   |  7 +-
 .../{ethtool-3.10 => ethtool-3.11}/run-ptest       |  0
 .../ethtool/{ethtool_3.10.bb => ethtool_3.11.bb}   |  4 +-
 16 files changed, 8 insertions(+), 89 deletions(-)
 delete mode 100644 meta/recipes-connectivity/openssh/openssh-6.2p2/mac.patch
 rename meta/recipes-connectivity/openssh/{openssh-6.2p2 => openssh-6.3p1}/init (100%)
 rename meta/recipes-connectivity/openssh/{openssh-6.2p2 => openssh-6.3p1}/nostrip.patch (100%)
 rename meta/recipes-connectivity/openssh/{openssh-6.2p2 => openssh-6.3p1}/openssh-CVE-2011-4327.patch (100%)
 rename meta/recipes-connectivity/openssh/{openssh-6.2p2 => openssh-6.3p1}/ssh_config (100%)
 rename meta/recipes-connectivity/openssh/{openssh-6.2p2 => openssh-6.3p1}/sshd (100%)
 rename meta/recipes-connectivity/openssh/{openssh-6.2p2 => openssh-6.3p1}/sshd.socket (100%)
 rename meta/recipes-connectivity/openssh/{openssh-6.2p2 => openssh-6.3p1}/[email protected] (100%)
 rename meta/recipes-connectivity/openssh/{openssh-6.2p2 => openssh-6.3p1}/sshd_config (100%)
 rename meta/recipes-connectivity/openssh/{openssh-6.2p2 => openssh-6.3p1}/sshdgenkeys.service (100%)
 rename meta/recipes-connectivity/openssh/{openssh-6.2p2 => openssh-6.3p1}/volatiles.99_sshd (100%)
 rename meta/recipes-connectivity/openssh/{openssh_6.2p2.bb => openssh_6.3p1.bb} (96%)
 rename meta/recipes-devtools/cmake/{cmake-native_2.8.11.2.bb => cmake-native_2.8.12.bb} (58%)
 rename meta/recipes-devtools/cmake/{cmake_2.8.11.2.bb => cmake_2.8.12.bb} (78%)
 rename meta/recipes-extended/ethtool/{ethtool-3.10 => ethtool-3.11}/run-ptest (100%)
 rename meta/recipes-extended/ethtool/{ethtool_3.10.bb => ethtool_3.11.bb} (87%)
Signature · 1 line
1.8.1.2
author
#3 lore raw

PATCH 3/3 cmake: upgrade to 2.8.12

Signed-off-by Paul Eggleton <[email protected]>
---
 .../cmake/{cmake-native_2.8.11.2.bb => cmake-native_2.8.12.bb}     | 4 ++--
 meta/recipes-devtools/cmake/{cmake_2.8.11.2.bb => cmake_2.8.12.bb} | 7 ++-----
 2 files changed, 4 insertions(+), 7 deletions(-)
 rename meta/recipes-devtools/cmake/{cmake-native_2.8.11.2.bb => cmake-native_2.8.12.bb} (58%)
 rename meta/recipes-devtools/cmake/{cmake_2.8.11.2.bb => cmake_2.8.12.bb} (78%)
meta/recipes-devtools/cmake/cmake-native_2.8.12.bb renamed from meta/recipes-devtools/cmake/cmake-native_2.8.11.2.bb +2 -2
similarity index 58%
rename from meta/recipes-devtools/cmake/cmake-native_2.8.11.2.bb
rename to meta/recipes-devtools/cmake/cmake-native_2.8.12.bb
index e2a157b..4ee9011 100644
@@ -6,5 +6,5 @@ DEPENDS += "bzip2-native zlib-native"
 
 SRC_URI += "file://cmlibarchive-disable-ext2fs.patch"
 
-SRC_URI[md5sum] = "6f5d7b8e7534a5d9e1a7664ba63cf882"
-SRC_URI[sha256sum] = "b32acb483afdd14339941c6e4ec25f633d916a7a472653a0b00838771a6c0562"
+SRC_URI[md5sum] = "105bc6d21cc2e9b6aff901e43c53afea"
+SRC_URI[sha256sum] = "d885ba10b2406ede59aa31a928df33c9d67fc01433202f7dd586999cfd0e0287"
meta/recipes-devtools/cmake/cmake_2.8.12.bb renamed from meta/recipes-devtools/cmake/cmake_2.8.11.2.bb +2 -5
similarity index 78%
rename from meta/recipes-devtools/cmake/cmake_2.8.11.2.bb
rename to meta/recipes-devtools/cmake/cmake_2.8.12.bb
index 91e5411..ffd947f 100644
@@ -6,11 +6,8 @@ DEPENDS += "curl expat zlib libarchive ncurses"
 
 SRC_URI += "file://dont-run-cross-binaries.patch"
 
-SRC_URI[md5sum] = "df5324a3b203373a9e0a04b924281a43"
-SRC_URI[sha256sum] = "b7dbb86824051319b8e082d2f892ebe6d5914b4dac9b9ef1aeac5e7ed054b0bf"
-
-SRC_URI[md5sum] = "6f5d7b8e7534a5d9e1a7664ba63cf882"
-SRC_URI[sha256sum] = "b32acb483afdd14339941c6e4ec25f633d916a7a472653a0b00838771a6c0562"
+SRC_URI[md5sum] = "105bc6d21cc2e9b6aff901e43c53afea"
+SRC_URI[sha256sum] = "d885ba10b2406ede59aa31a928df33c9d67fc01433202f7dd586999cfd0e0287"
 
 # Strip ${prefix} from ${docdir}, set result into docdir_stripped
 python () {
Signature · 1 line
1.8.1.2
author
#1 lore raw

PATCH 1/3 ethtool: upgrade to 3.11

In reply to Paul Eggleton
Signed-off-by Paul Eggleton <[email protected]>
---
 .../recipes-extended/ethtool/{ethtool-3.10 => ethtool-3.11}/run-ptest | 0
 meta/recipes-extended/ethtool/{ethtool_3.10.bb => ethtool_3.11.bb}    | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-extended/ethtool/{ethtool-3.10 => ethtool-3.11}/run-ptest (100%)
 rename meta/recipes-extended/ethtool/{ethtool_3.10.bb => ethtool_3.11.bb} (87%)
meta/recipes-extended/ethtool/ethtool-3.11/run-ptest renamed from meta/recipes-extended/ethtool/ethtool-3.10/run-ptest +0 -0
similarity index 100%
rename from meta/recipes-extended/ethtool/ethtool-3.10/run-ptest
rename to meta/recipes-extended/ethtool/ethtool-3.11/run-ptest
meta/recipes-extended/ethtool/ethtool_3.11.bb renamed from meta/recipes-extended/ethtool/ethtool_3.10.bb +2 -2
similarity index 87%
rename from meta/recipes-extended/ethtool/ethtool_3.10.bb
rename to meta/recipes-extended/ethtool/ethtool_3.11.bb
index 83587d9..1e89800 100644
@@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
 SRC_URI = "${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz \
            file://run-ptest"
 
-SRC_URI[md5sum] = "b41deb37143dfb86934a8f52cea853d2"
-SRC_URI[sha256sum] = "62f0a9cea954c32a2bdc2d2ece295fda5b915cfea56f5de97b997d8ebaae0381"
+SRC_URI[md5sum] = "b3fba5cc45377b8fc2ead9f1e05c11bd"
+SRC_URI[sha256sum] = "a054fd5a318a0a01113952908d2344eb452f4dfd2525fe8b525f7ff2236db38a"
 
 inherit autotools ptest
 RDEPENDS_${PN}-ptest += "make"
Signature · 1 line
1.8.1.2
author
#2 lore raw

PATCH 2/3 openssh: upgrade to 6.3p1

In reply to Paul Eggleton

Removed the following backported patch(es):
* mac.patch

Signed-off-by Paul Eggleton <[email protected]>
---
 .../openssh/openssh-6.2p2/mac.patch                | 76 ----------------------
 .../openssh/{openssh-6.2p2 => openssh-6.3p1}/init  |  0
 .../{openssh-6.2p2 => openssh-6.3p1}/nostrip.patch |  0
 .../openssh-CVE-2011-4327.patch                    |  0
 .../{openssh-6.2p2 => openssh-6.3p1}/ssh_config    |  0
 .../openssh/{openssh-6.2p2 => openssh-6.3p1}/sshd  |  0
 .../{openssh-6.2p2 => openssh-6.3p1}/sshd.socket   |  0
 .../{openssh-6.2p2 => openssh-6.3p1}/[email protected] |  0
 .../{openssh-6.2p2 => openssh-6.3p1}/sshd_config   |  0
 .../sshdgenkeys.service                            |  0
 .../volatiles.99_sshd                              |  0
 .../openssh/{openssh_6.2p2.bb => openssh_6.3p1.bb} |  6 +-
 12 files changed, 2 insertions(+), 80 deletions(-)
 delete mode 100644 meta/recipes-connectivity/openssh/openssh-6.2p2/mac.patch
 rename meta/recipes-connectivity/openssh/{openssh-6.2p2 => openssh-6.3p1}/init (100%)
 rename meta/recipes-connectivity/openssh/{openssh-6.2p2 => openssh-6.3p1}/nostrip.patch (100%)
 rename meta/recipes-connectivity/openssh/{openssh-6.2p2 => openssh-6.3p1}/openssh-CVE-2011-4327.patch (100%)
 rename meta/recipes-connectivity/openssh/{openssh-6.2p2 => openssh-6.3p1}/ssh_config (100%)
 rename meta/recipes-connectivity/openssh/{openssh-6.2p2 => openssh-6.3p1}/sshd (100%)
 rename meta/recipes-connectivity/openssh/{openssh-6.2p2 => openssh-6.3p1}/sshd.socket (100%)
 rename meta/recipes-connectivity/openssh/{openssh-6.2p2 => openssh-6.3p1}/[email protected] (100%)
 rename meta/recipes-connectivity/openssh/{openssh-6.2p2 => openssh-6.3p1}/sshd_config (100%)
 rename meta/recipes-connectivity/openssh/{openssh-6.2p2 => openssh-6.3p1}/sshdgenkeys.service (100%)
 rename meta/recipes-connectivity/openssh/{openssh-6.2p2 => openssh-6.3p1}/volatiles.99_sshd (100%)
 rename meta/recipes-connectivity/openssh/{openssh_6.2p2.bb => openssh_6.3p1.bb} (96%)
meta/recipes-connectivity/openssh/openssh-6.2p2/mac.patch deleted +0 -76
deleted file mode 100644
index 69fb69d..0000000
@@ -1,76 +0,0 @@
-[PATCH] force the MAC output to be 64-bit aligned
-
-Upstream-Status: Backport[anoncvs.mindrot.org/index.cgi/openssh/mac.c?r1=1.27&r2=1.28]
-
-Backport patch to fix segment fault due to unaligned memory access
-
-Wed Jun 5 22:12:37 2013 UTC (7 days, 3 hours ago) by dtucker
-Branch: MAIN
-CVS Tags: HEAD
-Changes since 1.27: +11 -8 lines
-Diff to previous 1.27
-
-   - [email protected] 2013/06/03 00:03:18
-     [mac.c]
-     force the MAC output to be 64-bit aligned so umac won't see
-unaligned
-     accesses on strict-alignment architectures.  bz#2101, patch from
-     tomas.kuthan at oracle.com, ok djm@
----
- mac.c |   18 +++++++++++-------
- 1 file changed, 11 insertions(+), 7 deletions(-)
-
-diff --git a/mac.c b/mac.c
-index 3f2dc6f..a5a80d3 100644
---- a/mac.c
-+++ b/mac.c
-@@ -152,12 +152,16 @@ mac_init(Mac *mac)
- u_char *
- mac_compute(Mac *mac, u_int32_t seqno, u_char *data, int datalen)
- {
--	static u_char m[EVP_MAX_MD_SIZE];
-+	static union {
-+		u_char m[EVP_MAX_MD_SIZE];
-+		u_int64_t for_align;
-+	} u;
-+
- 	u_char b[4], nonce[8];
- 
--	if (mac->mac_len > sizeof(m))
-+	if (mac->mac_len > sizeof(u))
- 		fatal("mac_compute: mac too long %u %lu",
--		    mac->mac_len, (u_long)sizeof(m));
-+		    mac->mac_len, (u_long)sizeof(u));
- 
- 	switch (mac->type) {
- 	case SSH_EVP:
-@@ -166,22 +170,22 @@ mac_compute(Mac *mac, u_int32_t seqno, u_char *data, int datalen)
- 		HMAC_Init(&mac->evp_ctx, NULL, 0, NULL);
- 		HMAC_Update(&mac->evp_ctx, b, sizeof(b));
- 		HMAC_Update(&mac->evp_ctx, data, datalen);
--		HMAC_Final(&mac->evp_ctx, m, NULL);
-+		HMAC_Final(&mac->evp_ctx, u.m, NULL);
- 		break;
- 	case SSH_UMAC:
- 		put_u64(nonce, seqno);
- 		umac_update(mac->umac_ctx, data, datalen);
--		umac_final(mac->umac_ctx, m, nonce);
-+		umac_final(mac->umac_ctx, u.m, nonce);
- 		break;
- 	case SSH_UMAC128:
- 		put_u64(nonce, seqno);
- 		umac128_update(mac->umac_ctx, data, datalen);
--		umac128_final(mac->umac_ctx, m, nonce);
-+		umac128_final(mac->umac_ctx, u.m, nonce);
- 		break;
- 	default:
- 		fatal("mac_compute: unknown MAC type");
- 	}
--	return (m);
-+	return (u.m);
- }
- 
- void
--- 
-1.7.9.5
-
meta/recipes-connectivity/openssh/openssh-6.3p1/init renamed from meta/recipes-connectivity/openssh/openssh-6.2p2/init +0 -0
similarity index 100%
rename from meta/recipes-connectivity/openssh/openssh-6.2p2/init
rename to meta/recipes-connectivity/openssh/openssh-6.3p1/init
meta/recipes-connectivity/openssh/openssh-6.3p1/nostrip.patch renamed from meta/recipes-connectivity/openssh/openssh-6.2p2/nostrip.patch +0 -0
similarity index 100%
rename from meta/recipes-connectivity/openssh/openssh-6.2p2/nostrip.patch
rename to meta/recipes-connectivity/openssh/openssh-6.3p1/nostrip.patch
meta/recipes-connectivity/openssh/openssh-6.3p1/openssh-CVE-2011-4327.patch renamed from meta/recipes-connectivity/openssh/openssh-6.2p2/openssh-CVE-2011-4327.patch +0 -0
similarity index 100%
rename from meta/recipes-connectivity/openssh/openssh-6.2p2/openssh-CVE-2011-4327.patch
rename to meta/recipes-connectivity/openssh/openssh-6.3p1/openssh-CVE-2011-4327.patch
meta/recipes-connectivity/openssh/openssh-6.3p1/ssh_config renamed from meta/recipes-connectivity/openssh/openssh-6.2p2/ssh_config +0 -0
similarity index 100%
rename from meta/recipes-connectivity/openssh/openssh-6.2p2/ssh_config
rename to meta/recipes-connectivity/openssh/openssh-6.3p1/ssh_config
meta/recipes-connectivity/openssh/openssh-6.3p1/sshd renamed from meta/recipes-connectivity/openssh/openssh-6.2p2/sshd +0 -0
similarity index 100%
rename from meta/recipes-connectivity/openssh/openssh-6.2p2/sshd
rename to meta/recipes-connectivity/openssh/openssh-6.3p1/sshd
meta/recipes-connectivity/openssh/openssh-6.3p1/sshd.socket renamed from meta/recipes-connectivity/openssh/openssh-6.2p2/sshd.socket +0 -0
similarity index 100%
rename from meta/recipes-connectivity/openssh/openssh-6.2p2/sshd.socket
rename to meta/recipes-connectivity/openssh/openssh-6.3p1/sshd.socket
meta/recipes-connectivity/openssh/openssh-6.3p1/[email protected] renamed from meta/recipes-connectivity/openssh/openssh-6.2p2/[email protected] +0 -0
similarity index 100%
rename from meta/recipes-connectivity/openssh/openssh-6.2p2/[email protected]
rename to meta/recipes-connectivity/openssh/openssh-6.3p1/[email protected]
meta/recipes-connectivity/openssh/openssh-6.3p1/sshd_config renamed from meta/recipes-connectivity/openssh/openssh-6.2p2/sshd_config +0 -0
similarity index 100%
rename from meta/recipes-connectivity/openssh/openssh-6.2p2/sshd_config
rename to meta/recipes-connectivity/openssh/openssh-6.3p1/sshd_config
meta/recipes-connectivity/openssh/openssh-6.3p1/sshdgenkeys.service renamed from meta/recipes-connectivity/openssh/openssh-6.2p2/sshdgenkeys.service +0 -0
similarity index 100%
rename from meta/recipes-connectivity/openssh/openssh-6.2p2/sshdgenkeys.service
rename to meta/recipes-connectivity/openssh/openssh-6.3p1/sshdgenkeys.service
meta/recipes-connectivity/openssh/openssh-6.3p1/volatiles.99_sshd renamed from meta/recipes-connectivity/openssh/openssh-6.2p2/volatiles.99_sshd +0 -0
similarity index 100%
rename from meta/recipes-connectivity/openssh/openssh-6.2p2/volatiles.99_sshd
rename to meta/recipes-connectivity/openssh/openssh-6.3p1/volatiles.99_sshd
meta/recipes-connectivity/openssh/openssh_6.3p1.bb renamed from meta/recipes-connectivity/openssh/openssh_6.2p2.bb +2 -4
similarity index 96%
rename from meta/recipes-connectivity/openssh/openssh_6.2p2.bb
rename to meta/recipes-connectivity/openssh/openssh_6.3p1.bb
index bb5c79e..7dba676 100644
@@ -7,7 +7,6 @@ SECTION = "console/network"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://LICENCE;md5=e326045657e842541d3f35aada442507"
 
-PR = "r0"
 
 DEPENDS = "zlib openssl"
 DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"

@@ -25,7 +24,6 @@ SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.
            file://ssh_config \
            file://init \
            file://openssh-CVE-2011-4327.patch \
-           file://mac.patch \
            ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \
            file://sshd.socket \
            file://[email protected] \

@@ -34,8 +32,8 @@ SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.
 
 PAM_SRC_URI = "file://sshd"
 
-SRC_URI[md5sum] = "be46174dcbb77ebb4ea88ef140685de1"
-SRC_URI[sha256sum] = "7f29b9d2ad672ae0f9e1dcbff871fc5c2e60a194e90c766432e32161b842313b"
+SRC_URI[md5sum] = "225e75c9856f76011966013163784038"
+SRC_URI[sha256sum] = "aea575ededd3ebd45c05d42d0a87af22c79131a847ea440c54e3fdd223f5a420"
 
 inherit useradd update-rc.d update-alternatives systemd
Signature · 1 line
1.8.1.2