Attachment #142809 for bug #189895

View | Details | Raw Unified | Return to bug 189895
Collapse All | Expand All

Lines 37-43 Link Here

(-)/home/plosher/dma/Makefile (-1 / +3 lines)
37	.include <bsd.port.pre.mk>	37	.include <bsd.port.pre.mk>
38		38
39	.if ${OSVERSION} < 900000	39	.if ${OSVERSION} < 900000
40	IGNORE= Does not build in 8.x	40	EXTRA_PATCHES= ${.CURDIR:H:H}/mail/dma/files/extrapatch-8-spool.c
		41	.else
		42	EXTRA_PATCHES= ${.CURDIR:H:H}/mail/dma/files/extrapatch-else-spool.c
41	.endif	43	.endif
42		44
43	pre-patch:	45	pre-patch:




--- spool.c	2013-06-03 14:03:15.000000000 +0000
+++ spool.c.8	2014-05-17 18:14:45.000000000 +0000
@@ -36,6 +36,7 @@
 
 #include <sys/file.h>
 #include <sys/stat.h>
+#include <sys/time.h>
 
 #include <ctype.h>
 #include <dirent.h>
@@ -415,7 +416,7 @@
 		return (0);
 
 	/* Did the flush file get touched within the last period seconds? */
-	if (st.st_mtim.tv_sec + period >= now.tv_sec)
+	if (st.st_mtime + (int)period >= now.tv_sec)
 		return (1);
 	else
 		return (0);

Line 0 Link Here

(-)/home/plosher/dma/files/extrapatch-else-spool.c (+11 lines)
	1	--- spool.c.orig 2013-06-03 14:03:15.000000000 +0000
	2	+++ spool.c 2013-08-22 11:07:47.000000000 +0000
	3	@@ -415,7 +415,7 @@ flushqueue_since(unsigned int period)
	4	return (0);
	5
	6	/* Did the flush file get touched within the last period seconds? */
	7	- if (st.st_mtim.tv_sec + period >= now.tv_sec)
	8	+ if (st.st_mtim.tv_sec + (int)period >= now.tv_sec)
	9	return (1);
	10	else
	11	return (0);

Lines 1-11 Link Here

(-)/home/plosher/dma/files/patch-spool.c (-11 lines)
1	--- spool.c.orig 2013-06-03 14:03:15.000000000 +0000
2	+++ spool.c 2013-08-22 11:07:47.000000000 +0000
3	@@ -415,7 +415,7 @@ flushqueue_since(unsigned int period)
4	return (0);
5
6	/* Did the flush file get touched within the last period seconds? */
7	- if (st.st_mtim.tv_sec + period >= now.tv_sec)
8	+ if (st.st_mtim.tv_sec + (int)period >= now.tv_sec)
9	return (1);
10	else
11	return (0);

Return to bug 189895

Line 0 Link Here

(-)/home/plosher/dma/files/extrapatch-8-spool.c (+19 lines)
	1	--- spool.c 2013-06-03 14:03:15.000000000 +0000
	2	+++ spool.c.8 2014-05-17 18:14:45.000000000 +0000
	3	@@ -36,6 +36,7 @@
	4
	5	#include <sys/file.h>
	6	#include <sys/stat.h>
	7	+#include <sys/time.h>
	8
	9	#include <ctype.h>
	10	#include <dirent.h>
	11	@@ -415,7 +416,7 @@
	12	return (0);
	13
	14	/* Did the flush file get touched within the last period seconds? */
	15	- if (st.st_mtim.tv_sec + period >= now.tv_sec)
	16	+ if (st.st_mtime + (int)period >= now.tv_sec)
	17	return (1);
	18	else
	19	return (0);