Fix keyring package

PKGBUILDS/stratos-keyring/.SRCINFO

@@ -0,0 +1,18 @@
+pkgbase = stratos-keyring
+	pkgdesc = StratOS keyring
+	pkgver = 20240819
+	pkgrel = 1
+	url = https://stratos-linux.github.io
+	install = stratos-keyring.install
+	arch = any
+	license = GPL-3.0-or-later
+	source = stratos.gpg
+	source = stratos-revoked
+	source = stratos-trusted
+	source = stratos-keyring.install
+	# sha512sums = 1933bb08294113c95ce05e608b5f1c8643e8f9afffc97e8bf479626440e31d451f54a5e92bbac6a20a991fa874eec47b36b2722b6529d87afb384bd2c32a5f30
+	# sha512sums = cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e
+	# sha512sums = 4c2677da43b2032453346605cdf869f8c584c6f7d22009cd47f1585fc01c81e91917db237c383dc64ef90baa901a40e887a8a8e693fb97d1851040a16d6b8b62
+	# sha512sums = 8be463fc3c516dcd761ac6d0658605bb688e178339b96d4499d440a9fca8f6b04b2eba6772b8c8b995700d26c734314f12bc386bf824e151e701e583a360c453
+
+pkgname = stratos-keyring

PKGBUILDS/stratos-keyring/PKGBUILD

@@ -1,24 +1,22 @@
+# Maintainer: ZeStig <o0vckutt@duck.com>
+
 pkgname=stratos-keyring
-pkgver=20240804
+pkgver=20240819
 pkgrel=1
-pkgdesc='StratOS keyring'
-arch=('x86_64')
-url='https://stratos-linux.github.io'
-license=('GPL')
-install="${pkgname}.install"
-source=('https://raw.githubusercontent.com/stratos-linux/keyring/main/Makefile'
-        'https://raw.githubusercontent.com/stratos-linux/keyring/main/stratos.gpg'
-        'https://raw.githubusercontent.com/stratos-linux/keyring/main/stratos-revoked'
-        'https://raw.githubusercontent.com/stratos-linux/keyring/main/stratos-trusted')     
-validpgpkeys=(
-               'A046BE254138E0AC1BF5F66690D63B3FE2F217ED' # zstg
-             )  
-sha512sums=('SKIP'
-           'SKIP'
-           'SKIP'
-           'SKIP')
+pkgdesc="StratOS keyring"
+arch=(any)
+url="https://stratos-linux.github.io"
+license=('GPL-3.0-or-later')
+install=$pkgname.install
+source=("stratos.gpg"
+        "stratos-revoked"
+        "stratos-trusted"
+        "$install")
 
+sha512sums=('SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP')
 package() {
-	cd "${srcdir}"
-	make PREFIX=/usr DESTDIR="${pkgdir}" install
-}
+    install -D -m0644 -t "${pkgdir}"/usr/share/pacman/keyrings/ 'stratos'{.gpg,-trusted,-revoked}
+}

PKGBUILDS/stratos-keyring/stratos-trusted

@@ -0,0 +1 @@
+A046BE254138E0AC1BF5F66690D63B3FE2F217ED:4:

PKGBUILDS/stratos-keyring/stratos.gpg

