Skip to contentSkip to conversation

Recipe upgrades

PATCH In review Paul Eggleton 1 participant 5 messages Jan 5, 2015

lore
Share & tools
lore
#0 lore raw

cover Recipe upgrades

The following changes since commit 24f19fedb40d0af84beb8e9a6595ea06f09d4615:

gstreamer1.0-omx: use mulitple SCMs to fetch submodules (2014-12-31 08:22:53 +0000)

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):
libevdev: upgrade to 1.3
openssh: upgrade to 6.7p1
dropbear: upgrade to 2014.66

 .../openssh/openssh/nostrip.patch                  |  20 ----
 .../openssh/openssh/openssh-CVE-2011-4327.patch    |  29 ------
 .../openssh/openssh/openssh-CVE-2014-2653.patch    | 114 ---------------------
 .../openssh/{openssh_6.6p1.bb => openssh_6.7p1.bb} |  14 +--
 meta/recipes-core/dropbear/dropbear.inc            |   2 +-
 .../0001-urandom-xauth-changes-to-options.h.patch  |   2 +-
 meta/recipes-core/dropbear/dropbear_2014.63.bb     |   4 -
 meta/recipes-core/dropbear/dropbear_2014.66.bb     |   4 +
 .../{libevdev_1.2.2.bb => libevdev_1.3.bb}         |   4 +-
 9 files changed, 13 insertions(+), 180 deletions(-)
 delete mode 100644 meta/recipes-connectivity/openssh/openssh/nostrip.patch
 delete mode 100644 meta/recipes-connectivity/openssh/openssh/openssh-CVE-2011-4327.patch
 delete mode 100644 meta/recipes-connectivity/openssh/openssh/openssh-CVE-2014-2653.patch
 rename meta/recipes-connectivity/openssh/{openssh_6.6p1.bb => openssh_6.7p1.bb} (93%)
 delete mode 100644 meta/recipes-core/dropbear/dropbear_2014.63.bb
 create mode 100644 meta/recipes-core/dropbear/dropbear_2014.66.bb
 rename meta/recipes-support/libevdev/{libevdev_1.2.2.bb => libevdev_1.3.bb} (74%)
Signature · 1 line
1.9.3
#1 lore raw

PATCH 1/3 libevdev: upgrade to 1.3

