haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-03-18 17:35:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

dovecot, bump version (#9539)

Browse Source
This commit is contained in:
Schrijvers Luc
2023-09-29 10:46:22 +00:00
committed by GitHub
parent d3cb1930bb
commit f1b88891e6
2 changed files with 43 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
net-mail/dovecot/dovecot-2.3.11.3.recipe → net-mail/dovecot/dovecot-2.3.21.recipe
View File

@@ -7,9 +7,9 @@ uses very little memory."
HOMEPAGE="https://dovecot.org/"
COPYRIGHT="2002-2016 Timo Sirainen"
LICENSE="MIT"
REVISION="2"
REVISION="1"
SOURCE_URI="https://dovecot.org/releases/2.3/dovecot-$portVersion.tar.gz"
CHECKSUM_SHA256="d3d9ea9010277f57eb5b9f4166a5d2ba539b172bd6d5a2b2529a6db524baafdc"
CHECKSUM_SHA256="05b11093a71c237c2ef309ad587510721cc93bbee6828251549fc1586c36502d"
PATCHES="dovecot-$portVersion.patchset"
ARCHITECTURES="all !x86_gcc2"
@@ -80,3 +80,8 @@ INSTALL()
# remove libtool files
rm -f $libDir/dovecot/{auth/*.la,doveadm/*.la,old-stats/*.la,*.la}
}
TEST()
{
make check
}

49
net-mail/dovecot/patches/dovecot-2.3.11.3.patchset → net-mail/dovecot/patches/dovecot-2.3.21.patchset
View File

@@ -1,14 +1,20 @@
From c947608ad7763031b2feb604ba52b735f4916628 Mon Sep 17 00:00:00 2001
From bcf8c3806b5c0db7dee927e46d9e9dc39cd0c3b6 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Fri, 29 Apr 2016 18:25:58 +0000
Subject: Haiku patch
modified: src/imap-hibernate/imap-client.c
modified: src/imap-hibernate/imap-hibernate-client.c
modified: src/imap/imap-client-hibernate.c
modified: src/imap/imap-master-client.c
modified: src/lib-http/test-http-client-errors.c
modified: src/plugins/old-stats/mail-stats-fill.c
diff --git a/src/imap-hibernate/imap-client.c b/src/imap-hibernate/imap-client.c
index fc158f1..92f4b78 100644
index fa5edde..7ca09a8 100644
--- a/src/imap-hibernate/imap-client.c
+++ b/src/imap-hibernate/imap-client.c
@@ -147,11 +147,13 @@ imap_client_move_back_send_callback(void *context, struct ostream *output)
@@ -185,11 +185,13 @@ imap_client_move_back_send_callback(void *context, struct ostream *output)
str_append(str, "\tuserdb_fields=");
str_append_tabescaped(str, state->userdb_fields);
}
@@ -23,25 +29,26 @@ index fc158f1..92f4b78 100644
str_printfa(str, "\tpeer_ino=%llu", (unsigned long long)state->peer_ino);
if (state->state_size > 0) {
diff --git a/src/imap-hibernate/imap-hibernate-client.c b/src/imap-hibernate/imap-hibernate-client.c
index fe2bbf7..95bb861 100644
index 4065adc..4a110c4 100644
--- a/src/imap-hibernate/imap-hibernate-client.c
+++ b/src/imap-hibernate/imap-hibernate-client.c
@@ -153,8 +153,10 @@ imap_hibernate_client_parse_input(const char *const *args, pool_t pool,
@@ -167,9 +167,11 @@ imap_hibernate_client_parse_input(const char *const *args, pool_t pool,
*error_r = "Missing tag";
return -1;
}
+#ifndef __HAIKU__
if (peer_dev_major != 0 || peer_dev_minor != 0)
state_r->peer_dev = makedev(peer_dev_major, peer_dev_minor);
+#endif
return 0;
+#endif
}
static int
diff --git a/src/imap/imap-client-hibernate.c b/src/imap/imap-client-hibernate.c
index 40a05e2..f65bdfe 100644
index b29f500..bd9d3de 100644
--- a/src/imap/imap-client-hibernate.c
+++ b/src/imap/imap-client-hibernate.c
@@ -55,10 +55,12 @@ static void imap_hibernate_write_cmd(struct client *client, string_t *cmd,
@@ -59,10 +59,12 @@ static void imap_hibernate_write_cmd(struct client *client, string_t *cmd,
str_printfa(cmd, "\tidle_notify_interval=%u",
client->set->imap_idle_notify_interval);
if (fstat(client->fd_in, &peer_st) == 0) {
@@ -55,10 +62,10 @@ index 40a05e2..f65bdfe 100644
str_append(cmd, "\tsession=");
diff --git a/src/imap/imap-master-client.c b/src/imap/imap-master-client.c
index 9b2e2df..44d6a33 100644
index 84814f0..1d0dae3 100644
--- a/src/imap/imap-master-client.c
+++ b/src/imap/imap-master-client.c
@@ -154,10 +154,12 @@ imap_master_client_parse_input(const char *const *args, pool_t pool,
@@ -176,10 +176,12 @@ imap_master_client_parse_input(const char *const *args, pool_t pool,
master_input_r->state_import_idle_continue = TRUE;
}
}
@@ -71,7 +78,7 @@ index 9b2e2df..44d6a33 100644
return 0;
}
@@ -176,6 +178,7 @@ static int imap_master_client_verify(const struct imap_master_input *master_inpu
@@ -198,6 +200,7 @@ static int imap_master_client_verify(const struct imap_master_input *master_inpu
}
if (peer_st.st_ino != master_input->peer_ino ||
!CMP_DEV_T(peer_st.st_dev, master_input->peer_dev)) {
@@ -79,7 +86,7 @@ index 9b2e2df..44d6a33 100644
*error_r = t_strdup_printf(
"BUG: Expected peer device=%lu,%lu inode=%s doesn't match "
"client fd's actual device=%lu,%lu inode=%s",
@@ -184,6 +187,7 @@ static int imap_master_client_verify(const struct imap_master_input *master_inpu
@@ -206,6 +209,7 @@ static int imap_master_client_verify(const struct imap_master_input *master_inpu
(unsigned long)major(master_input->peer_dev),
(unsigned long)minor(master_input->peer_dev),
dec2str(master_input->peer_ino));
@@ -87,6 +94,22 @@ index 9b2e2df..44d6a33 100644
return -1;
}
return 0;
diff --git a/src/lib-http/test-http-client-errors.c b/src/lib-http/test-http-client-errors.c
index e127041..f41b4d2 100644
--- a/src/lib-http/test-http-client-errors.c
+++ b/src/lib-http/test-http-client-errors.c
@@ -18,7 +18,11 @@
#include "http-client.h"
#include <unistd.h>
+#ifdef __HAIKU__
+#include <signal.h>
+#else
#include <sys/signal.h>
+#endif
#define CLIENT_PROGRESS_TIMEOUT 10
#define SERVER_KILL_TIMEOUT_SECS 20
diff --git a/src/plugins/old-stats/mail-stats-fill.c b/src/plugins/old-stats/mail-stats-fill.c
index 10d8c39..c57b1c5 100644
--- a/src/plugins/old-stats/mail-stats-fill.c
@@ -107,5 +130,5 @@ index 10d8c39..c57b1c5 100644
process_read_io_stats(stats_r);
user_trans_stats_get(suser, stats_r);
--
2.28.0
2.37.3