Publish 2023.3.1

Signed-off-by: Mubashshir <ahm@jadupc.com>

11 files changed, 162 insertions, 26 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..613e1b1
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+!/scripts
diff --git a/README.maintainer b/README.maintainer
index e10d989..6d6ce0f 100644
--- a/README.maintainer
+++ b/README.maintainer
@@ -11,17 +11,25 @@ jetring-gen keyrings/team-members.gpg~ keyrings/team-members.gpg \
   "add adsb (ID: C5CE5DC2C542CD59)"
 jetring-accept team-members/ add-C5CE5DC2C542CD59 
 
+or
+
+./scripts/add-member "$KEYFILE" "C5CE5DC2C542CD59" "add adsb" 
+
 Adding a new archive key
 ------------------------
 
-make keyrings/debian-archive-keyring.gpg
-gpg --no-default-keyring --keyring keyrings/debian-archive-keyring.gpg \
+make keyrings/jadupc-archive-keyring.gpg
+gpg --no-default-keyring --keyring keyrings/jadupc-archive-keyring.gpg \
   --no-auto-check-trustdb --import $KEYFILE
-jetring-gen keyrings/debian-archive-keyring.gpg~ \
-  keyrings/debian-archive-keyring.gpg \
-  "add jessie automatic key (security)"
-mv add-9D6D8F6BC857C906 add-jessie-security-automatic
-jetring-accept active-keys/ add-jessie-security-automatic
+jetring-gen keyrings/jadupc-archive-keyring.gpg~ \
+  keyrings/jadupc-archive-keyring.gpg \
+  "add shopno automatic key (security)"
+mv add-9D6D8F6BC857C906 add-shopno-security-automatic
+jetring-accept active-keys/ add-shopno-security-automatic
+
+or
+
+./scripts/add-archive $KEYFILE "9D6D8F6BC857C906" "shopno automatic key (security)"
 
 Note that the filenames used for the changeset filenames must never be
 subsets of another changeset filename, or the keyring build will
@@ -43,19 +51,19 @@ gpg --detach-sign --output active-keys/index.gpg --armor --sign \
 Confirm that the result was as expected by:
 
 make clean
-make keyrings/debian-archive-keyring.gpg
-make keyrings/debian-archive-removed-keys.gpg
+make keyrings/jadupc-archive-keyring.gpg
+make keyrings/jadupc-archive-removed-keys.gpg
 
 and checking the contents of each keyring
 
-Add an entry to debian/debian-archive-keyring.maintscript:
+Add an entry to jadupc/jadupc-archive-keyring.maintscript:
 
-rm_conffile /etc/apt/trusted.gpg.d/debian-archive-${foo}.gpg ${version}~~
+rm_conffile /etc/apt/trusted.gpg.d/jadupc-archive-${foo}.gpg ${version}~~
 
 Pre-build
 ---------
 
-gpg --armor --detach-sign keyrings/debian-archive-keyring.gpg
+gpg --armor --detach-sign keyrings/jadupc-archive-keyring.gpg
 
 If any keys were removed:
