[PATCH 0/9] Upgrades

[PATCH 0/9] Upgrades

[Jussi Kukkonen]

Mostly minor upgrades and a small fix to python module dependencies.

Thanks,
  Jussi


The following changes since commit f078ccf1ac60488169853724c35126cc056f975d:

  bitbake: siggen: Fix file variable typo in compare_sigfiles (2016-08-20 16:11:29 +0100)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib jku/upgrades
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=jku/upgrades

Jussi Kukkonen (9):
  python-3.5-manifest: Add enum dependency to signal
  fontconfig: Upgrade 2.12.0 -> 2.12.1
  gnome-themes-standard: Upgrade 3.18.0 -> 3.20.2
  gtk+3: Upgrade 3.20.6 -> 3.20.9
  vte: Upgrade 0.44.1 -> 0.44.2
  json-glib: Upgrade 1.2.0 -> 1.2.2
  libinput: Upgrade 1.3.0 -> 1.4.1
  wayland-protocols: 1.5 -> 1.7
  openssh: Upgrade 7.2p2 -> 7.3p1

 .../openssh/openssh/CVE-2015-8325.patch            | 39 ----------------------
 ...h-7.1p1-conditional-compile-des-in-cipher.patch | 30 +++++++++--------
 .../openssh/{openssh_7.2p2.bb => openssh_7.3p1.bb} |  5 ++-
 .../python/python-3.5-manifest.inc                 |  2 +-
 ...d_3.18.0.bb => gnome-themes-standard_3.20.2.bb} |  4 +--
 .../gtk+/{gtk+3_3.20.6.bb => gtk+3_3.20.9.bb}      |  4 +--
 ...e_3.20.6.bb => gtk-icon-utils-native_3.20.9.bb} |  4 +--
 .../{json-glib_1.2.0.bb => json-glib_1.2.2.bb}     |  4 +--
 .../{fontconfig_2.12.0.bb => fontconfig_2.12.1.bb} |  6 ++--
 .../{libinput_1.3.0.bb => libinput_1.4.1.bb}       |  4 +--
 ...d-protocols_1.5.bb => wayland-protocols_1.7.bb} |  4 +--
 .../vte/{vte_0.44.1.bb => vte_0.44.2.bb}           |  4 +--
 scripts/contrib/python/generate-manifest-3.5.py    |  2 +-
 13 files changed, 37 insertions(+), 75 deletions(-)
 delete mode 100644 meta/recipes-connectivity/openssh/openssh/CVE-2015-8325.patch
 rename meta/recipes-connectivity/openssh/{openssh_7.2p2.bb => openssh_7.3p1.bb} (97%)
 rename meta/recipes-gnome/gnome/{gnome-themes-standard_3.18.0.bb => gnome-themes-standard_3.20.2.bb} (90%)
 rename meta/recipes-gnome/gtk+/{gtk+3_3.20.6.bb => gtk+3_3.20.9.bb} (84%)
 rename meta/recipes-gnome/gtk+/{gtk-icon-utils-native_3.20.6.bb => gtk-icon-utils-native_3.20.9.bb} (93%)
 rename meta/recipes-gnome/json-glib/{json-glib_1.2.0.bb => json-glib_1.2.2.bb} (78%)
 rename meta/recipes-graphics/fontconfig/{fontconfig_2.12.0.bb => fontconfig_2.12.1.bb} (87%)
 rename meta/recipes-graphics/wayland/{libinput_1.3.0.bb => libinput_1.4.1.bb} (84%)
 rename meta/recipes-graphics/wayland/{wayland-protocols_1.5.bb => wayland-protocols_1.7.bb} (85%)
 rename meta/recipes-support/vte/{vte_0.44.1.bb => vte_0.44.2.bb} (86%)

-- 
2.1.4

[PATCH 1/9] python-3.5-manifest: Add enum dependency to signal

[Jussi Kukkonen]

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 meta/recipes-devtools/python/python-3.5-manifest.inc | 2 +-
 scripts/contrib/python/generate-manifest-3.5.py      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-devtools/python/python-3.5-manifest.inc b/meta/recipes-devtools/python/python-3.5-manifest.inc
