From e05c5f3bd221eeae62366618e44acdba72ef015b Mon Sep 17 00:00:00 2001 From: Tomasz Maciej Nowak Date: Fri, 5 May 2023 16:41:52 +0200 Subject: [PATCH] v4l-dvb: check hash of generated source tarball These are internally genrated but integrity wasn't checked. Signed-off-by: Tomasz Maciej Nowak --- v4l-dvb/Makefile | 9 ++++++--- v4l-dvb/origin/linuxtv.mk | 2 ++ v4l-dvb/origin/tbsdtv.mk | 1 + 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/v4l-dvb/Makefile b/v4l-dvb/Makefile index 459d9509d..99f39f79c 100644 --- a/v4l-dvb/Makefile +++ b/v4l-dvb/Makefile @@ -43,15 +43,18 @@ define Build/Prepare -e 's,tar rvf ,tar --numeric-owner --owner=0 --group=0 --mode=a-s --sort=name --mtime="$$$$(TAR_TS)" -r -v -f ,g' \ $(PKG_BUILD_DIR)/linux/Makefile - (if [ -s $(DL_DIR)/$(V4L_SOURCE_FILE) ]; \ + (if [ "`mkhash -N sha256 $(DL_DIR)/$(V4L_SOURCE_FILE)`" = "$(V4L_HASH)" ]; \ then $(CP) $(DL_DIR)/$(V4L_SOURCE_FILE) $(PKG_BUILD_DIR)/linux/linux-media.tar.bz2; \ - else if [ -d $(DL_DIR)/$(V4L_REPO_NAME) ]; \ + else if [ -d $(DL_DIR)/$(V4L_REPO_NAME)/.git ]; \ then git -C $(DL_DIR)/$(V4L_REPO_NAME) fetch --progress; \ else git clone --progress --single-branch $(V4L_SOURCE_URL) $(DL_DIR)/$(V4L_REPO_NAME); \ fi; \ git -C $(DL_DIR)/$(V4L_REPO_NAME) checkout --progress $(V4L_SOURCE_VERSION); \ cd $(PKG_BUILD_DIR)/linux; make tar DIR=$(DL_DIR)/$(V4L_REPO_NAME); \ - $(CP) linux-media.tar.bz2 $(DL_DIR)/$(V4L_SOURCE_FILE); \ + if [ "`mkhash -N sha256 linux-media.tar.bz2`" = "$(V4L_HASH)" ]; \ + then $(CP) linux-media.tar.bz2 $(DL_DIR)/$(V4L_SOURCE_FILE); \ + else echo 'Error: linux-media.tar.bz2 check sum does not match V4L_HASH.'; false; \ + fi; \ fi;) $(MAKE) -C $(PKG_BUILD_DIR) untar diff --git a/v4l-dvb/origin/linuxtv.mk b/v4l-dvb/origin/linuxtv.mk index a697f78fd..16bbafb75 100644 --- a/v4l-dvb/origin/linuxtv.mk +++ b/v4l-dvb/origin/linuxtv.mk @@ -4,11 +4,13 @@ PKG_SOURCE_PROTO := git PKG_SOURCE_URL := git://linuxtv.org/media_build.git PKG_SOURCE_VERSION := 0fe857b86addf382f6fd383948bd7736a3201403 PKG_SOURCE_DATE := 2022-05-24 +PKG_MIRROR_HASH := d7eecb327f2e0509c293c068cb9be8f2362419b547b8eebf57277e349890b0be V4L_SOURCE_URL := git://linuxtv.org/media_tree.git V4L_SOURCE_VERSION := 4b0986a3613c92f4ec1bdc7f60ec66fea135991f V4L_SOURCE_DATE := 2022-05-22 V4L_REPO_NAME := linux-media-linuxtv V4L_SOURCE_FILE := $(V4L_REPO_NAME)-$(V4L_SOURCE_DATE)-$(shell printf '%.8s' $(V4L_SOURCE_VERSION)).tar.bz2 +V4L_HASH := 9c2ee201302412ddd84d64de4b06278800c04add2542ee1d1b0fa606e433200f PATCH_DIR := patches-linuxtv diff --git a/v4l-dvb/origin/tbsdtv.mk b/v4l-dvb/origin/tbsdtv.mk index 0a80d7d2d..b4223afd1 100644 --- a/v4l-dvb/origin/tbsdtv.mk +++ b/v4l-dvb/origin/tbsdtv.mk @@ -11,5 +11,6 @@ V4L_SOURCE_VERSION := 16c763979217cd58c35ffd5ad776d73f1e5a950e V4L_SOURCE_DATE := 2023-01-15 V4L_REPO_NAME := linux-media-tbsdtv V4L_SOURCE_FILE := $(V4L_REPO_NAME)-$(V4L_SOURCE_DATE)-$(shell printf '%.8s' $(V4L_SOURCE_VERSION)).tar.bz2 +V4L_HASH := bc8a96235963c3a90251d7eaf68a956f463058a02ffb9ff41d875229b1b335f1 PATCH_DIR := patches-tbsdtv