---
 meta/recipes-support/libevdev/{libevdev_1.2.2.bb => libevdev_1.3.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-support/libevdev/{libevdev_1.2.2.bb => libevdev_1.3.bb} (74%)
meta/recipes-support/libevdev/libevdev_1.3.bb renamed from meta/recipes-support/libevdev/libevdev_1.2.2.bb +2 -2
similarity index 74%
rename from meta/recipes-support/libevdev/libevdev_1.2.2.bb
rename to meta/recipes-support/libevdev/libevdev_1.3.bb
index db4ffc6..7206b30 100644
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=75aae0d38feea6fda97ca381cb9132eb \
                     file://libevdev/libevdev.h;endline=21;md5=7ff4f0b5113252c2f1a828e0bbad98d1"
 
 SRC_URI = "http://www.freedesktop.org/software/libevdev/${BP}.tar.xz"
-SRC_URI[md5sum] = "7c1ee9c2069489b2a25dfde6f8e2ff6a"
-SRC_URI[sha256sum] = "860e9a1d5594393ff1f711cdeaf048efe354992019068408abbcfa4914ad6709"
+SRC_URI[md5sum] = "ab67de8f949e84ae2abb48af09eda423"
+SRC_URI[sha256sum] = "265411ce79a592b3074e9d07fb97d462745d0c7ef178254a6f720245ed253446"
 
 inherit autotools pkgconfig
Signature · 1 line
1.9.3
#3 lore raw

PATCH 2/3 openssh: upgrade to 6.7p1

In reply to Paul Eggleton

* Drop two CVE patches already handled upstream.
* Drop nostrip.patch which no longer applies and use the existing --disable-strip configure option instead.
* OpenSSH 6.7+ no longer supports tcp wrappers. We could apply the Debian patch to add support back in, but it seems best to follow upstream here unless we have a good reason to do otherwise.

---
 .../openssh/openssh/nostrip.patch                  |  20 ----
 .../openssh/openssh/openssh-CVE-2011-4327.patch    |  29 ------
 .../openssh/openssh/openssh-CVE-2014-2653.patch    | 114 ---------------------
 .../openssh/{openssh_6.6p1.bb => openssh_6.7p1.bb} |  14 +--
 4 files changed, 5 insertions(+), 172 deletions(-)
 delete mode 100644 meta/recipes-connectivity/openssh/openssh/nostrip.patch
 delete mode 100644 meta/recipes-connectivity/openssh/openssh/openssh-CVE-2011-4327.patch
 delete mode 100644 meta/recipes-connectivity/openssh/openssh/openssh-CVE-2014-2653.patch
 rename meta/recipes-connectivity/openssh/{openssh_6.6p1.bb => openssh_6.7p1.bb} (93%)
meta/recipes-connectivity/openssh/openssh/nostrip.patch deleted +0 -20
deleted file mode 100644
index 33111f5..0000000
@@ -1,20 +0,0 @@
-Disable stripping binaries during make install.
-
-Upstream-Status: Inappropriate [configuration]
-
-Build system specific.
-
-Signed-off-by: Scott Garman <[email protected]>
-
-diff -ur openssh-5.6p1.orig/Makefile.in openssh-5.6p1/Makefile.in
---- openssh-5.6p1.orig/Makefile.in	2010-05-11 23:51:39.000000000 -0700
-+++ openssh-5.6p1/Makefile.in	2010-08-30 16:49:54.000000000 -0700
-@@ -29,7 +29,7 @@
- RAND_HELPER=$(libexecdir)/ssh-rand-helper
- PRIVSEP_PATH=@PRIVSEP_PATH@
- SSH_PRIVSEP_USER=@SSH_PRIVSEP_USER@
--STRIP_OPT=@STRIP_OPT@
-+STRIP_OPT=
- 
- PATHS= -DSSHDIR=\"$(sysconfdir)\" \
- 	-D_PATH_SSH_PROGRAM=\"$(SSH_PROGRAM)\" \
meta/recipes-connectivity/openssh/openssh/openssh-CVE-2011-4327.patch deleted +0 -29
deleted file mode 100644
index 30c11cf..0000000
@@ -1,29 +0,0 @@
-openssh-CVE-2011-4327
-
-A security flaw was found in the way ssh-keysign,
-a ssh helper program for host based authentication,
-attempted to retrieve enough entropy information on configurations that
-lacked a built-in entropy pool in OpenSSL (a ssh-rand-helper program would
-be executed to retrieve the entropy from the system environment).
-A local attacker could use this flaw to obtain unauthorized access to host keys
-via ptrace(2) process trace attached to the 'ssh-rand-helper' program.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2011-4327
-http://www.openssh.com/txt/portable-keysign-rand-helper.adv
-
-Upstream-Status: Pending
-
-Signed-off-by: Li Wang <[email protected]>
---- a/ssh-keysign.c
-+++ b/ssh-keysign.c
-@@ -170,6 +170,10 @@
- 	key_fd[i++] = open(_PATH_HOST_DSA_KEY_FILE, O_RDONLY);
- 	key_fd[i++] = open(_PATH_HOST_ECDSA_KEY_FILE, O_RDONLY);
- 	key_fd[i++] = open(_PATH_HOST_RSA_KEY_FILE, O_RDONLY);
-+	if (fcntl(key_fd[0], F_SETFD, FD_CLOEXEC) != 0 ||
-+	    fcntl(key_fd[1], F_SETFD, FD_CLOEXEC) != 0 ||
-+	    fcntl(key_fd[2], F_SETFD, FD_CLOEXEC) != 0)
-+		fatal("fcntl failed");
- 
- 	original_real_uid = getuid();	/* XXX readconf.c needs this */
- 	if ((pw = getpwuid(original_real_uid)) == NULL)
meta/recipes-connectivity/openssh/openssh/openssh-CVE-2014-2653.patch deleted +0 -114

114 lines not on this page · raw message

meta/recipes-connectivity/openssh/openssh_6.7p1.bb renamed from meta/recipes-connectivity/openssh/openssh_6.6p1.bb +5 -9
similarity index 93%
rename from meta/recipes-connectivity/openssh/openssh_6.6p1.bb
rename to meta/recipes-connectivity/openssh/openssh_6.7p1.bb
index abc302b..19093fc 100644
@@ -11,11 +11,9 @@ DEPENDS = "zlib openssl"
 DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
 
 SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \
-           file://nostrip.patch \
            file://sshd_config \
            file://ssh_config \
            file://init \
-           file://openssh-CVE-2011-4327.patch \
            ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \
            file://sshd.socket \
            file://[email protected] \
@@ -23,13 +21,12 @@ SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.
            file://volatiles.99_sshd \
            file://add-test-support-for-busybox.patch \
            file://run-ptest \
-           file://openssh-CVE-2014-2653.patch \
            file://auth2-none.c-avoid-authenticate-empty-passwords-to-m.patch"
 
 PAM_SRC_URI = "file://sshd"
 
-SRC_URI[md5sum] = "3e9800e6bca1fbac0eea4d41baa7f239"
-SRC_URI[sha256sum] = "48c1f0664b4534875038004cc4f3555b8329c2a81c1df48db5c517800de203bb"
+SRC_URI[md5sum] = "3246aa79317b1d23cae783a3bf8275d6"
+SRC_URI[sha256sum] = "b2f8394eae858dabbdef7dac10b99aec00c95462753e80342e530bbb6f725507"
 
 inherit useradd update-rc.d update-alternatives systemd
 
@@ -42,9 +39,6 @@ INITSCRIPT_PARAMS_${PN}-sshd = "defaults 9"
 SYSTEMD_PACKAGES = "${PN}-sshd"
 SYSTEMD_SERVICE_${PN}-sshd = "sshd.socket"
 
-PACKAGECONFIG ??= "tcp-wrappers"
-PACKAGECONFIG[tcp-wrappers] = "--with-tcp-wrappers,,tcp-wrappers"
-
 inherit autotools-brokensep ptest
 
 # LFS support:
@@ -56,7 +50,9 @@ EXTRA_OECONF = "'LOGIN_PROGRAM=${base_bindir}/login' \
                 --without-zlib-version-check \
                 --with-privsep-path=/var/run/sshd \
                 --sysconfdir=${sysconfdir}/ssh \
-                --with-xauth=/usr/bin/xauth"
+                --with-xauth=/usr/bin/xauth \
+                --disable-strip \
+                "
 
 # Since we do not depend on libbsd, we do not want configure to use it
 # just because it finds libutil.h.  But, specifying --disable-libutil
Signature · 1 line
1.9.3
#4 lore raw

PATCH 3/3 dropbear: upgrade to 2014.66

In reply to Paul Eggleton

* Upgrade to upstream 2014.66; incorporates several minor bugfix releases.
* LIC_FILES_CHKSUM changed because the copyright year changed; there was no change to the license text itself.

---
 meta/recipes-core/dropbear/dropbear.inc                               | 2 +-
 .../dropbear/dropbear/0001-urandom-xauth-changes-to-options.h.patch   | 2 +-
 meta/recipes-core/dropbear/dropbear_2014.63.bb                        | 4 ----
 meta/recipes-core/dropbear/dropbear_2014.66.bb                        | 4 ++++
 4 files changed, 6 insertions(+), 6 deletions(-)
 delete mode 100644 meta/recipes-core/dropbear/dropbear_2014.63.bb
 create mode 100644 meta/recipes-core/dropbear/dropbear_2014.66.bb
meta/recipes-core/dropbear/dropbear.inc +1 -1
index 947a491..e187d04 100644
@@ -5,7 +5,7 @@ SECTION = "console/network"
 # some files are from other projects and have others license terms:
 #   public domain, OpenSSH 3.5p1, OpenSSH3.6.1p2, PuTTY
 LICENSE = "MIT & BSD-3-Clause & BSD-2-Clause & PD"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=4d290ce0ac102c828dfc9ce836784688"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=e3a1b9604afd1648b28b0c6f1709e9f4"
 
 DEPENDS = "zlib"
 RPROVIDES_${PN} = "ssh sshd" 
meta/recipes-core/dropbear/dropbear/0001-urandom-xauth-changes-to-options.h.patch +1 -1
index 71a4666..dc9d578 100644
@@ -13,7 +13,7 @@ index 7d06322..71a21c2 100644
  /* The command to invoke for xauth when using X11 forwarding.
   * "-q" for quiet */
  #ifndef XAUTH_COMMAND
--#define XAUTH_COMMAND "/usr/bin/X11/xauth -q"
+-#define XAUTH_COMMAND "/usr/bin/xauth -q"
 +#define XAUTH_COMMAND "xauth -q"
  #endif
  
meta/recipes-core/dropbear/dropbear_2014.63.bb deleted +0 -4
deleted file mode 100644
index bb7e617..0000000
@@ -1,4 +0,0 @@
-require dropbear.inc
-
-SRC_URI[md5sum] = "7066bb9a2da708f3ed06314fdc9c47fd"
-SRC_URI[sha256sum] = "595992de432ba586a0e7e191bbb1ad587727678bb3e345b018c395b8c55b57ae"
meta/recipes-core/dropbear/dropbear_2014.66.bb new file +4 -0
new file mode 100644
index 0000000..8931eb7
@@ -0,0 +1,4 @@
+require dropbear.inc
+
+SRC_URI[md5sum] = "c21a01111aa5015db038c6efdb85717d"
+SRC_URI[sha256sum] = "ab3fe2670a517cc0bbe398ff5d15e9ca12cd14f2fc18930a8111ae2baa64ab76"
Signature · 1 line
1.9.3
#2 lore raw

Re: [PATCH 1/3] libevdev: upgrade to 1.3

In reply to Paul Eggleton
Quoted 1 line · On Monday 05 January 2015 11:27:43 Paul Eggleton wrote:

So it turns out that the upstream website doesn't list the latest version, which is 1.3.2 (I've emailed the maintainer). I'd suggest ignoring this patch, I'll send another which upgrades to that version instead.

Cheers,
Paul

Signature · 2 lines
Paul Eggleton
Intel Open Source Technology Centre