mirrors/meta-security
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-security synced 2026-06-02 13:30:33 +00:00
Code Issues Projects Releases Wiki Activity

samhain: update to 4.4.2

Browse Source 
refresh a few patches too

Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Armin Kuster
2020-11-03 10:01:02 -08:00
parent ab133ef3f6
commit c40e8f8d9d
3 changed files with 42 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
recipes-ids/samhain/files/samhain-avoid-searching-host-for-postgresql.patch
+6 -9
View File
@@ -10,11 +10,11 @@ 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(-)
diff --git a/configure.ac b/configure.ac Index: samhain-4.4.2/configure.ac
index a224c68..f658d53 100644 ===================================================================
--- a/configure.ac --- samhain-4.4.2.orig/configure.ac
+++ b/configure.ac +++ samhain-4.4.2/configure.ac
@@ -1278,90 +1278,11 @@ AC_ARG_WITH(database, @@ -1290,90 +1290,11 @@ AC_ARG_WITH(database,
AC_DEFINE(WITH_POSTGRES) AC_DEFINE(WITH_POSTGRES)
AC_DEFINE(WITH_DATABASE) AC_DEFINE(WITH_DATABASE)
# #
@@ -110,7 +110,7 @@ index a224c68..f658d53 100644
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"
@@ -1370,18 +1291,6 @@ AC_ARG_WITH(database, @@ -1382,18 +1303,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,6 +129,3 @@ index a224c68..f658d53 100644
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.11.0
recipes-ids/samhain/files/samhain-configure-add-option-for-ps.patch
+29 -35
View File
@@ -14,29 +14,14 @@ to avoid host contamination.
Upstream-Status: Inappropriate [cross compile specific] 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]
aclocal.m4 | 2 +- Signed-off-by: Armin Kuster <akuster808@gmail.com>
configure.ac | 60 ++++++++++--------------------------------------------------
2 files changed, 11 insertions(+), 51 deletions(-)
diff --git a/aclocal.m4 b/aclocal.m4 Index: samhain-4.4.2/configure.ac
index a2e59a6..cd20a2f 100644 ===================================================================
--- a/aclocal.m4 --- samhain-4.4.2.orig/configure.ac
+++ b/aclocal.m4 +++ samhain-4.4.2/configure.ac
@@ -409,7 +409,7 @@ x_includes=NONE @@ -743,56 +743,16 @@ then
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 kcheck 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"
diff --git a/configure.ac b/configure.ac
index 5910b1f..8c3e087 100644
--- a/configure.ac
+++ b/configure.ac
@@ -730,56 +730,16 @@ then
fi fi
AC_CHECK_HEADERS(gmp.h) AC_CHECK_HEADERS(gmp.h)
@@ -55,7 +40,16 @@ index 5910b1f..8c3e087 100644
- 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])
- +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
@@ -90,19 +84,19 @@ index 5910b1f..8c3e087 100644
- 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
1.9.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/samhain.inc
+6 -7
View File
@@ -3,9 +3,12 @@ HOMEPAGE = "http://www.la-samhna.de/samhain/"
LICENSE = "GPLv2" LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://LICENSE;md5=8ca43cbc842c2336e835926c2166c28b" LIC_FILES_CHKSUM = "file://LICENSE;md5=8ca43cbc842c2336e835926c2166c28b"
PV = "4.3.3" PV = "4.4.2"
SRC_URI = "http://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}.default \
file://samhain.service \
file://samhain-mips64-aarch64-dnmalloc-hash-fix.patch \ file://samhain-mips64-aarch64-dnmalloc-hash-fix.patch \
file://samhain-samhainrc.patch \ file://samhain-samhainrc.patch \
file://samhain-samhainrc-fix-files-dirs-path.patch \ file://samhain-samhainrc-fix-files-dirs-path.patch \
@@ -15,13 +18,9 @@ SRC_URI = "http://la-samhna.de/archive/samhain_signed-${PV}.tar.gz \
file://samhain-avoid-searching-host-for-postgresql.patch \ file://samhain-avoid-searching-host-for-postgresql.patch \
file://samhain-add-LDFLAGS-variable-for-samhain_setpwd.patch \ file://samhain-add-LDFLAGS-variable-for-samhain_setpwd.patch \
file://fix-build-with-new-version-attr.patch \ file://fix-build-with-new-version-attr.patch \
file://${INITSCRIPT_NAME}.init \
file://${INITSCRIPT_NAME}.default \
file://samhain.service \
" "
SRC_URI[md5sum] = "7be46ae7d03f53ba21afafd41cff8926" SRC_URI[sha256sum] = "2bb2750b32646be32517d0b2259402559c72b96979800f6c33774fcdea327fff"
SRC_URI[sha256sum] = "33ad4bc3dad4699694553bd9635a6b5827939f965d1f0f05fce0b4e9cdadf21b"
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"