@@ -0,0 +1,81 @@
+-----zstg-----
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+QIHdp1JzsCE+RG+0J1plU3RpZyAoRm9yIEdpdExhYikgPG8wdmNrdXR0QGR1Y2su
+Y29tPokCUQQTAQgAOxYhBKBGviVBOOCsG/X2ZpDWOz/i8hftBQJlcDb9AhsDBQsJ
+CAcCAiICBhUKCQgLAgQWAgMBAh4HAheAAAoJEJDWOz/i8hftRU0P/jhyX8/kRGoY
+BOQ2ZHvRUOkmwYpB0wQLwTq3kQ37QYqPY2Bj3R0MLaBMGxCdf83+RHMwZ1vGuAhy
+dxb5WTTbw2UH9ze+iZomR64Pxrq+zOF/HsA5AZyG+9oVZbxhgW3W0zskLG5qS+g7
+n4Z9S2/OGF79A5EhgS1i/NdZcIYVUSsuhVFkAQwFsnYEn5Ivmqf4Fv8nMto9JXmM
+HMpTzwLFC96nhs0+oDwOAzGBqpNhXB7RLW1LwH1Gn+Mv91eD3nFy/DfbMvVuuHBS
+QqePOG8J+sXmzHqRabt9QhR/B38iQ/GWkoKBMyxIl16fpV8l0YK6AIDjwNfdmc1p
+AMmMGgkJkiSwwaFTM3+wNTHG1ovyHN6yv04OqPGwNdfi4Lv977I+DIl5J3z88W9L
+G1C1xYud+G5KUbVyBMO3V/DsVa0LFO85P2XtQ6Wa90My0qWe59jfPeQe3Iqd+D/y
+vJrnITYnQokC6YAqcmFwgXf7OBASO6yLm8ivarhS3dGqpJkLdIsGASCJCpb0Be6w
+lWLcwoZGa6ru8E8c5pSugiz1xwtnzJHc/89gwzo2Fgnx97ccsgXtvUGc/mpTw/6f
+l3iJ0Vh6UHjgP2AmSCTlJJzlcbaZtLgmN70jNR8IIwohuiRUf1lMejPwPG2okhGI
+UmOEogJvHeC/fkH+c4hMsQopvvZa+PlOuQINBGVeNfABEADgkZJo5HwMSYprBZCj
+o/FXEUsE4MkQEVrxA7uEB3r9wRQBfNBW0EuvdcfRbiJ/WEhRNK7fDCXLZIj3dTDx
+Va1gN/lNjshiUjMX8IlNwqmLJWHIzjk2/t4tGc/J0wsRMHUJzTvl39/vbL1VVrPC
+4XjjfhP8AR8XSiLaxa1vDC9nX8nw9DxCJNO1xrreNxi9XMLsSDrWUTuv3UD2ioBV
+IIZKQ69tWlkMrlPPRG8O6yWHtrLbymStPoLA4fRGxbEphjTMIeFWnpblqw+0oDZ8
+Zmj7/PUSEGKODIGfDgA19XJ4QLP+jqWx2HnuPzmGSqLwGwwyfge4ia1BN6RsO4du
+MKc8HdHP5VUIlFsZuKpbMJF1ljV6EkuFe0R+XRigZYxmqhoX2CmadMn+954bmxqt
+LMMwPLq6YnnUtmneGpl+kHZ4QnVW2WK/GX3P/8lOXq7d2BwMpa17q1sGw+VVAVpa
+O7c8jrfI1668JpU+It/SJAXLGRv0drhxX0AvFiRZ/vQ+Tr11Jzz1waQNaQgLB1Kk
+T3Xqa8BzCetFsc3n4XA1GX0K0bPZQJz0QleNhOYfU1wr7aMdEiS/4Ipj1mySIZep
+DSkM4IUhPIwc9KgGuHxX/CZXW1qb5/BbbuH1+f3L7fGY0X6XOMT4m8qZVcUwhZ90
+mrYh6wPbo0t4P1EYfCUD7ZmguwARAQABiQI2BBgBCAAgFiEEoEa+JUE44Kwb9fZm
+kNY7P+LyF+0FAmVeNfACGwwACgkQkNY7P+LyF+0TthAAh+zgflsc9UzCpphTAXJ7
+dOgLgKLEvM2RHFWYE5yQWZ2VkxzpUs67uMe+Ae/JGczOPhKV0sn3BCpcCqpdZrL8
+YoBuoP3K52/O1NL/60JiEpaJELV8z6bXL+mzVg1GF0MA/Xe5RRooP25ub5rldWd4
+dJs4IlUU2QdiuiZO5TDmJZScPc/0SInD2x0SFu/kruyRikRQfC6CAfUCJ2tLAZ9F
+Tl1ZbwcVW/Oz6JFTkWFr6Lq4FgRYJ7KLa9+e8fz87TV9XNxwsh7e+gXLo758QO6w
+w3fjWCdH/ZXyPp+U/jl3X7QMUXNAsWv34/8MufbuTJgd+R95o/kKkXuA+nPKrTC7
+YTkGl7s3dc1OP1GnVwZs8n7my0Ek+RLML/sAk3Yo/10qYX8haJnwg7GIFxqMHCek
+JlOgy1RHJXcxWFG7sBkWL3jlnIOGXSGLBvzCky9fNEDRh1mQ4eUk96Yn3WgjAw6Y
+FJfYfO5OUlk9smJQrTsKs+/kR82fE2afhSuC1GqsG4jRUq3mCdsvuQVa62l9DIPq
+eqBgvd4HzBanVPVfKqWOE6/roFgY3JMbcrajOP6KJDFpG4qwYc/0i8ubcVABbrnc
+T0Jv+CQVobodVEOEHt9WxUEDBa/EINMQaBaVgRPSgIt3cKLrUt5sB1yEgl0YnPF+
+uLpo+JueGuQoDU0pCSGTTjA=
+=3kvR
+-----END PGP PUBLIC KEY BLOCK-----

