summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbill-auger <mr.j.spam.me@gmail.com>2022-07-30 03:30:24 -0400
committerbill-auger <mr.j.spam.me@gmail.com>2022-07-30 03:35:03 -0400
commitdb990c173ddf0c64428a8ce4c212ed1c9537c9c9 (patch)
treee3da567da172311d79d9bcc18aeddab34d929090
parent93be04daa5376c88de01570a0bbacc6525c65951 (diff)
[pacman]: remove keyring update service files
the keyring network is in a sad shape these days --refresh-keys does more harm than good
-rw-r--r--libre/pacman/PKGBUILD15
-rw-r--r--libre/pacman/dummy.conf3
-rw-r--r--libre/pacman/pacman-keyring.initd26
-rw-r--r--libre/pacman/pacman-keyring.service7
-rw-r--r--libre/pacman/pacman-keyring.timer11
5 files changed, 2 insertions, 60 deletions
diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD
index ae5d4e909..aab8eff6b 100644
--- a/libre/pacman/PKGBUILD
+++ b/libre/pacman/PKGBUILD
@@ -10,7 +10,6 @@
# parabola changes and rationale:
# - adapt config files to support multiple arches
-# - install keyring updater service files
# - allow pacstrap to create cross-arch chroots
@@ -171,18 +170,4 @@ package() {
install -m644 "$srcdir/pacman.conf.$carch" "$pkgdir/usr/share/pacman/defaults/"
install -m644 "$srcdir/makepkg.conf.$carch" "$pkgdir/usr/share/pacman/defaults/"
done
-
- # systemd service
- install -dm755 "$pkgdir/usr/lib/systemd/system"
- install -dm755 "$pkgdir/usr/lib/systemd/system-preset"
- install -m644 "$srcdir/pacman-keyring.service" "$pkgdir/usr/lib/systemd/system/"
- install -m644 "$srcdir/pacman-keyring.timer" "$pkgdir/usr/lib/systemd/system/"
- install -m644 /dev/stdin "$pkgdir/usr/lib/systemd/system-preset/90-pacman.preset" \
- <<<"enable pacman-keyring.timer"
-
- # openrc service
- install -dm755 "$pkgdir/etc/init.d"
- install -dm755 "$pkgdir/etc/runlevels/default"
- install -m755 "$srcdir/pacman-keyring.initd" "$pkgdir/etc/init.d/pacman-keyring"
- ln -s /etc/init.d/pacman-keyring "$pkgdir/etc/runlevels/default/pacman-keyring"
}
diff --git a/libre/pacman/dummy.conf b/libre/pacman/dummy.conf
index 8d7df06d6..1b42f4bd4 100644
--- a/libre/pacman/dummy.conf
+++ b/libre/pacman/dummy.conf
@@ -1 +1,2 @@
-# parabola's pacman.conf expects at least 1 file matching /etc/pacman.d/*.conf
+# if the '# Over-rides #' include in pacman.conf is enabled,
+# there must exist at least 1 file matching /etc/pacman.d/*.conf
diff --git a/libre/pacman/pacman-keyring.initd b/libre/pacman/pacman-keyring.initd
deleted file mode 100644
index 1945af58b..000000000
--- a/libre/pacman/pacman-keyring.initd
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/openrc-run
-
-# This is not a daemon; but a short-lived process,
-# which only needs to run occasionally.
-# Running it as a pseudo-service,
-# simplifies the install (rather than requiring a cron deamon).
-# Users must only add it to the 'default' runlevel.
-
-
-name="pacman-keyring"
-description="Refresh pacman keyring"
-
-
-depend() {
- need net
- after logger
-}
-
-# Custom start() function with wrapper, to always exit "success" status.
-# The command will exit non-zero upon any failed key retrieval;
-# which is common if not likely, due to the large number of keys it fetches.
-start() {
- ebegin "Starting ${RC_SVCNAME}"
- start-stop-daemon --start --exec /usr/bin/bash -- -c '/usr/bin/pacman-key --refresh-keys || :'
- eend $?
-}
diff --git a/libre/pacman/pacman-keyring.service b/libre/pacman/pacman-keyring.service
deleted file mode 100644
index ded0235ad..000000000
--- a/libre/pacman/pacman-keyring.service
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=Refresh pacman keyring
-Documentation=man:pacman-key
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/pacman-key --refresh-keys
diff --git a/libre/pacman/pacman-keyring.timer b/libre/pacman/pacman-keyring.timer
deleted file mode 100644
index 1b54d4444..000000000
--- a/libre/pacman/pacman-keyring.timer
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Refresh pacman keyring once a week
-Documentation=man:pacman-key
-
-[Timer]
-OnCalendar=weekly
-AccuracySec=1h
-Persistent=true
-
-[Install]
-WantedBy=timers.target