-gpg --armor --detach-sign keyrings/debian-archive-removed-keys.gpg
+gpg --armor --detach-sign keyrings/jadupc-archive-removed-keys.gpg
diff --git a/active-keys/add-jadupc-archive-signing-2 b/active-keys/add-jadupc-archive-signing-2
new file mode 100644
index 0000000..eed6ee5
--- /dev/null
+++ b/active-keys/add-jadupc-archive-signing-2
@@ -0,0 +1,34 @@
+Comment: add jadupc archive signing (2)
+Date: Wed, 01 Mar 2023 11:46:03 +0600
+Action: import
+Data: 
+  -----BEGIN PGP PUBLIC KEY BLOCK-----
+  
+  mQINBGP7NMYBEACrNUBtvZbld1+yVaVRC7pNYU8js8Y1I4AiNDwqutp6DmRdtOrB
+  CRsd0rZEcleY4bhyADM4rMq5VQdMCcvPFD1ZBbM425ODo2BFVqb7Dc2CscSzdrUQ
+  hNrPulWEpMWQsFWf1Uy/n67HnqF/VKObA4WVJql5rB620zsZzztwUjchhqJK39ab
+  hSI8S0F7ns0rLUSCh8ug1ShYRF/xhxohOPR5Ol/eQz40oK7lQaQfneOHyX5pbnJo
+  ThxE6mun8aW9gV1/sXxj75av5xianfVxtss7vEqfyKsJNpkQwmHsvyUFp978nRLj
+  4MHMfsyjLMZEfIhAQUmrFHxwt9Bkdu+v0K8z02IFu7atIFohPqNhoLCLXL99jOcz
+  6Hzf+OXG8zgz0ffDbqpGnprwukEB+tU+TWhVv9qCyORY/QBtWVVo58Uqu0uueq9k
+  kgoDdDuqF22TzltuxcUjiw402xxwoIkZ/J/hXO3r13UAG/j2lXGxh9Ddsf4fMGM9
+  6quT23pxEE5WCi8VDb19oNxJzy/AvkHwXoXFw0r+7mi3EsJEcOHP/PMy6AJJQ/dd
+  RmAJcvCKlBrp32XJBa3Ab24BS4TjC/5eTVeL33o10XeS5DvMjIa8OUtH0PiEzH7e
+  wDfcoB40e6uIDznk1CQkObJ5O4oT20ARcbj42tZmGJuSg6413VIHvnlXRQARAQAB
+  tC5KYWR1UEMgQXJjaGl2ZSBTaWduaW5nIChmYXMpIDxyZXBvQGphZHVwYy5jb20+
+  iQJUBBMBCAA+FiEE/nhRXStMjKtUO+NFnOtLFH2PhOgFAmP7NMYCGwMFCQPCZwAF
+  CwkIBwIGFQoJCAsCBBYCAwECHgECF4AACgkQnOtLFH2PhOh2wxAAnUdWwOv6KuQi
+  YIGqIZLvIhK9mFcOjw8Bd+yG+YNo/UGnSo9e/Ql60zcISewNpB5cSD9rguSFmuHy
+  i/0vmzK0pwiHsiXuTf/aGy4NouUVjwnHccwRjaZo7M4xmCDowKiyVwejR5rWxmuW
+  0WikAyIQw4foERbTEJI64sLMMcFXRN0rQOvg9/HT8+EpGbRK3gvBvxujfO2Jlz5j
+  yoXpvI9JReqnX8lQVf3q5RSdt312ZHIeRxyKRMfZhyrQdxz2XXUl92p/WBBFnbmc
+  uvH6CUK/wAj+4+m/wnlVeROBaHKoYTT9C0+Q2SeCASdBSEM7vP+3XilUrc/4NrJE
+  VY/2gqMCnzds1qd67obSsHWpxoLO26YNxOe1WdCOgWaXkmyIACj1mje/ogGXbo/n
+  NCWCH2bTGnZDzRsxifxEk3jSt7FJm9Qv20G/o0UjL8c6FSMJqoTKEHGQ/bLNqqaX
+  iQ3J//Y5l8TFWI5h19CqY7feeC36bsH/c06WQJRkP5y2k3viFqFF/3vTUr3HlTeI
+  gh4QGAPNnho5Qq5NzItKzoXfDR3UsLuskhDzcHdxKKin1CrJ4e/biABJMsDqpx2j
+  a7ClyqeGuCuJ/lltCqYEXQndm+hltb6zsnCBm7Jlh4dA8yCCS1ZQEFOn7nB7T9uH
+  X1BSmFKQRtwQe80K7r2b0ZTri3i2rgw=
+  =mjRu
+  -----END PGP PUBLIC KEY BLOCK-----
+
diff --git a/active-keys/add-jadupc-archive-signing-3 b/active-keys/add-jadupc-archive-signing-3
new file mode 100644
index 0000000..fdd36fd
--- /dev/null
+++ b/active-keys/add-jadupc-archive-signing-3
@@ -0,0 +1,34 @@
+Comment: add jadupc archive signing (3)
+Date: Wed, 01 Mar 2023 11:49:57 +0600
+Action: import
+Data: 
+  -----BEGIN PGP PUBLIC KEY BLOCK-----
+  
+  mQINBGP7Np4BEACuK9qu0kCd6V2jU9TL5ew2BXOpI2JOCn3vhii0ov8SjnFp/jCf
+  w1Rhwg0f3ZJOha445nSqqyM90mQ5jhBXZPyLUT+Kv8DQjNX0wbXuneSzOxJ5CysC
+  xwck64XBcs664ZiL1fNDUeQk+I/fAziEAnLaQyHBiQRapvmmBZDzLA7cnK5AHeVj
+  9v0x1iUB/wki5YUceqZbrSFSHf4DbALyrCHpjEybuhiqVoJc9ot6j8W0a5Ysu0j4
+  To+cB8RDF/PbJYG0D0C/uAFRSQjGJDD82/thnc1oeI44BwM4y6ImY9ds9AABratY
+  HLrvs7JezjF6h+kftLgS4pMHZR0zpDCMFR+xFsOhJQJbSwMXxzfOB+quVlyc1C6v
+  QhmC2xGjesrDQITswoGrSEW1b5gOEAzBdwfHO7Tqi1P1BK6vfazjQQoUsjYd5beP
+  YJpTLg/2BJP9u+sRb4TB58hhB3e150//JAM66s+o7d/f1IZELZvV/8qwAgog1Z0+
+  nbgp/u/w75bWKwoty2wWGf5zxyhCczZm3COETnOSRg6Fh9zvM6yyuLzvJuaE5MDc
+  yIbwWb1UbTbtiX7oFMWoA229TWgGLFoXBb3MJAS2hcfk9byfR3SYc0BcS3+xMFt0
+  DPTydRi9z+0M0ZMWvFMQb/YDcQ9Wh56K+ooWQloDazeAg+IJXWYFom4NgQARAQAB
+  tC1KYWR1UEMgQXJjaGl2ZSBTaWduaW5nICh0YSkgPHJlcG9AamFkdXBjLmNvbT6J
+  AlQEEwEIAD4WIQRL4/WB6eqSFbu6I8x39Wbyy+T3OQUCY/s2ngIbAwUJA8JnAAUL
+  CQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRB39Wbyy+T3OatYEACC/6hN/KQuRSXK
+  AmnAnd2VM7mBLjN2ncsacxLjdMxZEtihcmbJu2tmunRz/IXK4NE3FVoj0a+9thkB
+  jvRLMxTlLdAzTDZOjQY5itX/w5wgJgotl8wawkYz2Nlw9FMNGhOtTHBzCM5m5jX1
+  UQdl4t8lKC6vqFXkYkUvgih56xKb6soCPTqsTzTDVfrmwL3xCwx7NxsywAKxxzfx
+  7aj/D7hcfGAZI+vz8lkpoCrFb6zy8fp14DqKpfzzbHxDmLv2HXfCysoiAJYj8yvy
+  Kj3xpaF3YlnTOpLpn/H7SoAigqT1pkgH7+5fiLCL2+ex45Tq5BogmJpd0a9ZgJgY
+  WYo4eAuhWVAmLgbAzLfTHGm/Lh0HEVI18JAoUzLXeWz7/zPlOIZjyUazEu7TT041
+  EAQR7ZqJjkttn1s5UQs8PrTcIGeCjjHTNzPgg/IEZJ4NTUQkJlRsnX2uccjMq3pc
+  JcclLgaam5WXvbSZyOKwC+Nhb5fs1Db6KFdFzFuwKcp9LNKrK8SBkHY7hspVXXRf
+  ckJZCF9YWPB60ut63/zBhTQxaBYJB6vASISgN+6blQvkqnmPgu2NdBjE/OxyTCiP
+  8HLjJhGoyO4mMbV9FIhyaEkN6Ot5H7B/2xlODaWCwZW5AUegdXYZVr1cVlDKwmEG
+  FdRdl1ulsFbWHCdTusyN9CkYOMduvg==
+  =ASx2
+  -----END PGP PUBLIC KEY BLOCK-----
+
diff --git a/active-keys/index b/active-keys/index
index 90008ca..b5fa734 100644
--- a/active-keys/index
+++ b/active-keys/index
@@ -1,3 +1,5 @@
 sha256-d3419463eb3a7b576f61d492ed4617f23da57a8d9e93ee7f2329d8d504c302d8  add-repo-key-shopno
 sha256-88eb647dd72de4a65ad726f7d61072f3ab04508e68a09b154db91225d940fdff  delete-repo-key-shopno
 sha256-855cda4cb7e472c2033feb95fafc6f926390de804c26a8a6700c940f1c0ccfc5  add-jadupc-archive-signing-1
