1 files changed, 134 insertions, 0 deletions
diff --git a/recipes-ids/samhain/files/0007-configure.ac-avoid-searching-host-for-postgresql.patch b/recipes-ids/samhain/files/0007-configure.ac-avoid-searching-host-for-postgresql.patch
new file mode 100644
index 0000000..9652c53
--- /dev/null
+++ b/recipes-ids/samhain/files/0007-configure.ac-avoid-searching-host-for-postgresql.patch
@@ -0,0 +1,134 @@
+From 117078cd32ee2c76bbe7d65325fbc0b451c73ace 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(-)
+diff --git a/configure.ac b/configure.ac
+index d0e3657..5b8d167 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -1351,90 +1351,11 @@ AC_ARG_WITH(database,
+           AC_DEFINE([WITH_POSTGRES], [1], [Use postgres as database])
+           AC_DEFINE([WITH_DATABASE], [1], [Use a 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"
+@@ -1443,18 +1364,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)
+-- 
+2.34.1

diff --git a/recipes-ids/samhain/files/0007-configure.ac-avoid-searching-host-for-postgresql.patch b/recipes-ids/samhain/files/0007-configure.ac-avoid-searching-host-for-postgresql.patch new file mode 100644 index 0000000..9652c53 --- /dev/null +++ b/recipes-ids/samhain/files/0007-configure.ac-avoid-searching-host-for-postgresql.patch
@@ -0,0 +1,134 @@
	1	From 117078cd32ee2c76bbe7d65325fbc0b451c73ace Mon Sep 17 00:00:00 2001
	2	From: Jackie Huang <jackie.huang@windriver.com>
	3	Date: Thu, 14 Sep 2017 11:02:12 +0800
	4	Subject: [PATCH] configure.ac: avoid searching host for postgresql
	5
	6	Upstream-Status: Inappropriate [cross compile specific]
	7
	8	Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
	9	---
	10	configure.ac \| 101 +++------------------------------------------------
	11	1 file changed, 5 insertions(+), 96 deletions(-)
	12
	13	diff --git a/configure.ac b/configure.ac
	14	index d0e3657..5b8d167 100644
	15	--- a/configure.ac
	16	+++ b/configure.ac
	17	@@ -1351,90 +1351,11 @@ AC_ARG_WITH(database,
	18	AC_DEFINE([WITH_POSTGRES], [1], [Use postgres as database])
	19	AC_DEFINE([WITH_DATABASE], [1], [Use a database])
	20	#
	21	- PGCONF="no"
	22	- MY_PATH="${PATH}:/usr/local/bin:/usr/local/pgsql/bin"
	23	- OLD_IFS="$IFS"
	24	- IFS=":"
	25	- for ff in ${MY_PATH}
	26	- do
	27	- if test -f "$ff/pg_config"
	28	- then
	29	- PGCONF="$ff/pg_config"
	30	- fi
	31	- done
	32	- IFS="${OLD_IFS}"
	33	- #
	34	- #
	35	- if test "x${PGCONF}" = "xno"
	36	- then
	37	- AC_MSG_CHECKING(for PostgreSQL in /usr/local/pgsql /usr/pgsql /usr/local /usr PGSQL_HOME)
	38	- pgsql_directory="/usr/local/pgsql /usr/pgsql /usr/local /usr ${PGSQL_HOME}"
	39	- for i in $pgsql_directory; do
	40	- if test -r $i/include/pgsql/libpq-fe.h; then
	41	- PGSQL_INC_DIR=$i/include
	42	- PGSQL_DIR=$i
	43	- # use AC_CHECK_HEADERS to check for pgsql/libpq-fe.h
	44	- fi
	45	- done
	46	- if test -z "$PGSQL_DIR"; then
	47	- for i in $pgsql_directory; do
	48	- if test -r $i/include/postgresql/libpq-fe.h; then
	49	- PGSQL_INC_DIR=$i/include
	50	- PGSQL_DIR=$i
	51	- fi
	52	- done
	53	- fi
	54	- if test -z "$PGSQL_DIR"; then
	55	- for i in $pgsql_directory; do
	56	- if test -r $i/include/libpq-fe.h; then
	57	- PGSQL_INC_DIR=$i/include
	58	- PGSQL_DIR=$i
	59	- fi
	60	- done
	61	- fi
	62	-
	63	- if test -z "$PGSQL_DIR"; then
	64	- tmp=""
	65	- for i in $pgsql_directory; do
	66	- tmp="$tmp $i/include $i/include/pgsql $i/include/postgresql"
	67	- done
	68	- FAIL_MESSAGE("PostgreSQL header file (libpq-fe.h)", $tmp)
	69	- fi
	70	-
	71	- for i in lib lib/pgsql lib/postgresql; do
	72	- str="$PGSQL_DIR/$i/libpq.*"
	73	- for j in `echo $str`; do
	74	- if test -r $j; then
	75	- PGSQL_LIB_DIR="$PGSQL_DIR/$i"
	76	- break 2
	77	- fi
	78	- done
	79	- done
	80	-
	81	- if test -z "$PGSQL_LIB_DIR"; then
	82	- for ff in $pgsql_directory; do
	83	- for i in lib lib/pgsql lib/postgresql; do
	84	- str="$ff/$i/libpq.*"
	85	- for j in `echo $str`; do
	86	- if test -r $j; then
	87	- PGSQL_LIB_DIR="$ff/$i"
	88	- break 3
	89	- fi
	90	- done
	91	- done
	92	- done
	93	- fi
	94	-
	95	- if test -z "$PGSQL_LIB_DIR"; then
	96	- tmp=""
	97	- for i in $pgsql_directory; do
	98	- tmp="$i/lib $i/lib/pgsql $i/lib/postgresql"
	99	- done
	100	- FAIL_MESSAGE("postgresql library libpq", $tmp)
	101	- fi
	102	-
	103	- AC_MSG_RESULT(yes)
	104	-
	105	+ if test -z "${PGSQL_LIB_DIR}" ; then
	106	+ FAIL_MESSAGE("PGSQL_LIB_DIR is not set!")
	107	+ elif test -z "${PGSQL_INC_DIR}" ; then
	108	+ FAIL_MESSAGE("PGSQL_INC_DIR is not set!")
	109	+ else
	110	LIBS="$LIBS -L${PGSQL_LIB_DIR} -lpq -lm"
	111	if test x"$enable_static" = xyes; then
	112	LIBS="$LIBS -L${PGSQL_LIB_DIR} -lpq -lcrypt -lm"
	113	@@ -1443,18 +1364,6 @@ AC_ARG_WITH(database,
	114	fi
	115	# CFLAGS="$CFLAGS -I${PGSQL_INC_DIR}"
	116	CPPFLAGS="$CPPFLAGS -I${PGSQL_INC_DIR}"
	117	- AC_CHECK_HEADERS(pgsql/libpq-fe.h)
	118	- AC_CHECK_HEADERS(postgresql/libpq-fe.h)
	119	- else
	120	- pg_lib_dir=`${PGCONF} --libdir`
	121	- if test x"$enable_static" = xyes; then
	122	- LIBS="$LIBS -L${pg_lib_dir} -lpq -lcrypt -lm"
	123	- else
	124	- LIBS="$LIBS -L${pg_lib_dir} -lpq -lm"
	125	- fi
	126	- pg_inc_dir=`${PGCONF} --includedir`
	127	- # CFLAGS="$CFLAGS -I${pg_inc_dir}"
	128	- CPPFLAGS="$CPPFLAGS -I${pg_inc_dir}"
	129	fi
	130	elif test "x${withval}" = "xodbc"; then
	131	AC_MSG_CHECKING(for odbc in /usr /usr/local ODBC_HOME)
	132	--
	133	2.34.1
	134