Mirror/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-07-12 18:59:50 +03:00
Code Issues Wiki Activity

testing/hiawatha: fix build with gcc 15

Browse source
This commit is contained in:
Celeste 2025-07-03 07:29:15 +00:00
parent efbb7a6603
commit 52ba47cb7c
2 changed files with 49 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
testing/hiawatha/APKBUILD
View file

@ -15,6 +15,7 @@ options="suid !check"
subpackages="$pkgname-doc $pkgname-openrc $pkgname-letsencrypt::noarch"
makedepends="cmake libxml2-dev libxslt-dev mbedtls-dev samurai"
source="https://hiawatha.leisink.net/files/hiawatha-$pkgver.tar.gz
gcc15.patch
hiawatha.initd
hiawatha.conf.sample
letsencrypt.helper
@ -64,6 +65,7 @@ letsencrypt() {
sha512sums="
a8d9f53d07e4bfb09e761db5ab03f2b83dc2399c7f2ba75d256737c428c7daae6208bb8f472b23feabb940130cfd4d40ae577716a88a514bab7690abee5cb2a1 hiawatha-11.6.tar.gz
206d57b2a0dfa1263fd73feca7e5ed6611a30a052fd8c9caf03f99acf92f643baaf26fe7d470cb53fe388d7877b779208f01044d1dc8c1cd4c08be7c245c1861 gcc15.patch
cec0adfb48e1751cf13031f2c28f4590340b2c747aa8e81d18c16bc8789bce69b2d9d99290a93b74b501db3b63190a071033a78abeeb8f60becba2dcaf3b5c40 hiawatha.initd
771bed17b5831bb9d4a28eb94482dd39de8c4b5b35b2c08e1c303a2778254f9e34e40a8d791cc7ef4e73740f474c502685252378e7fe2cba494c782c11f960d4 hiawatha.conf.sample
dbdd0cdf975b226d2ac27257861a1cc6c1f77c8387d632014368a1c835817a33b780f446cd3fdb7d9ca4322eaede1fea28652dde70928cc8a73f0b05dba46f6e letsencrypt.helper

47
testing/hiawatha/gcc15.patch Normal file
View file

@ -0,0 +1,47 @@
--- a/src/cgi-wrapper.c
+++ b/src/cgi-wrapper.c
@@ -40,7 +40,7 @@ typedef struct type_wrap {
static int cgi_pid;
-void ALRM_handler() {
+void ALRM_handler(int) {
if (kill(cgi_pid, SIGTERM) != -1) {
sleep(1);
kill(cgi_pid, SIGKILL);
--- a/src/hiawatha.c
+++ b/src/hiawatha.c
@@ -299,7 +299,7 @@ void task_runner(t_config *config) {
/* Signal handlers
*/
-void SEGV_handler() {
+void SEGV_handler(int) {
syslog(LOG_DAEMON | LOG_ALERT, "segmentation fault!");
#ifdef ENABLE_MONITOR
monitor_event("Server crash!");
@@ -308,20 +308,20 @@ void SEGV_handler() {
exit(EXIT_FAILURE);
}
-void TERM_handler() {
+void TERM_handler(int) {
received_signal = rs_QUIT_SERVER;
}
-void HUP_handler() {
+void HUP_handler(int) {
received_signal = rs_UNLOCK_LOGFILES;
}
-void USR1_handler() {
+void USR1_handler(int) {
received_signal = rs_UNBAN_CLIENTS;
}
#ifdef ENABLE_CACHE
-void USR2_handler() {
+void USR2_handler(int) {
received_signal = rs_CLEAR_CACHE;
}
#endif