+sha256-531bbe5e2cecf4829735a5ebf38595ade55c0875100209b08918c30bb93488e0  add-jadupc-archive-signing-2
+sha256-27164ed7a85b3668bad577e9e1be72a598029487d78bbf26b32b5108bf4b4e59  add-jadupc-archive-signing-3
diff --git a/active-keys/index.gpg b/active-keys/index.gpg
index 12c424f..a6ff7ef 100644
--- a/active-keys/index.gpg
+++ b/active-keys/index.gpg
diff --git a/debian/changelog b/debian/changelog
index a400dbd..517cbc5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+jadupc-archive-keyring (2023.3.1)  shopno; urgency=medium
+
+  * Add helper scripts
+  * Add Key for FAS
+  * Add Key for TA
+
+ -- Mubashshir <ahm@jadupc.com>  Wed, 01 Mar 2023 12:00:00 +0600
+
+jadupc-archive-keyring (2023.2.26) shopno; urgency=medium
+
+  * Remove lost key
+
+ -- Mubashshir <ahm@jadupc.com>  Wed, 22 Feb 2023 23:10:00 +0600
+
 jadupc-archive-keyring (2023.2.22) shopno; urgency=medium
 
   * Remove lost key
diff --git a/debian/jadupc-archive-keyring.maintscript b/debian/jadupc-archive-keyring.maintscript
new file mode 100644
index 0000000..5a035b0
--- /dev/null
+++ b/debian/jadupc-archive-keyring.maintscript
@@ -0,0 +1,5 @@
+# rm_conffile /etc/apt/trusted.gpg.d/jadupc-archive-${foo}.gpg ${version}~~
+
+rm_conffile /etc/apt/trusted.gpg.d/jadupc-archive-repo-key-shopno.gpg 2023.2.22~~
+
+# vim: ft=sh:ts=4:et
diff --git a/keyrings/jadupc-archive-keyring.gpg.asc b/keyrings/jadupc-archive-keyring.gpg.asc
index 3627779..89ce869 100644
--- a/keyrings/jadupc-archive-keyring.gpg.asc
+++ b/keyrings/jadupc-archive-keyring.gpg.asc
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNATURE-----
 