build.sh

@@ -14,27 +14,15 @@ trap 'handle_error $LINENO' ERR
 setup_environment() {
     dir=$(pwd)
     pacman-key --init
-    rm -rf /tmp/stratos-keyring 2>/dev/null
+    sudo rm -rf /tmp/stratos-keyring 2>/dev/null
     cp -r $dir/PKGBUILDS/stratos-keyring /tmp
     sudo chown -R builder:builder /tmp/stratos-keyring
     cd /tmp/stratos-keyring
     rm -f *.pkg.tar.zst 2>/dev/null
     sudo -u builder makepkg -si --noconfirm
-    # sudo pacman-key --recv-keys A046BE254138E0AC1BF5F66690D63B3FE2F217ED
-    # sudo pacman-key --finger A046BE254138E0AC1BF5F66690D63B3FE2F217ED
-    sudo pacman-key --lsign A046BE254138E0AC1BF5F66690D63B3FE2F217ED
-    ## echo "A046BE254138E0AC1BF5F66690D63B3FE2F217ED:6:" | gpg --import-ownertrust -
-    ## echo "A046BE254138E0AC1BF5F66690D63B3FE2F217ED:6:" | sudo -u builder gpg --import-ownertrust -
-    ## echo -e "trust\n6\ny\nsave\n" | sudo pacman-key --edit-key A046BE254138E0AC1BF5F66690D63B3FE2F217ED
-    # Do this if you want the packages to show up with "Ultimate" trust - else they'll be "full"y trusted bcos of pacman-key
-    # sudo gpg --homedir /etc/pacman.d/gnupg --export-ownertrust > /etc/pacman.d/gnupg/ownertrust.txt
-    # echo "A046BE254138E0AC1BF5F66690D63B3FE2F217ED:6:" >> /etc/pacman.d/gnupg/ownertrust.txt
-    # sudo gpg --homedir /etc/pacman.d/gnupg --import-ownertrust < /etc/pacman.d/gnupg/ownertrust.txt    
-    # pacman-key --list-keys | tail -n 20
-    cd $dir
     echo -e "\n[StratOS-repo]\nSigLevel = Optional TrustAll\nServer = https://${git config --get remote.origin.url | sed -E 's|.+[:/]([^:/]+)/([^/.]+)(\.git)?|\1|'}.github.io/StratOS-repo/x86_64" | sudo tee -a /etc/pacman.conf
     sudo sed -i 's/purge debug/purge !debug/g' /etc/makepkg.conf
-    # sudo sed -i 's/^#* *GPGKEY *=.*/GPGKEY="A046BE254138E0AC1BF5F66690D63B3FE2F217ED"/' /etc/makepkg.conf # add zstg's public key
+    sudo sed -i 's/^#* *GPGKEY *=.*/GPGKEY="A046BE254138E0AC1BF5F66690D63B3FE2F217ED"/' /etc/makepkg.conf # add zstg's public key
     sed -i 's/^#*\(PACKAGER=\).*/\1"StratOS team <stratos-linux@gmail.com>"/' /etc/makepkg.conf
 }