From efcb2c4473afb1390e0d06d6a34055a5018acf32 Mon Sep 17 00:00:00 2001
From: Daniel Langbein <daniel@systemli.org>
Date: Fri, 10 Sep 2021 12:08:02 +0200
Subject: [PATCH] add ungoogled-chromium mirror

---
 pkg/de-p1st-pacman/.install                    | 6 ++++++
 pkg/de-p1st-pacman/PKGBUILD                    | 8 +++++---
 pkg/de-p1st-pacman/pacman.conf.holoscript      | 5 ++++-
 pkg/de-p1st-pacman/pacman.d/de-p1st            | 2 +-
 pkg/de-p1st-pacman/pacman.d/ungoogled-chromium | 6 ++++++
 pkg/de-p1st-xfce4/PKGBUILD                     | 4 ++--
 6 files changed, 24 insertions(+), 7 deletions(-)
 create mode 100644 pkg/de-p1st-pacman/pacman.d/ungoogled-chromium

diff --git a/pkg/de-p1st-pacman/.install b/pkg/de-p1st-pacman/.install
index b754ef5..8db2702 100644
--- a/pkg/de-p1st-pacman/.install
+++ b/pkg/de-p1st-pacman/.install
@@ -1,11 +1,17 @@
 ## arg 1:  the new package version
 post_install() {
+  # add signing key of home_ungoogled_chromium_Arch mirror
+  curl -s 'https://download.opensuse.org/repositories/home:/ungoogled_chromium/Arch/x86_64/home_ungoogled_chromium_Arch.key' | sudo pacman-key --add -
+
   holo apply
 }
 
 ## arg 1:  the new package version
 ## arg 2:  the old package version
 post_upgrade() {
+  # add signing key of home_ungoogled_chromium_Arch mirror
+  curl -s 'https://download.opensuse.org/repositories/home:/ungoogled_chromium/Arch/x86_64/home_ungoogled_chromium_Arch.key' | sudo pacman-key --add -
+
   holo apply
 }
 
diff --git a/pkg/de-p1st-pacman/PKGBUILD b/pkg/de-p1st-pacman/PKGBUILD
index 9957c6e..e617625 100644
--- a/pkg/de-p1st-pacman/PKGBUILD
+++ b/pkg/de-p1st-pacman/PKGBUILD
@@ -2,13 +2,14 @@
 _pkgname=pacman
 _reponame=arch
 pkgname="de-p1st-$_pkgname"
-pkgver=0.1.2
+pkgver=0.2.1
 pkgrel=1
 pkgdesc="pacman with configuration"
 arch=('any')
 url="https://codeberg.org/privacy1st/${_reponame}"
 license=('MIT')
 depends=('pacman' 'holo' 'git' 'base')
+depends+=('curl')  # add signing key of mirror in .install
 makedepends=('git')
 optdepends=('de-p1st-pacman-mirrorlist')
 install='.install'
@@ -18,7 +19,8 @@ sha256sums=('SKIP')
 package() {
   cd "${_reponame}/pkg/${pkgname}"
 
-  install -Dm0644 pacman.d/de-p1st       "$pkgdir"/etc/pacman.d/de-p1st
+  install -Dm0644 pacman.d/de-p1st            "$pkgdir"/etc/pacman.d/de-p1st
+  install -Dm0644 pacman.d/ungoogled-chromium "$pkgdir"/etc/pacman.d/ungoogled-chromium
 
-  install -Dm0544 pacman.conf.holoscript "$pkgdir"/usr/share/holo/files/20-"$pkgname"/etc/pacman.conf.holoscript
+  install -Dm0544 pacman.conf.holoscript      "$pkgdir"/usr/share/holo/files/20-"$pkgname"/etc/pacman.conf.holoscript
 }
diff --git a/pkg/de-p1st-pacman/pacman.conf.holoscript b/pkg/de-p1st-pacman/pacman.conf.holoscript
index ad53ac8..359bd59 100644
--- a/pkg/de-p1st-pacman/pacman.conf.holoscript
+++ b/pkg/de-p1st-pacman/pacman.conf.holoscript
@@ -5,5 +5,8 @@
 # Enable parallel downloads
 sed 's|^#ParallelDownloads\s*=.*$|ParallelDownloads = 4|'
 
-# Include de-p1st mirror
+# de-p1st mirror
 echo 'Include = /etc/pacman.d/de-p1st'
+
+# home_ungoogled_chromium_Arch mirror
+echo 'Include = /etc/pacman.d/ungoogled-chromium'
diff --git a/pkg/de-p1st-pacman/pacman.d/de-p1st b/pkg/de-p1st-pacman/pacman.d/de-p1st
index 876ea14..2326259 100644
--- a/pkg/de-p1st-pacman/pacman.d/de-p1st
+++ b/pkg/de-p1st-pacman/pacman.d/de-p1st
@@ -1,4 +1,4 @@
-# in /etc/pacman.conf -> Include = /path/to/this/cfg/file
+# In /etc/pacman.conf -> Include = /path/to/this/cfg/file
 
 [de-p1st]
 SigLevel = Optional TrustAll
diff --git a/pkg/de-p1st-pacman/pacman.d/ungoogled-chromium b/pkg/de-p1st-pacman/pacman.d/ungoogled-chromium
new file mode 100644
index 0000000..47f3f27
--- /dev/null
+++ b/pkg/de-p1st-pacman/pacman.d/ungoogled-chromium
@@ -0,0 +1,6 @@
+# In /etc/pacman.conf -> Include = /path/to/this/cfg/file
+# Signing key: https://download.opensuse.org/repositories/home:/ungoogled_chromium/Arch/x86_64/home_ungoogled_chromium_Arch.key
+
+[home_ungoogled_chromium_Arch]
+SigLevel = Required TrustAll
+Server = https://download.opensuse.org/repositories/home:/ungoogled_chromium/Arch/$arch
diff --git a/pkg/de-p1st-xfce4/PKGBUILD b/pkg/de-p1st-xfce4/PKGBUILD
index ca79b78..ac4c39b 100644
--- a/pkg/de-p1st-xfce4/PKGBUILD
+++ b/pkg/de-p1st-xfce4/PKGBUILD
@@ -2,7 +2,7 @@
 _pkgname=xfce4
 _reponame=arch
 pkgname="de-p1st-$_pkgname"
-pkgver=0.1.2
+pkgver=0.1.3
 pkgrel=1
 pkgdesc="XFCE4 with configuration"
 arch=('any')
@@ -76,7 +76,7 @@ depends+=(de-p1st-sddm-theme)
 depends+=(nautilus)
 depends+=(xdg-user-dirs)  # nautilus new file templates
 depends+=(python-nautilus)  # e.g. Nextcloud integration
-depends+=(chromium cmark-gfm)  # md-to-pdf script depends on these two packages
+depends+=(ungoogled-chromium cmark-gfm)  # md-to-pdf script depends on these two packages
 
 # compression/archiving
 # -> https://docs.xfce.org/xfce/thunar/archive#supported_archive_managers