haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 04:00:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

dovecot, bump version, fixes building with newer openssl (#5427)

Browse Source
This commit is contained in:
Schrijvers Luc
2020-11-22 10:45:50 +01:00
committed by GitHub
parent 0d2dbc2ae3
commit 739151da2c
2 changed files with 29 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
net-mail/dovecot/dovecot-2.2.24.recipe → net-mail/dovecot/dovecot-2.3.11.3.recipe
View File

@@ -7,9 +7,9 @@ uses very little memory."
HOMEPAGE="https://dovecot.org/"
COPYRIGHT="2002-2016 Timo Sirainen"
LICENSE="MIT"
REVISION="4"
SOURCE_URI="https://dovecot.org/releases/2.2/dovecot-$portVersion.tar.gz"
CHECKSUM_SHA256="71c86891ea8deb5703d3dbbc3ea31ce2cbf7638f1aa395d9e8794d3ff7aebeb7"
REVISION="1"
SOURCE_URI="https://dovecot.org/releases/2.3/dovecot-$portVersion.tar.gz"
CHECKSUM_SHA256="d3d9ea9010277f57eb5b9f4166a5d2ba539b172bd6d5a2b2529a6db524baafdc"
PATCHES="dovecot-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 x86 x86_64"
@@ -27,6 +27,7 @@ PROVIDES="
cmd:doveadm$secondaryArchSuffix = $portVersion
cmd:doveconf$secondaryArchSuffix = $portVersion
cmd:dovecot$secondaryArchSuffix = $portVersion
cmd:dovecot_sysreport$secondaryArchSuffix = $portVersion
cmd:dsync$secondaryArchSuffix = $portVersion
lib:libdovecot$secondaryArchSuffix = 0.0.0
lib:libdovecot_storage$secondaryArchSuffix = 0.0.0
@@ -59,9 +60,11 @@ BUILD_PREREQUIRES="
BUILD()
{
export LDFLAGS="-lnetwork"
autoreconf -fi
CFLAGS=-D_BSD_SOURCE runConfigure ./configure \
--libexecdir=$libDir/libexec --with-ssl=openssl
--libexecdir=$libDir/libexec --with-ssl=openssl \
--disable-hardening
make
}

66
net-mail/dovecot/patches/dovecot-2.2.24.patchset → net-mail/dovecot/patches/dovecot-2.3.11.3.patchset Executable file → Normal file
View File

@@ -1,36 +1,14 @@
From b58d8af46ef7dc1d79da5460ef1b2f790e9b614e Mon Sep 17 00:00:00 2001
From c947608ad7763031b2feb604ba52b735f4916628 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
diff --git a/Makefile.am b/Makefile.am
index a7be896..96911d8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,4 @@
+ACLOCAL_AMFLAGS = -I.
aclocaldir = $(datadir)/aclocal
SUBDIRS = \
diff --git a/configure.ac b/configure.ac
index 2662d24..dc1effb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -392,7 +392,7 @@ dnl **
dnl ** just some generic stuff...
dnl **
-AC_SEARCH_LIBS(socket, socket)
+AC_SEARCH_LIBS(socket, socket network)
AC_SEARCH_LIBS(inet_addr, nsl)
AC_SEARCH_LIBS(fdatasync, rt, [
AC_DEFINE(HAVE_FDATASYNC,, [Define if you have fdatasync()])
diff --git a/src/imap-hibernate/imap-client.c b/src/imap-hibernate/imap-client.c
index 5c7209e..0110f42 100644
index fc158f1..92f4b78 100644
--- a/src/imap-hibernate/imap-client.c
+++ b/src/imap-hibernate/imap-client.c
@@ -117,11 +117,13 @@ imap_client_move_back_send_callback(void *context, struct ostream *output)
@@ -147,11 +147,13 @@ imap_client_move_back_send_callback(void *context, struct ostream *output)
str_append(str, "\tuserdb_fields=");
str_append_tabescaped(str, state->userdb_fields);
}
@@ -45,12 +23,12 @@ index 5c7209e..0110f42 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 9bec027..cfc866b 100644
index fe2bbf7..95bb861 100644
--- a/src/imap-hibernate/imap-hibernate-client.c
+++ b/src/imap-hibernate/imap-hibernate-client.c
@@ -138,8 +138,10 @@ imap_hibernate_client_parse_input(const char *const *args, pool_t pool,
state_r->state_size = state_buf->used;
}
@@ -153,8 +153,10 @@ 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)
@@ -60,10 +38,10 @@ index 9bec027..cfc866b 100644
}
diff --git a/src/imap/imap-client-hibernate.c b/src/imap/imap-client-hibernate.c
index c2704b3..84f5fea 100644
index 40a05e2..f65bdfe 100644
--- a/src/imap/imap-client-hibernate.c
+++ b/src/imap/imap-client-hibernate.c
@@ -51,10 +51,12 @@ static void imap_hibernate_write_cmd(struct client *client, string_t *cmd,
@@ -55,10 +55,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) {
@@ -75,12 +53,12 @@ index c2704b3..84f5fea 100644
+#endif
}
if (client->session_id != NULL) {
str_append(cmd, "\tsession=");
diff --git a/src/imap/imap-master-client.c b/src/imap/imap-master-client.c
index d562d1b..37a6445 100644
index 9b2e2df..44d6a33 100644
--- a/src/imap/imap-master-client.c
+++ b/src/imap/imap-master-client.c
@@ -142,10 +142,12 @@ imap_master_client_parse_input(const char *const *args, pool_t pool,
@@ -154,10 +154,12 @@ imap_master_client_parse_input(const char *const *args, pool_t pool,
master_input_r->state_import_idle_continue = TRUE;
}
}
@@ -93,7 +71,7 @@ index d562d1b..37a6445 100644
return 0;
}
@@ -164,6 +166,7 @@ static int imap_master_client_verify(const struct imap_master_input *master_inpu
@@ -176,6 +178,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)) {
@@ -101,7 +79,7 @@ index d562d1b..37a6445 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",
@@ -172,6 +175,7 @@ static int imap_master_client_verify(const struct imap_master_input *master_inpu
@@ -184,6 +187,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));
@@ -109,12 +87,12 @@ index d562d1b..37a6445 100644
return -1;
}
return 0;
diff --git a/src/plugins/stats/mail-stats-fill.c b/src/plugins/stats/mail-stats-fill.c
index 7c48f6f..a7d2ed4 100644
--- a/src/plugins/stats/mail-stats-fill.c
+++ b/src/plugins/stats/mail-stats-fill.c
@@ -118,12 +118,14 @@ void mail_stats_fill(struct stats_user *suser, struct mail_stats *stats_r)
memset(&usage, 0, sizeof(usage));
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
+++ b/src/plugins/old-stats/mail-stats-fill.c
@@ -134,12 +134,14 @@ void mail_stats_fill(struct stats_user *suser, struct mail_stats *stats_r)
stats_r->user_cpu = usage.ru_utime;
stats_r->sys_cpu = usage.ru_stime;
+#ifndef __HAIKU__
@@ -125,9 +103,9 @@ index 7c48f6f..a7d2ed4 100644
stats_r->disk_input = (unsigned long long)usage.ru_inblock * 512ULL;
stats_r->disk_output = (unsigned long long)usage.ru_oublock * 512ULL;
+#endif
(void)gettimeofday(&stats_r->clock_time, NULL);
i_gettimeofday(&stats_r->clock_time);
process_read_io_stats(stats_r);
user_trans_stats_get(suser, stats_r);
--
2.2.2
2.28.0