From 33ad5c16e414767c32739f8b1cacd93aa72a0625 Mon Sep 17 00:00:00 2001
From: Leonid Plyushch <leonid.plyushch@gmail.com>
Date: Mon, 28 Jan 2019 18:12:03 +0200
Subject: [PATCH] move common gpg keys to the single package

---
 packages/root-repo/build.sh                        |   6 +++---
 packages/termux-keyring/build.sh                   |  11 +++++++++++
 packages/{root-repo => termux-keyring}/grimler.gpg | Bin
 packages/{x11-repo => termux-keyring}/xeffyr.gpg   | Bin
 packages/x11-repo/build.sh                         |   6 +++---
 5 files changed, 17 insertions(+), 6 deletions(-)
 create mode 100644 packages/termux-keyring/build.sh
 rename packages/{root-repo => termux-keyring}/grimler.gpg (100%)
 rename packages/{x11-repo => termux-keyring}/xeffyr.gpg (100%)

diff --git a/packages/root-repo/build.sh b/packages/root-repo/build.sh
index 07fb21720..a3004c8bf 100644
--- a/packages/root-repo/build.sh
+++ b/packages/root-repo/build.sh
@@ -2,13 +2,13 @@ TERMUX_PKG_HOMEPAGE=https://github.com/termux/termux-root-packages
 TERMUX_PKG_DESCRIPTION="Package repository containing programs for rooted devices"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_MAINTAINER="Henrik Grimler @Grimler91"
-TERMUX_PKG_VERSION=1.2
+TERMUX_PKG_VERSION=1.3
+TERMUX_PKG_DEPENDS="termux-keyring"
 TERMUX_PKG_PLATFORM_INDEPENDENT=yes
 
 termux_step_make_install() {
-	mkdir -p $TERMUX_PREFIX/etc/apt/{sources.list.d,trusted.gpg.d}
+	mkdir -p $TERMUX_PREFIX/etc/apt/sources.list.d
 	echo "deb https://grimler.se root stable" > $TERMUX_PREFIX/etc/apt/sources.list.d/root.list
-	cp $TERMUX_PKG_BUILDER_DIR/grimler.gpg $TERMUX_PREFIX/etc/apt/trusted.gpg.d/
 }
 
 termux_step_create_debscripts () {
diff --git a/packages/termux-keyring/build.sh b/packages/termux-keyring/build.sh
new file mode 100644
index 000000000..fc93c36c8
--- /dev/null
+++ b/packages/termux-keyring/build.sh
@@ -0,0 +1,11 @@
+TERMUX_PKG_HOMEPAGE=https://github.com/termux
+TERMUX_PKG_DESCRIPTION="GPG public keys for the official Termux repositories"
+TERMUX_PKG_LICENSE="Apache-2.0"
+TERMUX_PKG_VERSION=1.0
+TERMUX_PKG_PLATFORM_INDEPENDENT=yes
+
+termux_step_make_install() {
+	mkdir -p $TERMUX_PREFIX/etc/apt/trusted.gpg.d
+	install -Dm600 $TERMUX_PKG_BUILDER_DIR/grimler.gpg $TERMUX_PREFIX/etc/apt/trusted.gpg.d/
+	install -Dm600 $TERMUX_PKG_BUILDER_DIR/xeffyr.gpg $TERMUX_PREFIX/etc/apt/trusted.gpg.d/
+}
diff --git a/packages/root-repo/grimler.gpg b/packages/termux-keyring/grimler.gpg
similarity index 100%
rename from packages/root-repo/grimler.gpg
rename to packages/termux-keyring/grimler.gpg
diff --git a/packages/x11-repo/xeffyr.gpg b/packages/termux-keyring/xeffyr.gpg
similarity index 100%
rename from packages/x11-repo/xeffyr.gpg
rename to packages/termux-keyring/xeffyr.gpg
diff --git a/packages/x11-repo/build.sh b/packages/x11-repo/build.sh
index c1429f964..2476a7e23 100644
--- a/packages/x11-repo/build.sh
+++ b/packages/x11-repo/build.sh
@@ -2,13 +2,13 @@ TERMUX_PKG_HOMEPAGE=https://termux-x11.ml
 TERMUX_PKG_DESCRIPTION="Package repository containing X11 programs and libraries"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
-TERMUX_PKG_VERSION=1.2
+TERMUX_PKG_VERSION=1.3
+TERMUX_PKG_DEPENDS="termux-keyring"
 TERMUX_PKG_PLATFORM_INDEPENDENT=yes
 
 termux_step_make_install() {
-	mkdir -p $TERMUX_PREFIX/etc/apt/{sources.list.d,trusted.gpg.d}
+	mkdir -p $TERMUX_PREFIX/etc/apt/sources.list.d
 	echo "deb https://termux-x11.ml x11 main" > $TERMUX_PREFIX/etc/apt/sources.list.d/x11.list
-	cp $TERMUX_PKG_BUILDER_DIR/xeffyr.gpg $TERMUX_PREFIX/etc/apt/trusted.gpg.d/
 }
 
 termux_step_create_debscripts () {