From owner-freebsd-ports-bugs@FreeBSD.ORG Sat May 17 19:10:00 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 91CE8C5 for ; Sat, 17 May 2014 19:10:00 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6C4E32E9E for ; Sat, 17 May 2014 19:10:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s4HJA08C045573 for ; Sat, 17 May 2014 19:10:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s4HJA0YL045572; Sat, 17 May 2014 19:10:00 GMT (envelope-from gnats) Resent-Date: Sat, 17 May 2014 19:10:00 GMT Resent-Message-Id: <201405171910.s4HJA0YL045572@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Peter Losher Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 08F09DC7 for ; Sat, 17 May 2014 18:59:57 +0000 (UTC) Received: from cgiserv.freebsd.org (cgiserv.freebsd.org [IPv6:2001:1900:2254:206a::50:4]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DDCA32DB2 for ; Sat, 17 May 2014 18:59:56 +0000 (UTC) Received: from cgiserv.freebsd.org ([127.0.1.6]) by cgiserv.freebsd.org (8.14.8/8.14.8) with ESMTP id s4HIxuYY056011 for ; Sat, 17 May 2014 18:59:56 GMT (envelope-from nobody@cgiserv.freebsd.org) Received: (from nobody@localhost) by cgiserv.freebsd.org (8.14.8/8.14.8/Submit) id s4HIxuqt056010; Sat, 17 May 2014 18:59:56 GMT (envelope-from nobody) Message-Id: <201405171859.s4HIxuqt056010@cgiserv.freebsd.org> Date: Sat, 17 May 2014 18:59:56 GMT From: Peter Losher To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/189895: Update mail/dma to build under 8.x (8.4) X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 May 2014 19:10:00 -0000 >Number: 189895 >Category: ports >Synopsis: Update mail/dma to build under 8.x (8.4) >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sat May 17 19:10:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Peter Losher >Release: 8.4-RELEASE >Organization: >Environment: >Description: >How-To-Repeat: cd /usr/ports/mail/dma under a 8.x box and watch it blow... [...] /usr/ports/mail/dma/work/corecode-dma-2bb8bcb/dma/..//spool.c: In function 'flushqueue_since': /usr/ports/mail/dma/work/corecode-dma-2bb8bcb/dma/..//spool.c:419: error: 'struct stat' has no member named 'st_mtim' >Fix: See attached patches - moved the existing spool.c patch to it's own conditional and added one for 8.x systems. Patch attached with submission follows: diff -ruN /usr/ports/mail/dma/Makefile /home/plosher/dma/Makefile --- /usr/ports/mail/dma/Makefile 2013-09-22 14:36:55.000000000 +0000 +++ /home/plosher/dma/Makefile 2014-05-17 18:43:30.000000000 +0000 @@ -37,7 +37,9 @@ .include .if ${OSVERSION} < 900000 -IGNORE= Does not build in 8.x +EXTRA_PATCHES= ${.CURDIR:H:H}/mail/dma/files/extrapatch-8-spool.c +.else +EXTRA_PATCHES= ${.CURDIR:H:H}/mail/dma/files/extrapatch-else-spool.c .endif pre-patch: diff -ruN /usr/ports/mail/dma/files/extrapatch-8-spool.c /home/plosher/dma/files/extrapatch-8-spool.c --- /usr/ports/mail/dma/files/extrapatch-8-spool.c 1970-01-01 00:00:00.000000000 +0000 +++ /home/plosher/dma/files/extrapatch-8-spool.c 2014-05-17 18:43:30.000000000 +0000 @@ -0,0 +1,19 @@ +--- 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 + #include ++#include + + #include + #include +@@ -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); diff -ruN /usr/ports/mail/dma/files/extrapatch-else-spool.c /home/plosher/dma/files/extrapatch-else-spool.c --- /usr/ports/mail/dma/files/extrapatch-else-spool.c 1970-01-01 00:00:00.000000000 +0000 +++ /home/plosher/dma/files/extrapatch-else-spool.c 2014-05-17 18:43:30.000000000 +0000 @@ -0,0 +1,11 @@ +--- spool.c.orig 2013-06-03 14:03:15.000000000 +0000 ++++ spool.c 2013-08-22 11:07:47.000000000 +0000 +@@ -415,7 +415,7 @@ flushqueue_since(unsigned int period) + 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_mtim.tv_sec + (int)period >= now.tv_sec) + return (1); + else + return (0); diff -ruN /usr/ports/mail/dma/files/patch-spool.c /home/plosher/dma/files/patch-spool.c --- /usr/ports/mail/dma/files/patch-spool.c 2014-01-22 17:40:44.000000000 +0000 +++ /home/plosher/dma/files/patch-spool.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ ---- spool.c.orig 2013-06-03 14:03:15.000000000 +0000 -+++ spool.c 2013-08-22 11:07:47.000000000 +0000 -@@ -415,7 +415,7 @@ flushqueue_since(unsigned int period) - 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_mtim.tv_sec + (int)period >= now.tv_sec) - return (1); - else - return (0); >Release-Note: >Audit-Trail: >Unformatted: