mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 19:50:05 +02:00
libevent: (kqueue backend) Allow building without EVFILT_SIGNAL. (#10821)
Patchset thanks to waddlesplash. (reference: #10815) While we're at it, remove an unused .patchset for an older version.
This commit is contained in:
OscarL
GitHub
@@ -10,11 +10,13 @@ HOMEPAGE="http://www.libevent.org/"
|
||||
COPYRIGHT="2000-2007 Niels Provos
|
||||
2005 Nick Mathewson, and other contributors."
|
||||
LICENSE="BSD (3-clause)"
|
||||
REVISION="2"
|
||||
REVISION="3"
|
||||
SOURCE_URI="https://github.com/libevent/libevent/releases/download/release-$portVersion-stable/libevent-$portVersion-stable.tar.gz"
|
||||
CHECKSUM_SHA256="92e6de1be9ec176428fd2367677e61ceffc2ee1cb119035037a27d346b0403bb"
|
||||
SOURCE_DIR="libevent-${portVersion}-stable"
|
||||
|
||||
PATCHES="libevent-${portVersion}.patchset"
|
||||
|
||||
ARCHITECTURES="all !x86_gcc2"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
@@ -78,7 +80,7 @@ BUILD()
|
||||
{
|
||||
autoreconf -fi
|
||||
|
||||
CPPFLAGS="-DB_USE_POSITIVE_POSIX_ERRORS -D_BSD_SOURCE" \
|
||||
CPPFLAGS="-DB_USE_POSITIVE_POSIX_ERRORS -D_BSD_SOURCE -DEV_ENABLE=0" \
|
||||
LDFLAGS="-lbsd -lposix_error_mapper -lnetwork" \
|
||||
runConfigure ./configure --disable-static
|
||||
make $jobArgs
|
||||
|
||||
@@ -1,209 +0,0 @@
|
||||
From ce89716728141568e10e66bf69e350fa9f9e6bd1 Mon Sep 17 00:00:00 2001
|
||||
From: begasus <begasus@gmail.com>
|
||||
Date: Sun, 22 Nov 2020 10:03:12 +0000
|
||||
Subject: Fix build for strsep and newer openssl
|
||||
|
||||
|
||||
diff --git a/bufferevent_openssl.c b/bufferevent_openssl.c
|
||||
index 7582d9b..0d6a5ba 100644
|
||||
--- a/bufferevent_openssl.c
|
||||
+++ b/bufferevent_openssl.c
|
||||
@@ -60,6 +60,7 @@
|
||||
#include <openssl/bio.h>
|
||||
#include <openssl/ssl.h>
|
||||
#include <openssl/err.h>
|
||||
+#include "openssl-compat.h"
|
||||
|
||||
/*
|
||||
* Define an OpenSSL bio that targets a bufferevent.
|
||||
@@ -103,10 +104,8 @@ print_err(int val)
|
||||
static int
|
||||
bio_bufferevent_new(BIO *b)
|
||||
{
|
||||
- b->init = 0;
|
||||
- b->num = -1;
|
||||
- b->ptr = NULL; /* We'll be putting the bufferevent in this field.*/
|
||||
- b->flags = 0;
|
||||
+ BIO_set_init(b, 0);
|
||||
+ BIO_set_data(b, NULL); /* We'll be putting the bufferevent in this field.*/
|
||||
return 1;
|
||||
}
|
||||
|
||||
@@ -116,12 +115,10 @@ bio_bufferevent_free(BIO *b)
|
||||
{
|
||||
if (!b)
|
||||
return 0;
|
||||
- if (b->shutdown) {
|
||||
- if (b->init && b->ptr)
|
||||
- bufferevent_free(b->ptr);
|
||||
- b->init = 0;
|
||||
- b->flags = 0;
|
||||
- b->ptr = NULL;
|
||||
+ if (BIO_get_shutdown(b)) {
|
||||
+ if (BIO_get_init(b) && BIO_get_data(b))
|
||||
+ bufferevent_free(BIO_get_data(b));
|
||||
+ BIO_free(b);
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
@@ -137,10 +134,10 @@ bio_bufferevent_read(BIO *b, char *out, int outlen)
|
||||
|
||||
if (!out)
|
||||
return 0;
|
||||
- if (!b->ptr)
|
||||
+ if (!BIO_get_data(b))
|
||||
return -1;
|
||||
|
||||
- input = bufferevent_get_input(b->ptr);
|
||||
+ input = bufferevent_get_input(BIO_get_data(b));
|
||||
if (evbuffer_get_length(input) == 0) {
|
||||
/* If there's no data to read, say so. */
|
||||
BIO_set_retry_read(b);
|
||||
@@ -156,13 +153,13 @@ bio_bufferevent_read(BIO *b, char *out, int outlen)
|
||||
static int
|
||||
bio_bufferevent_write(BIO *b, const char *in, int inlen)
|
||||
{
|
||||
- struct bufferevent *bufev = b->ptr;
|
||||
+ struct bufferevent *bufev = BIO_get_data(b);
|
||||
struct evbuffer *output;
|
||||
size_t outlen;
|
||||
|
||||
BIO_clear_retry_flags(b);
|
||||
|
||||
- if (!b->ptr)
|
||||
+ if (!BIO_get_data(b))
|
||||
return -1;
|
||||
|
||||
output = bufferevent_get_output(bufev);
|
||||
@@ -188,15 +185,15 @@ bio_bufferevent_write(BIO *b, const char *in, int inlen)
|
||||
static long
|
||||
bio_bufferevent_ctrl(BIO *b, int cmd, long num, void *ptr)
|
||||
{
|
||||
- struct bufferevent *bufev = b->ptr;
|
||||
+ struct bufferevent *bufev = BIO_get_data(b);
|
||||
long ret = 1;
|
||||
|
||||
switch (cmd) {
|
||||
case BIO_CTRL_GET_CLOSE:
|
||||
- ret = b->shutdown;
|
||||
+ ret = BIO_get_shutdown(b);
|
||||
break;
|
||||
case BIO_CTRL_SET_CLOSE:
|
||||
- b->shutdown = (int)num;
|
||||
+ BIO_set_shutdown(b, (int)num);
|
||||
break;
|
||||
case BIO_CTRL_PENDING:
|
||||
ret = evbuffer_get_length(bufferevent_get_input(bufev)) != 0;
|
||||
@@ -225,23 +222,24 @@ bio_bufferevent_puts(BIO *b, const char *s)
|
||||
}
|
||||
|
||||
/* Method table for the bufferevent BIO */
|
||||
-static BIO_METHOD methods_bufferevent = {
|
||||
- BIO_TYPE_LIBEVENT, "bufferevent",
|
||||
- bio_bufferevent_write,
|
||||
- bio_bufferevent_read,
|
||||
- bio_bufferevent_puts,
|
||||
- NULL /* bio_bufferevent_gets */,
|
||||
- bio_bufferevent_ctrl,
|
||||
- bio_bufferevent_new,
|
||||
- bio_bufferevent_free,
|
||||
- NULL /* callback_ctrl */,
|
||||
-};
|
||||
+static BIO_METHOD *methods_bufferevent;
|
||||
|
||||
/* Return the method table for the bufferevents BIO */
|
||||
static BIO_METHOD *
|
||||
BIO_s_bufferevent(void)
|
||||
{
|
||||
- return &methods_bufferevent;
|
||||
+ if (methods_bufferevent == NULL) {
|
||||
+ methods_bufferevent = BIO_meth_new(BIO_TYPE_LIBEVENT, "bufferevent");
|
||||
+ if (methods_bufferevent == NULL)
|
||||
+ return NULL;
|
||||
+ BIO_meth_set_write(methods_bufferevent, bio_bufferevent_write);
|
||||
+ BIO_meth_set_read(methods_bufferevent, bio_bufferevent_read);
|
||||
+ BIO_meth_set_puts(methods_bufferevent, bio_bufferevent_puts);
|
||||
+ BIO_meth_set_ctrl(methods_bufferevent, bio_bufferevent_ctrl);
|
||||
+ BIO_meth_set_create(methods_bufferevent, bio_bufferevent_new);
|
||||
+ BIO_meth_set_destroy(methods_bufferevent, bio_bufferevent_free);
|
||||
+ }
|
||||
+ return methods_bufferevent;
|
||||
}
|
||||
|
||||
/* Create a new BIO to wrap communication around a bufferevent. If close_flag
|
||||
@@ -254,9 +252,9 @@ BIO_new_bufferevent(struct bufferevent *bufferevent, int close_flag)
|
||||
return NULL;
|
||||
if (!(result = BIO_new(BIO_s_bufferevent())))
|
||||
return NULL;
|
||||
- result->init = 1;
|
||||
- result->ptr = bufferevent;
|
||||
- result->shutdown = close_flag ? 1 : 0;
|
||||
+ BIO_set_init(result, 1);
|
||||
+ BIO_set_data(result, bufferevent);
|
||||
+ BIO_set_shutdown(result, close_flag ? 1 : 0);
|
||||
return result;
|
||||
}
|
||||
|
||||
diff --git a/configure.in b/configure.in
|
||||
index 18165f3..f43e9fd 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -12,7 +12,7 @@ AC_INIT(event.c)
|
||||
AC_CONFIG_MACRO_DIR([m4])
|
||||
|
||||
AM_INIT_AUTOMAKE(libevent,2.0.21-stable)
|
||||
-AM_CONFIG_HEADER(config.h)
|
||||
+AC_CONFIG_HEADERS(config.h)
|
||||
AC_DEFINE(NUMERIC_VERSION, 0x02001500, [Numeric representation of the version])
|
||||
|
||||
dnl Initialize prefix.
|
||||
@@ -284,6 +284,7 @@ AC_C_INLINE
|
||||
AC_HEADER_TIME
|
||||
|
||||
dnl Checks for library functions.
|
||||
+AC_SEARCH_LIBS(strsep, [bsd])
|
||||
AC_CHECK_FUNCS([gettimeofday vasprintf fcntl clock_gettime strtok_r strsep])
|
||||
AC_CHECK_FUNCS([getnameinfo strlcpy inet_ntop inet_pton signal sigaction strtoll inet_aton pipe eventfd sendfile mmap splice arc4random arc4random_buf issetugid geteuid getegid getprotobynumber setenv unsetenv putenv sysctl])
|
||||
AC_CHECK_FUNCS([umask])
|
||||
diff --git a/openssl-compat.h b/openssl-compat.h
|
||||
new file mode 100644
|
||||
index 0000000..628f566
|
||||
--- /dev/null
|
||||
+++ b/openssl-compat.h
|
||||
@@ -0,0 +1,33 @@
|
||||
+#ifndef OPENSSL_COMPAT_H
|
||||
+#define OPENSSL_COMPAT_H
|
||||
+
|
||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||||
+
|
||||
+static BIO_METHOD *BIO_meth_new(int type, const char *name)
|
||||
+{
|
||||
+ BIO_METHOD *biom = calloc(1, sizeof(BIO_METHOD));
|
||||
+
|
||||
+ if (biom != NULL) {
|
||||
+ biom->type = type;
|
||||
+ biom->name = name;
|
||||
+ }
|
||||
+ return biom;
|
||||
+}
|
||||
+
|
||||
+#define BIO_meth_set_write(b, f) (b)->bwrite = (f)
|
||||
+#define BIO_meth_set_read(b, f) (b)->bread = (f)
|
||||
+#define BIO_meth_set_puts(b, f) (b)->bputs = (f)
|
||||
+#define BIO_meth_set_ctrl(b, f) (b)->ctrl = (f)
|
||||
+#define BIO_meth_set_create(b, f) (b)->create = (f)
|
||||
+#define BIO_meth_set_destroy(b, f) (b)->destroy = (f)
|
||||
+
|
||||
+#define BIO_set_init(b, val) (b)->init = (val)
|
||||
+#define BIO_set_data(b, val) (b)->ptr = (val)
|
||||
+#define BIO_set_shutdown(b, val) (b)->shutdown = (val)
|
||||
+#define BIO_get_init(b) (b)->init
|
||||
+#define BIO_get_data(b) (b)->ptr
|
||||
+#define BIO_get_shutdown(b) (b)->shutdown
|
||||
+
|
||||
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
|
||||
+
|
||||
+#endif /* OPENSSL_COMPAT_H */
|
||||
--
|
||||
2.28.0
|
||||
|
||||
83
dev-libs/libevent/patches/libevent-2.1.12.patchset
Normal file
83
dev-libs/libevent/patches/libevent-2.1.12.patchset
Normal file
@@ -0,0 +1,83 @@
|
||||
From 4fe7cfeafe027f14ff0b0112d5d605e2cb3e17ce Mon Sep 17 00:00:00 2001
|
||||
From: Augustin Cavalier <waddlesplash@gmail.com>
|
||||
Date: Mon, 12 Aug 2024 15:16:05 -0400
|
||||
Subject: kqueue backend: Allow building without EVFILT_SIGNAL.
|
||||
|
||||
Just use the standard signal handling system in this case.
|
||||
|
||||
diff --git a/kqueue.c b/kqueue.c
|
||||
index dfd7751..1e7ead6 100644
|
||||
--- a/kqueue.c
|
||||
+++ b/kqueue.c
|
||||
@@ -105,6 +105,7 @@ const struct eventop kqops = {
|
||||
EVENT_CHANGELIST_FDINFO_SIZE
|
||||
};
|
||||
|
||||
+#ifdef EVFILT_SIGNAL
|
||||
static const struct eventop kqsigops = {
|
||||
"kqueue_signal",
|
||||
NULL,
|
||||
@@ -116,6 +117,7 @@ static const struct eventop kqsigops = {
|
||||
0,
|
||||
0
|
||||
};
|
||||
+#endif
|
||||
|
||||
static void *
|
||||
kq_init(struct event_base *base)
|
||||
@@ -164,7 +166,11 @@ kq_init(struct event_base *base)
|
||||
goto err;
|
||||
}
|
||||
|
||||
+#ifdef EVFILT_SIGNAL
|
||||
base->evsigsel = &kqsigops;
|
||||
+#else
|
||||
+ evsig_init_(base);
|
||||
+#endif
|
||||
|
||||
return (kqueueop);
|
||||
err:
|
||||
@@ -401,8 +407,10 @@ kq_dispatch(struct event_base *base, struct timeval *tv)
|
||||
which |= EV_READ;
|
||||
} else if (events[i].filter == EVFILT_WRITE) {
|
||||
which |= EV_WRITE;
|
||||
+#ifdef EVFILT_SIGNAL
|
||||
} else if (events[i].filter == EVFILT_SIGNAL) {
|
||||
which |= EV_SIGNAL;
|
||||
+#endif
|
||||
#ifdef EVFILT_USER
|
||||
} else if (events[i].filter == EVFILT_USER) {
|
||||
base->is_notify_pending = 0;
|
||||
@@ -412,9 +420,12 @@ kq_dispatch(struct event_base *base, struct timeval *tv)
|
||||
if (!which)
|
||||
continue;
|
||||
|
||||
+#ifdef EVFILT_SIGNAL
|
||||
if (events[i].filter == EVFILT_SIGNAL) {
|
||||
evmap_signal_active_(base, events[i].ident, 1);
|
||||
- } else {
|
||||
+ } else
|
||||
+#endif
|
||||
+ {
|
||||
evmap_io_active_(base, events[i].ident, which | EV_ET);
|
||||
}
|
||||
}
|
||||
@@ -449,6 +460,7 @@ kq_dealloc(struct event_base *base)
|
||||
kqop_free(kqop);
|
||||
}
|
||||
|
||||
+#ifdef EVFILT_SIGNAL
|
||||
/* signal handling */
|
||||
static int
|
||||
kq_sig_add(struct event_base *base, int nsignal, short old, short events, void *p)
|
||||
@@ -510,6 +522,7 @@ kq_sig_del(struct event_base *base, int nsignal, short old, short events, void *
|
||||
|
||||
return (0);
|
||||
}
|
||||
+#endif
|
||||
|
||||
|
||||
/* OSX 10.6 and FreeBSD 8.1 add support for EVFILT_USER, which we can use
|
||||
--
|
||||
2.45.2
|
||||
|
||||
Reference in New Issue
Block a user