Recipe upgrades

PATCH In review Paul Eggleton 1 participant 8 messages May 13, 2014 – May 14, 2014

lore

Share & tools

lore

Paul Eggleton

author

2014-05-13 11:02 UTC #0 lore raw

cover Recipe upgrades

Recipe upgrades plus a couple of tidy-up patches.

The following changes since commit 23521fccb122b64f3469d46176f73fe476b0dfc5:

gstreamer1.0-plugins-good: add libxfixes and libxdamange to x11 depends (2014-05-11 13:07:36 +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 (6):
openssh: update to 6.6p1
openssh: move packaging definitions to the end
ethtool: upgrade to 3.14
nfs-utils: upgrade to 1.3.0
dropbear: add missing patch header
libsdl2: upgrade to 2.0.3

 .../{nfs-utils_1.2.9.bb => nfs-utils_1.3.0.bb}         |  7 +++----
 .../openssh/{openssh_6.5p1.bb => openssh_6.6p1.bb}     | 18 +++++++++---------
 .../dropbear/dropbear/0003-configure.patch             |  4 +++-
 .../ethtool/{ethtool_3.13.bb => ethtool_3.14.bb}       |  4 ++--
 .../libsdl2/{libsdl2_2.0.1.bb => libsdl2_2.0.3.bb}     |  6 +++---
 5 files changed, 20 insertions(+), 19 deletions(-)
 rename meta/recipes-connectivity/nfs-utils/{nfs-utils_1.2.9.bb => nfs-utils_1.3.0.bb} (95%)
 rename meta/recipes-connectivity/openssh/{openssh_6.5p1.bb => openssh_6.6p1.bb} (97%)
 rename meta/recipes-extended/ethtool/{ethtool_3.13.bb => ethtool_3.14.bb} (87%)
 rename meta/recipes-graphics/libsdl2/{libsdl2_2.0.1.bb => libsdl2_2.0.3.bb} (91%)

Signature · 1 line

1.9.0

Paul Eggleton

author

2014-05-13 11:02 UTC #1 lore raw

PATCH 1/6 openssh: update to 6.6p1

Signed-off-by Paul Eggleton <[email protected]>

---
 .../openssh/{openssh_6.5p1.bb => openssh_6.6p1.bb}                    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-connectivity/openssh/{openssh_6.5p1.bb => openssh_6.6p1.bb} (97%)

meta/recipes-connectivity/openssh/openssh_6.6p1.bb renamed from meta/recipes-connectivity/openssh/openssh_6.5p1.bb +2 -2

similarity index 97%
rename from meta/recipes-connectivity/openssh/openssh_6.5p1.bb
rename to meta/recipes-connectivity/openssh/openssh_6.6p1.bb
index b93b9ae..e784cf4 100644
@@ -33,8 +33,8 @@ SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.
 
 PAM_SRC_URI = "file://sshd"
 
-SRC_URI[md5sum] = "a084e7272b8cbd25afe0f5dce4802fef"
-SRC_URI[sha256sum] = "a1195ed55db945252d5a1730d4a2a2a5c1c9a6aa01ef2e5af750a962623d9027"
+SRC_URI[md5sum] = "3e9800e6bca1fbac0eea4d41baa7f239"
+SRC_URI[sha256sum] = "48c1f0664b4534875038004cc4f3555b8329c2a81c1df48db5c517800de203bb"
 
 inherit useradd update-rc.d update-alternatives systemd

Signature · 1 line

1.9.0

Paul Eggleton

author

2014-05-13 11:02 UTC #2 lore raw

PATCH 2/6 openssh: move packaging definitions to the end

In reply to Paul Eggleton

Signed-off-by Paul Eggleton <[email protected]>

---
 meta/recipes-connectivity/openssh/openssh_6.6p1.bb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

meta/recipes-connectivity/openssh/openssh_6.6p1.bb +7 -7

index e784cf4..5173a93 100644
@@ -10,13 +10,6 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=e326045657e842541d3f35aada442507"
 DEPENDS = "zlib openssl"
 DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
 
-RPROVIDES_${PN}-ssh = "ssh"
-RPROVIDES_${PN}-sshd = "sshd"
-
-RCONFLICTS_${PN} = "dropbear"
-RCONFLICTS_${PN}-sshd = "dropbear"
-RCONFLICTS_${PN}-keygen = "ssh-keygen"
-
 SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \
            file://nostrip.patch \
            file://sshd_config \

@@ -141,6 +134,13 @@ RDEPENDS_${PN} += "${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-keygen"
 RDEPENDS_${PN}-sshd += "${PN}-keygen ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-keyinit pam-plugin-loginuid', '', d)}"
 RDEPENDS_${PN}-ptest += "${PN}-sftp ${PN}-misc ${PN}-sftp-server make"
 
+RPROVIDES_${PN}-ssh = "ssh"
+RPROVIDES_${PN}-sshd = "sshd"
+
+RCONFLICTS_${PN} = "dropbear"
+RCONFLICTS_${PN}-sshd = "dropbear"
+RCONFLICTS_${PN}-keygen = "ssh-keygen"
+
 CONFFILES_${PN}-sshd = "${sysconfdir}/ssh/sshd_config"
 CONFFILES_${PN}-ssh = "${sysconfdir}/ssh/ssh_config"

Signature · 1 line

1.9.0

Paul Eggleton

author

2014-05-13 11:02 UTC #3 lore raw

PATCH 3/6 ethtool: upgrade to 3.14

In reply to Paul Eggleton

Signed-off-by Paul Eggleton <[email protected]>

---
 meta/recipes-extended/ethtool/{ethtool_3.13.bb => ethtool_3.14.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-extended/ethtool/{ethtool_3.13.bb => ethtool_3.14.bb} (87%)

meta/recipes-extended/ethtool/ethtool_3.14.bb renamed from meta/recipes-extended/ethtool/ethtool_3.13.bb +2 -2

similarity index 87%
rename from meta/recipes-extended/ethtool/ethtool_3.13.bb
rename to meta/recipes-extended/ethtool/ethtool_3.14.bb
index adcb6db..2a3ca70 100644
@@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
 SRC_URI = "${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz \
            file://run-ptest"
 
-SRC_URI[md5sum] = "0c0c0558a403b478cd3f65dadc00470d"
-SRC_URI[sha256sum] = "68f6b6c9417e8ff3d3b5a8bc22fc4fe8846176ee7d7636e365ce6a2e7b1e44e9"
+SRC_URI[md5sum] = "997e20c25c43ad5800f8ae3204455a8a"
+SRC_URI[sha256sum] = "b1a988d6e397bd9d5d73cfd64329f85121936a050174bbfe90f8701fd893a1df"
 
 inherit autotools ptest
 RDEPENDS_${PN}-ptest += "make"

Signature · 1 line

1.9.0

Paul Eggleton

author

2014-05-13 11:02 UTC #4 lore raw

PATCH 4/6 nfs-utils: upgrade to 1.3.0

In reply to Paul Eggleton

Signed-off-by Paul Eggleton <[email protected]>

---
 .../nfs-utils/{nfs-utils_1.2.9.bb => nfs-utils_1.3.0.bb}           | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
 rename meta/recipes-connectivity/nfs-utils/{nfs-utils_1.2.9.bb => nfs-utils_1.3.0.bb} (95%)

meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.0.bb renamed from meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.9.bb +3 -4

similarity index 95%
rename from meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.9.bb
rename to meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.0.bb
index 4f287f4..73cfa6b 100644
@@ -3,7 +3,6 @@ DESCRIPTION = "The nfs-utils package provides a daemon for the kernel \
 NFS server and related tools."
 HOMEPAGE = "http://nfs.sourceforge.net/"
 SECTION = "console/network"
-PR = "r1"
 
 LICENSE = "MIT & GPLv2+ & BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=95f3a93a5c3c7888de623b46ea085a84"

@@ -20,7 +19,7 @@ USERADD_PACKAGES = "${PN}-client"
 USERADD_PARAM_${PN}-client = "--system  --home-dir /var/lib/nfs \
 			      --shell /bin/false --user-group rpcuser"
 
-SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.bz2 \
+SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.xz \
            file://0001-configure-Allow-to-explicitly-disable-nfsidmap.patch \
            file://nfs-utils-1.0.6-uclibc.patch \
            file://nfs-utils-1.2.3-sm-notify-res_init.patch \

@@ -31,8 +30,8 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.b
            file://nfs-mountd.service \
            file://nfs-statd.service "
 
-SRC_URI[md5sum] = "18869d16db3f49c053f8c68eba3fe2e0"
-SRC_URI[sha256sum] = "90b76d5692a520b74273e607a4fd69df4cc35f65e242e22e2bc61b58759722f3"
+SRC_URI[md5sum] = "6e93a7997ca3a1eac56bf219adab72a8"
+SRC_URI[sha256sum] = "ab8384d0e487ed6a18c5380d5df28015f7dd98680bf08f3247c97d9f7d99e56f"
 
 PARALLEL_MAKE = ""

Signature · 1 line

1.9.0

Paul Eggleton

author

2014-05-13 11:02 UTC #5 lore raw

PATCH 5/6 dropbear: add missing patch header

In reply to Paul Eggleton

* Add a brief subject mentioning what the patch is for
* Add Upstream-Status

Signed-off-by Paul Eggleton <[email protected]>

---
 meta/recipes-core/dropbear/dropbear/0003-configure.patch | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

meta/recipes-core/dropbear/dropbear/0003-configure.patch +3 -1

index 2baf665..c53ab01 100644
@@ -1,7 +1,9 @@
 From c5f5c5054c1b15539dccf866e2c3faba7ed68456 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Eric=20B=C3=A9nard?= <[email protected]>
 Date: Thu, 25 Apr 2013 00:27:25 +0200
-Subject: [PATCH 3/6] configure
+Subject: [PATCH 3/6] configure: add a variable to allow openpty check to be cached
+
+Upstream-Status: Pending
 
 ---
  configure.ac | 11 ++++++++---

Signature · 1 line

1.9.0

Paul Eggleton

author

2014-05-13 11:02 UTC #6 lore raw

PATCH 6/6 libsdl2: upgrade to 2.0.3

In reply to Paul Eggleton

License checksum changed only because copyright year changed; the actual license text remains the same.

Signed-off-by Paul Eggleton <[email protected]>

---
 .../recipes-graphics/libsdl2/{libsdl2_2.0.1.bb => libsdl2_2.0.3.bb} | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-graphics/libsdl2/{libsdl2_2.0.1.bb => libsdl2_2.0.3.bb} (91%)

meta/recipes-graphics/libsdl2/libsdl2_2.0.3.bb renamed from meta/recipes-graphics/libsdl2/libsdl2_2.0.1.bb +3 -3

similarity index 91%
rename from meta/recipes-graphics/libsdl2/libsdl2_2.0.1.bb
rename to meta/recipes-graphics/libsdl2/libsdl2_2.0.3.bb
index fa19566..38304a9 100644
@@ -8,7 +8,7 @@ BUGTRACKER = "http://bugzilla.libsdl.org/"
 SECTION = "libs"
 
 LICENSE = "Zlib"
-LIC_FILES_CHKSUM = "file://COPYING.txt;md5=0605ca7e995ab1217e0bb988731a87fe"
+LIC_FILES_CHKSUM = "file://COPYING.txt;md5=67dcb7fae16952557bc5f96e9eb5d188"
 
 PROVIDES = "virtual/libsdl2"

@@ -23,8 +23,8 @@ SRC_URI = "http://www.libsdl.org/release/SDL2-${PV}.tar.gz \
 
 S = "${WORKDIR}/SDL2-${PV}"
 
-SRC_URI[md5sum] = "0eb97039488bf463e775295f7b18b227"
-SRC_URI[sha256sum] = "0ae7e902a26777614a011fe7053ca7e8b14843db3c42ca117564d208cf6732f0"
+SRC_URI[md5sum] = "fe6c61d2e9df9ef570e7e80c6e822537"
+SRC_URI[sha256sum] = "a5a69a6abf80bcce713fa873607735fe712f44276a7f048d60a61bb2f6b3c90c"
 
 inherit autotools lib_package binconfig pkgconfig

Signature · 1 line

1.9.0

Paul Eggleton

author

2014-05-14 17:20 UTC #7 lore raw

In reply to Paul Eggleton

Quoted 15 lines · On Tuesday 13 May 2014 12:00:58 Paul Eggleton wrote:

Recipe upgrades plus a couple of tidy-up patches.
The following changes since commit 23521fccb122b64f3469d46176f73fe476b0dfc5:
gstreamer1.0-plugins-good: add libxfixes and libxdamange to x11 depends
(2014-05-11 13:07:36 +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=paul
e/upgrades

Quoted 7 lines

Paul Eggleton (6):
openssh: update to 6.6p1
openssh: move packaging definitions to the end
ethtool: upgrade to 3.14
nfs-utils: upgrade to 1.3.0
dropbear: add missing patch header
libsdl2: upgrade to 2.0.3

I've rebased this branch on top of master and re-pushed it, since the OpenSSH CVEs have now been merged. The substance of the patches has not otherwise changed however.

Cheers,
Paul

Signature · 2 lines

Paul Eggleton
Intel Open Source Technology Centre