cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove some un-needed patches. Add some better defaults.

Browse Source 
Properly bump this time.
This commit is contained in:
ajacoutot 2010-12-02 08:56:32 +00:00
parent 4ac0c1cd21
commit 7f4aca029a
12 changed files with 34 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mail/cyrus-imapd/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.42 2010/12/01 19:57:01 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.43 2010/12/02 08:56:32 ajacoutot Exp $
COMMENT-main= Cyrus IMAP server
COMMENT-perl= perl utils for the Cyrus IMAP server
@ -9,7 +9,8 @@ PKGNAME-main= ${DISTNAME}
FULLPKGNAME-perl=cyrus-imapd-perl-${V}
FULLPKGPATH-perl=mail/cyrus-imapd,-perl
REVISION= 0
REVISION-main= 1
REVISION-perl= 0
CATEGORIES= mail

11
mail/cyrus-imapd/patches/patch-configure
View File

@ -1,5 +1,5 @@
--- configure.orig Mon Nov 29 14:29:23 2010
+++ configure Mon Nov 29 14:56:36 2010
+++ configure Thu Dec 2 09:20:29 2010
@@ -5052,9 +5052,7 @@ CFLAGS=$save_CFLAGS
fi
@ -40,6 +40,15 @@
elif test "$gss_impl" = "cybersafe03"; then
# Version of CyberSafe with two libraries
CPPFLAGS="$CPPFLAGS -D$platform -I${gssapi}/appsec-sdk/include"
@@ -10446,7 +10444,7 @@ elif test "${with_perl}" != "no"; then
PERL_SUBDIRS="imap"
PERL="${with_perl}"
case "${target_os}" in
- linux*|netbsd*)
+ linux*|netbsd*|openbsd*)
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl cccdlflags needed on \"${target_os}\"" >&5
$as_echo_n "checking for perl cccdlflags needed on \"${target_os}\"... " >&6; }
eval `${PERL} -V:cccdlflags`
@@ -10559,6 +10557,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
extern "C"
#endif

21
mail/cyrus-imapd/patches/patch-imap_annotate_c
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-imap_annotate_c,v 1.1 2010/10/29 09:26:58 ajacoutot Exp $
--- imap/annotate.c.orig Sat Oct 23 12:48:46 2010
+++ imap/annotate.c Sat Oct 23 12:49:34 2010
@@ -581,7 +581,7 @@ static void output_entryatt(const char *mboxname, cons
* modifiedsince time */
if ((fdata->attribs & ATTRIB_MODIFIEDSINCE_SHARED)
&& attrib->value && attrib->modifiedsince) {
- snprintf(buf, sizeof(buf), "%ld", attrib->modifiedsince);
+ snprintf(buf, sizeof(buf), "%ld", (long int)attrib->modifiedsince);
appendattvalue(&attvalues, "modifiedsince.shared", buf);
}
}
@@ -607,7 +607,7 @@ static void output_entryatt(const char *mboxname, cons
* modifiedsince time */
if ((fdata->attribs & ATTRIB_MODIFIEDSINCE_PRIV)
&& attrib->value && attrib->modifiedsince) {
- snprintf(buf, sizeof(buf), "%ld", attrib->modifiedsince);
+ snprintf(buf, sizeof(buf), "%ld", (long int)attrib->modifiedsince);
appendattvalue(&attvalues, "modifiedsince.priv", buf);
}
}

21
mail/cyrus-imapd/patches/patch-imap_duplicate_c
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-imap_duplicate_c,v 1.1 2010/10/29 09:26:58 ajacoutot Exp $
--- imap/duplicate.c.orig Sat Oct 23 12:47:28 2010
+++ imap/duplicate.c Sat Oct 23 12:48:26 2010
@@ -157,7 +157,7 @@ time_t duplicate_check(char *id, int idlen, const char
}
syslog(LOG_DEBUG, "duplicate_check: %-40s %-20s %ld",
- buf, buf+idlen+1, mark);
+ buf, buf+idlen+1, (long int)mark);
return mark;
}
@@ -196,7 +196,7 @@ void duplicate_mark(char *id, int idlen, const char *t
} while (r == CYRUSDB_AGAIN);
syslog(LOG_DEBUG, "duplicate_mark: %-40s %-20s %ld %lu",
- buf, buf+idlen+1, mark, uid);
+ buf, buf+idlen+1, (long int)mark, uid);
return;
}