-iQIzBAABCgAdFiEEIU8MRkJtXTo68nuir+aMt+j47yUFAmP2SuwACgkQr+aMt+j4
-7yXkphAAjxUfDLcKIEIkbVW3qhbVouwD4UDeSKZ+px/LTb0+zWV/GeYvA9kX9LHN
-OM0ig+LbHIk3x49B39rH1rrNvbygHcoOSyWfpAcsv/QglcbfOFkw+SMb/uUTeYDK
-H+c9maMzO7GaYoSrJWHcNuSaQwJIAkh0koEMkTeCKh1iwo0uSEPfMrWyUikZEyVr
-NI+stczU0UlIjx8uJl8nayYhkjJcNnjL13xQR8GPzOzG1EZiiiSNHq3JPue2bW2H
-PGDnUa/qub1R89qXyK0NoZGJDpsGB0lxz2dQXezlq5vEuBlQdzKj8ax0FQ0O8P0r
-f4lNBQxxpg+U474lZXU9Dfnv7HyLDeol9dCP4IXokAy3zptd5fK3u0Fy6ewpJZ1M
-RyS7EQwwmBmD6xN514MHJPpzuShHwq6ZmyUuq60yGyRg37/W06jtfpTqTN/JkcPC
-bgwpu5UpQXAhV7R87JBgpwv0HQBGKOuA8Id/C+pMYpYfEBkyEdlphLWj89h3326S
-n9hedVBlGoAp3/jgrE5OvGVBN1ZVhev21LVHzuJoODh0eWLKAi/vy6FJaxg8c5hn
-yULnpcIohMndSWXw+M5P7DdGDkg1SvYMkjg3/FaYTXg9sQ/xF3q6OmFhsUkEkXPz
-cPomlh5Hpw4J2Vl3hqK+Gx8DU60NXu+tbhlx9dBHX0e6fM9j2jU=
-=esXv
+iQIzBAABCgAdFiEEIU8MRkJtXTo68nuir+aMt+j47yUFAmQAQrUACgkQr+aMt+j4
+7yXClRAAiAnv9u3+//hNu70CyrgzEfUts9HT+a7QZXb9Nk1iF0DGm3v1B/hbnxdL
+toexTphgerNAkfE0Vc07lB9jXFj25JSla4IxjvrtuDSpkw5MR2ON0I2A2wNZKNVG
+q6dWkIDlSgdbtco1+nFdyjKvovJZry5U97UkNkpktxK5tXimMFw7e4NJPrSIVN7G
++OSBLWFDDKw59RNc4VfWfdzY/Vet5+GgPLZrLVY642r9wStEhHBpFjQxDu3u0Ph/
+veNSTKtNIj2GrJ5s52MhGFiEmmJ4eSE7B/PIaOE27fCxdd04QOy2MTOxj72k5u8e
+J9St/kyP5uxswraZlMrvJPoXWeO7J4uLA4Qf2tTJ6u6Q8T3KoyO5JFh0gWlbgVoO
+Z3ZXeG6s+22s7mbWjLW4MPcq9C4K4lExdw6/dT21yXvWhcd44k72hDD7w8o74+bm
+spwpZCxA4hW5oj9aIKYmkqsRORKrX0jE1Ci+kZjge8NvneOL5F3HKf5MSQtRV0SJ
+ag6ZWr/U2f9utRgrOkNDjDWl6Z6FVxrJHQXXfGDaxA9u9kOVnwC33QKI/n7ewq4U
+XeLm3Pc1PBlBB8Tgxy47FZYSLxBJQPVt1fHHpDunwLEC2oQc944wsOnPC9tRbVIh
+raNnz5TC8KGSn2UBkr/49hkANYcfm6tqgkh8uNOTAJssZWibymA=
+=GwTC
 -----END PGP SIGNATURE-----
