From b9d0a654048c7bdd8543ff4db66768426ff4387b Mon Sep 17 00:00:00 2001
From: Yi Zhao <yi.zhao@eng.windriver.com>
Date: Thu, 27 Mar 2025 21:23:23 +0800
Subject: samhain: upgrade 4.4.10 -> 4.5.2

ChangeLog:
https://fossies.org/linux/samhain/docs/Changelog

* Refresh patches

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 ...mhain-avoid-searching-host-for-postgresql.patch | 131 ---------------------
 1 file changed, 131 deletions(-)
 delete mode 100644 recipes-ids/samhain/files/samhain-avoid-searching-host-for-postgresql.patch

(limited to 'recipes-ids/samhain/files/samhain-avoid-searching-host-for-postgresql.patch')

diff --git a/recipes-ids/samhain/files/samhain-avoid-searching-host-for-postgresql.patch b/recipes-ids/samhain/files/samhain-avoid-searching-host-for-postgresql.patch
deleted file mode 100644
index a84229e..0000000
--- a/recipes-ids/samhain/files/samhain-avoid-searching-host-for-postgresql.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-From 3e2ca7e06b16ceff6d12beb5113312f6525df595 Mon Sep 17 00:00:00 2001
-From: Jackie Huang <jackie.huang@windriver.com>
-Date: Thu, 14 Sep 2017 11:02:12 +0800
-Subject: [PATCH] configure.ac: avoid searching host for postgresql
-
-Upstream-Status: Inappropriate [cross compile specific]
-
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
----
- configure.ac | 101 +++--------------------------------------------------------
- 1 file changed, 5 insertions(+), 96 deletions(-)
-
-Index: samhain-4.4.2/configure.ac
-===================================================================
---- samhain-4.4.2.orig/configure.ac
-+++ samhain-4.4.2/configure.ac
-@@ -1290,90 +1290,11 @@ AC_ARG_WITH(database,
-           AC_DEFINE(WITH_POSTGRES)
-           AC_DEFINE(WITH_DATABASE)
- 	  #
--	  PGCONF="no"
--	  MY_PATH="${PATH}:/usr/local/bin:/usr/local/pgsql/bin"
--	  OLD_IFS="$IFS"
--	  IFS=":"
--	  for ff in ${MY_PATH}
--	  do
--	    if test -f "$ff/pg_config"
--	    then
--		PGCONF="$ff/pg_config"
--	    fi
--	  done
--	  IFS="${OLD_IFS}"
--	  #
--	  #
--	  if test "x${PGCONF}" = "xno"
--	  then
--	    AC_MSG_CHECKING(for PostgreSQL in /usr/local/pgsql /usr/pgsql /usr/local /usr PGSQL_HOME)
--	    pgsql_directory="/usr/local/pgsql /usr/pgsql /usr/local /usr ${PGSQL_HOME}"
--  	    for i in $pgsql_directory; do 
--    	      if test -r $i/include/pgsql/libpq-fe.h; then
--                PGSQL_INC_DIR=$i/include
--		PGSQL_DIR=$i
--		# use AC_CHECK_HEADERS to check for pgsql/libpq-fe.h
--              fi
--            done 
--            if test -z "$PGSQL_DIR"; then
--  	      for i in $pgsql_directory; do 
--    	        if test -r $i/include/postgresql/libpq-fe.h; then
--                  PGSQL_INC_DIR=$i/include
--		  PGSQL_DIR=$i
--                fi
--              done
--	    fi
--            if test -z "$PGSQL_DIR"; then
--  	      for i in $pgsql_directory; do 
--    	        if test -r $i/include/libpq-fe.h; then
--                  PGSQL_INC_DIR=$i/include
--		  PGSQL_DIR=$i
--                fi
--              done
--	    fi
--	    
--            if test -z "$PGSQL_DIR"; then
--              tmp=""
--              for i in $pgsql_directory; do
--                tmp="$tmp $i/include $i/include/pgsql $i/include/postgresql"
--              done
--              FAIL_MESSAGE("PostgreSQL header file (libpq-fe.h)", $tmp)
--	    fi
--
--	    for i in lib lib/pgsql lib/postgresql; do
--      		str="$PGSQL_DIR/$i/libpq.*"
--      		for j in `echo $str`; do
--       		 if test -r $j; then
--       		   PGSQL_LIB_DIR="$PGSQL_DIR/$i"
--       		   break 2
--      		  fi
--    		done
--   	    done
--
--	    if test -z "$PGSQL_LIB_DIR"; then
--	      for ff in $pgsql_directory; do
--		for i in lib lib/pgsql lib/postgresql; do
--      		  str="$ff/$i/libpq.*"
--      		  for j in `echo $str`; do
--       		    if test -r $j; then
--       		      PGSQL_LIB_DIR="$ff/$i"
--       		      break 3
--      		    fi
--    		  done
--   	        done
--              done
--	    fi
--
--	    if test -z "$PGSQL_LIB_DIR"; then
--	       tmp=""
--	       for i in $pgsql_directory; do
--		   tmp="$i/lib $i/lib/pgsql $i/lib/postgresql"
--	       done
--	       FAIL_MESSAGE("postgresql library libpq", $tmp)
--            fi
--
--            AC_MSG_RESULT(yes)
--
-+	  if test -z "${PGSQL_LIB_DIR}" ; then
-+            FAIL_MESSAGE("PGSQL_LIB_DIR is not set!")
-+	  elif test -z "${PGSQL_INC_DIR}" ; then
-+            FAIL_MESSAGE("PGSQL_INC_DIR is not set!")
-+	  else
- 	    LIBS="$LIBS -L${PGSQL_LIB_DIR} -lpq -lm"
- 	    if test x"$enable_static" = xyes; then
- 	      LIBS="$LIBS -L${PGSQL_LIB_DIR} -lpq -lcrypt -lm"
-@@ -1382,18 +1303,6 @@ AC_ARG_WITH(database,
- 	    fi
- 	    # CFLAGS="$CFLAGS -I${PGSQL_INC_DIR}"
- 	    CPPFLAGS="$CPPFLAGS -I${PGSQL_INC_DIR}"
--	    AC_CHECK_HEADERS(pgsql/libpq-fe.h)
--	    AC_CHECK_HEADERS(postgresql/libpq-fe.h)
--	  else
--	    pg_lib_dir=`${PGCONF} --libdir`
--	    if test x"$enable_static" = xyes; then
--	      LIBS="$LIBS -L${pg_lib_dir} -lpq -lcrypt -lm"
--            else
--	      LIBS="$LIBS -L${pg_lib_dir} -lpq -lm"
--            fi
--	    pg_inc_dir=`${PGCONF} --includedir`
--	    # CFLAGS="$CFLAGS -I${pg_inc_dir}"
--	    CPPFLAGS="$CPPFLAGS -I${pg_inc_dir}"
- 	  fi
- 	elif test "x${withval}" = "xodbc"; then
- 	  AC_MSG_CHECKING(for odbc in /usr /usr/local ODBC_HOME)
-- 
cgit v1.2.3-54-g00ecf