git: c59c5adc46f3 - main - mail/dbmail: Remove dead sbrk linkage
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 10 Dec 2023 14:56:42 UTC
The branch main has been updated by bofh:
URL: https://cgit.FreeBSD.org/ports/commit/?id=c59c5adc46f3c43f00ee2f271018e0d5068578a8
commit c59c5adc46f3c43f00ee2f271018e0d5068578a8
Author: Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2023-12-09 08:17:00 +0000
Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2023-12-10 14:56:31 +0000
mail/dbmail: Remove dead sbrk linkage
Differential Revision: https://reviews.freebsd.org/D42973
---
mail/dbmail/Makefile | 3 +--
mail/dbmail/files/patch-src_mpool_mpool.c | 38 +++++++++++++++++++++++++++++++
2 files changed, 39 insertions(+), 2 deletions(-)
diff --git a/mail/dbmail/Makefile b/mail/dbmail/Makefile
index ff43f3f1a98a..002e6470b66b 100644
--- a/mail/dbmail/Makefile
+++ b/mail/dbmail/Makefile
@@ -1,5 +1,6 @@
PORTNAME= dbmail
PORTVERSION= 3.4.1
+PORTREVISION= 1
DISTVERSIONPREFIX= v
CATEGORIES= mail
@@ -9,8 +10,6 @@ WWW= http://www.dbmail.org/
LICENSE= GPLv2
-BROKEN_aarch64= Fails to link: missing sbrk
-
BUILD_DEPENDS= asciidoc:textproc/asciidoc \
docbook-sgml>0:textproc/docbook-sgml \
xmlto:textproc/xmlto
diff --git a/mail/dbmail/files/patch-src_mpool_mpool.c b/mail/dbmail/files/patch-src_mpool_mpool.c
new file mode 100644
index 000000000000..281c65aab0ab
--- /dev/null
+++ b/mail/dbmail/files/patch-src_mpool_mpool.c
@@ -0,0 +1,38 @@
+--- src/mpool/mpool.c.orig
++++ src/mpool/mpool.c
+@@ -241,6 +241,7 @@
+ (void)printf("allocating %u pages or %lu bytes\n", page_n, size);
+ #endif
+
++#if 0
+ if (BIT_IS_SET(mp_p->mp_flags, MPOOL_FLAG_USE_SBRK)) {
+ mem = sbrk(size);
+ if (mem == (void *)-1) {
+@@ -263,7 +264,9 @@
+ mem = (char *)mem + fill;
+ }
+ }
+- else {
++ else
++#endif
++ {
+ state = MAP_PRIVATE;
+ #ifdef MAP_FILE
+ state |= MAP_FILE;
+@@ -937,12 +940,15 @@
+ }
+ }
+
++#if 0
+ if (BIT_IS_SET(flags, MPOOL_FLAG_USE_SBRK)) {
+ mp.mp_fd = -1;
+ mp.mp_addr = NULL;
+ mp.mp_top = 0;
+ }
+- else {
++ else
++#endif
++ {
+ /* open dev-zero for our mmaping */
+ mp.mp_fd = open("/dev/zero", O_RDWR, 0);
+ if (mp.mp_fd < 0) {