aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtto Modinos <ottomodinos@gmail.com>2019-10-06 21:16:24 +0300
committerKevin Daudt <kdaudt@alpinelinux.org>2019-10-08 19:16:03 +0000
commit6e923c1f84ca04c947268291ddd6f011826aab0e (patch)
tree133277f1ae8b6f29962186f6b862d72f65128f72
parent98759be75b016e8b3343cc092103915143b68910 (diff)
downloadaports-6e923c1f84ca04c947268291ddd6f011826aab0e.tar.gz
aports-6e923c1f84ca04c947268291ddd6f011826aab0e.tar.bz2
aports-6e923c1f84ca04c947268291ddd6f011826aab0e.tar.xz
main/chrony: use upstream logrotate
Fixes #10832 Closes !291
-rw-r--r--main/chrony/APKBUILD6
-rw-r--r--main/chrony/chrony.logrotate12
2 files changed, 2 insertions, 16 deletions
diff --git a/main/chrony/APKBUILD b/main/chrony/APKBUILD
index 967e6771fc..76982988b5 100644
--- a/main/chrony/APKBUILD
+++ b/main/chrony/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=chrony
pkgver=3.5
-pkgrel=0
+pkgrel=1
_ver=${pkgver/_/-}
pkgdesc="NTP client and server programs"
url="https://chrony.tuxfamily.org"
@@ -22,7 +22,6 @@ source="https://download.tuxfamily.org/$pkgname/$pkgname-$_ver.tar.gz
chronyd.confd
chronyd.initd
- chrony.logrotate
chrony.conf
timepps.h
"
@@ -61,7 +60,7 @@ package() {
make DESTDIR="$pkgdir" install
mkdir -p "$pkgdir"/etc/logrotate.d
- install -Dm644 "$srcdir"/chrony.logrotate "$pkgdir"/etc/logrotate.d/chrony
+ install -Dm644 examples/chrony.logrotate "$pkgdir"/etc/logrotate.d/chrony
mkdir -p "$pkgdir"/usr/share/doc/chrony
install -m644 examples/*.example "$pkgdir"/usr/share/doc/chrony/
@@ -87,6 +86,5 @@ sha512sums="c4f6376a44d71b6ac2b6d86e3d6fb4348642faeef7f3f3a4d6431627b5645efcc868
b26581ed32680585edea5b8163a0062a87f648394c0f363c77a7d01a36608fcf4d005d9e6ab179ed2827b8a08f598f7bad4801bb5e135cad5107eb77fb19b247 max_resolve_interval.patch
0490770cc214b4ccf76470420e0b33e6c41ad16344d6503973a28346b002e2cee441e9ae982be1a8f21696da26f436f2ce36a5201e9628becb83bad3487d9170 chronyd.confd
5c1a36a4a5f3d7b76c0042c70ff066664a0e2926fff66ce6c0fdcefbc4b70a8b23f660fec59eea45d3c90628bd9a1db7c5d34bbf2b5786d4c6cd9311538b8b6c chronyd.initd
-ab38f06bf45888846778ad935e24abb30d13b6805e9a750bc694ff953695fa8c5b33aac560f5f7f96dc46031c1a38660e5c418b6fce6fb34a87908a9a3c99357 chrony.logrotate
0ae453fca3461b6e56a32a9eb6be0d448c39bf0279583222ab2fecef307e1113f082d4e86f957e4baac4f223c5c57804cdea97322678009f3413ab99d54694b6 chrony.conf
eb11fc19243d1789016d88eb7645bfe67c46304547781489bf36eb1dd4c252d523681ff835a6488fa0ef62b6b9e2f781c672279f4439f5d5640a3f214a113048 timepps.h"
diff --git a/main/chrony/chrony.logrotate b/main/chrony/chrony.logrotate
deleted file mode 100644
index 4461a3063d..0000000000
--- a/main/chrony/chrony.logrotate
+++ /dev/null
@@ -1,12 +0,0 @@
-/var/log/chrony/*.log {
- missingok
- sharedscripts
- postrotate
- PASSWORD=`awk '$1 ~ /^1$/ {print $2; exit}' /etc/chrony/chrony.keys`
- cat << EOF | /usr/bin/chronyc | sed '/^200 OK$/d'
- password $PASSWORD
- cyclelogs
-EOF
- endscript
-}
-