From a6f76bffd89add05a545faf95bcef63dad02f8bc Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sat, 30 Apr 2016 20:39:23 +0200 Subject: [PATCH] signing: remove unatteded build key and use current keyring instead Remove the public unatteded buildkey from the opkg package to avoid having hardcoded keys in tree. Use the external keyring package instead which can be easily updated by users. Signed-off-by: Jo-Philipp Wich --- package/base-files/files/etc/opkg/keys/b5043e70f9a75cde | 2 -- package/system/lede-keyring/Makefile | 7 +++---- 2 files changed, 3 insertions(+), 6 deletions(-) delete mode 100644 package/base-files/files/etc/opkg/keys/b5043e70f9a75cde diff --git a/package/base-files/files/etc/opkg/keys/b5043e70f9a75cde b/package/base-files/files/etc/opkg/keys/b5043e70f9a75cde deleted file mode 100644 index bcbd9db631..0000000000 --- a/package/base-files/files/etc/opkg/keys/b5043e70f9a75cde +++ /dev/null @@ -1,2 +0,0 @@ -untrusted comment: LEDE usign key for unattended build jobs -RWS1BD5w+adc3j2Hqg9+b66CvLR7NlHbsj7wjNVj0XGt/othDgIAOJS+ diff --git a/package/system/lede-keyring/Makefile b/package/system/lede-keyring/Makefile index 4737fbb5a2..684a7ec5cd 100644 --- a/package/system/lede-keyring/Makefile +++ b/package/system/lede-keyring/Makefile @@ -1,17 +1,16 @@ -# Copyright (C) 2009-2012 OpenWrt.org -# All rights reserved. +# Copyright (C) 2016 LEDE project include $(TOPDIR)/rules.mk PKG_NAME:=lede-keyring -PKG_VERSION:=2016-04-27 +PKG_VERSION:=2016-04-30 PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(LEDE_GIT)/keyring.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=deb70780cc8aea8258db16af4dbebf4d8dcc7a7c +PKG_SOURCE_VERSION:=5c7857eed3fa06a9005f96b9b029388c7f316e83 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_MAINTAINER:=John Crispin