mirror of
https://github.com/yann64/haikuports.git
synced 2026-03-19 01:46:00 +01:00
132 lines
3.9 KiB
Plaintext
132 lines
3.9 KiB
Plaintext
From a82f14e80b6a009e8a92f7afaeb1494f394b260f Mon Sep 17 00:00:00 2001
|
|
From: Nav <nav@unlicrea.com>
|
|
Date: Mon, 15 Dec 2014 16:39:31 +0000
|
|
Subject: Fixed redefinition error
|
|
|
|
|
|
diff --git a/server/Makefile.in b/server/Makefile.in
|
|
index 8111877..35323c6 100644
|
|
--- a/server/Makefile.in
|
|
+++ b/server/Makefile.in
|
|
@@ -34,7 +34,7 @@ test_char.h: gen_test_char
|
|
util.lo: test_char.h
|
|
|
|
EXPORT_DIRS = $(top_srcdir)/include $(top_srcdir)/os/$(OS_DIR)
|
|
-EXPORT_DIRS_APR = $(APR_INCLUDEDIR) $(APU_INCLUDEDIR)
|
|
+EXPORT_DIRS_APR = $(APU_INCLUDEDIR)
|
|
|
|
# If export_files is a dependency here, but we remove it during this stage,
|
|
# when exports.c is generated, make will not detect that export_files is no
|
|
--
|
|
2.51.0
|
|
|
|
|
|
From 0cbab3bc6914342a30ac24ac6e9d6d03cdb3b29a Mon Sep 17 00:00:00 2001
|
|
From: PulkoMandy <pulkomandy@pulkomandy.tk>
|
|
Date: Sat, 14 Sep 2024 16:12:28 +0200
|
|
Subject: Disable uid check on Haiku
|
|
|
|
User 0 is a normal user and does not have specific permissions in Haiku.
|
|
|
|
diff --git a/modules/arch/unix/mod_unixd.c b/modules/arch/unix/mod_unixd.c
|
|
index 1baa278..15886e7 100644
|
|
--- a/modules/arch/unix/mod_unixd.c
|
|
+++ b/modules/arch/unix/mod_unixd.c
|
|
@@ -214,7 +214,7 @@ unixd_set_user(cmd_parms *cmd, void *dummy,
|
|
|
|
ap_unixd_config.user_name = arg;
|
|
ap_unixd_config.user_id = ap_uname2id(arg);
|
|
-#if !defined (BIG_SECURITY_HOLE) && !defined (OS2)
|
|
+#if !defined (BIG_SECURITY_HOLE) && !defined (OS2) && !defined(__HAIKU__)
|
|
if (ap_unixd_config.user_id == 0) {
|
|
return "Error:\tApache has not been designed to serve pages while\n"
|
|
"\trunning as root. There are known race conditions that\n"
|
|
--
|
|
2.51.0
|
|
|
|
|
|
From d552cd3ef7f3729ccd488567757000ce4ea8ba34 Mon Sep 17 00:00:00 2001
|
|
From: PulkoMandy <pulkomandy@pulkomandy.tk>
|
|
Date: Sat, 14 Sep 2024 16:33:12 +0200
|
|
Subject: Fix log directory
|
|
|
|
|
|
diff --git a/config.layout b/config.layout
|
|
index a29351e..b12dc09 100644
|
|
--- a/config.layout
|
|
+++ b/config.layout
|
|
@@ -28,8 +28,8 @@
|
|
cgidir: ${datadir}/cgi-bin
|
|
includedir: ${prefix}/include
|
|
localstatedir: ${prefix}
|
|
- runtimedir: ${localstatedir}/logs
|
|
- logfiledir: ${localstatedir}/logs
|
|
+ runtimedir: ${localstatedir}/log
|
|
+ logfiledir: ${localstatedir}/log
|
|
proxycachedir: ${localstatedir}/proxy
|
|
</Layout>
|
|
|
|
@@ -174,7 +174,7 @@
|
|
includedir: ${prefix}/include
|
|
localstatedir: /var${prefix}
|
|
runtimedir: ${localstatedir}/run
|
|
- logfiledir: ${localstatedir}/logs
|
|
+ logfiledir: ${localstatedir}/log
|
|
proxycachedir: ${localstatedir}/proxy
|
|
</Layout>
|
|
|
|
@@ -246,7 +246,7 @@
|
|
includedir: ${exec_prefix}/include
|
|
localstatedir: ${prefix}
|
|
runtimedir: /var/run
|
|
- logfiledir: ${datadir}/logs
|
|
+ logfiledir: ${datadir}/log
|
|
proxycachedir: ${datadir}/proxy
|
|
</Layout>
|
|
|
|
@@ -269,8 +269,8 @@
|
|
cgidir: ${prefix}/cgi-bin
|
|
includedir: ${exec_prefix}/lib/apache/include
|
|
localstatedir: ${prefix}
|
|
- runtimedir: ${prefix}/logs
|
|
- logfiledir: ${prefix}/logs
|
|
+ runtimedir: ${prefix}/log
|
|
+ logfiledir: ${prefix}/log
|
|
proxycachedir: ${prefix}/proxy
|
|
</Layout>
|
|
|
|
@@ -367,7 +367,7 @@
|
|
includedir: ${prefix}/include
|
|
localstatedir: /var/httpd
|
|
runtimedir: ${localstatedir}/run
|
|
- logfiledir: ${localstatedir}/logs
|
|
+ logfiledir: ${localstatedir}/log
|
|
proxycachedir: ${localstatedir}/proxy
|
|
</Layout>
|
|
|
|
--
|
|
2.51.0
|
|
|
|
|
|
From 4923ddeaf3e0b61e4ae2dac5389bc1401e7581d4 Mon Sep 17 00:00:00 2001
|
|
From: Luc Schrijvers <begasus@gmail.com>
|
|
Date: Tue, 15 Apr 2025 08:47:34 +0200
|
|
Subject: Fix conftest program not finding a definition for the crypt function
|
|
|
|
|
|
diff --git a/configure.in b/configure.in
|
|
index d2a009d..680f43f 100644
|
|
--- a/configure.in
|
|
+++ b/configure.in
|
|
@@ -496,6 +496,7 @@ if test "$ac_cv_search_crypt" != "no"; then
|
|
#include <crypt.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
+#include <unistd.h>
|
|
|
|
#define PASSWD_0 "Hello world!"
|
|
#define SALT_0 "\$6\$saltstring"
|
|
--
|
|
2.51.0
|
|
|