Attachment 173106 Details for Bug 211451 – Patches to files in port directory

Patches to files in port directory

fcron-diff (text/plain), 3.86 KB, created by Bob Eager on 2016-07-30 00:55:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bob Eager

Created: 2016-07-30 00:55:40 UTC

Size: 3.86 KB

patch

obsolete

>===> Generating patch
>===> Viewing diff with cdiff -s -w 0
>diff -ruN ../fcron.orig/Makefile ./Makefile
>--- ../fcron.orig/Makefile	2016-07-19 12:04:13.000000000 +0100
>+++ ./Makefile	2016-07-27 21:21:18.818028000 +0100
>@@ -1,7 +1,7 @@
> # $FreeBSD: head/sysutils/fcron/Makefile 418767 2016-07-19 11:04:13Z mat $
> 
> PORTNAME=	fcron
>-PORTVERSION=	3.2.0
>+PORTVERSION=	3.2.1
> CATEGORIES=	sysutils
> MASTER_SITES=	http://fcron.free.fr/archives/ \
> 		ftp://ftp.seul.org/pub/fcron/
>diff -ruN ../fcron.orig/distinfo ./distinfo
>--- ../fcron.orig/distinfo	2016-05-08 10:33:26.000000000 +0100
>+++ ./distinfo	2016-07-27 21:21:33.364193000 +0100
>@@ -1,2 +1,3 @@
>-SHA256 (fcron-3.2.0.src.tar.gz) = eb13b86ed96805d117e19847f1da30b834f1990f7ef4c38f5007234d44679564
>-SIZE (fcron-3.2.0.src.tar.gz) = 595408
>+TIMESTAMP = 1469650893
>+SHA256 (fcron-3.2.1.src.tar.gz) = 6114d0a39a32853669c0c0ba0f96d92920e7cabca3ff1edf37d25750403e5f6a
>+SIZE (fcron-3.2.1.src.tar.gz) = 601142
>diff -ruN ../fcron.orig/files/patch-configure ./files/patch-configure
>--- ../fcron.orig/files/patch-configure	2016-05-08 10:33:26.000000000 +0100
>+++ ./files/patch-configure	2016-07-27 21:23:45.013879000 +0100
>@@ -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 -ruN ../fcron.orig/files/patch-fcrondyn.c ./files/patch-fcrondyn.c
>--- ../fcron.orig/files/patch-fcrondyn.c	2016-05-08 10:33:26.000000000 +0100
>+++ ./files/patch-fcrondyn.c	1970-01-01 01:00:00.000000000 +0100
>@@ -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 -ruN ../fcron.orig/files/patch-fileconf.c ./files/patch-fileconf.c
>--- ../fcron.orig/files/patch-fileconf.c	2016-05-08 10:33:26.000000000 +0100
>+++ ./files/patch-fileconf.c	2016-07-27 21:23:45.023850000 +0100
>@@ -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 @@
> -        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 -ruN ../fcron.orig/files/patch-save.c ./files/patch-save.c
>--- ../fcron.orig/files/patch-save.c	2016-05-08 10:33:26.000000000 +0100
>+++ ./files/patch-save.c	2016-07-27 21:23:45.029824000 +0100
>@@ -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! */
>====> Cleaning up
>===> Done

Actions: View

Attachments on bug 211451: 173106