mirrors/meta-security
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-security synced 2026-07-16 15:57:21 +00:00
Code Issues Projects Releases Wiki Activity

samhain: upgrade 4.4.10 -> 4.5.2

Browse Source 
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>
This commit is contained in:
Yi Zhao
2025-03-27 21:23:23 +08:00
committed by Armin Kuster
parent 2dc2227267
commit b9d0a65404
15 changed files with 168 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
recipes-ids/samhain/files/samhain-mips64-aarch64-dnmalloc-hash-fix.patch → recipes-ids/samhain/files/0001-Hash-fix-for-MIPS64-and-AARCH64.patch
+16 -11
View File
@@ -1,28 +1,30 @@
commit 0f6bdc219e598de08a3f37887efa5dfa50e2b996 From 3f6884e711cdbd66ceca8ed13158b11ca2d6ddc1 Mon Sep 17 00:00:00 2001
Author: Aws Ismail <aws.ismail@windriver.com> From: Aws Ismail <aws.ismail@windriver.com>
Date: Fri Jun 22 15:47:08 2012 -0400 Date: Fri, 22 Jun 2012 15:47:08 -0400
Subject: [PATCH] Hash fix for MIPS64 and AARCH64
Hash fix for MIPS64 and AARCH64
Samhain uses the addresses of local variables in generating hash Samhain uses the addresses of local variables in generating hash
values. The hashing function is designed only for 32-bit values. values. The hashing function is designed only for 32-bit values.
For MIPS64 when a 64-bit address is passed in the resulting hash For MIPS64 when a 64-bit address is passed in the resulting hash
exceeds the limits of the underlying mechanism and samhain exceeds the limits of the underlying mechanism and samhain
ultimately fails. The solution is to simply take the lower ultimately fails. The solution is to simply take the lower
32-bits of the address and use that in generating hash values. 32-bits of the address and use that in generating hash values.
Signed-off-by: Greg Moffatt <greg.moffatt@windriver.com> Signed-off-by: Greg Moffatt <greg.moffatt@windriver.com>
Upstream-Status: Pending Upstream-Status: Pending
Signed-off-by: Aws Ismail <aws.ismail@windriver.com> Signed-off-by: Aws Ismail <aws.ismail@windriver.com>
Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
src/dnmalloc.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/src/dnmalloc.c b/src/dnmalloc.c diff --git a/src/dnmalloc.c b/src/dnmalloc.c
index da9a5c5..fc91400 100644 index 9f7bacc..d6e9ec5 100644
--- a/src/dnmalloc.c --- a/src/dnmalloc.c
+++ b/src/dnmalloc.c +++ b/src/dnmalloc.c
@@ -2703,11 +2703,19 @@ static void freecilst_add(chunkinfoptr p) { @@ -2710,11 +2710,19 @@ static void freecilst_add(chunkinfoptr p) {
} }
/* Calculate the hash table entry for a chunk */ /* Calculate the hash table entry for a chunk */
@@ -38,7 +40,10 @@ index da9a5c5..fc91400 100644
#else #else
#define hash(p) (((unsigned long) p - (unsigned long) startheap) >> 7) #define hash(p) (((unsigned long) p - (unsigned long) startheap) >> 7)
#endif #endif
+#endif /* CONFIG_ARCH_MIPS64 */ +#endif /* CONFIG_ARCH_MIPS64 */
static void static void
hashtable_add (chunkinfoptr ci) hashtable_add (chunkinfoptr ci)
--
2.34.1
recipes-ids/samhain/files/samhain-samhainrc.patch → recipes-ids/samhain/files/0002-Make-samhainrc-OE-friendly.patch
+15 -10
View File
@@ -1,20 +1,22 @@
commit 4c6658441eb3ffc4e51ed70f78cbdab046957580 From 5797a57fd839d4b42c38fec49a6f937ca2e359af Mon Sep 17 00:00:00 2001
Author: Aws Ismail <aws.ismail@windriver.com> From: Aws Ismail <aws.ismail@windriver.com>
Date: Fri Jun 22 16:38:20 2012 -0400 Date: Fri, 22 Jun 2012 16:38:20 -0400
Subject: [PATCH] Make samhainrc OE-friendly.
Make samhainrc OE-friendly. Patch the samhainrc that will be installed
Patch the samhainrc that will be installed
as part of the 'make install' step to more as part of the 'make install' step to more
accurately reflect what will be found, and accurately reflect what will be found, and
what will be of concern, on a OE install. what will be of concern, on a OE install.
Upstream-Status: Inappropriate [configuration] Upstream-Status: Inappropriate [configuration]
Signed-off-by: Aws Ismail <aws.ismail@windriver.com> Signed-off-by: Aws Ismail <aws.ismail@windriver.com>
---
samhainrc.linux | 63 +++++++++----------------------------------------
1 file changed, 11 insertions(+), 52 deletions(-)
diff --git a/samhainrc.linux b/samhainrc.linux diff --git a/samhainrc.linux b/samhainrc.linux
index 9bc5ca4..10a8176 100644 index 02906bb..5b6ec6a 100644
--- a/samhainrc.linux --- a/samhainrc.linux
+++ b/samhainrc.linux +++ b/samhainrc.linux
@@ -74,7 +74,6 @@ dir = 0/ @@ -74,7 +74,6 @@ dir = 0/
@@ -128,7 +130,7 @@ index 9bc5ca4..10a8176 100644
## Remote server (yule) ## Remote server (yule)
## ##
@@ -556,7 +513,8 @@ ChecksumTest=check @@ -539,7 +496,8 @@ ChecksumTest=check
## and I/O limit (kilobytes per second; 0 == off) ## and I/O limit (kilobytes per second; 0 == off)
## to reduce load on host. ## to reduce load on host.
# #
@@ -138,7 +140,7 @@ index 9bc5ca4..10a8176 100644
# SetIOLimit = 0 # SetIOLimit = 0
## The version string to embed in file signature databases ## The version string to embed in file signature databases
@@ -565,13 +523,14 @@ ChecksumTest=check @@ -548,13 +506,14 @@ ChecksumTest=check
## Interval between time stamp messages ## Interval between time stamp messages
# #
@@ -156,3 +158,6 @@ index 9bc5ca4..10a8176 100644
## Alternative: crontab-like schedule ## Alternative: crontab-like schedule
# #
--
2.34.1
recipes-ids/samhain/files/samhain-samhainrc-fix-files-dirs-path.patch → recipes-ids/samhain/files/0003-fix-real-path-for-some-files-dirs.patch
+5 -5
View File
@@ -1,4 +1,4 @@
From 00fb527e45da42550156197647e01de9a6b1ad52 Mon Sep 17 00:00:00 2001 From 041af4897336b0873cbac8d15b434638bf3aaf7e Mon Sep 17 00:00:00 2001
From: Wenzong Fan <wenzong.fan@windriver.com> From: Wenzong Fan <wenzong.fan@windriver.com>
Date: Mon, 3 Mar 2014 01:50:01 -0500 Date: Mon, 3 Mar 2014 01:50:01 -0500
Subject: [PATCH] fix real path for some files/dirs Subject: [PATCH] fix real path for some files/dirs
@@ -7,11 +7,11 @@ Upstream-Status: Inappropriate [configuration]
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
--- ---
samhainrc.linux | 15 +++++++-------- samhainrc.linux | 13 ++++++-------
1 file changed, 7 insertions(+), 8 deletions(-) 1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/samhainrc.linux b/samhainrc.linux diff --git a/samhainrc.linux b/samhainrc.linux
index e9727b4..7775d83 100644 index 5b6ec6a..ff6ddf1 100644
--- a/samhainrc.linux --- a/samhainrc.linux
+++ b/samhainrc.linux +++ b/samhainrc.linux
@@ -93,7 +93,6 @@ dir = 99/etc @@ -93,7 +93,6 @@ dir = 99/etc
@@ -57,5 +57,5 @@ index e9727b4..7775d83 100644
[Attributes] [Attributes]
# #
-- --
1.7.9.5 2.34.1
recipes-ids/samhain/files/samhain-pid-path.patch → recipes-ids/samhain/files/0004-Set-the-PID-Lock-path-for-samhain.pid.patch
+13 -8
View File
@@ -1,22 +1,24 @@
commit a932b03b65edeb02ccad2fce06bfa68a8f2fbb04 From 942843096e86669492700f49abc2c6489ea9994e Mon Sep 17 00:00:00 2001
Author: Aws Ismail <aws.ismail@windriver.com> From: Aws Ismail <aws.ismail@windriver.com>
Date: Thu Jan 10 16:29:05 2013 -0500 Date: Thu, 10 Jan 2013 16:29:05 -0500
Subject: [PATCH] Set the PID Lock path for samhain.pid
Set the PID Lock path for samhain.pid
The explicit path for samhain.pid inorder The explicit path for samhain.pid inorder
for samhain to work properly after it initial for samhain to work properly after it initial
database build. database build.
Upstream-Status: Inappropriate [configuration] Upstream-Status: Inappropriate [configuration]
Signed-off-by: Aws Ismail <aws.ismail@windriver.com> Signed-off-by: Aws Ismail <aws.ismail@windriver.com>
---
samhainrc.linux | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/samhainrc.linux b/samhainrc.linux diff --git a/samhainrc.linux b/samhainrc.linux
index 10a8176..a7b06e6 100644 index ff6ddf1..d4b71e9 100644
--- a/samhainrc.linux --- a/samhainrc.linux
+++ b/samhainrc.linux +++ b/samhainrc.linux
@@ -639,7 +639,7 @@ SetFileCheckTime = 86400 @@ -621,7 +621,7 @@ SetFileCheckTime = 86400
## Path to the PID file ## Path to the PID file
# #
@@ -25,3 +27,6 @@ index 10a8176..a7b06e6 100644
## The digest/checksum/hash algorithm ## The digest/checksum/hash algorithm
--
2.34.1
recipes-ids/samhain/files/samhain-sha256-big-endian.patch → recipes-ids/samhain/files/0005-Fix-sha256-for-big-endian-machines.patch
+13 -3
View File
@@ -1,4 +1,7 @@
samhain: fix sha256 for big-endian machines From 54242aa53da0d69c04b76c22120956ac6079ef6f Mon Sep 17 00:00:00 2001
From: Joe Slater <jslater@windriver.com>
Date: Thu, 27 Mar 2025 11:12:33 +0800
Subject: [PATCH] Fix sha256 for big-endian machines
After computing the digest, big-endian machines would After computing the digest, big-endian machines would
memset() the digest to the first byte of state instead memset() the digest to the first byte of state instead
@@ -7,11 +10,15 @@ of using memcpy() to transfer it.
Upstream-Status: Pending Upstream-Status: Pending
Signed-off-by: Joe Slater <jslater@windriver.com> Signed-off-by: Joe Slater <jslater@windriver.com>
---
src/sh_checksum.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/sh_checksum.c b/src/sh_checksum.c
index e434d5c..dc23738 100644
--- a/src/sh_checksum.c --- a/src/sh_checksum.c
+++ b/src/sh_checksum.c +++ b/src/sh_checksum.c
@@ -468,7 +468,7 @@ void SHA256_Final(sha2_byte digest[], SH @@ -468,7 +468,7 @@ void SHA256_Final(sha2_byte digest[SHA256_DIGEST_LENGTH], SHA256_CTX* context)
} }
} }
#else #else
@@ -20,3 +27,6 @@ Signed-off-by: Joe Slater <jslater@windriver.com>
/* bcopy(context->state, d, SHA256_DIGEST_LENGTH); */ /* bcopy(context->state, d, SHA256_DIGEST_LENGTH); */
#endif #endif
} }
--
2.34.1
recipes-ids/samhain/files/samhain-configure-add-option-for-ps.patch → recipes-ids/samhain/files/0006-configure-add-option-for-ps.patch
+41 -31
View File
@@ -1,4 +1,4 @@
From 02a143f0068cbc6cea71359169210fbb3606d4bb Mon Sep 17 00:00:00 2001 From 2a33032ee97be5015101d94b333244e6fc53840c Mon Sep 17 00:00:00 2001
From: Jackie Huang <jackie.huang@windriver.com> From: Jackie Huang <jackie.huang@windriver.com>
Date: Mon, 18 Jan 2016 00:24:57 -0500 Date: Mon, 18 Jan 2016 00:24:57 -0500
Subject: [PATCH] configure: add option for ps Subject: [PATCH] configure: add option for ps
@@ -16,12 +16,31 @@ Upstream-Status: Inappropriate [cross compile specific]
Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
[AK: refactored for 4.4.3] [AK: refactored for 4.4.3]
Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
Refresh to 4.5.2
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
acinclude.m4 | 2 +-
configure.ac | 60 +++++++++-------------------------------------------
2 files changed, 11 insertions(+), 51 deletions(-)
Index: samhain-4.4.2/configure.ac diff --git a/acinclude.m4 b/acinclude.m4
=================================================================== index def24be..e2a57e2 100644
--- samhain-4.4.2.orig/configure.ac --- a/acinclude.m4
+++ samhain-4.4.2/configure.ac +++ b/acinclude.m4
@@ -743,56 +743,16 @@ then @@ -359,7 +359,7 @@ x_includes=NONE
x_libraries=NONE
DESTDIR=
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"
-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"
+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 ps-path"
# Installation directory options.
# These are left unexpanded so users can "make install exec_prefix=/foo"
diff --git a/configure.ac b/configure.ac
index f59754c..d0e3657 100644
--- a/configure.ac
+++ b/configure.ac
@@ -799,56 +799,16 @@ then
fi fi
AC_CHECK_HEADERS(gmp.h) AC_CHECK_HEADERS(gmp.h)
@@ -39,17 +58,8 @@ Index: samhain-4.4.2/configure.ac
- AC_MSG_RESULT([no]) - AC_MSG_RESULT([no])
- AC_MSG_ERROR([Cannot find ps in any of /usr/ucb /bin /usr/bin]) - AC_MSG_ERROR([Cannot find ps in any of /usr/ucb /bin /usr/bin])
-fi -fi
-AC_DEFINE_UNQUOTED([PSPATH], _("$PS"), [Path to ps]) -AC_DEFINE_UNQUOTED([PSPATH], [_("$PS")], [Path to ps executable])
+AC_ARG_WITH(ps-path, -
+ [ --with-ps-path=PATH set path to ps command ],
+ [
+ if test "x${withval}" != xno; then
+ pspath="${withval}"
+ AC_DEFINE_UNQUOTED([PSPATH], _("${pspath}"), [Path to ps])
+ AC_DEFINE_UNQUOTED([PSARG], _("ax"), [Argument for ps])
+ fi
+ ])
-AC_MSG_CHECKING([how to use ps]) -AC_MSG_CHECKING([how to use ps])
-$PS ax >/dev/null 2>&1 -$PS ax >/dev/null 2>&1
-if test $? -eq 0; then -if test $? -eq 0; then
@@ -83,20 +93,20 @@ Index: samhain-4.4.2/configure.ac
-else -else
- PSARG="-e" - PSARG="-e"
-fi -fi
-AC_DEFINE_UNQUOTED([PSARG], _("$PSARG"), [Argument for ps]) -AC_DEFINE_UNQUOTED([PSARG], [_("$PSARG")], [Argument for ps])
+AC_ARG_WITH(ps-path,
+ [ --with-ps-path=PATH set path to ps command ],
+ [
+ if test "x${withval}" != xno; then
+ pspath="${withval}"
+ AC_DEFINE_UNQUOTED([PSPATH], _("${pspath}"), [Path to ps])
+ AC_DEFINE_UNQUOTED([PSARG], _("ax"), [Argument for ps])
+ fi
+ ])
+
AC_MSG_RESULT([$PS $PSARG]) AC_MSG_RESULT([$PS $PSARG])
dnl ***************************************** dnl *****************************************
Index: samhain-4.4.2/aclocal.m4 --
=================================================================== 2.34.1
--- samhain-4.4.2.orig/aclocal.m4
+++ samhain-4.4.2/aclocal.m4
@@ -409,7 +409,7 @@ x_includes=NONE
x_libraries=NONE
DESTDIR=
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"
-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"
+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"
# Installation directory options.
# These are left unexpanded so users can "make install exec_prefix=/foo"
recipes-ids/samhain/files/samhain-avoid-searching-host-for-postgresql.patch → recipes-ids/samhain/files/0007-configure.ac-avoid-searching-host-for-postgresql.patch
+15 -12
View File
@@ -1,4 +1,4 @@
From 3e2ca7e06b16ceff6d12beb5113312f6525df595 Mon Sep 17 00:00:00 2001 From 117078cd32ee2c76bbe7d65325fbc0b451c73ace Mon Sep 17 00:00:00 2001
From: Jackie Huang <jackie.huang@windriver.com> From: Jackie Huang <jackie.huang@windriver.com>
Date: Thu, 14 Sep 2017 11:02:12 +0800 Date: Thu, 14 Sep 2017 11:02:12 +0800
Subject: [PATCH] configure.ac: avoid searching host for postgresql Subject: [PATCH] configure.ac: avoid searching host for postgresql
@@ -7,16 +7,16 @@ Upstream-Status: Inappropriate [cross compile specific]
Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
--- ---
configure.ac | 101 +++-------------------------------------------------------- configure.ac | 101 +++------------------------------------------------
1 file changed, 5 insertions(+), 96 deletions(-) 1 file changed, 5 insertions(+), 96 deletions(-)
Index: samhain-4.4.2/configure.ac diff --git a/configure.ac b/configure.ac
=================================================================== index d0e3657..5b8d167 100644
--- samhain-4.4.2.orig/configure.ac --- a/configure.ac
+++ samhain-4.4.2/configure.ac +++ b/configure.ac
@@ -1290,90 +1290,11 @@ AC_ARG_WITH(database, @@ -1351,90 +1351,11 @@ AC_ARG_WITH(database,
AC_DEFINE(WITH_POSTGRES) AC_DEFINE([WITH_POSTGRES], [1], [Use postgres as database])
AC_DEFINE(WITH_DATABASE) AC_DEFINE([WITH_DATABASE], [1], [Use a database])
# #
- PGCONF="no" - PGCONF="no"
- MY_PATH="${PATH}:/usr/local/bin:/usr/local/pgsql/bin" - MY_PATH="${PATH}:/usr/local/bin:/usr/local/pgsql/bin"
@@ -103,14 +103,14 @@ Index: samhain-4.4.2/configure.ac
- AC_MSG_RESULT(yes) - AC_MSG_RESULT(yes)
- -
+ if test -z "${PGSQL_LIB_DIR}" ; then + if test -z "${PGSQL_LIB_DIR}" ; then
+ FAIL_MESSAGE("PGSQL_LIB_DIR is not set!") + FAIL_MESSAGE("PGSQL_LIB_DIR is not set!")
+ elif test -z "${PGSQL_INC_DIR}" ; then + elif test -z "${PGSQL_INC_DIR}" ; then
+ FAIL_MESSAGE("PGSQL_INC_DIR is not set!") + FAIL_MESSAGE("PGSQL_INC_DIR is not set!")
+ else + else
LIBS="$LIBS -L${PGSQL_LIB_DIR} -lpq -lm" LIBS="$LIBS -L${PGSQL_LIB_DIR} -lpq -lm"
if test x"$enable_static" = xyes; then if test x"$enable_static" = xyes; then
LIBS="$LIBS -L${PGSQL_LIB_DIR} -lpq -lcrypt -lm" LIBS="$LIBS -L${PGSQL_LIB_DIR} -lpq -lcrypt -lm"
@@ -1382,18 +1303,6 @@ AC_ARG_WITH(database, @@ -1443,18 +1364,6 @@ AC_ARG_WITH(database,
fi fi
# CFLAGS="$CFLAGS -I${PGSQL_INC_DIR}" # CFLAGS="$CFLAGS -I${PGSQL_INC_DIR}"
CPPFLAGS="$CPPFLAGS -I${PGSQL_INC_DIR}" CPPFLAGS="$CPPFLAGS -I${PGSQL_INC_DIR}"
@@ -129,3 +129,6 @@ Index: samhain-4.4.2/configure.ac
fi fi
elif test "x${withval}" = "xodbc"; then elif test "x${withval}" = "xodbc"; then
AC_MSG_CHECKING(for odbc in /usr /usr/local ODBC_HOME) AC_MSG_CHECKING(for odbc in /usr /usr/local ODBC_HOME)
--
2.34.1
recipes-ids/samhain/files/samhain-add-LDFLAGS-variable-for-samhain_setpwd.patch → recipes-ids/samhain/files/0008-Add-LDFLAGS-variable-for-compiling-samhain_setpwd.patch
+4 -4
View File
@@ -1,4 +1,4 @@
From ae79606a6745dbbd429d1d4671dfe3045d735057 Mon Sep 17 00:00:00 2001 From 7fc1f0a8d4c6a109f7e86853a9136a008c68808a Mon Sep 17 00:00:00 2001
From: Jackie Huang <jackie.huang@windriver.com> From: Jackie Huang <jackie.huang@windriver.com>
Date: Thu, 14 Sep 2017 13:26:55 +0800 Date: Thu, 14 Sep 2017 13:26:55 +0800
Subject: [PATCH] Add LDFLAGS variable for compiling samhain_setpwd Subject: [PATCH] Add LDFLAGS variable for compiling samhain_setpwd
@@ -11,10 +11,10 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.in b/Makefile.in diff --git a/Makefile.in b/Makefile.in
index 01de987..49356cf 100644 index ade0638..1806159 100644
--- a/Makefile.in --- a/Makefile.in
+++ b/Makefile.in +++ b/Makefile.in
@@ -1128,7 +1128,7 @@ sh_tiger_i.o: $(srcsrc)/$(TIGER_SRC) Makefile config_xor.h @@ -1159,7 +1159,7 @@ sh_tiger_i.o: $(srcsrc)/$(TIGER_SRC) Makefile config_xor.h
samhain_setpwd: encode config_xor.h $(srcsrc)/samhain_setpwd.c samhain_setpwd: encode config_xor.h $(srcsrc)/samhain_setpwd.c
@echo '$(COMPILE) -o samhain_setpwd $(srcsrc)/samhain_setpwd.c'; \ @echo '$(COMPILE) -o samhain_setpwd $(srcsrc)/samhain_setpwd.c'; \
./encode $(XOR_CODE) $(srcsrc)/samhain_setpwd.c; \ ./encode $(XOR_CODE) $(srcsrc)/samhain_setpwd.c; \
@@ -24,5 +24,5 @@ index 01de987..49356cf 100644
samhain_stealth: encode config_xor.h $(srcsrc)/samhain_stealth.c samhain_stealth: encode config_xor.h $(srcsrc)/samhain_stealth.c
-- --
2.11.0 2.34.1
recipes-ids/samhain/files/fix-build-with-new-version-attr.patch → recipes-ids/samhain/files/0009-fix-build-with-new-version-attr.patch
+11 -11
View File
@@ -1,4 +1,4 @@
From e67acafa62f71f0015ed548918b98ed0b1ded128 Mon Sep 17 00:00:00 2001 From 9d693fbeb0a14bfe858aed2b46cb9e74a90d00b9 Mon Sep 17 00:00:00 2001
From: Yi Zhao <yi.zhao@windriver.com> From: Yi Zhao <yi.zhao@windriver.com>
Date: Sun, 19 Jan 2020 15:53:48 +0800 Date: Sun, 19 Jan 2020 15:53:48 +0800
Subject: [PATCH] fix build with new version attr Subject: [PATCH] fix build with new version attr
@@ -12,15 +12,15 @@ Upstream-Status: Pending
Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
--- ---
aclocal.m4 | 26 +++++++++++--------------- acinclude.m4 | 26 +++++++++++---------------
src/sh_unix.c | 2 +- src/sh_unix.c | 2 +-
2 files changed, 12 insertions(+), 16 deletions(-) 2 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/aclocal.m4 b/aclocal.m4 diff --git a/acinclude.m4 b/acinclude.m4
index ee5b204..38cef8e 100644 index e2a57e2..bfdd2f6 100644
--- a/aclocal.m4 --- a/acinclude.m4
+++ b/aclocal.m4 +++ b/acinclude.m4
@@ -1453,23 +1453,19 @@ AC_DEFUN([sh_CHECK_POSIX_ACL], @@ -1392,23 +1392,19 @@ AC_DEFUN([sh_CHECK_POSIX_ACL],
AC_DEFUN([sh_CHECK_XATTR], AC_DEFUN([sh_CHECK_XATTR],
[ [
@@ -53,13 +53,13 @@ index ee5b204..38cef8e 100644
+ LIBS="$OLDLIBS" + LIBS="$OLDLIBS"
+ +
if test x"$sh_fattr" = xyes; then if test x"$sh_fattr" = xyes; then
AC_DEFINE(USE_XATTR, 1, [Define if you want extended attributes support.]) AC_DEFINE([USE_XATTR], [1], [Define if you want extended attributes support.])
LIBS="$LIBS $LIBATTR" LIBS="$LIBS $LIBATTR"
diff --git a/src/sh_unix.c b/src/sh_unix.c diff --git a/src/sh_unix.c b/src/sh_unix.c
index 3ede57f..ef236e9 100644 index b1c0b75..2469068 100644
--- a/src/sh_unix.c --- a/src/sh_unix.c
+++ b/src/sh_unix.c +++ b/src/sh_unix.c
@@ -3681,7 +3681,7 @@ static char * sh_unix_getinfo_acl (char * path, int fd, struct stat * buf) @@ -3682,7 +3682,7 @@ static char * sh_unix_getinfo_acl (char * path, int fd, struct stat * buf)
#ifdef USE_XATTR #ifdef USE_XATTR
@@ -69,5 +69,5 @@ index 3ede57f..ef236e9 100644
{ {
char * out = NULL; char * out = NULL;
-- --
2.7.4 2.34.1
recipes-ids/samhain/files/samhain-fix-initializer-element-is-not-constant.patch → recipes-ids/samhain/files/0010-Fix-initializer-element-is-not-constant.patch
+9 -1
View File
@@ -1,3 +1,8 @@
From 77d55c4707395b76e32e07bf0f679b5b6999d568 Mon Sep 17 00:00:00 2001
From: Kai Kang <kai.kang@windriver.com>
Date: Thu, 27 Mar 2025 11:43:40 +0800
Subject: [PATCH] Fix initializer element is not constant
Fix error when compile for powerpc: Fix error when compile for powerpc:
| x_sh_dbIO.c: In function 'swap_short': | x_sh_dbIO.c: In function 'swap_short':
@@ -13,7 +18,7 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com>
1 file changed, 2 insertions(+), 1 deletion(-) 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/sh_dbIO.c b/src/sh_dbIO.c diff --git a/src/sh_dbIO.c b/src/sh_dbIO.c
index b547ac5..23a9621 100644 index 1f9b152..503456d 100644
--- a/src/sh_dbIO.c --- a/src/sh_dbIO.c
+++ b/src/sh_dbIO.c +++ b/src/sh_dbIO.c
@@ -226,7 +226,8 @@ static unsigned short * swap_short (unsigned short * iptr) @@ -226,7 +226,8 @@ static unsigned short * swap_short (unsigned short * iptr)
@@ -26,3 +31,6 @@ index b547ac5..23a9621 100644
unsigned short hi = (ooop & 0xff00); unsigned short hi = (ooop & 0xff00);
unsigned short lo = (ooop & 0xff); unsigned short lo = (ooop & 0xff);
ooop = (lo << 8) | (hi >> 8); ooop = (lo << 8) | (hi >> 8);
--
2.34.1
recipes-ids/samhain/files/samhain-not-run-ptest-on-host.patch → recipes-ids/samhain/files/0011-not-run-test-on-host-since-we-are-doing-cross-compil.patch
+8 -5
View File
@@ -1,17 +1,20 @@
not run test on host, since we are doing cross-compile From 506833786a4ae5b888f12c59b82f7d842cda778c Mon Sep 17 00:00:00 2001
From: Roy Li <rongqing.li@windriver.com>
Date: Thu, 27 Mar 2025 11:46:20 +0800
Subject: [PATCH] not run test on host, since we are doing cross-compile
Upstream-Status: Inappropriate [cross compile specific] Upstream-Status: Inappropriate [cross compile specific]
Signed-off-by: Roy Li <rongqing.li@windriver.com> Signed-off-by: Roy Li <rongqing.li@windriver.com>
--- ---
Makefile.in | 1 - Makefile.in | 1 -
1 file changed, 1 deletion(-) 1 file changed, 1 deletion(-)
diff --git a/Makefile.in b/Makefile.in diff --git a/Makefile.in b/Makefile.in
index e1b32a8..74bfdc9 100644 index 1806159..eccb4f6 100644
--- a/Makefile.in --- a/Makefile.in
+++ b/Makefile.in +++ b/Makefile.in
@@ -1234,7 +1234,6 @@ intcutest: internal.h $(OBJECTS) $(CUTEST_OBJECTS) sh_tiger_i.o $(srcsrc)/CuTest @@ -1219,7 +1219,6 @@ intcutest: internal.h $(OBJECTS) $(CUTEST_OBJECTS) sh_tiger_i.o $(srcsrc)/CuTest
rm x_samhain.c; \ rm x_samhain.c; \
$(LINK) sh_tiger_i.o $(CUTEST_OBJECTS) CuTestMain.o CuTest.o $(OBJECTS) $(LIBS_TRY); \ $(LINK) sh_tiger_i.o $(CUTEST_OBJECTS) CuTestMain.o CuTest.o $(OBJECTS) $(LIBS_TRY); \
test -f ./intcutest && mv ./intcutest ./cutest; \ test -f ./intcutest && mv ./intcutest ./cutest; \
@@ -20,5 +23,5 @@ index e1b32a8..74bfdc9 100644
runcutest: runcutest:
gdb ./cutest gdb ./cutest
-- --
1.7.10.4 2.34.1
recipes-ids/samhain/files/0001-Don-t-expose-configure-args.patch → recipes-ids/samhain/files/0012-Don-t-expose-configure-args.patch
+2 -2
View File
@@ -1,4 +1,4 @@
From 111b1e8f35e989513d8961a45a806767109f6e1e Mon Sep 17 00:00:00 2001 From 4625ce72e462950cfbbd37ad2a19be625fd081b0 Mon Sep 17 00:00:00 2001
From: Mingli Yu <mingli.yu@windriver.com> From: Mingli Yu <mingli.yu@windriver.com>
Date: Thu, 11 Aug 2022 17:15:30 +0800 Date: Thu, 11 Aug 2022 17:15:30 +0800
Subject: [PATCH] Don't expose configure args Subject: [PATCH] Don't expose configure args
@@ -40,5 +40,5 @@ index 635a746..b9a42e7 100644
echo '#!/bin/sh' > ./sstrip echo '#!/bin/sh' > ./sstrip
-- --
2.25.1 2.34.1
recipes-ids/samhain/files/run-ptest
Executable → Regular
View File
recipes-ids/samhain/samhain-standalone.bb
+4 -3
View File
@@ -1,7 +1,7 @@
require samhain.inc require samhain.inc
SRC_URI += "file://samhain-not-run-ptest-on-host.patch \ SRC_URI += "file://0011-not-run-test-on-host-since-we-are-doing-cross-compil.patch \
file://0001-Don-t-expose-configure-args.patch \ file://0012-Don-t-expose-configure-args.patch \
file://run-ptest \ file://run-ptest \
" "
@@ -28,7 +28,8 @@ do_install:append() {
do_install_ptest() { do_install_ptest() {
mkdir -p ${D}${PTEST_PATH} mkdir -p ${D}${PTEST_PATH}
install ${S}/cutest ${D}${PTEST_PATH} install -m 755 ${S}/cutest ${D}${PTEST_PATH}
install -m 644 ${S}/COPYING ${D}${PTEST_PATH}
} }
RPROVIDES:${PN} += "samhain" RPROVIDES:${PN} += "samhain"
recipes-ids/samhain/samhain.inc
+12 -12
View File
@@ -3,25 +3,25 @@ HOMEPAGE = "http://www.la-samhna.de/samhain/"
LICENSE = "GPL-2.0-only" LICENSE = "GPL-2.0-only"
LIC_FILES_CHKSUM = "file://LICENSE;md5=8ca43cbc842c2336e835926c2166c28b" LIC_FILES_CHKSUM = "file://LICENSE;md5=8ca43cbc842c2336e835926c2166c28b"
PV = "4.4.10" PV = "4.5.2"
SRC_URI = "https://la-samhna.de/archive/samhain_signed-${PV}.tar.gz \ SRC_URI = "https://la-samhna.de/archive/samhain_signed-${PV}.tar.gz \
file://${INITSCRIPT_NAME}.init \ file://${INITSCRIPT_NAME}.init \
file://${INITSCRIPT_NAME}.default \ file://${INITSCRIPT_NAME}.default \
file://samhain.service \ file://samhain.service \
file://samhain-mips64-aarch64-dnmalloc-hash-fix.patch \ file://0001-Hash-fix-for-MIPS64-and-AARCH64.patch \
file://samhain-samhainrc.patch \ file://0002-Make-samhainrc-OE-friendly.patch \
file://samhain-samhainrc-fix-files-dirs-path.patch \ file://0003-fix-real-path-for-some-files-dirs.patch \
file://samhain-pid-path.patch \ file://0004-Set-the-PID-Lock-path-for-samhain.pid.patch \
file://samhain-sha256-big-endian.patch \ file://0005-Fix-sha256-for-big-endian-machines.patch \
file://samhain-configure-add-option-for-ps.patch \ file://0006-configure-add-option-for-ps.patch \
file://samhain-avoid-searching-host-for-postgresql.patch \ file://0007-configure.ac-avoid-searching-host-for-postgresql.patch \
file://samhain-add-LDFLAGS-variable-for-samhain_setpwd.patch \ file://0008-Add-LDFLAGS-variable-for-compiling-samhain_setpwd.patch \
file://fix-build-with-new-version-attr.patch \ file://0009-fix-build-with-new-version-attr.patch \
file://samhain-fix-initializer-element-is-not-constant.patch \ file://0010-Fix-initializer-element-is-not-constant.patch \
" "
SRC_URI[sha256sum] = "ae6ee8eff3cb111b7fc14a57bcc258443dd0bcf1bfacfdf229935ed053c1ce3d" SRC_URI[sha256sum] = "0b5d3534fd60ecf45dfd79bd415e81f7a56eba7f1755771735e204f334033578"
UPSTREAM_CHECK_URI = "https://www.la-samhna.de/samhain/archive.html" UPSTREAM_CHECK_URI = "https://www.la-samhna.de/samhain/archive.html"
UPSTREAM_CHECK_REGEX = "samhain_signed-(?P<pver>(\d+(\.\d+)+))\.tar" UPSTREAM_CHECK_REGEX = "samhain_signed-(?P<pver>(\d+(\.\d+)+))\.tar"