include <time.h> and <utime.h> so that where time_t has been changed to 64-bit values on NetBSD, we we get correctly referred to __utime50() which can handle 64-bit values. This fixes a problem where mailbox mtimes were being reset to 0 Note that this actually causes some build warnings as the code uses "time_t tp[2]" instead of "struct utimbuf tp" (contains two time_t values) Although the <os_bsi.h> file says it is used for BSDI, it seems to be used by NetBSD and OpenBSD, both of which have the <utime.h> and <time.h> bump PKGREVISIONdiff -r1.19 -r1.20 pkgsrc/mail/alpine/Makefile
(plunky)
@@ -1,18 +1,18 @@ | @@ -1,18 +1,18 @@ | |||
1 | # $NetBSD: Makefile,v 1.19 2009/05/01 11:58:46 abs Exp $ | 1 | # $NetBSD: Makefile,v 1.20 2009/05/17 17:34:01 plunky Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | DISTNAME= alpine-2.00 | 4 | DISTNAME= alpine-2.00 | |
5 | PKGREVISION= 1 | 5 | PKGREVISION= 2 | |
6 | CATEGORIES= mail | 6 | CATEGORIES= mail | |
7 | MASTER_SITES= ftp://ftp.cac.washington.edu/alpine/ | 7 | MASTER_SITES= ftp://ftp.cac.washington.edu/alpine/ | |
8 | DIST_SUBDIR= alpine-2.00 | 8 | DIST_SUBDIR= alpine-2.00 | |
9 | EXTRACT_SUFX= .tar.bz2 | 9 | EXTRACT_SUFX= .tar.bz2 | |
10 | 10 | |||
11 | MAINTAINER= abs@NetBSD.org | 11 | MAINTAINER= abs@NetBSD.org | |
12 | HOMEPAGE= http://www.washington.edu/alpine/ | 12 | HOMEPAGE= http://www.washington.edu/alpine/ | |
13 | COMMENT= Program for Internet News and E-mail | 13 | COMMENT= Program for Internet News and E-mail | |
14 | 14 | |||
15 | PKG_DESTDIR_SUPPORT= user-destdir | 15 | PKG_DESTDIR_SUPPORT= user-destdir | |
16 | 16 | |||
17 | .include "options.mk" | 17 | .include "options.mk" | |
18 | 18 |
@@ -1,14 +1,15 @@ | @@ -1,14 +1,15 @@ | |||
1 | $NetBSD: distinfo,v 1.14 2009/05/01 11:58:46 abs Exp $ | 1 | $NetBSD: distinfo,v 1.15 2009/05/17 17:34:01 plunky Exp $ | |
2 | 2 | |||
3 | SHA1 (alpine-2.00/alpine-2.00.tar.bz2) = dcbd3c5419954f484ccf706feaba31ce48cdebc4 | 3 | SHA1 (alpine-2.00/alpine-2.00.tar.bz2) = dcbd3c5419954f484ccf706feaba31ce48cdebc4 | |
4 | RMD160 (alpine-2.00/alpine-2.00.tar.bz2) = 9e67704b23b3973d8b878e65ad9e6f5026c10d13 | 4 | RMD160 (alpine-2.00/alpine-2.00.tar.bz2) = 9e67704b23b3973d8b878e65ad9e6f5026c10d13 | |
5 | Size (alpine-2.00/alpine-2.00.tar.bz2) = 5222673 bytes | 5 | Size (alpine-2.00/alpine-2.00.tar.bz2) = 5222673 bytes | |
6 | SHA1 (alpine-2.00/fancy.patch.gz) = 2622d3e86a76908bf4d1ca63501c6dac75563348 | 6 | SHA1 (alpine-2.00/fancy.patch.gz) = 2622d3e86a76908bf4d1ca63501c6dac75563348 | |
7 | RMD160 (alpine-2.00/fancy.patch.gz) = b877b97fd88fa73a8428d288f929579560faec4e | 7 | RMD160 (alpine-2.00/fancy.patch.gz) = b877b97fd88fa73a8428d288f929579560faec4e | |
8 | Size (alpine-2.00/fancy.patch.gz) = 24556 bytes | 8 | Size (alpine-2.00/fancy.patch.gz) = 24556 bytes | |
9 | SHA1 (alpine-2.00/maildir.patch.gz) = b1b790ca644c891f52f28663867b2deb032bb98c | 9 | SHA1 (alpine-2.00/maildir.patch.gz) = b1b790ca644c891f52f28663867b2deb032bb98c | |
10 | RMD160 (alpine-2.00/maildir.patch.gz) = ffa3a6a588c76e33bc92fe26ddfb9f6e6dbefe20 | 10 | RMD160 (alpine-2.00/maildir.patch.gz) = ffa3a6a588c76e33bc92fe26ddfb9f6e6dbefe20 | |
11 | Size (alpine-2.00/maildir.patch.gz) = 32100 bytes | 11 | Size (alpine-2.00/maildir.patch.gz) = 32100 bytes | |
12 | SHA1 (alpine-2.00/searchheader.patch.gz) = 1c8dfaefa9a9ed502da454b5d1334c94bc1873c4 | 12 | SHA1 (alpine-2.00/searchheader.patch.gz) = 1c8dfaefa9a9ed502da454b5d1334c94bc1873c4 | |
13 | RMD160 (alpine-2.00/searchheader.patch.gz) = cc1b2c3cf4cbceaf62e1c0378f5edf6bee619581 | 13 | RMD160 (alpine-2.00/searchheader.patch.gz) = cc1b2c3cf4cbceaf62e1c0378f5edf6bee619581 | |
14 | Size (alpine-2.00/searchheader.patch.gz) = 1708 bytes | 14 | Size (alpine-2.00/searchheader.patch.gz) = 1708 bytes | |
15 | SHA1 (patch-aa) = c306613a297d61591d577b6968a31fc85b03f852 |
$NetBSD: patch-aa,v 1.4 2009/05/17 17:34:01 plunky Exp $
include <time.h> and <utime.h> so that where time_t has been changed to 64-bit
values on NetBSD, we we get correctly referred to __utime50() which can handle
64-bit values. This fixes a problem where mailbox mtimes were being reset to 0
Note that this actually causes some build warnings as the code uses
"time_t tp[2]" instead of "struct utimbuf tp" (contains two time_t values)
Although the <os_bsi.h> file says it is used for BSDI, it seems to be used by
NetBSD and OpenBSD, both of which have the <utime.h> and <time.h>
- plunky
--- imap/src/osdep/unix/os_bsi.h.orig 2008-06-04 19:18:34.000000000 +0100
+++ imap/src/osdep/unix/os_bsi.h 2009-05-17 18:00:44.000000000 +0100
@@ -34,6 +34,8 @@
#include <fcntl.h>
#include <syslog.h>
#include <sys/file.h>
+#include <time.h>
+#include <utime.h>
#include "env_unix.h"