From 11262ef22048ea36517622b04f5e65ea98704a76 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Tue, 3 Oct 2023 12:20:31 +0000 Subject: [PATCH] db, bump version (#9563) --- dev-db/db/db-4.8.30.recipe | 90 ------------ dev-db/db/db-5.3.28.recipe | 93 ------------ dev-db/db/db-6.0.30.recipe | 97 ------------- dev-db/db/db18-18.1.40.recipe | 132 ++++++++++++++++++ dev-db/db/db61-6.1.23.recipe | 97 ------------- .../{db-5.3.28.patch => db-18.1.40.patchset} | 38 +++-- dev-db/db/patches/db-4.8.30.patch | 79 ----------- dev-db/db/patches/db-6.0.30.patch | 79 ----------- dev-db/db/patches/db-6.1.23.patch | 79 ----------- 9 files changed, 161 insertions(+), 623 deletions(-) delete mode 100644 dev-db/db/db-4.8.30.recipe delete mode 100644 dev-db/db/db-5.3.28.recipe delete mode 100644 dev-db/db/db-6.0.30.recipe create mode 100644 dev-db/db/db18-18.1.40.recipe delete mode 100644 dev-db/db/db61-6.1.23.recipe rename dev-db/db/patches/{db-5.3.28.patch => db-18.1.40.patchset} (67%) delete mode 100644 dev-db/db/patches/db-4.8.30.patch delete mode 100644 dev-db/db/patches/db-6.0.30.patch delete mode 100644 dev-db/db/patches/db-6.1.23.patch diff --git a/dev-db/db/db-4.8.30.recipe b/dev-db/db/db-4.8.30.recipe deleted file mode 100644 index c004e06cc..000000000 --- a/dev-db/db/db-4.8.30.recipe +++ /dev/null @@ -1,90 +0,0 @@ -SUMMARY="The Oracle Berkeley Database" -DESCRIPTION="The Oracle Berkeley DB family of open source, embeddable \ -databases provides developers with fast, reliable, local persistence with zero \ -administration." -HOMEPAGE="http://www.oracle.com/technetwork/database/berkeleydb/index.html" -COPYRIGHT="1990-2013, Oracle - 1990-1995, The Regents of the University of California - 1996-1996, The President and Fellows of Harvard University - 2000-2005, INRIA - France Telecom" -LICENSE="SleepyCat" -REVISION="2" -SOURCE_URI="http://download.oracle.com/berkeley-db/db-${portVersion}.tar.gz" -CHECKSUM_SHA256="e0491a07cdb21fb9aa82773bbbedaeb7639cbd0e7f96147ab46141e0045db72a" -PATCHES="db-${portVersion}.patch" - -ARCHITECTURES="all" -SECONDARY_ARCHITECTURES="x86_gcc2 x86" - -PROVIDES=" - db${secondaryArchSuffix} = $portVersion compat >= 4.8 - cmd:db_archive${secondaryArchSuffix} - cmd:db_checkpoint${secondaryArchSuffix} - cmd:db_deadlock${secondaryArchSuffix} - cmd:db_dump${secondaryArchSuffix} - cmd:db_hotbackup${secondaryArchSuffix} - cmd:db_load${secondaryArchSuffix} - cmd:db_printlog${secondaryArchSuffix} - cmd:db_recover${secondaryArchSuffix} - cmd:db_sql${secondaryArchSuffix} - cmd:db_stat${secondaryArchSuffix} - cmd:db_upgrade${secondaryArchSuffix} - cmd:db_verify${secondaryArchSuffix} - lib:libdb${secondaryArchSuffix} - lib:libdb_4${secondaryArchSuffix} - lib:libdb_4.8${secondaryArchSuffix} - lib:libdb_cxx${secondaryArchSuffix} - lib:libdb_cxx_4${secondaryArchSuffix} - lib:libdb_cxx_4.8${secondaryArchSuffix} - " -REQUIRES=" - haiku${secondaryArchSuffix} - " - -PROVIDES_devel=" - db${secondaryArchSuffix}_devel = $portVersion compat >= 4.8 - devel:libdb${secondaryArchSuffix} = $portVersion - devel:libdb_4.8${secondaryArchSuffix} = $portVersion - devel:libdb_cxx${secondaryArchSuffix} = $portVersion - devel:libdb_cxx_4.8${secondaryArchSuffix} = $portVersion - " -REQUIRES_devel=" - db$secondaryArchSuffix == $portVersion base - " - -BUILD_REQUIRES=" - " -BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - cmd:libtool - cmd:make - " - -BUILD() -{ - cd build_unix - runConfigure ../dist/configure --enable-cxx - make $jobArgs -} - -INSTALL() -{ - cd build_unix - make install - - # prepare develop/lib - prepareInstalledDevelLibs libdb libdb-4.8 libdb_cxx libdb_cxx-4.8 - fixPkgconfig - - # devel package - packageEntries devel \ - $developDir -} - -TEST() -{ - cd build_unix - #make dbtest -} diff --git a/dev-db/db/db-5.3.28.recipe b/dev-db/db/db-5.3.28.recipe deleted file mode 100644 index a48019ec5..000000000 --- a/dev-db/db/db-5.3.28.recipe +++ /dev/null @@ -1,93 +0,0 @@ -SUMMARY="The Oracle Berkeley Database" -DESCRIPTION="The Oracle Berkeley DB family of open source, embeddable \ -databases provides developers with fast, reliable, local persistence with zero \ -administration." -HOMEPAGE="http://www.oracle.com/technetwork/database/berkeleydb/index.html" -COPYRIGHT="1990-2013, Oracle - 1990-1995, The Regents of the University of California - 1996-1996, The President and Fellows of Harvard University - 2000-2005, INRIA - France Telecom" -LICENSE="SleepyCat" -REVISION="3" -SOURCE_URI="http://download.oracle.com/berkeley-db/db-$portVersion.tar.gz" -CHECKSUM_SHA256="e0a992d740709892e81f9d93f06daf305cf73fb81b545afe72478043172c3628" -SOURCE_DIR="db-${portVersion}" -PATCHES="db-${portVersion}.patch" - -ARCHITECTURES="all" -SECONDARY_ARCHITECTURES="x86_gcc2 x86" - -PROVIDES=" - db${secondaryArchSuffix} = $portVersion compat >= 5.3 - cmd:db_archive${secondaryArchSuffix} - cmd:db_checkpoint${secondaryArchSuffix} - cmd:db_deadlock${secondaryArchSuffix} - cmd:db_dump${secondaryArchSuffix} - cmd:db_hotbackup${secondaryArchSuffix} - cmd:db_load${secondaryArchSuffix} - cmd:db_log_verify${secondaryArchSuffix} - cmd:db_printlog${secondaryArchSuffix} - cmd:db_recover${secondaryArchSuffix} - cmd:db_replicate${secondaryArchSuffix} - cmd:db_stat${secondaryArchSuffix} - cmd:db_tuner${secondaryArchSuffix} - cmd:db_upgrade${secondaryArchSuffix} - cmd:db_verify${secondaryArchSuffix} - lib:libdb${secondaryArchSuffix} - lib:libdb_5${secondaryArchSuffix} - lib:libdb_5.3${secondaryArchSuffix} - lib:libdb_cxx${secondaryArchSuffix} - lib:libdb_cxx_5${secondaryArchSuffix} - lib:libdb_cxx_5.3${secondaryArchSuffix} - " -REQUIRES=" - haiku${secondaryArchSuffix} - " - -PROVIDES_devel=" - db${secondaryArchSuffix}_devel = $portVersion compat >= 5.3 - devel:libdb${secondaryArchSuffix} = $portVersion - devel:libdb_5.3${secondaryArchSuffix} = $portVersion - devel:libdb_cxx${secondaryArchSuffix} = $portVersion - devel:libdb_cxx_5.3${secondaryArchSuffix} = $portVersion - " -REQUIRES_devel=" - db$secondaryArchSuffix == $portVersion base - " - -BUILD_REQUIRES=" - " -BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - cmd:libtool - cmd:make - " - -BUILD() -{ - cd build_unix - runConfigure ../dist/configure --enable-cxx - make $jobArgs -} - -INSTALL() -{ - cd build_unix - make install - - # prepare develop/lib - prepareInstalledDevelLibs libdb libdb-5.3 libdb_cxx libdb_cxx-5.3 - fixPkgconfig - - # devel package - packageEntries devel \ - $developDir -} - -TEST() -{ - cd build_unix - #make dbtest -} diff --git a/dev-db/db/db-6.0.30.recipe b/dev-db/db/db-6.0.30.recipe deleted file mode 100644 index 55afdecdd..000000000 --- a/dev-db/db/db-6.0.30.recipe +++ /dev/null @@ -1,97 +0,0 @@ -SUMMARY="The Oracle Berkeley Database" -DESCRIPTION="The Oracle Berkeley DB family of open source, embeddable \ -databases provides developers with fast, reliable, local persistence with zero \ -administration." -HOMEPAGE="http://www.oracle.com/technetwork/database/berkeleydb/index.html" -COPYRIGHT="1990-2013, Oracle - 1990-1995, The Regents of the University of California - 1996-1996, The President and Fellows of Harvard University - 2000-2005, INRIA - France Telecom" -LICENSE="SleepyCat" -REVISION="3" -SOURCE_URI="http://download.oracle.com/berkeley-db/db-$portVersion.tar.gz" -CHECKSUM_SHA256="608e4b1cf390e9bf54c0ef00c5bd9ca76d36e2261b9f4d33d54516f3f6a20fd2" -SOURCE_DIR="db-${portVersion}" -PATCHES="db-${portVersion}.patch" - -ARCHITECTURES="all" -SECONDARY_ARCHITECTURES="x86_gcc2 x86" - -PROVIDES=" - db${secondaryArchSuffix} = $portVersion compat >= 6.0 - cmd:db_archive${secondaryArchSuffix} - cmd:db_checkpoint${secondaryArchSuffix} - cmd:db_deadlock${secondaryArchSuffix} - cmd:db_dump${secondaryArchSuffix} - cmd:db_hotbackup${secondaryArchSuffix} - cmd:db_load${secondaryArchSuffix} - cmd:db_log_verify${secondaryArchSuffix} - cmd:db_printlog${secondaryArchSuffix} - cmd:db_recover${secondaryArchSuffix} - cmd:db_replicate${secondaryArchSuffix} - cmd:db_stat${secondaryArchSuffix} - cmd:db_tuner${secondaryArchSuffix} - cmd:db_upgrade${secondaryArchSuffix} - cmd:db_verify${secondaryArchSuffix} - lib:libdb${secondaryArchSuffix} - lib:libdb_6${secondaryArchSuffix} - lib:libdb_6.0${secondaryArchSuffix} - lib:libdb_cxx${secondaryArchSuffix} - lib:libdb_cxx_6${secondaryArchSuffix} - lib:libdb_cxx_6.0${secondaryArchSuffix} - " -REQUIRES=" - haiku${secondaryArchSuffix} - " - -PROVIDES_devel=" - db${secondaryArchSuffix}_devel = $portVersion compat >= 6.0 - devel:libdb${secondaryArchSuffix} = $portVersion - devel:libdb_6.0${secondaryArchSuffix} = $portVersion - devel:libdb_cxx${secondaryArchSuffix} = $portVersion - devel:libdb_cxx_6.0${secondaryArchSuffix} = $portVersion - " -REQUIRES_devel=" - db$secondaryArchSuffix == $portVersion base - " - -BUILD_REQUIRES=" - " -BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - cmd:libtool - cmd:make - " - -BUILD() -{ - cd build_unix - runConfigure ../dist/configure --enable-cxx \ - --disable-static - make $jobArgs -} - -INSTALL() -{ - cd build_unix - make install - - # remove libtool files - rm $libDir/*.la - - # prepare develop/lib - prepareInstalledDevelLibs libdb libdb-6.0 libdb_cxx libdb_cxx-6.0 - fixPkgconfig - - # devel package - packageEntries devel \ - $developDir -} - -TEST() -{ - cd build_unix - #make dbtest -} diff --git a/dev-db/db/db18-18.1.40.recipe b/dev-db/db/db18-18.1.40.recipe new file mode 100644 index 000000000..8326eee23 --- /dev/null +++ b/dev-db/db/db18-18.1.40.recipe @@ -0,0 +1,132 @@ +SUMMARY="The Oracle Berkeley Database" +DESCRIPTION="The Oracle Berkeley DB family of open source, embeddable \ +databases provides developers with fast, reliable, local persistence with zero \ +administration." +HOMEPAGE="http://www.oracle.com/technetwork/database/berkeleydb/index.html" +COPYRIGHT="1990-2013, Oracle + 1990-1995, The Regents of the University of California + 1996-1996, The President and Fellows of Harvard University + 2000-2005, INRIA - France Telecom" +LICENSE="SleepyCat" +REVISION="1" +SOURCE_URI="http://download.oracle.com/berkeley-db/db-$portVersion.tar.gz" +CHECKSUM_SHA256="0cecb2ef0c67b166de93732769abdeba0555086d51de1090df325e18ee8da9c8" +SOURCE_DIR="db-$portVersion" +PATCHES="db-$portVersion.patchset" + +ARCHITECTURES="all" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + db18$secondaryArchSuffix = $portVersion compat >= 18.1 + lib:libdb_18$secondaryArchSuffix = $portVersion + lib:libdb_18.1$secondaryArchSuffix = $portVersion + lib:libdb_cxx_18$secondaryArchSuffix = $portVersion + lib:libdb_cxx_18.1$secondaryArchSuffix = $portVersion +# lib:libdb_java_18$secondaryArchSuffix = $portVersion +# lib:libdb_java_18.1$secondaryArchSuffix = $portVersion +# lib:libdb_java_18.1_g$secondaryArchSuffix = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix + lib:libcrypto$secondaryArchSuffix + lib:libssl$secondaryArchSuffix + " + +if [ -z "$secondaryArchSuffix" ]; then + SUMMARY_tools="The TIFF tools" + PROVIDES_tools=" + db18${secondaryArchSuffix}_tools = $portVersion compat >= 18.1 + cmd:db_archive$secondaryArchSuffix + cmd:db_checkpoint$secondaryArchSuffix + cmd:db_convert$secondaryArchSuffix + cmd:db_deadlock$secondaryArchSuffix + cmd:db_dump$secondaryArchSuffix + cmd:db_hotbackup$secondaryArchSuffix + cmd:db_load$secondaryArchSuffix + cmd:db_log_verify$secondaryArchSuffix + cmd:db_printlog$secondaryArchSuffix + cmd:db_recover$secondaryArchSuffix + cmd:db_replicate$secondaryArchSuffix + cmd:db_stat$secondaryArchSuffix + cmd:db_tuner$secondaryArchSuffix + cmd:db_upgrade$secondaryArchSuffix + cmd:db_verify$secondaryArchSuffix + " + REQUIRES_tools=" + db18$secondaryArchSuffix == $portVersion base + $REQUIRES + " +fi + +PROVIDES_devel=" + db18${secondaryArchSuffix}_devel = $portVersion compat >= 18.1 + devel:libdb$secondaryArchSuffix = $portVersion + devel:libdb_18.1$secondaryArchSuffix = $portVersion + devel:libdb_cxx$secondaryArchSuffix = $portVersion + devel:libdb_cxx_18.1$secondaryArchSuffix = $portVersion +# devel:libdb_java$secondaryArchSuffix = $portVersion +# devel:libdb_java_18.1$secondaryArchSuffix = $portVersion + " +REQUIRES_devel=" + db18$secondaryArchSuffix == $portVersion base + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel +# openjdk17$secondaryArchSuffix + devel:libcrypto$secondaryArchSuffix + devel:libssl$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel + cmd:gcc$secondaryArchSuffix +# cmd:javac >= 17 + cmd:ld$secondaryArchSuffix + cmd:libtool + cmd:make + cmd:pkg_config$secondaryArchSuffix + " + +BUILD() +{ +# export CPPFLAGS="-I/boot/system/lib/openjdk17/include/haiku" + + cd build_unix + runConfigure ../dist/configure --enable-cxx \ + --disable-static # --enable-gui --enable-java + make $jobArgs +} + +INSTALL() +{ + make -C build_unix install + + # remove libtool files + rm $libDir/*.la + + # prepare develop/lib + prepareInstalledDevelLibs libdb libdb-18.1 libdb_cxx libdb_cxx-18.1 # libdb_java libdb_java-18.1 + fixPkgconfig + + # tools package + if [ -z "$secondaryArchSuffix" ]; then + packageEntries tools \ + $binDir + fi + + # devel package + packageEntries devel \ + $developDir \ + $documentationDir + + # Remove stuff we don't need in the secondary architecture base package. + if [ -n "$secondaryArchSuffix" ]; then + rm -rf $binDir + fi +} + +TEST() +{ + make -C build_unix check +} diff --git a/dev-db/db/db61-6.1.23.recipe b/dev-db/db/db61-6.1.23.recipe deleted file mode 100644 index 1ed3daf5b..000000000 --- a/dev-db/db/db61-6.1.23.recipe +++ /dev/null @@ -1,97 +0,0 @@ -SUMMARY="The Oracle Berkeley Database" -DESCRIPTION="The Oracle Berkeley DB family of open source, embeddable \ -databases provides developers with fast, reliable, local persistence with zero \ -administration." -HOMEPAGE="http://www.oracle.com/technetwork/database/berkeleydb/index.html" -COPYRIGHT="1990-2013, Oracle - 1990-1995, The Regents of the University of California - 1996-1996, The President and Fellows of Harvard University - 2000-2005, INRIA - France Telecom" -LICENSE="SleepyCat" -REVISION="4" -SOURCE_URI="http://download.oracle.com/berkeley-db/db-$portVersion.tar.gz" -CHECKSUM_SHA256="822e1591f7f535c5eb16389fbd5c1f14877a9561674cc1d497f1db318ef86107" -SOURCE_DIR="db-${portVersion}" -PATCHES="db-${portVersion}.patch" - -ARCHITECTURES="all" -SECONDARY_ARCHITECTURES="x86_gcc2 x86" - -PROVIDES=" - db61${secondaryArchSuffix} = $portVersion compat >= 6.1 - cmd:db_archive${secondaryArchSuffix} - cmd:db_checkpoint${secondaryArchSuffix} - cmd:db_deadlock${secondaryArchSuffix} - cmd:db_dump${secondaryArchSuffix} - cmd:db_hotbackup${secondaryArchSuffix} - cmd:db_load${secondaryArchSuffix} - cmd:db_log_verify${secondaryArchSuffix} - cmd:db_printlog${secondaryArchSuffix} - cmd:db_recover${secondaryArchSuffix} - cmd:db_replicate${secondaryArchSuffix} - cmd:db_stat${secondaryArchSuffix} - cmd:db_tuner${secondaryArchSuffix} - cmd:db_upgrade${secondaryArchSuffix} - cmd:db_verify${secondaryArchSuffix} - lib:libdb${secondaryArchSuffix} - lib:libdb_6${secondaryArchSuffix} - lib:libdb_6.1${secondaryArchSuffix} - lib:libdb_cxx${secondaryArchSuffix} - lib:libdb_cxx_6${secondaryArchSuffix} - lib:libdb_cxx_6.1${secondaryArchSuffix} - " -REQUIRES=" - haiku${secondaryArchSuffix} - " - -PROVIDES_devel=" - db61${secondaryArchSuffix}_devel = $portVersion compat >= 6.1 - devel:libdb${secondaryArchSuffix} = $portVersion - devel:libdb_6.1${secondaryArchSuffix} = $portVersion - devel:libdb_cxx${secondaryArchSuffix} = $portVersion - devel:libdb_cxx_6.1${secondaryArchSuffix} = $portVersion - " -REQUIRES_devel=" - db61$secondaryArchSuffix == $portVersion base - " - -BUILD_REQUIRES=" - " -BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - cmd:libtool - cmd:make - " - -BUILD() -{ - cd build_unix - runConfigure ../dist/configure --enable-cxx \ - --disable-static - make $jobArgs -} - -INSTALL() -{ - cd build_unix - make install - - # remove libtool files - rm $libDir/*.la - - # prepare develop/lib - prepareInstalledDevelLibs libdb libdb-6.1 libdb_cxx libdb_cxx-6.1 - fixPkgconfig - - # devel package - packageEntries devel \ - $developDir -} - -TEST() -{ - cd build_unix - #make dbtest -} diff --git a/dev-db/db/patches/db-5.3.28.patch b/dev-db/db/patches/db-18.1.40.patchset similarity index 67% rename from dev-db/db/patches/db-5.3.28.patch rename to dev-db/db/patches/db-18.1.40.patchset index 70cc54b4d..967083801 100644 --- a/dev-db/db/patches/db-5.3.28.patch +++ b/dev-db/db/patches/db-18.1.40.patchset @@ -1,5 +1,11 @@ +From d4b29b4d6cf9b3a4b72f3d29dd2dac1679f78efc Mon Sep 17 00:00:00 2001 +From: Begasus +Date: Wed, 27 Sep 2023 15:59:34 +0200 +Subject: Import patch from previous version + + diff --git a/dist/Makefile.in b/dist/Makefile.in -index e90c0c2..60f8aef 100644 +index c9f4c32..2ce53a7 100644 --- a/dist/Makefile.in +++ b/dist/Makefile.in @@ -17,7 +17,7 @@ exec_prefix=@exec_prefix@ @@ -11,11 +17,22 @@ index e90c0c2..60f8aef 100644 dmode= 755 emode= 555 +@@ -1299,8 +1299,8 @@ uninstall_utilities: + + # We install csharp docs even on UNIX so we don't have a + # broken link on the landing page. +-DOCLIST=api_reference articles bdb-sql collections csharp gsg \ +- gsg_db_rep gsg_db_server gsg_txn index.html installation \ ++DOCLIST=api_reference articles collections csharp gsg \ ++ gsg_db_rep gsg_txn index.html installation \ + java license porting programmer_reference upgrading + + install_docs: diff --git a/dist/configure b/dist/configure -index 32b2c66..5d1ed9a 100755 +index 2cb5d60..bb50e5e 100755 --- a/dist/configure +++ b/dist/configure -@@ -5122,6 +5122,8 @@ irix*) optimize_flag="-O2" +@@ -5213,6 +5213,8 @@ irix*) optimize_flag="-O2" CPPFLAGS="$CPPFLAGS -D_SGI_MP_SOURCE";; mpeix*) CPPFLAGS="$CPPFLAGS -D_POSIX_SOURCE -D_SOCKET_SOURCE" LIBSO_LIBS="$LIBSO_LIBS -lsocket -lsvipc";; @@ -25,10 +42,10 @@ index 32b2c66..5d1ed9a 100755 *qnx*) qnx_build="yes" $as_echo "#define HAVE_QNX 1" >>confdefs.h diff --git a/dist/configure.ac b/dist/configure.ac -index 689f3b8..d5d5125 100644 +index 9747ab8..026abc5 100644 --- a/dist/configure.ac +++ b/dist/configure.ac -@@ -206,6 +206,8 @@ irix*) optimize_flag="-O2" +@@ -203,6 +203,8 @@ irix*) optimize_flag="-O2" CPPFLAGS="$CPPFLAGS -D_SGI_MP_SOURCE";; mpeix*) CPPFLAGS="$CPPFLAGS -D_POSIX_SOURCE -D_SOCKET_SOURCE" LIBSO_LIBS="$LIBSO_LIBS -lsocket -lsvipc";; @@ -37,7 +54,7 @@ index 689f3b8..d5d5125 100644 osf*) CPPFLAGS="$CPPFLAGS -pthread";; *qnx*) qnx_build="yes" AC_DEFINE(HAVE_QNX) -@@ -671,6 +673,9 @@ AC_SEARCH_LIBS(sched_yield, rt) +@@ -587,6 +589,9 @@ AC_SEARCH_LIBS(sched_yield, rt) # The Berkeley DB library calls fdatasync, only available in -lrt on Solaris. AC_SEARCH_LIBS(fdatasync, rt) @@ -48,10 +65,10 @@ index 689f3b8..d5d5125 100644 AC_SEARCH_LIBS(hstrerror, resolv) diff --git a/src/repmgr/repmgr_posix.c b/src/repmgr/repmgr_posix.c -index f803863..e2b93f6 100644 +index 87d2cd0..c13b902 100644 --- a/src/repmgr/repmgr_posix.c +++ b/src/repmgr/repmgr_posix.c -@@ -571,11 +571,7 @@ __repmgr_wake_main_thread(env) +@@ -645,11 +645,7 @@ __repmgr_wake_main_thread(env) * PUBLIC: int __repmgr_writev __P((socket_t, db_iovec_t *, int, size_t *)); */ int @@ -64,7 +81,7 @@ index f803863..e2b93f6 100644 { int nw, result; -@@ -593,11 +589,7 @@ __repmgr_writev(fd, iovec, buf_count, byte_count_p) +@@ -667,11 +663,7 @@ __repmgr_writev(fd, iovec, buf_count, byte_count_p) * PUBLIC: int __repmgr_readv __P((socket_t, db_iovec_t *, int, size_t *)); */ int @@ -77,3 +94,6 @@ index f803863..e2b93f6 100644 { int result; ssize_t nw; +-- +2.37.3 + diff --git a/dev-db/db/patches/db-4.8.30.patch b/dev-db/db/patches/db-4.8.30.patch deleted file mode 100644 index 0b176f9b4..000000000 --- a/dev-db/db/patches/db-4.8.30.patch +++ /dev/null @@ -1,79 +0,0 @@ -diff --git a/dist/Makefile.in b/dist/Makefile.in -index c4b0739..d3860b4 100644 ---- a/dist/Makefile.in -+++ b/dist/Makefile.in -@@ -11,7 +11,7 @@ exec_prefix=@exec_prefix@ - bindir= @bindir@ - includedir=@includedir@ - libdir= @libdir@ --docdir= $(prefix)/docs -+docdir= @docdir@ - - dmode= 755 - emode= 555 -diff --git a/dist/configure b/dist/configure -index 295fec1..e05e451 100755 ---- a/dist/configure -+++ b/dist/configure -@@ -4533,6 +4533,8 @@ irix*) optimize_debug="-O2" - CPPFLAGS="$CPPFLAGS -D_SGI_MP_SOURCE";; - mpeix*) CPPFLAGS="$CPPFLAGS -D_POSIX_SOURCE -D_SOCKET_SOURCE" - LIBSO_LIBS="$LIBSO_LIBS -lsocket -lsvipc";; -+haiku*) -+ LIBSO_LIBS="$LIBSO_LIBS -lnetwork";; - osf*) CPPFLAGS="$CPPFLAGS -pthread";; - *qnx*) qnx_build="yes" - $as_echo "#define HAVE_QNX 1" >>confdefs.h -diff --git a/dist/configure.ac b/dist/configure.ac -index 4a99779..85dfb93 100644 ---- a/dist/configure.ac -+++ b/dist/configure.ac -@@ -184,6 +184,8 @@ irix*) optimize_debug="-O2" - CPPFLAGS="$CPPFLAGS -D_SGI_MP_SOURCE";; - mpeix*) CPPFLAGS="$CPPFLAGS -D_POSIX_SOURCE -D_SOCKET_SOURCE" - LIBSO_LIBS="$LIBSO_LIBS -lsocket -lsvipc";; -+haiku*) -+ LIBSO_LIBS="$LIBSO_LIBS -lnetwork";; - osf*) CPPFLAGS="$CPPFLAGS -pthread";; - *qnx*) qnx_build="yes" - AC_DEFINE(HAVE_QNX) -@@ -519,6 +521,9 @@ AC_SEARCH_LIBS(sched_yield, rt) - # The Berkeley DB library calls fdatasync, only available in -lrt on Solaris. - AC_SEARCH_LIBS(fdatasync, rt) - -+# Socket only available in -lnetwork on Haiku -+AC_SEARCH_LIBS(socket, network) -+ - AC_SEARCH_LIBS(getaddrinfo, nsl socket) - AC_SEARCH_LIBS(hstrerror, resolv) - -diff --git a/repmgr/repmgr_posix.c b/repmgr/repmgr_posix.c -index 741f378..6892469 100644 ---- a/repmgr/repmgr_posix.c -+++ b/repmgr/repmgr_posix.c -@@ -488,11 +488,7 @@ __repmgr_wake_main_thread(env) - * PUBLIC: int __repmgr_writev __P((socket_t, db_iovec_t *, int, size_t *)); - */ - int --__repmgr_writev(fd, iovec, buf_count, byte_count_p) -- socket_t fd; -- db_iovec_t *iovec; -- int buf_count; -- size_t *byte_count_p; -+__repmgr_writev(socket_t fd, db_iovec_t *iovec, int buf_count, size_t *byte_count_p) - { - int nw; - -@@ -506,11 +502,7 @@ __repmgr_writev(fd, iovec, buf_count, byte_count_p) - * PUBLIC: int __repmgr_readv __P((socket_t, db_iovec_t *, int, size_t *)); - */ - int --__repmgr_readv(fd, iovec, buf_count, byte_count_p) -- socket_t fd; -- db_iovec_t *iovec; -- int buf_count; -- size_t *byte_count_p; -+__repmgr_readv(socket_t fd, db_iovec_t *iovec, int buf_count, size_t *byte_count_p) - { - ssize_t nw; - diff --git a/dev-db/db/patches/db-6.0.30.patch b/dev-db/db/patches/db-6.0.30.patch deleted file mode 100644 index 70cc54b4d..000000000 --- a/dev-db/db/patches/db-6.0.30.patch +++ /dev/null @@ -1,79 +0,0 @@ -diff --git a/dist/Makefile.in b/dist/Makefile.in -index e90c0c2..60f8aef 100644 ---- a/dist/Makefile.in -+++ b/dist/Makefile.in -@@ -17,7 +17,7 @@ exec_prefix=@exec_prefix@ - bindir= @bindir@ - includedir=@includedir@ - libdir= @libdir@ --docdir= $(prefix)/docs -+docdir= @docdir@ - - dmode= 755 - emode= 555 -diff --git a/dist/configure b/dist/configure -index 32b2c66..5d1ed9a 100755 ---- a/dist/configure -+++ b/dist/configure -@@ -5122,6 +5122,8 @@ irix*) optimize_flag="-O2" - CPPFLAGS="$CPPFLAGS -D_SGI_MP_SOURCE";; - mpeix*) CPPFLAGS="$CPPFLAGS -D_POSIX_SOURCE -D_SOCKET_SOURCE" - LIBSO_LIBS="$LIBSO_LIBS -lsocket -lsvipc";; -+haiku*) -+ LIBSO_LIBS="$LIBSO_LIBS -lnetwork";; - osf*) CPPFLAGS="$CPPFLAGS -pthread";; - *qnx*) qnx_build="yes" - $as_echo "#define HAVE_QNX 1" >>confdefs.h -diff --git a/dist/configure.ac b/dist/configure.ac -index 689f3b8..d5d5125 100644 ---- a/dist/configure.ac -+++ b/dist/configure.ac -@@ -206,6 +206,8 @@ irix*) optimize_flag="-O2" - CPPFLAGS="$CPPFLAGS -D_SGI_MP_SOURCE";; - mpeix*) CPPFLAGS="$CPPFLAGS -D_POSIX_SOURCE -D_SOCKET_SOURCE" - LIBSO_LIBS="$LIBSO_LIBS -lsocket -lsvipc";; -+haiku*) -+ LIBSO_LIBS="$LIBSO_LIBS -lnetwork";; - osf*) CPPFLAGS="$CPPFLAGS -pthread";; - *qnx*) qnx_build="yes" - AC_DEFINE(HAVE_QNX) -@@ -671,6 +673,9 @@ AC_SEARCH_LIBS(sched_yield, rt) - # The Berkeley DB library calls fdatasync, only available in -lrt on Solaris. - AC_SEARCH_LIBS(fdatasync, rt) - -+# Socket only available in -lnetwork on Haiku -+AC_SEARCH_LIBS(socket, network) -+ - AC_SEARCH_LIBS(getaddrinfo, nsl socket) - AC_SEARCH_LIBS(hstrerror, resolv) - -diff --git a/src/repmgr/repmgr_posix.c b/src/repmgr/repmgr_posix.c -index f803863..e2b93f6 100644 ---- a/src/repmgr/repmgr_posix.c -+++ b/src/repmgr/repmgr_posix.c -@@ -571,11 +571,7 @@ __repmgr_wake_main_thread(env) - * PUBLIC: int __repmgr_writev __P((socket_t, db_iovec_t *, int, size_t *)); - */ - int --__repmgr_writev(fd, iovec, buf_count, byte_count_p) -- socket_t fd; -- db_iovec_t *iovec; -- int buf_count; -- size_t *byte_count_p; -+__repmgr_writev(socket_t fd, db_iovec_t *iovec, int buf_count, size_t *byte_count_p) - { - int nw, result; - -@@ -593,11 +589,7 @@ __repmgr_writev(fd, iovec, buf_count, byte_count_p) - * PUBLIC: int __repmgr_readv __P((socket_t, db_iovec_t *, int, size_t *)); - */ - int --__repmgr_readv(fd, iovec, buf_count, byte_count_p) -- socket_t fd; -- db_iovec_t *iovec; -- int buf_count; -- size_t *byte_count_p; -+__repmgr_readv(socket_t fd, db_iovec_t *iovec, int buf_count, size_t *byte_count_p) - { - int result; - ssize_t nw; diff --git a/dev-db/db/patches/db-6.1.23.patch b/dev-db/db/patches/db-6.1.23.patch deleted file mode 100644 index 70cc54b4d..000000000 --- a/dev-db/db/patches/db-6.1.23.patch +++ /dev/null @@ -1,79 +0,0 @@ -diff --git a/dist/Makefile.in b/dist/Makefile.in -index e90c0c2..60f8aef 100644 ---- a/dist/Makefile.in -+++ b/dist/Makefile.in -@@ -17,7 +17,7 @@ exec_prefix=@exec_prefix@ - bindir= @bindir@ - includedir=@includedir@ - libdir= @libdir@ --docdir= $(prefix)/docs -+docdir= @docdir@ - - dmode= 755 - emode= 555 -diff --git a/dist/configure b/dist/configure -index 32b2c66..5d1ed9a 100755 ---- a/dist/configure -+++ b/dist/configure -@@ -5122,6 +5122,8 @@ irix*) optimize_flag="-O2" - CPPFLAGS="$CPPFLAGS -D_SGI_MP_SOURCE";; - mpeix*) CPPFLAGS="$CPPFLAGS -D_POSIX_SOURCE -D_SOCKET_SOURCE" - LIBSO_LIBS="$LIBSO_LIBS -lsocket -lsvipc";; -+haiku*) -+ LIBSO_LIBS="$LIBSO_LIBS -lnetwork";; - osf*) CPPFLAGS="$CPPFLAGS -pthread";; - *qnx*) qnx_build="yes" - $as_echo "#define HAVE_QNX 1" >>confdefs.h -diff --git a/dist/configure.ac b/dist/configure.ac -index 689f3b8..d5d5125 100644 ---- a/dist/configure.ac -+++ b/dist/configure.ac -@@ -206,6 +206,8 @@ irix*) optimize_flag="-O2" - CPPFLAGS="$CPPFLAGS -D_SGI_MP_SOURCE";; - mpeix*) CPPFLAGS="$CPPFLAGS -D_POSIX_SOURCE -D_SOCKET_SOURCE" - LIBSO_LIBS="$LIBSO_LIBS -lsocket -lsvipc";; -+haiku*) -+ LIBSO_LIBS="$LIBSO_LIBS -lnetwork";; - osf*) CPPFLAGS="$CPPFLAGS -pthread";; - *qnx*) qnx_build="yes" - AC_DEFINE(HAVE_QNX) -@@ -671,6 +673,9 @@ AC_SEARCH_LIBS(sched_yield, rt) - # The Berkeley DB library calls fdatasync, only available in -lrt on Solaris. - AC_SEARCH_LIBS(fdatasync, rt) - -+# Socket only available in -lnetwork on Haiku -+AC_SEARCH_LIBS(socket, network) -+ - AC_SEARCH_LIBS(getaddrinfo, nsl socket) - AC_SEARCH_LIBS(hstrerror, resolv) - -diff --git a/src/repmgr/repmgr_posix.c b/src/repmgr/repmgr_posix.c -index f803863..e2b93f6 100644 ---- a/src/repmgr/repmgr_posix.c -+++ b/src/repmgr/repmgr_posix.c -@@ -571,11 +571,7 @@ __repmgr_wake_main_thread(env) - * PUBLIC: int __repmgr_writev __P((socket_t, db_iovec_t *, int, size_t *)); - */ - int --__repmgr_writev(fd, iovec, buf_count, byte_count_p) -- socket_t fd; -- db_iovec_t *iovec; -- int buf_count; -- size_t *byte_count_p; -+__repmgr_writev(socket_t fd, db_iovec_t *iovec, int buf_count, size_t *byte_count_p) - { - int nw, result; - -@@ -593,11 +589,7 @@ __repmgr_writev(fd, iovec, buf_count, byte_count_p) - * PUBLIC: int __repmgr_readv __P((socket_t, db_iovec_t *, int, size_t *)); - */ - int --__repmgr_readv(fd, iovec, buf_count, byte_count_p) -- socket_t fd; -- db_iovec_t *iovec; -- int buf_count; -- size_t *byte_count_p; -+__repmgr_readv(socket_t fd, db_iovec_t *iovec, int buf_count, size_t *byte_count_p) - { - int result; - ssize_t nw;