From 809a0521f83cec37b72f9f35cfb9bed24781206d Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Thu, 22 Feb 2018 19:25:29 +0100 Subject: [PATCH] aufs: gen-patch: Fix Subject generation to skip SPDX-License-Identifier --- debian/changelog | 4 ++++ debian/patches/features/all/aufs4/gen-patch | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 2075c96a8..9b9d24b30 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,13 @@ linux (4.15.4-2) UNRELEASED; urgency=medium + [ Salvatore Bonaccorso ] * Add ABI reference for 4.15.0-1 * ALSA: seq: Fix racy pool initializations (CVE-2018-7566) * sctp: verify size of a new chunk in _sctp_make_chunk() (CVE-2018-5803) + [ Ben Hutchings ] + * aufs: gen-patch: Fix Subject generation to skip SPDX-License-Identifier + -- Salvatore Bonaccorso Tue, 20 Feb 2018 21:51:39 +0100 linux (4.15.4-1) unstable; urgency=medium diff --git a/debian/patches/features/all/aufs4/gen-patch b/debian/patches/features/all/aufs4/gen-patch index d1d96fdac..f37ec0b2c 100755 --- a/debian/patches/features/all/aufs4/gen-patch +++ b/debian/patches/features/all/aufs4/gen-patch @@ -20,7 +20,7 @@ for patch in aufs4-{base,mmap,standalone}.patch; do git log --pretty='Date: %ad' HEAD -1 -- "$patch" fi echo -n 'Subject: ' - head -1 "$aufs_dir/$patch" + grep -v '^SPDX-License-Identifier:' "$aufs_dir/$patch" | head -1 echo "$origin_line" echo "$bug_line" echo