diff options
Diffstat (limited to 'sysutils/fcron/files')
-rw-r--r-- | sysutils/fcron/files/patch-configure | 4 | ||||
-rw-r--r-- | sysutils/fcron/files/patch-fcrondyn.c | 23 | ||||
-rw-r--r-- | sysutils/fcron/files/patch-fileconf.c | 4 | ||||
-rw-r--r-- | sysutils/fcron/files/patch-save.c | 4 |
4 files changed, 6 insertions, 29 deletions
diff --git a/sysutils/fcron/files/patch-configure b/sysutils/fcron/files/patch-configure index e96c7cfd317f..0133c8c8120b 100644 --- a/sysutils/fcron/files/patch-configure +++ b/sysutils/fcron/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2014-07-06 10:05:56 UTC +--- configure.orig 2016-06-26 17:46:37 UTC +++ configure -@@ -5153,7 +5153,7 @@ if ${ax_cv_lib_readline+:} false; then : +@@ -5164,7 +5164,7 @@ if ${ax_cv_lib_readline+:} false; then : else ORIG_LIBS="$LIBS" diff --git a/sysutils/fcron/files/patch-fcrondyn.c b/sysutils/fcron/files/patch-fcrondyn.c deleted file mode 100644 index 4948b08b5e5e..000000000000 --- a/sysutils/fcron/files/patch-fcrondyn.c +++ /dev/null @@ -1,23 +0,0 @@ -Fix use of size_t in context where ssize_t (error value included) is -more correct. - ---- fcrondyn.c.orig 2014-05-10 17:03:59 UTC -+++ fcrondyn.c -@@ -482,7 +482,7 @@ talk_fcron(char *cmd_str, int fd) - long int *cmd = NULL; - int cmd_len = 0; - char buf[LINE_LEN]; -- size_t read_len = 0; -+ ssize_t read_len = 0; - char existing_connection = (fd < 0) ? 0 : 1; - fd_set read_set; /* needed to use select to check if some data is waiting */ - struct timeval tv; -@@ -578,7 +578,7 @@ talk_fcron(char *cmd_str, int fd) - } - - -- while ((read_len = (size_t) recv(fd, buf, sizeof(buf) - 1, 0)) >= 0 -+ while ((read_len = (ssize_t) recv(fd, buf, sizeof(buf) - 1, 0)) >= 0 - || errno == EINTR) { - - if (errno == EINTR && debug_opt) diff --git a/sysutils/fcron/files/patch-fileconf.c b/sysutils/fcron/files/patch-fileconf.c index 53bff7b53462..1d85379dfff0 100644 --- a/sysutils/fcron/files/patch-fileconf.c +++ b/sysutils/fcron/files/patch-fileconf.c @@ -1,6 +1,6 @@ We don't need to fflush the file, since it is opened read-only. ---- fileconf.c.orig 2014-05-10 17:03:59 UTC +--- fileconf.c.orig 2016-06-26 17:42:39 UTC +++ fileconf.c @@ -278,10 +278,6 @@ read_file(char *filename, int fd) cf->cf_next = file_base; @@ -11,5 +11,5 @@ We don't need to fflush the file, since it is opened read-only. - error_e("could not fflush() file_name"); - Free_safe(default_line.cl_runas); + Free_safe(default_line.cl_mailfrom); Free_safe(default_line.cl_mailto); - Free_safe(default_line.cl_tz); diff --git a/sysutils/fcron/files/patch-save.c b/sysutils/fcron/files/patch-save.c index 5ddd7209eebd..878a2d2cfd15 100644 --- a/sysutils/fcron/files/patch-save.c +++ b/sysutils/fcron/files/patch-save.c @@ -1,8 +1,8 @@ Replace fdatasync() with fsync() because FreeBSD doesn't have fdatasync(). ---- save.c.orig 2014-05-10 17:03:59 UTC +--- save.c.orig 2016-06-26 15:02:48 UTC +++ save.c -@@ -311,8 +311,8 @@ write_file_to_disk(int fd, struct cf_t * +@@ -315,8 +315,8 @@ write_file_to_disk(int fd, struct cf_t * * This is to avoid cases where the file name (meta-data) would be updated, * and there is a crash before the data is fully written: not sure if that * is possible, but better safe than sorry! */ |