index b9c2fec..bc6842b 100644
--- a/meta/recipes-devtools/python/python-3.5-manifest.inc
+++ b/meta/recipes-devtools/python/python-3.5-manifest.inc
@@ -206,7 +206,7 @@ RDEPENDS_${PN}-shell="${PN}-core ${PN}-re ${PN}-compression"
 FILES_${PN}-shell="${libdir}/python3.5/cmd.* ${libdir}/python3.5/commands.* ${libdir}/python3.5/dircache.* ${libdir}/python3.5/fnmatch.* ${libdir}/python3.5/glob.* ${libdir}/python3.5/popen2.* ${libdir}/python3.5/shlex.* ${libdir}/python3.5/shutil.* "
 
 SUMMARY_${PN}-signal="Python set handlers for asynchronous events support"
-RDEPENDS_${PN}-signal="${PN}-core"
+RDEPENDS_${PN}-signal="${PN}-core ${PN}-enum"
 FILES_${PN}-signal="${libdir}/python3.5/signal.* "
 
 SUMMARY_${PN}-smtpd="Python Simple Mail Transport Daemon"
diff --git a/scripts/contrib/python/generate-manifest-3.5.py b/scripts/contrib/python/generate-manifest-3.5.py
index 3a88018..9f53dbe 100755
--- a/scripts/contrib/python/generate-manifest-3.5.py
+++ b/scripts/contrib/python/generate-manifest-3.5.py
@@ -345,7 +345,7 @@ if __name__ == "__main__":
     m.addPackage( "${PN}-shell", "Python shell-like functionality", "${PN}-core ${PN}-re ${PN}-compression",
     "cmd.* commands.* dircache.* fnmatch.* glob.* popen2.* shlex.* shutil.*" )
 