diff --git a/scripts/add-archive b/scripts/add-archive
new file mode 100755
index 0000000..3d7b57f
--- /dev/null
+++ b/scripts/add-archive
@@ -0,0 +1,20 @@
+#!/bin/sh
+cd "$(dirname "$(realpath "$0")")/.."
+
+if [ "$#" -lt 3 ]; then
+	cat >&2 << EOF
+Usage: ${0} [key-file] [key-id] [key-type]
+EOF
+else
+	file="$1"
+	id="$2"
+	message="$3"
+	type="$(                            echo -n "$message" | sed -E 's/\bkey\b//' | tr -s '[:space:][:punct:]' '-' | sed 's/-$//')"
+	make keyrings/jadupc-archive-keyring.gpg
+	gpg --no-default-keyring --keyring keyrings/jadupc-archive-keyring.gpg \
+		--no-auto-check-trustdb --import "$file"
+	jetring-gen keyrings/jadupc-archive-keyring.gpg~ keyrings/jadupc-archive-keyring.gpg \
+		"add $message"
+	mv "add-$id" "add-$type"
+	jetring-accept active-keys/ "add-$type"
+fi
diff --git a/scripts/add-member b/scripts/add-member
new file mode 100755
index 0000000..a8340dd
--- /dev/null
+++ b/scripts/add-member
@@ -0,0 +1,18 @@
+#!/bin/sh
+cd "$(dirname "$(realpath "$0")")/.."
+
+if [ "$#" -lt 3 ]; then
+	cat >&2 << EOF
+Usage: ${0} [key-file] [key-id] [change-message]
+EOF
+else
+	file="$1"
+	id="$2"
+	message="$3"
+	make keyrings/team-members.gpg
+	gpg --no-default-keyring --keyring keyrings/team-members.gpg \
+		--no-auto-check-trustdb --import "$file"
+	jetring-gen keyrings/team-members.gpg~ keyrings/team-members.gpg \
+		"$message (ID: $id)"
+	jetring-accept team-members/ "add-$id"
+fi