From df0446b83d56d131d757d385515aec231f0d1ba7 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 15 Jul 2017 13:50:02 +0200
Subject: apply 1.5.2 patch.


diff --git a/config.layout b/config.layout
index fb087a8..a599e0d 100644
--- a/config.layout
+++ b/config.layout
@@ -60,6 +60,23 @@
     runtimedir:    ${localstatedir}/run
 </Layout>
 
+#	Haiku Layout making use of finddir
+<Layout haiku>
+    prefix:        /boot/system
+    exec_prefix:   /boot/system
+    bindir:        /boot/system/bin
+    sbindir:       /boot/system/servers
+    libdir:        /boot/system/lib
+    libexecdir:    /boot/system/servers
+    mandir:        /boot/system/documentation/man
+    sysconfdir:    /boot/system/settings
+    datadir:       /boot/system/data
+    installbuilddir: /boot/develop/build
+    includedir:    /boot/system/include
+    localstatedir: /boot/system/var
+    runtimedir:    ${localstatedir}/log
+</Layout>
+
 #   Mac OS X Server (Rhapsody)
 <Layout Mac OS X Server>
     prefix:        /Local/Library/WebServer
diff --git a/configure.in b/configure.in
index b0457e2..d22a48f 100644
--- a/configure.in
+++ b/configure.in
@@ -898,9 +898,9 @@ case $host in
       ac_cv_func_CreateFileMapping=yes
       ;;
    *)
+      AC_SEARCH_LIBS(socket, socket network)
       AC_SEARCH_LIBS(gethostbyname, nsl)
       AC_SEARCH_LIBS(gethostname, nsl)
-      AC_SEARCH_LIBS(socket, socket)
       AC_SEARCH_LIBS(crypt, crypt ufc)
       AC_CHECK_LIB(truerand, main)
       AC_SEARCH_LIBS(modf, m)
-- 
2.45.2


From ba67b73a165228d4f5b5f182ba56b5042ee5ca79 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Mon, 25 Apr 2022 21:18:48 +0200
Subject: Haiku: decide to use standard POSIX methods


diff --git a/configure.in b/configure.in
index d22a48f..f74ecd9 100644
--- a/configure.in
+++ b/configure.in
@@ -1460,6 +1460,9 @@ case $host in
             APR_DECISION_OVERRIDE(USE_SHMEM_MMAP_ZERO USE_SHMEM_SHMGET_ANON)
         fi
         ;;
+    *haiku* )
+        APR_DECISION_OVERRIDE(USE_SHMEM_MMAP_ANON)
+        ;;
     *hpux11* ) 
         APR_DECISION_OVERRIDE(USE_SHMEM_SHMGET_ANON)
         ;;
@@ -2608,6 +2611,11 @@ esac
 if test "x$apr_lock_method" != "x"; then
     APR_DECISION_FORCE($apr_lock_method)
 fi
+case $host in
+    *haiku* )
+        APR_DECISION_OVERRIDE(USE_SYSVSEM_SERIALIZE)
+        ;;
+esac
 APR_END_DECISION
 AC_DEFINE_UNQUOTED($ac_decision)
 
-- 
2.45.2


From 20af3a6d0b0755cd57332290193ff8ac60080dd4 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Tue, 26 Apr 2022 14:42:58 +0200
Subject: fix checking if fcntl returns EACCES when F_SETLK is already held


diff --git a/configure.in b/configure.in
index f74ecd9..71fbea7 100644
--- a/configure.in
+++ b/configure.in
@@ -2697,11 +2697,11 @@ int main(int argc, const char *argv[])
         wait(&status);
     }
     else {
-      return(lockit());
+      return (lockit() != EACCES ? 1 : 0);
     }
 
     close(fd);
-    exit(WEXITSTATUS(status) != EACCES);
+    exit(WEXITSTATUS(status));
 }
 
 int lockit() {
-- 
2.45.2


From 057c23002e572f951e5877a5d2cad9e32605f452 Mon Sep 17 00:00:00 2001
From: PulkoMandy <pulkomandy@pulkomandy.tk>
Date: Sun, 15 Sep 2024 10:46:58 +0200
Subject: Fix named shared memory

A previous patch disabled the area based shared memory but enabled only
one of the UNIX shared memory implementations, allowing only anonymous
shared memory to be created.

diff --git a/configure.in b/configure.in
index 71fbea7..20944d6 100644
--- a/configure.in
+++ b/configure.in
@@ -1546,6 +1546,9 @@ case $host in
                                   USE_SHMEM_SHMGET)
         fi
         ;;
+    *haiku* )
+        APR_DECISION_OVERRIDE(USE_SHMEM_MMAP_TMP)
+        ;;
     *aix* )
         # AIX cannot lseek() shared memory, and we always truncate/lseek together
         APR_DECISION_OVERRIDE(USE_SHMEM_SHMGET)
-- 
2.45.2