15
mail/cyrus-imapd/patches/patch-imap_mailbox_c
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-imap_mailbox_c,v 1.2 2010/11/29 14:18:17 ajacoutot Exp $
--- imap/mailbox.c.orig Mon Nov 29 14:28:06 2010
+++ imap/mailbox.c Mon Nov 29 14:56:36 2010
@@ -1882,9 +1882,9 @@ bit32 make_sync_crc(struct mailbox *mailbox, struct in
}
snprintf(buf, 4096, "%u " MODSEQ_FMT " %lu (%u) %lu %s",
- record->uid, record->modseq, record->last_updated,
+ record->uid, record->modseq, (long int)record->last_updated,
flagcrc,
- record->internaldate,
+ (long int)record->internaldate,
message_guid_encode(&record->guid));
return crc32_cstring(buf);

12
mail/cyrus-imapd/patches/patch-imap_mbdump_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-imap_mbdump_c,v 1.2 2010/11/12 06:26:40 ajacoutot Exp $
--- imap/mbdump.c.orig Thu Nov 11 23:15:33 2010
+++ imap/mbdump.c Fri Nov 12 07:12:58 2010
@@ -368,7 +368,7 @@ static int dump_annotations(const char *mailbox __attr
" {" SIZE_T_FMT "%s}\r\n%s)",
ename_size, (!ctx->tag ? "+" : ""),
userid, entry,
- attrib->modifiedsince,
+ (long int)attrib->modifiedsince,
attrib->size, (!ctx->tag ? "+" : ""),
attrib->value,
strlen(attrib->contenttype), (!ctx->tag ? "+" : ""),

35
mail/cyrus-imapd/patches/patch-imap_mbexamine_c
View File

@ -1,35 +0,0 @@
$OpenBSD: patch-imap_mbexamine_c,v 1.3 2010/10/29 09:26:58 ajacoutot Exp $
--- imap/mbexamine.c.orig Sat Oct 23 12:50:51 2010
+++ imap/mbexamine.c Sat Oct 23 12:52:55 2010
@@ -263,7 +263,7 @@ int do_examine(char *name,
printf(" Number of Messages: %u Mailbox Size: " UQUOTA_T_FMT " bytes\n",
mailbox->i.exists, mailbox->i.quota_mailbox_used);
printf(" Last Append Date: (%lu) %s",
- mailbox->i.last_appenddate, ctime(&mailbox->i.last_appenddate));
+ (long unsigned int)mailbox->i.last_appenddate, ctime(&mailbox->i.last_appenddate));
printf(" UIDValidity: %u Last UID: %u\n",
mailbox->i.uidvalidity, mailbox->i.last_uid);
printf(" Deleted: %u Answered: %u Flagged: %u\n",
@@ -283,7 +283,7 @@ int do_examine(char *name,
}
}
printf("\n");
- printf(" Last POP3 Login: (%ld) %s", mailbox->i.pop3_last_login,
+ printf(" Last POP3 Login: (%ld) %s", (long int)mailbox->i.pop3_last_login,
ctime((const long *) &mailbox->i.pop3_last_login));
printf(" Highest Mod Sequence: " MODSEQ_FMT "\n",
mailbox->i.highestmodseq);
@@ -308,10 +308,10 @@ int do_examine(char *name,
}
printf("%06u> UID:%08u INT_DATE:%lu SENTDATE:%lu SIZE:%-6u\n",
- msgno, record.uid, record.internaldate,
- record.sentdate, record.size);
+ msgno, record.uid, (long unsigned int)record.internaldate,
+ (long unsigned int)record.sentdate, record.size);
printf(" > HDRSIZE:%-6u LASTUPD :%lu SYSFLAGS:%08X",
- record.header_size, record.last_updated,
+ record.header_size, (long unsigned int)record.last_updated,
record.system_flags);
if (mailbox->i.minor_version >= 5)
printf(" LINES:%-6u\n", record.content_lines);

12
mail/cyrus-imapd/patches/patch-imtest_imtest_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-imtest_imtest_c,v 1.1 2010/10/29 09:26:58 ajacoutot Exp $
--- imtest/imtest.c.orig Sat Oct 23 12:53:03 2010
+++ imtest/imtest.c Sat Oct 23 12:53:27 2010
@@ -1878,7 +1878,7 @@ static void send_recv_test(void)
end=time(NULL);
- printf("took %ld seconds\n", end - start);
+ printf("took %ld seconds\n", (long int)end - start);
}
/*********************************** POP3 ************************************/

