Date: Friday, September 13, 2019 @ 17:10:48 Author: eworm Revision: 362579
archrelease: copy trunk to testing-x86_64 Added: cronie/repos/testing-x86_64/ cronie/repos/testing-x86_64/0001-do-not-log-carriage-return.patch (from rev 362578, cronie/trunk/0001-do-not-log-carriage-return.patch) cronie/repos/testing-x86_64/PKGBUILD (from rev 362578, cronie/trunk/PKGBUILD) cronie/repos/testing-x86_64/deny (from rev 362578, cronie/trunk/deny) cronie/repos/testing-x86_64/pam.d (from rev 362578, cronie/trunk/pam.d) cronie/repos/testing-x86_64/service (from rev 362578, cronie/trunk/service) ---------------------------------------+ 0001-do-not-log-carriage-return.patch | 35 ++++++++++++++++ PKGBUILD | 70 ++++++++++++++++++++++++++++++++ deny | 1 pam.d | 10 ++++ service | 11 +++++ 5 files changed, 127 insertions(+) Copied: cronie/repos/testing-x86_64/0001-do-not-log-carriage-return.patch (from rev 362578, cronie/trunk/0001-do-not-log-carriage-return.patch) =================================================================== --- testing-x86_64/0001-do-not-log-carriage-return.patch (rev 0) +++ testing-x86_64/0001-do-not-log-carriage-return.patch 2019-09-13 17:10:48 UTC (rev 362579) @@ -0,0 +1,35 @@ +From cdc44c2b78ae88bf62bb870969ba814d3a79e71c Mon Sep 17 00:00:00 2001 +From: Christian Hesse <m...@eworm.de> +Date: Mon, 9 Sep 2019 10:17:32 +0200 +Subject: [PATCH 1/1] do not log carriage return + +Some commands (like ssh) end their output with carriage return (\r) and +new line (\n). Just cutting the new line before sending to syslog may +have undesired effects of unprintable characters. Reading cronie logs +with journalctl I can see: + +Sep 06 16:50:01 linux CROND[152575]: [96B blob data] + +Adding switch --all for unprintable characters it shows: + +Sep 06 16:50:01 linux CROND[152575]: (root) CMDOUT (Warning: Permanently +added '10.52.33.217' (ED25519) to the list of known hosts.^M) + +Just skip carriage return for syslog to prevent this. +--- + src/do_command.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/do_command.c b/src/do_command.c +index 45c49f7..ed56775 100644 +--- a/src/do_command.c ++++ b/src/do_command.c +@@ -506,6 +506,8 @@ static int child_process(entry * e, char **jobenv) { + */ + + while (EOF != (ch = getc(in))) { ++ if (ch == '\r') ++ continue; + bytes++; + if (mail) + putc(ch, mail); Copied: cronie/repos/testing-x86_64/PKGBUILD (from rev 362578, cronie/trunk/PKGBUILD) =================================================================== --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2019-09-13 17:10:48 UTC (rev 362579) @@ -0,0 +1,70 @@ +# Contributor: Kaiting Chen <kaiting.c...@kiwilight.com> +# Maintainer: Gaetan Bisson <bis...@archlinux.org> + +pkgname='cronie' +pkgver=1.5.4 +pkgrel=2 +pkgdesc='Daemon that runs specified programs at scheduled times and related tools' +url='https://github.com/cronie-crond/cronie/' +license=('custom:BSD') +arch=('x86_64') +depends=('pam' 'bash' 'run-parts') +optdepends=('smtp-server: send job output via email' + 'smtp-forwarder: forward job output to email server') +source=("https://github.com/cronie-crond/cronie/releases/download/${pkgname}-${pkgver}-final/${pkgname}-${pkgver}.tar.gz" + '0001-do-not-log-carriage-return.patch' + 'service' + 'pam.d' + 'deny') +sha256sums=('af8970559cad4262f8ffd7ec72abf682d2dcce04fdfb8f206a71d96566aba882' + '595e96997afe506ad93a98896830f3651667f56406a5ae67f4bcf513cfcb45ad' + 'ac3ff3c8a5ce1b6367b06877b4b12ff74e7f18a3c510fb9f80d6ea6b6321e3b1' + '00864268b491bab8c66400a4a4b4bf85f168a6e44e85676105e084940924090c' + 'ae6e533ecdfc1bd2dd80a9e25acb0260cbe9f00c4e4abee93d552b3660f263fc') + +backup=('etc/cron.deny' + 'etc/pam.d/crond' + 'etc/cron.d/0hourly' + 'etc/anacrontab') + +conflicts=('cron') +provides=('cron') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 < ../0001-do-not-log-carriage-return.patch +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --sbindir=/usr/bin \ + --enable-anacron \ + --with-inotify \ + --with-pam \ + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + + chmod u+s "${pkgdir}"/usr/bin/crontab + install -d "${pkgdir}"/var/spool/{ana,}cron + install -d "${pkgdir}"/etc/cron.{d,hourly,daily,weekly,monthly} + + install -Dm644 ../deny "${pkgdir}"/etc/cron.deny + install -Dm644 ../pam.d "${pkgdir}"/etc/pam.d/crond + install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/cronie.service + + install -Dm644 contrib/anacrontab "${pkgdir}"/etc/anacrontab + install -Dm644 contrib/0hourly "${pkgdir}"/etc/cron.d/0hourly + install -Dm755 contrib/0anacron "${pkgdir}"/etc/cron.hourly/0anacron + + install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/cronie/COPYING +} Copied: cronie/repos/testing-x86_64/deny (from rev 362578, cronie/trunk/deny) =================================================================== --- testing-x86_64/deny (rev 0) +++ testing-x86_64/deny 2019-09-13 17:10:48 UTC (rev 362579) @@ -0,0 +1 @@ +# without this file, only users listed in /etc/cron.allow can use crontab Copied: cronie/repos/testing-x86_64/pam.d (from rev 362578, cronie/trunk/pam.d) =================================================================== --- testing-x86_64/pam.d (rev 0) +++ testing-x86_64/pam.d 2019-09-13 17:10:48 UTC (rev 362579) @@ -0,0 +1,10 @@ +auth required pam_unix.so +auth required pam_env.so + +account required pam_access.so +account required pam_unix.so +account required pam_time.so + +session required pam_loginuid.so +session required pam_limits.so +session required pam_unix.so Copied: cronie/repos/testing-x86_64/service (from rev 362578, cronie/trunk/service) =================================================================== --- testing-x86_64/service (rev 0) +++ testing-x86_64/service 2019-09-13 17:10:48 UTC (rev 362579) @@ -0,0 +1,11 @@ +[Unit] +Description=Periodic Command Scheduler + +[Service] +ExecStart=/usr/bin/crond -n +ExecReload=/usr/bin/kill -HUP $MAINPID +KillMode=process +Restart=always + +[Install] +WantedBy=multi-user.target