Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] package/drogon: bump to version 1.9.14
@ 2026-10-19 12:26 Dario Binacchi
  2026-10-19 13:17 ` Thomas Petazzoni via buildroot
  0 siblings, 1 reply; 2+ messages in thread
From: Dario Binacchi @ 2026-10-19 12:26 UTC (permalink / raw)
  To: buildroot; +Cc: Dario Binacchi

Release notes:
https://github.com/drogonframework/drogon/releases/tag/v1.9.14

Drop the local patches, as both fixes are part of the trantor
submodule shipped with this release:
- 0001-Fix-EPOLLRDHUP-POLLRDHUP-mismatch-on-Linux-SPARC-SPA.patch:
  https://github.com/an-tao/trantor/commit/0f45310fbbb6
- 0002-Fix-incomplete-struct-tm-type-on-uClibc.patch:
  https://github.com/an-tao/trantor/commit/66dc5780ed4d

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---
 ...OLLRDHUP-mismatch-on-Linux-SPARC-SPA.patch | 93 -------------------
 ...-incomplete-struct-tm-type-on-uClibc.patch | 36 -------
 package/drogon/drogon.hash                    |  2 +-
 package/drogon/drogon.mk                      |  2 +-
 4 files changed, 2 insertions(+), 131 deletions(-)
 delete mode 100644 package/drogon/0001-Fix-EPOLLRDHUP-POLLRDHUP-mismatch-on-Linux-SPARC-SPA.patch
 delete mode 100644 package/drogon/0002-Fix-incomplete-struct-tm-type-on-uClibc.patch

diff --git a/package/drogon/0001-Fix-EPOLLRDHUP-POLLRDHUP-mismatch-on-Linux-SPARC-SPA.patch b/package/drogon/0001-Fix-EPOLLRDHUP-POLLRDHUP-mismatch-on-Linux-SPARC-SPA.patch
deleted file mode 100644
index 7a9fab389fec..000000000000
--- a/package/drogon/0001-Fix-EPOLLRDHUP-POLLRDHUP-mismatch-on-Linux-SPARC-SPA.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 9ecfb965e6ea02583874e534f8936ebb43a9db29 Mon Sep 17 00:00:00 2001
-From: Dario Binacchi <dario.binacchi@amarulasolutions.com>
-Date: Mon, 20 Jul 2026 16:16:22 +0200
-Subject: [PATCH] Fix EPOLLRDHUP/POLLRDHUP mismatch on Linux SPARC/SPARC64
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fix a build failure reported by Buildroot autobuild for the
-bootlin-sparc64-glibc configuration:
-
-  EpollPoller.cc:41:26: error: static assertion failed:
-  EPOLLRDHUP != POLLRDHUP
-
-On SPARC/SPARC64, EPOLLRDHUP (0x2000) and POLLRDHUP (0x0800) are
-different bits, breaking the assumption elsewhere in this file that
-epoll and poll flags are interchangeable.
-
-Introduce a combined RDHUP value for this architecture and translate
-it before epoll_ctl() and after epoll_wait(), since revents_ is later
-tested against POLLRDHUP in Channel::handleEvent() — otherwise
-half-close detection would silently break at runtime.
-
-This patch is inspired by the equivalent fix in lighttpd:
-https://redmine.lighttpd.net/issues/3251
-
-Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
-Upstream: https://github.com/an-tao/trantor/pull/407
----
- trantor/trantor/net/inner/poller/EpollPoller.cc | 25 ++++++++++++++++++++++++-
- 1 file changed, 24 insertions(+), 1 deletion(-)
-
-diff --git a/trantor/trantor/net/inner/poller/EpollPoller.cc b/trantor/trantor/net/inner/poller/EpollPoller.cc
-index c9c4f7d481b4..812b48c30d79 100644
---- a/trantor/trantor/net/inner/poller/EpollPoller.cc
-+++ b/trantor/trantor/net/inner/poller/EpollPoller.cc
-@@ -22,6 +22,9 @@
- #include <assert.h>
- #include <strings.h>
- #include <iostream>
-+#if (defined(__sparc__) || defined(__sparc))
-+#define TRANTOR_RDHUP 0x2800 /* EPOLLRDHUP | POLLRDHUP */
-+#endif
- #elif defined _WIN32
- #include "Wepoll.h"
- #include <assert.h>
-@@ -38,7 +41,12 @@ namespace trantor
- static_assert(EPOLLIN == POLLIN, "EPOLLIN != POLLIN");
- static_assert(EPOLLPRI == POLLPRI, "EPOLLPRI != POLLPRI");
- static_assert(EPOLLOUT == POLLOUT, "EPOLLOUT != POLLOUT");
-+#if (defined(__sparc__) || defined(__sparc))
-+static_assert(EPOLLRDHUP & TRANTOR_RDHUP,
-+              "EPOLLRDHUP not included in TRANTOR_RDHUP");
-+#else
- static_assert(EPOLLRDHUP == POLLRDHUP, "EPOLLRDHUP != POLLRDHUP");
-+#endif
- static_assert(EPOLLERR == POLLERR, "EPOLLERR != POLLERR");
- static_assert(EPOLLHUP == POLLHUP, "EPOLLHUP != POLLHUP");
- #endif
-@@ -127,7 +135,15 @@ void EpollPoller::fillActiveChannels(int numEvents,
-         assert(it != channels_.end());
-         assert(it->second == channel);
- #endif
--        channel->setRevents(events_[i].events);
-+        int revents = events_[i].events;
-+#if defined(__linux__) && (defined(__sparc__) || defined(__sparc))
-+        if (revents & EPOLLRDHUP)
-+        {
-+            revents &= ~EPOLLRDHUP;
-+            revents |= POLLRDHUP;
-+        }
-+#endif
-+        channel->setRevents(revents);
-         activeChannels->push_back(channel);
-     }
-     // LOG_TRACE<<"active Channels num:"<<activeChannels->size();
-@@ -205,6 +221,13 @@ void EpollPoller::update(int operation, Channel *channel)
-     struct epoll_event event;
-     memset(&event, 0, sizeof(event));
-     event.events = channel->events();
-+#if defined(__linux__) && (defined(__sparc__) || defined(__sparc))
-+    if (event.events & TRANTOR_RDHUP)
-+    {
-+        event.events &= ~TRANTOR_RDHUP;
-+        event.events |= EPOLLRDHUP;
-+    }
-+#endif
-     event.data.ptr = channel;
-     int fd = channel->fd();
-     if (::epoll_ctl(epollfd_, operation, fd, &event) < 0)
--- 
-2.43.0
-
diff --git a/package/drogon/0002-Fix-incomplete-struct-tm-type-on-uClibc.patch b/package/drogon/0002-Fix-incomplete-struct-tm-type-on-uClibc.patch
deleted file mode 100644
index 4fad84664cb9..000000000000
--- a/package/drogon/0002-Fix-incomplete-struct-tm-type-on-uClibc.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From cd29aa61d299c82d82d3285215fc4fc65e4d4fb9 Mon Sep 17 00:00:00 2001
-From: Dario Binacchi <dario.binacchi@amarulasolutions.com>
-Date: Sun, 30 Aug 2026 12:00:00 +0200
-Subject: [PATCH] Fix incomplete 'struct tm' type on uClibc
-
-Fix a build failure [1] reported by Buildroot autobuild for the
-mips/uClibc configuration:
-
-  Date.cc:98:28: error: return type 'struct trantor::tm' is incomplete
-     98 | struct tm Date::tmStruct() const
-        |                            ^~~~~
-
-Add the missing include to Date.h.
-
-[1] https://autobuild.buildroot.org/results/e48e0fc1b95a8ad5de964b1e6d12bc45ac39f0b4/
-Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
-Upstream: https://github.com/an-tao/trantor/pull/415
----
- trantor/utils/Date.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/trantor/trantor/utils/Date.h b/trantor/trantor/utils/Date.h
-index 4367d76e0305..41b02d355d14 100644
---- a/trantor/trantor/utils/Date.h
-+++ b/trantor/trantor/utils/Date.h
-@@ -16,6 +16,7 @@
- 
- #include <trantor/exports.h>
- #include <stdint.h>
-+#include <time.h>
- #include <string>
- 
- namespace trantor
--- 
-2.43.0
-
diff --git a/package/drogon/drogon.hash b/package/drogon/drogon.hash
index 997fd519e1d6..ec4970731dad 100644
--- a/package/drogon/drogon.hash
+++ b/package/drogon/drogon.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  1d7dc4591b61c34903362209e58a3f92903c76ce6514ffba5ccfaa86a2e3227c  drogon-v1.9.13-git4.tar.gz
+sha256  9917aa99aac53d4b6253a0b764ba3e8a94889df1c41932e1adef8352f917ea6a  drogon-v1.9.14-git4.tar.gz
 sha256  7e1ed2ca339c384279f1e195e99916eb0145a0d87659969c7e22f8fdd53e11fd  LICENSE
diff --git a/package/drogon/drogon.mk b/package/drogon/drogon.mk
index 73388ea92c34..03cba45ceb34 100644
--- a/package/drogon/drogon.mk
+++ b/package/drogon/drogon.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-DROGON_VERSION = v1.9.13
+DROGON_VERSION = v1.9.14
 DROGON_SITE = https://github.com/drogonframework/drogon
 DROGON_SITE_METHOD = git
 DROGON_GIT_SUBMODULES = YES
-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 2+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/drogon: bump to version 1.9.14
  2026-10-19 12:26 [Buildroot] [PATCH 1/1] package/drogon: bump to version 1.9.14 Dario Binacchi
@ 2026-10-19 13:17 ` Thomas Petazzoni via buildroot
  0 siblings, 0 replies; 2+ messages in thread
From: Thomas Petazzoni via buildroot @ 2026-10-19 13:17 UTC (permalink / raw)
  To: Dario Binacchi; +Cc: buildroot

On Mon, Oct 19, 2026 at 02:26:26PM +0200, Dario Binacchi wrote:
> Release notes:
> https://github.com/drogonframework/drogon/releases/tag/v1.9.14
> 
> Drop the local patches, as both fixes are part of the trantor
> submodule shipped with this release:
> - 0001-Fix-EPOLLRDHUP-POLLRDHUP-mismatch-on-Linux-SPARC-SPA.patch:
>   https://github.com/an-tao/trantor/commit/0f45310fbbb6
> - 0002-Fix-incomplete-struct-tm-type-on-uClibc.patch:
>   https://github.com/an-tao/trantor/commit/66dc5780ed4d
> 
> Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>

Applied to master, thanks!

Best regards,

Thomas Petazzoni
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-10-19 13:17 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-10-19 12:26 [Buildroot] [PATCH 1/1] package/drogon: bump to version 1.9.14 Dario Binacchi
2026-10-19 13:17 ` Thomas Petazzoni via buildroot

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox