cronie-selinux 1.5.5-1 update

3 files changed, 10 insertions, 54 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4a3f5126c72f..d2a8e0c1344c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = cronie-selinux
 	pkgdesc = Daemon that runs specified programs at scheduled times and related tools with SELinux support
-	pkgver = 1.5.4
-	pkgrel = 3
+	pkgver = 1.5.5
+	pkgrel = 1
 	url = https://github.com/cronie-crond/cronie/
 	arch = i686
 	arch = x86_64
@@ -14,8 +14,8 @@ pkgbase = cronie-selinux
 	optdepends = smtp-server: send job output via email
 	optdepends = smtp-forwarder: forward job output to email server
 	provides = cron
-	provides = cronie=1.5.4-3
-	provides = selinux-cronie=1.5.4-3
+	provides = cronie=1.5.5-1
+	provides = selinux-cronie=1.5.5-1
 	conflicts = cron
 	conflicts = cronie
 	conflicts = selinux-cronie
@@ -23,14 +23,12 @@ pkgbase = cronie-selinux
 	backup = etc/pam.d/crond
 	backup = etc/cron.d/0hourly
 	backup = etc/anacrontab
-	source = https://github.com/cronie-crond/cronie/releases/download/cronie-1.5.4-final/cronie-1.5.4.tar.gz
-	source = 0001-do-not-log-carriage-return.patch
+	source = https://github.com/cronie-crond/cronie/releases/download/cronie-1.5.5/cronie-1.5.5.tar.gz
 	source = 80-cronie.hook
 	source = service
 	source = pam.d
 	source = deny
-	sha256sums = af8970559cad4262f8ffd7ec72abf682d2dcce04fdfb8f206a71d96566aba882
-	sha256sums = 595e96997afe506ad93a98896830f3651667f56406a5ae67f4bcf513cfcb45ad
+	sha256sums = be34c79505e5544323281854744b9955ff16b160ee569f9df7c0dddae5720eac
 	sha256sums = f85e9a68bf3bf446f8a6167f068371c06afffe11ca71935d8ee5487b38b2c9db
 	sha256sums = ac3ff3c8a5ce1b6367b06877b4b12ff74e7f18a3c510fb9f80d6ea6b6321e3b1
 	sha256sums = 00864268b491bab8c66400a4a4b4bf85f168a6e44e85676105e084940924090c
diff --git a/0001-do-not-log-carriage-return.patch b/0001-do-not-log-carriage-return.patch
deleted file mode 100644
index d8e450a284f7..000000000000
--- a/0001-do-not-log-carriage-return.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From cdc44c2b78ae88bf62bb870969ba814d3a79e71c Mon Sep 17 00:00:00 2001
-From: Christian Hesse <mail@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);
diff --git a/PKGBUILD b/PKGBUILD
index ff6d19a2e816..ae2bf86a44c4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,8 +8,8 @@
 # If you want to help keep it up to date, please open a Pull Request there.
 
 pkgname='cronie-selinux'
-pkgver=1.5.4
-pkgrel=3
+pkgver=1.5.5
+pkgrel=1
 pkgdesc='Daemon that runs specified programs at scheduled times and related tools with SELinux support'
 url='https://github.com/cronie-crond/cronie/'
 license=('custom:BSD')
@@ -21,14 +21,12 @@ conflicts=('cron' "${pkgname/-selinux}" "selinux-${pkgname/-selinux}")
 provides=('cron' "${pkgname/-selinux}=${pkgver}-${pkgrel}"
           "selinux-${pkgname/-selinux}=${pkgver}-${pkgrel}")
 groups=('selinux')
-source=("https://github.com/cronie-crond/cronie/releases/download/${pkgname/-selinux}-${pkgver}-final/${pkgname/-selinux}-${pkgver}.tar.gz"
-        '0001-do-not-log-carriage-return.patch'
+source=("https://github.com/cronie-crond/cronie/releases/download/${pkgname/-selinux}-${pkgver}/${pkgname/-selinux}-${pkgver}.tar.gz"
         '80-cronie.hook'
         'service'
         'pam.d'
         'deny')
-sha256sums=('af8970559cad4262f8ffd7ec72abf682d2dcce04fdfb8f206a71d96566aba882'
-            '595e96997afe506ad93a98896830f3651667f56406a5ae67f4bcf513cfcb45ad'
+sha256sums=('be34c79505e5544323281854744b9955ff16b160ee569f9df7c0dddae5720eac'
             'f85e9a68bf3bf446f8a6167f068371c06afffe11ca71935d8ee5487b38b2c9db'
             'ac3ff3c8a5ce1b6367b06877b4b12ff74e7f18a3c510fb9f80d6ea6b6321e3b1'
             '00864268b491bab8c66400a4a4b4bf85f168a6e44e85676105e084940924090c'
@@ -38,11 +36,6 @@ backup=('etc/cron.deny'
         'etc/cron.d/0hourly'
         'etc/anacrontab')
 
-prepare() {
-	cd "${srcdir}/${pkgname/-selinux}-${pkgver}"
-	patch -Np1 < ../0001-do-not-log-carriage-return.patch
-}
-
 build() {
 	cd "${srcdir}/${pkgname/-selinux}-${pkgver}"
 	./configure \