Skip to content

Commit 20e4fdc

Browse files
committed
2 parents fc76b4a + 82fcc65 commit 20e4fdc

File tree

4 files changed

+57
-7
lines changed

4 files changed

+57
-7
lines changed

base_pkglist.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
; the same pkgrel as the base package.
77

88
core/coreutils
9-
extra/cronie
9+
extra/cronie = 1.7.2-1
1010
core/dbus
1111
core/dbus-broker
1212
core/findutils

cronie-selinux/.SRCINFO

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
pkgbase = cronie-selinux
22
pkgdesc = Daemon that runs specified programs at scheduled times and related tools with SELinux support
33
pkgver = 1.7.2
4-
pkgrel = 1
4+
pkgrel = 2
55
url = https://github.com/cronie-crond/cronie/
66
arch = i686
77
arch = x86_64
@@ -15,8 +15,8 @@ pkgbase = cronie-selinux
1515
optdepends = smtp-server: send job output via email
1616
optdepends = smtp-forwarder: forward job output to email server
1717
provides = cron
18-
provides = cronie=1.7.2-1
19-
provides = selinux-cronie=1.7.2-1
18+
provides = cronie=1.7.2-2
19+
provides = selinux-cronie=1.7.2-2
2020
conflicts = cron
2121
conflicts = cronie
2222
conflicts = selinux-cronie
@@ -32,10 +32,12 @@ pkgbase = cronie-selinux
3232
source = cron-deny
3333
source = crontab
3434
source = default-anacron
35+
source = cronie-1.7.2-fix-for-gcc15.patch
3536
sha256sums = f1da374a15ba7605cf378347f96bc8b678d3d7c0765269c8242cfe5b0789c571
3637
sha256sums = f85e9a68bf3bf446f8a6167f068371c06afffe11ca71935d8ee5487b38b2c9db
3738
sha256sums = ae6e533ecdfc1bd2dd80a9e25acb0260cbe9f00c4e4abee93d552b3660f263fc
3839
sha256sums = 64d517a8d011b5cfa6b2433d528498e80fa8d0748c91f1b73e6ded70e776dc35
3940
sha256sums = c5772fd0df22d807ed6b62edf4052db529aafb626b1bfe8961229fb864039a5c
41+
sha256sums = 0c96be00c25b0c8fbb46df0d6ba1a7b60f2c85b33cb9bcafaf220064fe8d4662
4042

4143
pkgname = cronie-selinux

cronie-selinux/PKGBUILD

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
pkgname='cronie-selinux'
1111
pkgver=1.7.2
12-
pkgrel=1
12+
pkgrel=2
1313
pkgdesc='Daemon that runs specified programs at scheduled times and related tools with SELinux support'
1414
url='https://github.com/cronie-crond/cronie/'
1515
license=('custom:BSD')
@@ -25,12 +25,14 @@ source=("https://github.com/cronie-crond/cronie/releases/download/${pkgname/-sel
2525
'80-cronie.hook'
2626
'cron-deny'
2727
'crontab'
28-
'default-anacron')
28+
'default-anacron'
29+
'cronie-1.7.2-fix-for-gcc15.patch')
2930
sha256sums=('f1da374a15ba7605cf378347f96bc8b678d3d7c0765269c8242cfe5b0789c571'
3031
'f85e9a68bf3bf446f8a6167f068371c06afffe11ca71935d8ee5487b38b2c9db'
3132
'ae6e533ecdfc1bd2dd80a9e25acb0260cbe9f00c4e4abee93d552b3660f263fc'
3233
'64d517a8d011b5cfa6b2433d528498e80fa8d0748c91f1b73e6ded70e776dc35'
33-
'c5772fd0df22d807ed6b62edf4052db529aafb626b1bfe8961229fb864039a5c')
34+
'c5772fd0df22d807ed6b62edf4052db529aafb626b1bfe8961229fb864039a5c'
35+
'0c96be00c25b0c8fbb46df0d6ba1a7b60f2c85b33cb9bcafaf220064fe8d4662')
3436
backup=('etc/anacrontab'
3537
'etc/cron.d/0hourly'
3638
'etc/cron.deny'
@@ -39,6 +41,15 @@ backup=('etc/anacrontab'
3941
'etc/pam.d/crond'
4042
'etc/sysconfig/crond')
4143

44+
prepare() {
45+
cd "${srcdir}/${pkgname/-selinux}-${pkgver}"
46+
47+
# Fix compilation issue with GCC 15
48+
# https://github.com/cronie-crond/cronie/issues/193
49+
# https://github.com/cronie-crond/cronie/commit/09c630c654b2aeff06a90a412cce0a60ab4955a4
50+
patch -Np1 -i ../cronie-1.7.2-fix-for-gcc15.patch
51+
}
52+
4253
build() {
4354
cd "${srcdir}/${pkgname/-selinux}-${pkgver}"
4455

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
From 09c630c654b2aeff06a90a412cce0a60ab4955a4 Mon Sep 17 00:00:00 2001
2+
From: Tomas Mraz <[email protected]>
3+
Date: Mon, 18 Nov 2024 21:02:30 +0100
4+
Subject: [PATCH] load_entry(): Make error_func prototype complete
5+
6+
Fixes #193
7+
---
8+
src/entry.c | 2 +-
9+
src/funcs.h | 2 +-
10+
2 files changed, 2 insertions(+), 2 deletions(-)
11+
12+
diff --git a/src/entry.c b/src/entry.c
13+
index 586eb9d..a2077e8 100644
14+
--- a/src/entry.c
15+
+++ b/src/entry.c
16+
@@ -90,7 +90,7 @@ void free_entry(entry * e) {
17+
/* return NULL if eof or syntax error occurs;
18+
* otherwise return a pointer to a new entry.
19+
*/
20+
-entry *load_entry(FILE * file, void (*error_func) (), struct passwd *pw,
21+
+entry *load_entry(FILE * file, void (*error_func) (const char *), struct passwd *pw,
22+
char **envp) {
23+
/* this function reads one crontab entry -- the next -- from a file.
24+
* it skips any leading blank lines, ignores comments, and returns
25+
diff --git a/src/funcs.h b/src/funcs.h
26+
index 427e027..f28d634 100644
27+
--- a/src/funcs.h
28+
+++ b/src/funcs.h
29+
@@ -89,7 +89,7 @@ char *env_get(const char *, char **),
30+
user *load_user(int, struct passwd *, const char *, const char *, const char *),
31+
*find_user(cron_db *, const char *, const char *);
32+
33+
-entry *load_entry(FILE *, void (*)(), struct passwd *, char **);
34+
+entry *load_entry(FILE *, void (*)(const char *), struct passwd *, char **);
35+
36+
FILE *cron_popen(char *, const char *, struct passwd *, char **);
37+

0 commit comments

Comments
 (0)