From 03e1a4e6bd8b51eac421c2378a95cac475417fa3 Mon Sep 17 00:00:00 2001
From: Hajimu UMEMOTO <ume@FreeBSD.org>
Date: Fri, 14 Apr 2006 14:42:44 +0000
Subject: [PATCH] Fix build with WITH_NNTP=yes.

PR:		ports/95690
Obtained from:	https://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/imap/fetchnews.c.diff?r1=1.14&r2=1.15&f=u
---
 .../files/patch-imap::fetchnews.c             | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 mail/cyrus-imapd22/files/patch-imap::fetchnews.c

diff --git a/mail/cyrus-imapd22/files/patch-imap::fetchnews.c b/mail/cyrus-imapd22/files/patch-imap::fetchnews.c
new file mode 100644
index 000000000000..cba683c8faec
--- /dev/null
+++ b/mail/cyrus-imapd22/files/patch-imap::fetchnews.c
@@ -0,0 +1,46 @@
+Index: imap/fetchnews.c
+diff -u -p imap/fetchnews.c.orig imap/fetchnews.c
+--- imap/fetchnews.c.orig	Wed Mar 23 09:40:11 2005
++++ imap/fetchnews.c	Fri Apr 14 23:36:14 2006
+@@ -38,7 +38,7 @@
+  * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+  *
+- * $Id: fetchnews.c,v 1.14 2005/03/23 00:40:11 shadow Exp $
++ * $Id: fetchnews.c,v 1.15 2006/04/10 16:19:33 murch Exp $
+  */
+ 
+ #include <config.h>
+@@ -60,6 +60,7 @@
+ #include "cyrusdb.h"
+ #include "exitcodes.h"
+ #include "global.h"
++#include "gmtoff.h"
+ #include "lock.h"
+ #include "prot.h"
+ #include "xmalloc.h"
+@@ -388,6 +389,7 @@ int main(int argc, char *argv[])
+ 	       &ctime.tm_hour, &ctime.tm_min, &ctime.tm_sec);
+ 	ctime.tm_year -= 1900;
+ 	ctime.tm_mon--;
++	ctime.tm_isdst = -1;
+ 
+ 	/* read the previous timestamp */
+ 	if (!sfile[0]) {
+@@ -417,6 +419,7 @@ int main(int argc, char *argv[])
+ 	/* ask for new articles */
+ 	if (stamp) stamp -= 180; /* adjust back 3 minutes */
+ 	ptime = gmtime(&stamp);
++	ptime->tm_isdst = -1;
+ 	strftime(buf, sizeof(buf), datefmt, ptime);
+ 	prot_printf(pout, "NEWNEWS %s %s GMT\r\n", wildmat, buf);
+ 	
+@@ -433,7 +436,7 @@ int main(int argc, char *argv[])
+ 	   We can't change this, otherwise we'd be incompatible
+ 	   with an old localtime timestamp.
+ 	*/
+-	stamp -= timezone;
++	stamp += gmtoff_of(&ctime, stamp);
+     }
+ 
+     if (!newnews) {