-    m.addPackage( "${PN}-signal", "Python set handlers for asynchronous events support", "${PN}-core",
+    m.addPackage( "${PN}-signal", "Python set handlers for asynchronous events support", "${PN}-core ${PN}-enum",
     "signal.*" )
 
     m.addPackage( "${PN}-subprocess", "Python subprocess support", "${PN}-core ${PN}-io ${PN}-re ${PN}-fcntl ${PN}-pickle ${PN}-threading ${PN}-signal ${PN}-selectors",
-- 
2.1.4

[PATCH 2/9] fontconfig: Upgrade 2.12.0 -> 2.12.1

[Jussi Kukkonen]

License text block moved, checksum remains same.

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 .../fontconfig/{fontconfig_2.12.0.bb => fontconfig_2.12.1.bb}       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-graphics/fontconfig/{fontconfig_2.12.0.bb => fontconfig_2.12.1.bb} (87%)

diff --git a/meta/recipes-graphics/fontconfig/fontconfig_2.12.0.bb b/meta/recipes-graphics/fontconfig/fontconfig_2.12.1.bb
similarity index 87%
rename from meta/recipes-graphics/fontconfig/fontconfig_2.12.0.bb
rename to meta/recipes-graphics/fontconfig/fontconfig_2.12.1.bb
index 373a241..115f558 100644
--- a/meta/recipes-graphics/fontconfig/fontconfig_2.12.0.bb
+++ b/meta/recipes-graphics/fontconfig/fontconfig_2.12.1.bb
@@ -14,7 +14,7 @@ BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig"
 LICENSE = "MIT-style & MIT & PD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=7a0449e9bc5370402a94c00204beca3d \
                     file://src/fcfreetype.c;endline=45;md5=5d9513e3196a1fbfdfa94051c09dfc84 \
-                    file://src/fccache.c;beginline=1281;endline=1296;md5=0326cfeb4a7333dd4dd25fbbc4b9f27f"
+                    file://src/fccache.c;beginline=1360;endline=1375;md5=0326cfeb4a7333dd4dd25fbbc4b9f27f"
 
 SECTION = "libs"
 
@@ -23,8 +23,8 @@ DEPENDS = "expat freetype zlib"
 SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
            file://revert-static-pkgconfig.patch \
            "
-SRC_URI[md5sum] = "d8b056231abcb6257db6dc6d745360b2"
-SRC_URI[sha256sum] = "fb10dee06097d8bc6c548ecfaaad5edd6db2d7805e0c9d783692c0a23e8b702d"
+SRC_URI[md5sum] = "ce55e525c37147eee14cc2de6cc09f6c"
+SRC_URI[sha256sum] = "a9f42d03949f948a3a4f762287dbc16e53a927c91a07ee64207ebd90a9e5e292"
 
 PACKAGES =+ "fontconfig-utils"
 FILES_${PN} =+ "${datadir}/xml/*"
-- 
2.1.4

[PATCH 3/9] gnome-themes-standard: Upgrade 3.18.0 -> 3.20.2

[Jussi Kukkonen]

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 ...nome-themes-standard_3.18.0.bb => gnome-themes-standard_3.20.2.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-gnome/gnome/{gnome-themes-standard_3.18.0.bb => gnome-themes-standard_3.20.2.bb} (90%)

diff --git a/meta/recipes-gnome/gnome/gnome-themes-standard_3.18.0.bb b/meta/recipes-gnome/gnome/gnome-themes-standard_3.20.2.bb
similarity index 90%
rename from meta/recipes-gnome/gnome/gnome-themes-standard_3.18.0.bb
rename to meta/recipes-gnome/gnome/gnome-themes-standard_3.20.2.bb
index 523253e..c98d870 100644
--- a/meta/recipes-gnome/gnome/gnome-themes-standard_3.18.0.bb
+++ b/meta/recipes-gnome/gnome/gnome-themes-standard_3.20.2.bb
@@ -16,8 +16,8 @@ MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
 SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
           "
 
-SRC_URI[md5sum] = "4d17bc62e4d0c5440fc4eda3d9271367"
-SRC_URI[sha256sum] = "e646eb04c225282b7df7fff65741adaad4cf9ed2c12616b7310e7edd27d2bacb"
+SRC_URI[md5sum] = "adc3b1d57330561fea524842d0c0b485"
+SRC_URI[sha256sum] = "9d0d9c4b2c9f9008301c3c1878ebb95859a735b7fd4a6a518802b9637e4a7915"
 
 EXTRA_OECONF = "--disable-gtk3-engine"
 
-- 
2.1.4

[PATCH 4/9] gtk+3: Upgrade 3.20.6 -> 3.20.9

[Jussi Kukkonen]

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 meta/recipes-gnome/gtk+/{gtk+3_3.20.6.bb => gtk+3_3.20.9.bb}          | 4 ++--
 ...tk-icon-utils-native_3.20.6.bb => gtk-icon-utils-native_3.20.9.bb} | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename meta/recipes-gnome/gtk+/{gtk+3_3.20.6.bb => gtk+3_3.20.9.bb} (84%)
 rename meta/recipes-gnome/gtk+/{gtk-icon-utils-native_3.20.6.bb => gtk-icon-utils-native_3.20.9.bb} (93%)

diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.20.6.bb b/meta/recipes-gnome/gtk+/gtk+3_3.20.9.bb
similarity index 84%
rename from meta/recipes-gnome/gtk+/gtk+3_3.20.6.bb
rename to meta/recipes-gnome/gtk+/gtk+3_3.20.9.bb
index 453a4e2..9a0bfc4 100644
--- a/meta/recipes-gnome/gtk+/gtk+3_3.20.6.bb
+++ b/meta/recipes-gnome/gtk+/gtk+3_3.20.9.bb
@@ -8,8 +8,8 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar
            file://0003-Add-disable-opengl-configure-option.patch \
            file://0004-configure.ac-Fix-wayland-protocols-path.patch \
           "
-SRC_URI[md5sum] = "914e55ea053161f4a575c1c8dade7954"
-SRC_URI[sha256sum] = "3f8016563a96b1cfef4ac9e795647f6316deb2978ff939b19e4e4f8f936fa4b2"
+SRC_URI[md5sum] = "cc76cac5e18c772c6784bf19a3dff08b"
+SRC_URI[sha256sum] = "83a609ba2f3424b5509e73967c49c67833af466d6f91081b24ee5c64fce6ac17"
 
 S = "${WORKDIR}/gtk+-${PV}"
 
diff --git a/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.20.6.bb b/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.20.9.bb
similarity index 93%
rename from meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.20.6.bb
rename to meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.20.9.bb
index e870ba3..71c1d62 100644
--- a/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.20.6.bb
+++ b/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.20.9.bb
@@ -10,8 +10,8 @@ MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
 
 SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz \
           file://Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch"
-SRC_URI[md5sum] = "914e55ea053161f4a575c1c8dade7954"
-SRC_URI[sha256sum] = "3f8016563a96b1cfef4ac9e795647f6316deb2978ff939b19e4e4f8f936fa4b2"
+SRC_URI[md5sum] = "cc76cac5e18c772c6784bf19a3dff08b"
+SRC_URI[sha256sum] = "83a609ba2f3424b5509e73967c49c67833af466d6f91081b24ee5c64fce6ac17"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
                     file://gtk/gtk.h;endline=25;md5=1d8dc0fccdbfa26287a271dce88af737 \
-- 
2.1.4

[PATCH 5/9] vte: Upgrade 0.44.1 -> 0.44.2

[Jussi Kukkonen]

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 meta/recipes-support/vte/{vte_0.44.1.bb => vte_0.44.2.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-support/vte/{vte_0.44.1.bb => vte_0.44.2.bb} (86%)

diff --git a/meta/recipes-support/vte/vte_0.44.1.bb b/meta/recipes-support/vte/vte_0.44.2.bb
similarity index 86%
rename from meta/recipes-support/vte/vte_0.44.1.bb
rename to meta/recipes-support/vte/vte_0.44.2.bb
index f3baa1e..a1204a3 100644
--- a/meta/recipes-support/vte/vte_0.44.1.bb
+++ b/meta/recipes-support/vte/vte_0.44.2.bb
@@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 inherit gnomebase gtk-doc distro_features_check upstream-version-is-even vala gobject-introspection
 
 SRC_URI += "file://0001-Don-t-enable-stack-protection-by-default.patch"
-SRC_URI[archive.md5sum] = "20916d97a5902657e54307cc2757beee"
-SRC_URI[archive.sha256sum] = "712dd548339f600fd7e221d12b2670a13a4361b2cd23ba0e057e76cc19fe5d4e"
+SRC_URI[archive.md5sum] = "eca8f8a9d9f9bb8e9d592d0acfeec015"
+SRC_URI[archive.sha256sum] = "a1ea594814bb136a3a9a6c7656b46240571f6a198825c1111007fe99194b0949"
 
 ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
 
-- 
2.1.4

[PATCH 6/9] json-glib: Upgrade 1.2.0 -> 1.2.2

[Jussi Kukkonen]

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 .../json-glib/{json-glib_1.2.0.bb => json-glib_1.2.2.bb}              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-gnome/json-glib/{json-glib_1.2.0.bb => json-glib_1.2.2.bb} (78%)

diff --git a/meta/recipes-gnome/json-glib/json-glib_1.2.0.bb b/meta/recipes-gnome/json-glib/json-glib_1.2.2.bb
similarity index 78%
rename from meta/recipes-gnome/json-glib/json-glib_1.2.0.bb
rename to meta/recipes-gnome/json-glib/json-glib_1.2.2.bb
index 1a7b769..1203a6a 100644
--- a/meta/recipes-gnome/json-glib/json-glib_1.2.0.bb
+++ b/meta/recipes-gnome/json-glib/json-glib_1.2.2.bb
@@ -10,8 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
 
 DEPENDS = "glib-2.0"
 
-SRC_URI[archive.md5sum] = "efe14b6b8e7aa95ee3240cc60627dc9f"
-SRC_URI[archive.sha256sum] = "99d6dfbe49c08fd7529f1fe8dcb1893b810a1bb222f1e7b65f41507658b8a7d3"
+SRC_URI[archive.md5sum] = "c1daefb8d0fb59612af0c072c8aabb58"
+SRC_URI[archive.sha256sum] = "ea128ab52a824fcd06e5448fbb2bd8d9a13740d51c66d445828edba71321a621"
 
 inherit gnomebase gettext lib_package gobject-introspection
 
-- 
2.1.4

[PATCH 7/9] libinput: Upgrade 1.3.0 -> 1.4.1

[Jussi Kukkonen]

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 .../recipes-graphics/wayland/{libinput_1.3.0.bb => libinput_1.4.1.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/wayland/{libinput_1.3.0.bb => libinput_1.4.1.bb} (84%)

diff --git a/meta/recipes-graphics/wayland/libinput_1.3.0.bb b/meta/recipes-graphics/wayland/libinput_1.4.1.bb
similarity index 84%
rename from meta/recipes-graphics/wayland/libinput_1.3.0.bb
rename to meta/recipes-graphics/wayland/libinput_1.4.1.bb
index 13724d5..c3905f3 100644
--- a/meta/recipes-graphics/wayland/libinput_1.3.0.bb
+++ b/meta/recipes-graphics/wayland/libinput_1.4.1.bb
@@ -10,8 +10,8 @@ DEPENDS = "libevdev udev mtdev"
 SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz \
            file://touchpad-serial-synaptics-need-to-fake-new-touches-on-TRIPLETAP.patch \
 "
-SRC_URI[md5sum] = "5f8bc2c746bfbc9454143f78e5b477a9"
-SRC_URI[sha256sum] = "998a75fb261d161efaa7da44411cdc9a32a953280e4ffc6322ca19f057d0c1ea"
+SRC_URI[md5sum] = "2e7ba577ed74d8d1baeb07dbd4fb912a"
+SRC_URI[sha256sum] = "26e7b3ab499358caba499705680ea7e5851af2bd37dc32f2be64181610d6392a"
 
 inherit autotools pkgconfig
 
-- 
2.1.4

[PATCH 8/9] wayland-protocols: 1.5 -> 1.7

[Jussi Kukkonen]

* xdg-shell unstable v6 (backwards incompatible)
* new unstable protocols xdg-foreign, idle-inhibit

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 .../wayland/{wayland-protocols_1.5.bb => wayland-protocols_1.7.bb}    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/wayland/{wayland-protocols_1.5.bb => wayland-protocols_1.7.bb} (85%)

diff --git a/meta/recipes-graphics/wayland/wayland-protocols_1.5.bb b/meta/recipes-graphics/wayland/wayland-protocols_1.7.bb
similarity index 85%
rename from meta/recipes-graphics/wayland/wayland-protocols_1.5.bb
rename to meta/recipes-graphics/wayland/wayland-protocols_1.7.bb
index 3a40fb2..1d2f0db 100644
--- a/meta/recipes-graphics/wayland/wayland-protocols_1.5.bb
+++ b/meta/recipes-graphics/wayland/wayland-protocols_1.7.bb
@@ -11,8 +11,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c7b12b6702da38ca028ace54aae3d484 \
 
 SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
            "
-SRC_URI[md5sum] = "e4279fec1283067706373d4d975be333"
-SRC_URI[sha256sum] = "7d0b426ccaeafc084fc579bb2a139f8ad4ea3492d54b7b0210d124c61fbeb2bf"
+SRC_URI[md5sum] = "9acfc9556f7cfedc44d97af60da66a5f"
+SRC_URI[sha256sum] = "635f2a937d318f1fecb97b54074ca211486e38af943868dd0fa82ea38d091c1f"
 
 inherit allarch autotools pkgconfig
 
-- 
2.1.4

[PATCH 9/9] openssh: Upgrade 7.2p2 -> 7.3p1

[Jussi Kukkonen]

Remove CVE-2015-8325.patch as it's included upstream. Rebase another
patch.

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 .../openssh/openssh/CVE-2015-8325.patch            | 39 ----------------------
 ...h-7.1p1-conditional-compile-des-in-cipher.patch | 30 +++++++++--------
 .../openssh/{openssh_7.2p2.bb => openssh_7.3p1.bb} |  5 ++-
 3 files changed, 18 insertions(+), 56 deletions(-)
 delete mode 100644 meta/recipes-connectivity/openssh/openssh/CVE-2015-8325.patch
 rename meta/recipes-connectivity/openssh/{openssh_7.2p2.bb => openssh_7.3p1.bb} (97%)

diff --git a/meta/recipes-connectivity/openssh/openssh/CVE-2015-8325.patch b/meta/recipes-connectivity/openssh/openssh/CVE-2015-8325.patch
deleted file mode 100644
index 2263897..0000000
--- a/meta/recipes-connectivity/openssh/openssh/CVE-2015-8325.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 85bdcd7c92fe7ff133bbc4e10a65c91810f88755 Mon Sep 17 00:00:00 2001
-From: Damien Miller <djm@mindrot.org>
-Date: Wed, 13 Apr 2016 10:39:57 +1000
-Subject: ignore PAM environment vars when UseLogin=yes
-
-If PAM is configured to read user-specified environment variables
-and UseLogin=yes in sshd_config, then a hostile local user may
-attack /bin/login via LD_PRELOAD or similar environment variables
-set via PAM.
-
-CVE-2015-8325, found by Shayan Sadigh, via Colin Watson
-
-
-
-https://anongit.mindrot.org/openssh.git/commit/session.c?id=85bdcd7c92fe7ff133bbc4e10a65c91810f88755
-
-CVE: CVE-2015-8325
-Upstream-Status: Backport
-Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
----
- session.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/session.c b/session.c
-index 4859245..4653b09 100644
---- a/session.c
-+++ b/session.c
-@@ -1322,7 +1322,7 @@ do_setup_env(Session *s, const char *shell)
- 	 * Pull in any environment variables that may have
- 	 * been set by PAM.
- 	 */
--	if (options.use_pam) {
-+	if (options.use_pam && !options.use_login) {
- 		char **p;
- 
- 		p = fetch_pam_child_environment();
--- 
-cgit v0.11.2
-
diff --git a/meta/recipes-connectivity/openssh/openssh/openssh-7.1p1-conditional-compile-des-in-cipher.patch b/meta/recipes-connectivity/openssh/openssh/openssh-7.1p1-conditional-compile-des-in-cipher.patch
index 2e59589..2773c14 100644
--- a/meta/recipes-connectivity/openssh/openssh/openssh-7.1p1-conditional-compile-des-in-cipher.patch
+++ b/meta/recipes-connectivity/openssh/openssh/openssh-7.1p1-conditional-compile-des-in-cipher.patch
@@ -1,18 +1,18 @@
-From 1cd94ed4750d5392cf3c09ed64d2c162a0833bdb Mon Sep 17 00:00:00 2001
+From d7eb26785ad4f25fb09fae46726ab8ca3fe16921 Mon Sep 17 00:00:00 2001
 From: Haiqing Bai <Haiqing.Bai@windriver.com>
-Date: Fri, 18 Mar 2016 15:49:31 +0800
-Subject: [PATCH 2/3] remove des in cipher.
+Date: Mon, 22 Aug 2016 14:11:16 +0300
+Subject: [PATCH] Remove des in cipher.
 
 Upstream-Status: Pending
 
 Signed-off-by: Haiqing Bai <Haiqing.Bai@windriver.com>
-
+Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
 ---
  cipher.c | 18 ++++++++++++++++++
  1 file changed, 18 insertions(+)
 
 diff --git a/cipher.c b/cipher.c
-index 02dae6f..63d3c29 100644
+index 031bda9..6cd667a 100644
 --- a/cipher.c
 +++ b/cipher.c
 @@ -53,8 +53,10 @@
@@ -26,7 +26,7 @@ index 02dae6f..63d3c29 100644
  #endif
  
  struct sshcipher {
-@@ -79,13 +81,17 @@ struct sshcipher {
+@@ -79,15 +81,19 @@ struct sshcipher {
  
  static const struct sshcipher ciphers[] = {
  #ifdef WITH_SSH1
@@ -34,17 +34,19 @@ index 02dae6f..63d3c29 100644
  	{ "des",	SSH_CIPHER_DES, 8, 8, 0, 0, 0, 1, EVP_des_cbc },
  	{ "3des",	SSH_CIPHER_3DES, 8, 16, 0, 0, 0, 1, evp_ssh1_3des },
 +#endif /* OPENSSL_NO_DES */
+ # ifndef OPENSSL_NO_BF
  	{ "blowfish",	SSH_CIPHER_BLOWFISH, 8, 32, 0, 0, 0, 1, evp_ssh1_bf },
+ # endif /* OPENSSL_NO_BF */
  #endif /* WITH_SSH1 */
  #ifdef WITH_OPENSSL
  	{ "none",	SSH_CIPHER_NONE, 8, 0, 0, 0, 0, 0, EVP_enc_null },
 +#ifndef OPENSSL_NO_DES
  	{ "3des-cbc",	SSH_CIPHER_SSH2, 8, 24, 0, 0, 0, 1, EVP_des_ede3_cbc },
 +#endif /* OPENSSL_NO_DES */
+ # ifndef OPENSSL_NO_BF
  	{ "blowfish-cbc",
  			SSH_CIPHER_SSH2, 8, 16, 0, 0, 0, 1, EVP_bf_cbc },
- 	{ "cast128-cbc",
-@@ -163,8 +169,10 @@ cipher_keylen(const struct sshcipher *c)
+@@ -171,8 +177,10 @@ cipher_keylen(const struct sshcipher *c)
  u_int
  cipher_seclen(const struct sshcipher *c)
  {
@@ -55,7 +57,7 @@ index 02dae6f..63d3c29 100644
  	return cipher_keylen(c);
  }
  
-@@ -201,11 +209,13 @@ u_int
+@@ -209,11 +217,13 @@ u_int
  cipher_mask_ssh1(int client)
  {
  	u_int mask = 0;
@@ -69,7 +71,7 @@ index 02dae6f..63d3c29 100644
  	return mask;
  }
  
-@@ -546,7 +556,9 @@ cipher_get_keyiv(struct sshcipher_ctx *cc, u_char *iv, u_int len)
+@@ -553,7 +563,9 @@ cipher_get_keyiv(struct sshcipher_ctx *cc, u_char *iv, u_int len)
  	switch (c->number) {
  #ifdef WITH_OPENSSL
  	case SSH_CIPHER_SSH2:
@@ -79,7 +81,7 @@ index 02dae6f..63d3c29 100644
  	case SSH_CIPHER_BLOWFISH:
  		evplen = EVP_CIPHER_CTX_iv_length(&cc->evp);
  		if (evplen == 0)
-@@ -569,8 +581,10 @@ cipher_get_keyiv(struct sshcipher_ctx *cc, u_char *iv, u_int len)
+@@ -576,8 +588,10 @@ cipher_get_keyiv(struct sshcipher_ctx *cc, u_char *iv, u_int len)
  		break;
  #endif
  #ifdef WITH_SSH1
@@ -90,7 +92,7 @@ index 02dae6f..63d3c29 100644
  #endif
  	default:
  		return SSH_ERR_INVALID_ARGUMENT;
-@@ -594,7 +608,9 @@ cipher_set_keyiv(struct sshcipher_ctx *cc, const u_char *iv)
+@@ -601,7 +615,9 @@ cipher_set_keyiv(struct sshcipher_ctx *cc, const u_char *iv)
  	switch (c->number) {
  #ifdef WITH_OPENSSL
  	case SSH_CIPHER_SSH2:
@@ -100,7 +102,7 @@ index 02dae6f..63d3c29 100644
  	case SSH_CIPHER_BLOWFISH:
  		evplen = EVP_CIPHER_CTX_iv_length(&cc->evp);
  		if (evplen <= 0)
-@@ -609,8 +625,10 @@ cipher_set_keyiv(struct sshcipher_ctx *cc, const u_char *iv)
+@@ -616,8 +632,10 @@ cipher_set_keyiv(struct sshcipher_ctx *cc, const u_char *iv)
  		break;
  #endif
  #ifdef WITH_SSH1
@@ -112,5 +114,5 @@ index 02dae6f..63d3c29 100644
  	default:
  		return SSH_ERR_INVALID_ARGUMENT;
 -- 
-1.9.1
+2.1.4
 
diff --git a/meta/recipes-connectivity/openssh/openssh_7.2p2.bb b/meta/recipes-connectivity/openssh/openssh_7.3p1.bb
similarity index 97%
rename from meta/recipes-connectivity/openssh/openssh_7.2p2.bb
rename to meta/recipes-connectivity/openssh/openssh_7.3p1.bb
index 3df825b..b319726 100644
--- a/meta/recipes-connectivity/openssh/openssh_7.2p2.bb
+++ b/meta/recipes-connectivity/openssh/openssh_7.3p1.bb
@@ -22,15 +22,14 @@ SRC_URI = "http://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://CVE-2015-8325.patch \
            file://openssh-7.1p1-conditional-compile-des-in-cipher.patch \
            file://openssh-7.1p1-conditional-compile-des-in-pkcs11.patch \
            "
 
 PAM_SRC_URI = "file://sshd"
 
-SRC_URI[md5sum] = "13009a9156510d8f27e752659075cced"
-SRC_URI[sha256sum] = "a72781d1a043876a224ff1b0032daa4094d87565a68528759c1c2cab5482548c"
+SRC_URI[md5sum] = "dfadd9f035d38ce5d58a3bf130b86d08"
+SRC_URI[sha256sum] = "3ffb989a6dcaa69594c3b550d4855a5a2e1718ccdde7f5e36387b424220fbecc"
 
 inherit useradd update-rc.d update-alternatives systemd
 
-- 
2.1.4