Skip to content

Commit

Permalink
[security] Upgrade kernel version to 3.16.57-2 (#68)
Browse files Browse the repository at this point in the history
* Update Makefile to take 3.16.57-2 kernel

* Update the changelog.patch

* Update the URL to Azure links
  • Loading branch information
zhenggen-xu authored and lguohan committed Oct 4, 2018
1 parent 652f259 commit dff16eb
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 16 deletions.
12 changes: 6 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
SHELL = /bin/bash
.SHELLFLAGS += -e

KVERSION_SHORT ?= 3.16.0-5
KVERSION_SHORT ?= 3.16.0-6
KVERSION ?= $(KVERSION_SHORT)-amd64
KERNEL_VERSION ?= 3.16.51
KERNEL_SUBVERSION ?= 3+deb8u1
KERNEL_VERSION ?= 3.16.57
KERNEL_SUBVERSION ?= 2

MAIN_TARGET = linux-headers-$(KVERSION_SHORT)-common_$(KERNEL_VERSION)-$(KERNEL_SUBVERSION)_amd64.deb
DERIVED_TARGETS = linux-headers-$(KVERSION)_$(KERNEL_VERSION)-$(KERNEL_SUBVERSION)_amd64.deb \
Expand All @@ -17,9 +17,9 @@ DEBIAN_FILE = linux_$(KERNEL_VERSION)-$(KERNEL_SUBVERSION).debian.tar.xz
URL = http://security.debian.org/debian-security/pool/updates/main/l/linux
BUILD_DIR=linux-$(KERNEL_VERSION)

DSC_FILE_URL = "https://sonicstorage.blob.core.windows.net/packages/$(DSC_FILE)?sv=2015-04-05&sr=b&sig=FzpIoc5gzw9oj09C0ifOaCTMo6K%2BP0WadjFgprGe508%3D&se=2117-12-17T19%3A52%3A55Z&sp=r"
DEBIAN_FILE_URL = "https://sonicstorage.blob.core.windows.net/packages/$(DEBIAN_FILE)?sv=2015-04-05&sr=b&sig=E65G0WdVW4FrpDQxmKqjuKjur2QM%2BycXy5NbVtmBYlY%3D&se=2117-12-17T19%3A54%3A03Z&sp=r"
ORIG_FILE_URL = "https://sonicstorage.blob.core.windows.net/packages/$(ORIG_FILE)?sv=2015-04-05&sr=b&sig=f%2BXBexkqVW9nru%2FwjT%2FNUwToUP3uMRnokIpuZa9AbHk%3D&se=2117-12-17T19%3A54%3A25Z&sp=r"
DSC_FILE_URL = "https://sonicstorage.blob.core.windows.net/packages/kernel-public/$(DSC_FILE)?sv=2015-04-05&sr=b&sig=MrxcOUmGZALsvb4ROPUqXBbRU8UfVtQi%2FJLWKVqF6WA%3D&se=2155-08-11T16%3A02%3A31Z&sp=r"
DEBIAN_FILE_URL = "https://sonicstorage.blob.core.windows.net/packages/kernel-public/$(DEBIAN_FILE)?sv=2015-04-05&sr=b&sig=wn66yUesisxcNMJKyUfOy7Ol6qmU0JQWppiADjWOYio%3D&se=2155-08-11T16%3A03%3A01Z&sp=r"
ORIG_FILE_URL = "https://sonicstorage.blob.core.windows.net/packages/kernel-public/$(ORIG_FILE)?sv=2015-04-05&sr=b&sig=bwePSkU3UAsbZUd0z9QF8Uz%2FQ354QYInijbF3RL0dik%3D&se=2155-08-11T16%3A03%3A23Z&sp=r"

$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
# Obtaining the Debian kernel source
Expand Down
17 changes: 7 additions & 10 deletions patch/changelog.patch
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
From a96e033ed01d4a68a0825c187bebe45a527fb868 Mon Sep 17 00:00:00 2001
From: Qi Luo <qiluo-msft@users.noreply.github.com>
Date: Wed, 10 Jan 2018 01:18:57 +0000
From: Zhenggen Xu <zxu@linkedin.com>
Date: Tue Oct 2 23:03:23 2018 -0700
Subject: [PATCH] Update changelog

Signed-off-by: Qi Luo <qiluo-msft@users.noreply.github.com>
Signed-off-by: Zhenggen Xu <zxu@linkedin.com>
---
debian/changelog | 12 ++++++++++++
1 file changed, 12 insertions(+)
Expand All @@ -13,21 +13,18 @@ index baeab31..9cdcdfc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+linux (3.16.51-3+deb8u1) sonic; urgency=high
+linux (3.16.57-2) sonic; urgency=high
+
+ * add driver patches for MLNX SN2700
+
+ -- Guohan Lu <gulv@microsoft.com> Sun, 19 Dec 2015 01:50:04 +0100
+
+linux (3.16.51-3+deb8u1) sonic; urgency=high
+linux (3.16.57-2) sonic; urgency=high
+
+ * add support for S6000
+
+ -- Shuotian Cheng <shuche@microsoft.com> Sun, 19 Dec 2015 01:50:04 +0100
+
linux (3.16.51-3+deb8u1) jessie-security; urgency=high
linux (3.16.57-2) jessie-security; urgency=high

* dccp: CVE-2017-8824: use-after-free in DCCP code
--
2.1.4

* mmc/host: Ignore ABI changes (fixes FTBFS on armhf)

0 comments on commit dff16eb

Please sign in to comment.