summaryrefslogtreecommitdiffstats
path: root/recipes-ids/samhain/files/samhain-configure-add-option-for-ps.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-ids/samhain/files/samhain-configure-add-option-for-ps.patch')
-rw-r--r--recipes-ids/samhain/files/samhain-configure-add-option-for-ps.patch66
1 files changed, 30 insertions, 36 deletions
diff --git a/recipes-ids/samhain/files/samhain-configure-add-option-for-ps.patch b/recipes-ids/samhain/files/samhain-configure-add-option-for-ps.patch
index 8de0735..7e7f86e 100644
--- a/recipes-ids/samhain/files/samhain-configure-add-option-for-ps.patch
+++ b/recipes-ids/samhain/files/samhain-configure-add-option-for-ps.patch
@@ -14,29 +14,14 @@ to avoid host contamination.
14Upstream-Status: Inappropriate [cross compile specific] 14Upstream-Status: Inappropriate [cross compile specific]
15 15
16Signed-off-by: Jackie Huang <jackie.huang@windriver.com> 16Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
17--- 17[AK: refactored for 4.4.3]
18 aclocal.m4 | 2 +- 18Signed-off-by: Armin Kuster <akuster808@gmail.com>
19 configure.ac | 60 ++++++++++--------------------------------------------------
20 2 files changed, 11 insertions(+), 51 deletions(-)
21 19
22diff --git a/aclocal.m4 b/aclocal.m4 20Index: samhain-4.4.2/configure.ac
23index a2e59a6..cd20a2f 100644 21===================================================================
24--- a/aclocal.m4 22--- samhain-4.4.2.orig/configure.ac
25+++ b/aclocal.m4 23+++ samhain-4.4.2/configure.ac
26@@ -409,7 +409,7 @@ x_includes=NONE 24@@ -743,56 +743,16 @@ then
27 x_libraries=NONE
28 DESTDIR=
29 SH_ENABLE_OPTS="selinux posix-acl asm ssp db-reload xml-log message-queue login-watch process-check port-check mounts-check logfile-monitor userfiles debug ptrace static network udp nocl stealth micro-stealth install-name identity khide suidcheck base largefile mail external-scripts encrypt srp dnmalloc ipv6 shellexpand suid"
30-SH_WITH_OPTS="prelude libprelude-prefix database libwrap cflags libs console altconsole timeserver alttimeserver rnd egd-socket port logserver altlogserver kcheck gpg keyid checksum fp recipient sender trusted tmp-dir config-file log-file pid-file state-dir data-file html-file"
31+SH_WITH_OPTS="prelude libprelude-prefix database libwrap cflags libs console altconsole timeserver alttimeserver rnd egd-socket port logserver altlogserver kcheck gpg keyid checksum fp recipient sender trusted tmp-dir config-file log-file pid-file state-dir data-file html-file ps-path"
32
33 # Installation directory options.
34 # These are left unexpanded so users can "make install exec_prefix=/foo"
35diff --git a/configure.ac b/configure.ac
36index 5910b1f..8c3e087 100644
37--- a/configure.ac
38+++ b/configure.ac
39@@ -730,56 +730,16 @@ then
40 fi 25 fi
41 AC_CHECK_HEADERS(gmp.h) 26 AC_CHECK_HEADERS(gmp.h)
42 27
@@ -55,7 +40,16 @@ index 5910b1f..8c3e087 100644
55- AC_MSG_ERROR([Cannot find ps in any of /usr/ucb /bin /usr/bin]) 40- AC_MSG_ERROR([Cannot find ps in any of /usr/ucb /bin /usr/bin])
56-fi 41-fi
57-AC_DEFINE_UNQUOTED([PSPATH], _("$PS"), [Path to ps]) 42-AC_DEFINE_UNQUOTED([PSPATH], _("$PS"), [Path to ps])
58- 43+AC_ARG_WITH(ps-path,
44+ [ --with-ps-path=PATH set path to ps command ],
45+ [
46+ if test "x${withval}" != xno; then
47+ pspath="${withval}"
48+ AC_DEFINE_UNQUOTED([PSPATH], _("${pspath}"), [Path to ps])
49+ AC_DEFINE_UNQUOTED([PSARG], _("ax"), [Argument for ps])
50+ fi
51+ ])
52
59-AC_MSG_CHECKING([how to use ps]) 53-AC_MSG_CHECKING([how to use ps])
60-$PS ax >/dev/null 2>&1 54-$PS ax >/dev/null 2>&1
61-if test $? -eq 0; then 55-if test $? -eq 0; then
@@ -90,19 +84,19 @@ index 5910b1f..8c3e087 100644
90- PSARG="-e" 84- PSARG="-e"
91-fi 85-fi
92-AC_DEFINE_UNQUOTED([PSARG], _("$PSARG"), [Argument for ps]) 86-AC_DEFINE_UNQUOTED([PSARG], _("$PSARG"), [Argument for ps])
93+AC_ARG_WITH(ps-path,
94+ [ --with-ps-path=PATH set path to ps command ],
95+ [
96+ if test "x${withval}" != xno; then
97+ pspath="${withval}"
98+ AC_DEFINE_UNQUOTED([PSPATH], _("${pspath}"), [Path to ps])
99+ AC_DEFINE_UNQUOTED([PSARG], _("ax"), [Argument for ps])
100+ fi
101+ ])
102+
103 AC_MSG_RESULT([$PS $PSARG]) 87 AC_MSG_RESULT([$PS $PSARG])
104 88
105 dnl ***************************************** 89 dnl *****************************************
106-- 90Index: samhain-4.4.2/aclocal.m4
1071.9.1 91===================================================================
108 92--- samhain-4.4.2.orig/aclocal.m4
93+++ samhain-4.4.2/aclocal.m4
94@@ -409,7 +409,7 @@ x_includes=NONE
95 x_libraries=NONE
96 DESTDIR=
97 SH_ENABLE_OPTS="selinux posix-acl asm ssp db-reload xml-log message-queue login-watch process-check port-check mounts-check logfile-monitor userfiles debug ptrace static network udp nocl stealth micro-stealth install-name identity khide suidcheck base largefile mail external-scripts encrypt srp dnmalloc ipv6 shellexpand suid"
98-SH_WITH_OPTS="prelude libprelude-prefix database libwrap cflags libs console altconsole timeserver alttimeserver rnd egd-socket port logserver altlogserver signify pubkey-checksum gpg keyid checksum fp recipient sender trusted tmp-dir config-file log-file pid-file state-dir data-file html-file"
99+SH_WITH_OPTS="prelude libprelude-prefix database libwrap cflags libs console altconsole timeserver alttimeserver rnd egd-socket port logserver altlogserver kcheck gpg keyid checksum fp recipient sender trusted tmp-dir config-file log-file pid-file state-dir data-file html-file ps-path"
100
101 # Installation directory options.
102 # These are left unexpanded so users can "make install exec_prefix=/foo"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-05-31 22:52:56 +0000