summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2015-07-29 14:56:44 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2015-07-29 15:01:55 -0300
commit3e805c32fd3a7ae1befdcfcd8f3aaeb7610d6794 (patch)
treef29be25eb270532296985049233937f52d2c94eb
parent26c0aa2a34dae7b4ff2d9cb9f7b35ee2890bdfc2 (diff)
downloadabslibre-3e805c32fd3a7ae1befdcfcd8f3aaeb7610d6794.tar.gz
abslibre-3e805c32fd3a7ae1befdcfcd8f3aaeb7610d6794.tar.bz2
abslibre-3e805c32fd3a7ae1befdcfcd8f3aaeb7610d6794.zip
pacman-4.2.1-2.parabola2: convert cron job to systemd timer and leave cron as optional dependency -> https://lists.parabola.nu/pipermail/dev/2015-July/003128.html
-rw-r--r--libre/pacman/PKGBUILD15
-rw-r--r--libre/pacman/pacman-keyring.service6
-rw-r--r--libre/pacman/pacman-keyring.timer11
-rw-r--r--libre/pacman/refresh-pacman-keys3
4 files changed, 27 insertions, 8 deletions
diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD
index 4fba5108f..70d2de513 100644
--- a/libre/pacman/PKGBUILD
+++ b/libre/pacman/PKGBUILD
@@ -6,10 +6,11 @@
# Contributor: Márcio Silva <coadde@parabola.nu>
# Contributor: Nicolás Reynolds <fauno@kiwwwi.com.ar>
# Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
+# Contributor: Daniel Milewski <niitotantei@riseup.net>
pkgname=pacman
pkgver=4.2.1
-pkgrel=2.parabola1
+pkgrel=2.parabola2
pkgdesc="A library-based package manager with dependency support"
arch=('i686' 'x86_64')
url="http://www.archlinux.org/pacman/"
@@ -17,9 +18,10 @@ license=('GPL')
groups=('base' 'base-devel')
depends=('bash' 'glibc' 'libarchive>=3.1.2' 'curl>=7.39.0'
'gpgme' 'pacman-mirrorlist' 'archlinux-keyring'
- 'parabola-keyring' 'ca-certificates-cacert' 'cronie')
+ 'parabola-keyring' 'ca-certificates-cacert')
makedepends=('asciidoc') # roundup patch alters docs
checkdepends=('python2' 'fakechroot')
+optdepends=('cron: run specified programs at scheduled times and related tools')
provides=("$pkgname-contrib")
conflicts=("$pkgname-contrib" "$pkgname-parabola" 'cacert-dot-org')
replaces=("$pkgname-contrib" "$pkgname-parabola" 'cacert-dot-org')
@@ -29,7 +31,8 @@ source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig
ensure-matching-database-and-package-version.patch
$pkgname.conf.{i686,x86_64}
makepkg.conf
- refresh-$pkgname-keys
+ $pkgname-keyring.service
+ $pkgname-keyring.timer
makepkg-pkgrel-4.patch)
md5sums=('2a596fc8f723e99660c0869a74afcf47'
'SKIP'
@@ -37,7 +40,8 @@ md5sums=('2a596fc8f723e99660c0869a74afcf47'
'9c1454e48b2216b23f931e04d6dab1ee'
'7279d086428df483fd60c33f7c88cf3e'
'ce525a9af50f1d9b824806d2e5a4f0c8'
- '093f0779ac55ae781ba028ad74b95f84'
+ '11a5fac02651041e44d65d66c3538030'
+ '7fb448e0d2b5b22da5ddc0040378efb0'
'0ee98dc38ff80ba127772f5104e18e46')
validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD') # Allan McRae <allan@archlinux.org>
@@ -108,5 +112,6 @@ package() {
install -Dm644 contrib/PKGBUILD.vim "$pkgdir/usr/share/vim/vimfiles/syntax/PKGBUILD.vim"
- install -Dm755 "$srcdir/refresh-pacman-keys" "$pkgdir/etc/cron.weekly/refresh-pacman-keys"
+ install -Dm644 "$srcdir/pacman-keyring.service" "$pkgdir/usr/lib/systemd/system/pacman-keyring.service"
+ install -Dm644 "$srcdir/pacman-keyring.timer" "$pkgdir/usr/lib/systemd/system/pacman-keyring.timer"
}
diff --git a/libre/pacman/pacman-keyring.service b/libre/pacman/pacman-keyring.service
new file mode 100644
index 000000000..e09073494
--- /dev/null
+++ b/libre/pacman/pacman-keyring.service
@@ -0,0 +1,6 @@
+[Unit]
+Description=Refresh pacman keyring
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/pacman-key --refresh-keys
diff --git a/libre/pacman/pacman-keyring.timer b/libre/pacman/pacman-keyring.timer
new file mode 100644
index 000000000..137ef7c70
--- /dev/null
+++ b/libre/pacman/pacman-keyring.timer
@@ -0,0 +1,11 @@
+[Unit]
+Description=Refresh pacman keyring once a week
+Documentation=man:pacman-key
+
+[Timer]
+OnCalendar=weekly
+AccuracySec=1h
+Persistent=true
+
+[Install]
+WantedBy=multi-user.target
diff --git a/libre/pacman/refresh-pacman-keys b/libre/pacman/refresh-pacman-keys
deleted file mode 100644
index e96dc34e5..000000000
--- a/libre/pacman/refresh-pacman-keys
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-pacman-key --refresh-keys