12
mail/cyrus-imapd/patches/patch-lib_auth_pts_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-lib_auth_pts_c,v 1.1 2010/10/29 09:26:58 ajacoutot Exp $
--- lib/auth_pts.c.orig Tue Oct 19 05:08:28 2010
+++ lib/auth_pts.c Sat Oct 23 13:00:24 2010
@@ -397,7 +397,7 @@ static int ptload(const char *identifier, struct auth_
syslog(LOG_DEBUG,
"ptload(): fetched cache record (%s)" \
"(mark %ld, current %ld, limit %ld)", identifier,
- fetched->mark, now, now - timeout);
+ (long int)fetched->mark, (long int)now, (long int)now - (long int)timeout);
if (fetched->mark > (now - timeout)) {
/* not expired; let's return it */

21
mail/cyrus-imapd/patches/patch-lib_imapoptions Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-lib_imapoptions,v 1.1 2010/12/02 08:56:32 ajacoutot Exp $
--- lib/imapoptions.orig Thu Dec 2 08:51:32 2010
+++ lib/imapoptions Thu Dec 2 08:52:05 2010
@@ -1018,7 +1018,7 @@ And the notification message will be available on \fIs
{ "seenstate_db", "skiplist", STRINGLIST("flat", "berkeley", "berkeley-hash", "skiplist")}
/* The cyrusdb backend to use for the seen state. */
-{ "sendmail", "/usr/lib/sendmail", STRING }
+{ "sendmail", "/usr/sbin/sendmail", STRING }
/* The pathname of the sendmail executable. Sieve invokes sendmail
for sending rejections, redirects and vacation responses. */
@@ -1082,7 +1082,7 @@ product version in the capabilities */
/* If enabled, timsieved will emit a capability response after a successful
SASL authentication, per draft-martin-managesieve-12.txt . */
-{ "sievedir", "/usr/sieve", STRING }
+{ "sievedir", "/var/sieve", STRING }
/* If sieveusehomedir is false, this directory is searched for Sieve
scripts. */

21
mail/cyrus-imapd/patches/patch-lib_prot_c
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-lib_prot_c,v 1.1 2010/10/29 09:26:58 ajacoutot Exp $
--- lib/prot.c.orig Fri Oct 22 21:54:45 2010
+++ lib/prot.c Fri Oct 22 21:55:04 2010
@@ -715,7 +715,7 @@ int prot_fill(struct protstream *s)
char timebuf[20];
time(&newtime);
- snprintf(timebuf, sizeof(timebuf), "<%ld<", newtime);
+ snprintf(timebuf, sizeof(timebuf), "<%d<", newtime);
n = write(s->logfd, timebuf, strlen(timebuf));
left = s->cnt;
@@ -758,7 +758,7 @@ static void prot_flush_log(struct protstream *s)
char timebuf[20];
time(&newtime);
- snprintf(timebuf, sizeof(timebuf), ">%ld>", newtime);
+ snprintf(timebuf, sizeof(timebuf), ">%d>", newtime);
n = write(s->logfd, timebuf, strlen(timebuf));
do {

12
mail/cyrus-imapd/patches/patch-notifyd_notify_mailto_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-notifyd_notify_mailto_c,v 1.1 2010/10/29 09:26:58 ajacoutot Exp $
--- notifyd/notify_mailto.c.orig Sat Oct 23 12:53:35 2010
+++ notifyd/notify_mailto.c Sat Oct 23 12:54:21 2010
@@ -112,7 +112,7 @@ char* notify_mailto(const char *class,
t = time(NULL);
snprintf(outmsgid, sizeof(outmsgid), "<cmu-sieve-%d-%lu-%d@%s>",
- (int) sm_pid, t, global_outgoing_count++, config_servername);
+ (int) sm_pid, (long unsigned int)t, global_outgoing_count++, config_servername);
fprintf(sm, "Message-ID: %s\r\n", outmsgid);