diff --git a/PKGBUILD b/PKGBUILD index 6d8386b..6d6fed9 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Yi-Ting Shih pkgname=hl-base-env -pkgver=1.1.1 +pkgver=1.1.2 pkgrel=1 pkgdesc="Base environment for konchin.com homelab" arch=(any) @@ -21,7 +21,7 @@ source=( 'install.sh' '90-editor.sh' 'hl-rootca.crt' - 'hl-package.asc' + 'hl-package.pem' 'timesyncd.conf' ) @@ -34,7 +34,7 @@ package() { install -Dm755 install.sh "$pkgdir/usr/lib/$pkgname/install.sh" install -Dm644 90-editor.sh "$pkgdir/etc/profile.d/90-editor.sh" install -Dm644 hl-rootca.crt "$pkgdir/usr/share/$pkgname/hl-rootca.crt" - install -Dm644 hl-package.asc "$pkgdir/usr/share/$pkgname/hl-package.asc" + install -Dm644 hl-package.pem "$pkgdir/usr/share/$pkgname/hl-package.pem" install -Dm644 timesyncd.conf "$pkgdir/etc/systemd/timesyncd.conf.d/$pkgname.conf" } sha256sums=('164d84a6db866f8445d8cd2b92a6513de4b8fd0204e4d127432416f13032890b' @@ -43,5 +43,5 @@ sha256sums=('164d84a6db866f8445d8cd2b92a6513de4b8fd0204e4d127432416f13032890b' '9d3f3962e7088ed30962d171536d81e042169ee5c3c46e3f7995eb53b27e71f5' '8df871b1727d147ecc410de3aa6cf24e5bf046f1bfb4b600b60c40acd6c4fa9a' '1bcae0144eb86eae3948eae7299c99f0b1fc53d0f47884da6dfcaddab503a382' - 'SKIP' + '986eaa2445c51d8d81023c9c7280b27785ec9f0513bcf9d8601ed8a8aad2c0c6' '2e24060a81df174639d4f3743b42d1cde191724292fa5bd2433d088d7f49b4f9') diff --git a/hl-base-env.install b/hl-base-env.install index c8b2434..c1cf00d 100644 --- a/hl-base-env.install +++ b/hl-base-env.install @@ -1,8 +1,9 @@ +_keyuid='Yi-Ting Shih Packaging Infrastructure ' + _package_changed() { trust anchor --store /usr/share/hl-base-env/hl-rootca.crt - pacman-key --add /usr/share/hl-base-env/hl-package.asc && \ - pacman-key --lsign-key \ - 'Yi-Ting Shih Packaging Infrastructure ' + pacman-key --add /usr/share/hl-base-env/hl-package.pem && \ + pacman-key --lsign-key "$_keyuid" update-ca-trust } @@ -17,5 +18,6 @@ post_upgrade() { pre_remove() { trust anchor --remove /usr/share/hl-base-env/hl-rootca.crt + pacman-key --delete "$_keyuid" update-ca-trust } diff --git a/hl-package.asc b/hl-package.pem similarity index 100% rename from hl-package.asc rename to hl-package.pem