summaryrefslogtreecommitdiffstats
path: root/Makefile.in
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in202
1 files changed, 116 insertions, 86 deletions
diff --git a/Makefile.in b/Makefile.in
index 684e92b..581965b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -117,7 +117,7 @@ HEADERS = samhain.h sh_unix.h sh_utils.h sh_error.h sh_error_min.h sh_files.h \
sh_mail.h sh_mail_int.h sh_nmail.h sh_filter.h \
sh_mem.h sh_entropy.h sh_xfer.h sh_modules.h sh_utmp.h \
sh_suidchk.h sh_srp.h sh_fifo.h sh_html.h sh_tools.h \
- sh_gpg.h sh_cat.h sh_calls.h sh_extern.h sh_database.h sh_trace.h \
+ sh_sig.h sh_cat.h sh_calls.h sh_extern.h sh_database.h sh_trace.h \
sh_schedule.h bignum.h trustfile.h slib.h zAVLTree.h \
lzoconf.h minilzo.h rijndael-alg-fst.h rijndael-api-fst.h \
rijndael-boxes-fst.h sh_socket.h sh_ignore.h sh_prelude.h \
@@ -127,7 +127,7 @@ HEADERS = samhain.h sh_unix.h sh_utils.h sh_error.h sh_error_min.h sh_files.h \
sh_log_mark.h sh_log_repeat.h sh_inotify.h sh_registry.h sh_ipvx.h \
sh_restrict.h sh_sub.h sh_fInotify.h sh_checksum.h \
sh_dbIO.h sh_dbIO_int.h sh_guid.h sh_dbCheck.h sh_dbCreate.h \
- sh_sem.h
+ sh_sem.h sh_subuid.h
SOURCES = $(srcsrc)/samhain.c $(srcsrc)/sh_unix.c \
@@ -143,14 +143,14 @@ SOURCES = $(srcsrc)/samhain.c $(srcsrc)/sh_unix.c \
$(srcsrc)/sh_utmp.c $(srcsrc)/sh_login_track.c \
$(srcsrc)/sh_suidchk.c $(srcsrc)/sh_srp.c \
$(srcsrc)/sh_fifo.c $(srcsrc)/sh_tools.c \
- $(srcsrc)/sh_html.c $(srcsrc)/sh_gpg.c \
+ $(srcsrc)/sh_html.c $(srcsrc)/sh_sig.c \
$(srcsrc)/sh_cat.c $(srcsrc)/sh_calls.c \
$(srcsrc)/sh_extern.c $(srcsrc)/sh_database.c \
$(srcsrc)/sh_err_log.c $(srcsrc)/sh_err_console.c \
$(srcsrc)/sh_err_syslog.c $(srcsrc)/sh_schedule.c \
$(srcsrc)/bignum.c $(srcsrc)/mkhdr.c \
$(srcsrc)/samhain_setpwd.c $(srcsrc)/samhain_stealth.c \
- $(srcsrc)/encode.c $(srcsrc)/sstrip.c \
+ $(srcsrc)/encode.c \
$(srcsrc)/trustfile.c $(srcsrc)/exepack.c \
$(srcsrc)/exepack_fill.c $(srcsrc)/exepack_mkdata.c \
$(srcsrc)/minilzo.c $(srcsrc)/slib.c \
@@ -174,6 +174,7 @@ SOURCES = $(srcsrc)/samhain.c $(srcsrc)/sh_unix.c \
$(srcsrc)/sh_filetype.c $(srcsrc)/sh_sub.c $(srcsrc)/sh_fInotify.c \
$(srcsrc)/sh_checksum.c $(srcsrc)/sh_guid.c $(srcsrc)/sh_sem.c \
$(srcsrc)/sh_dbIO.c $(srcsrc)/sh_dbCheck.c $(srcsrc)/sh_dbCreate.c \
+ $(srcsrc)/sh_subuid.c \
$(srcsrc)/t-test1.c
OBJECTS = sh_files.o sh_tiger0.o sh_tiger2.o sh_tiger2_64.o \
@@ -182,7 +183,7 @@ OBJECTS = sh_files.o sh_tiger0.o sh_tiger2.o sh_tiger2_64.o \
sh_hash.o sh_mail.o sh_nmail.o sh_mem.o sh_login_track.o \
sh_entropy.o sh_modules.o sh_utmp.o \
sh_xfer_client.o sh_xfer_server.o sh_xfer_syslog.o \
- sh_suidchk.o sh_srp.o sh_fifo.o sh_tools.o sh_html.o sh_gpg.o \
+ sh_suidchk.o sh_srp.o sh_fifo.o sh_tools.o sh_html.o sh_sig.o \
sh_cat.o sh_calls.o sh_extern.o sh_database.o sh_err_log.o \
sh_err_console.o sh_err_syslog.o sh_schedule.o bignum.o \
trustfile.o rijndael-alg-fst.o rijndael-api-fst.o slib.o \
@@ -196,15 +197,20 @@ OBJECTS = sh_files.o sh_tiger0.o sh_tiger2.o sh_tiger2_64.o \
sh_pthread.o sh_string.o sh_inotify.o dnmalloc.o \
sh_audit.o sh_registry.o sh_ipvx.o sh_restrict.o \
sh_filetype.o sh_sub.o sh_fInotify.o sh_checksum.o \
- sh_guid.o sh_sem.o sh_dbIO.o sh_dbCheck.o sh_dbCreate.o
+ sh_guid.o sh_sem.o sh_dbIO.o sh_dbCheck.o sh_dbCreate.o \
+ sh_subuid.o
TESTSUITE = test.sh testcompile.sh testhash.sh testtiger.txt \
testtimesrv.sh \
testext.sh testrc_1ext.in test_ext.c.in testrun_1d.sh \
- testrun_1.sh testrun_1a.sh testrun_1b.sh testrun_1c.sh testrc_1 \
+ testrun_1.sh testrun_1a.sh testrun_1b.sh testrun_1c.sh \
+ testrc_1 testrc_1i.dyn test1i_file.sig test1i_samhain.pub \
+ testrun_1d.sh testrun_1e.sh testrun_1f.sh \
+ testrun_1g.sh testrun_1h.sh testrun_1i.sh \
testrun_2.sh testrun_2a.sh testrun_2b.sh testrc_2.in \
- testrun_2c.sh testrun_2d.sh
+ testrun_2c.sh testrun_2d.sh testrun_2e.sh testrun_2f.sh \
+ testrun_2g.sh
DIST_COMMON = README COPYING LICENSE samhain.jpg \
samhainrc.linux samhainrc.solaris samhainrc.freebsd samhainrc.aix5.2.0 \
@@ -229,7 +235,7 @@ PROGRAMS = $(SETPWD) $(STEGIN) $(SAMHAIN) $(YULECTL) $(SADMIN)
#
#----------------------------------------------------------
-all: $(top_srcdir)/depend.sum $(SETPWD) $(STEGIN) $(SAMHAIN) $(YULECTL) sstrip
+all: $(top_srcdir)/depend.sum $(SETPWD) $(STEGIN) $(SAMHAIN) $(YULECTL)
#----------------------------------------------------------
@@ -360,7 +366,7 @@ depend: depend-gen
#
CLEANFILES = encode config_xor.h depend-gen \
- internal.h sh_MK.h trustfile sstrip samhain mkhdr encode cutest \
+ internal.h sh_MK.h trustfile samhain mkhdr encode cutest \
yule samhain_setpwd samhain_stealth samhainrc yulectl
clean:
@@ -371,13 +377,14 @@ clean:
# everything created by (./configure && make)
#
-DISTCLEANFILES = Makefile samhain.spec sh_gpg_checksum.h sh_gpg_fp.h \
- init/samhain.startLinux init/samhain.startGentoo \
+DISTCLEANFILES = Makefile samhain.spec sh_sig_checksum.h sh_gpg_fp.h \
+ init/samhain.startLinux init/samhain.startGentoo init/samhain.startSystemd \
init/samhain.startLSB init/samhain.startFreeBSD \
init/samhain.startSolaris init/samhain.startHPUX \
init/samhain.startIRIX init/samhain.startMACOSX \
- deploy.sh sh_MK.h samhain-install.sh sh_gpg_chksum.h sh_gpg_fp.h \
+ deploy.sh sh_MK.h samhain-install.sh \
rules.deb rules.deb-light src/CuTestMain.c \
+ scripts/samhainadmin-sig.pl scripts/samhainadmin-gpg.pl \
scripts/samhainadmin.pl scripts/check_samhain.pl \
scripts/samhain.ebuild scripts/samhain.ebuild-light \
scripts/yuleadmin.pl scripts/logrotate \
@@ -512,7 +519,7 @@ uninstall-boot: samhain-install.sh
#
-install-program: $(PROGRAMS) sstrip
+install-program: $(PROGRAMS)
@$(mkinstalldirs) $(DESTDIR)$(sbindir)
@if test x$(mytmpdir) != x; then \
$(mkinstalldirs) $(DESTDIR)$(mytmpdir); \
@@ -525,8 +532,6 @@ install-program: $(PROGRAMS) sstrip
echo " $(INSTALL_PROGRAM) $$p $$target"; \
$(INSTALL_PROGRAM) $$p $$target; \
chmod 0700 $$target; \
- echo " ./sstrip $$target"; \
- ./sstrip $$target; \
else \
echo " $(INSTALL_SHELL) $$p $$target"; \
$(INSTALL_SHELL) $$p $$target; \
@@ -577,8 +582,12 @@ install-data: trustfile
@$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
@$(mkinstalldirs) $(DESTDIR)$(mylockdir)
@$(mkinstalldirs) $(DESTDIR)$(mylogdir)
- @$(mkinstalldirs) $(DESTDIR)$(mydatadir); \
- chmod 700 $(DESTDIR)$(mydatadir)
+ @if test -d $(DESTDIR)$(mydatadir); then \
+ :; \
+ else \
+ $(mkinstalldirs) $(DESTDIR)$(mydatadir); \
+ chmod 755 $(DESTDIR)$(mydatadir); \
+ fi
@if test -f samhainrc.$(selectconfig); then \
:; \
else \
@@ -677,7 +686,7 @@ run: run-light
run-light: all
@echo "Building $(PACKAGE)-$(VERSION).run"; \
- STAGE=$(PACKAGE)-$(VERSION); \
+ STAGE=$(PACKAGE)-$(VERSION)-run-installer; \
mkdir $$STAGE; \
if test x"$$?" != x0; then \
echo "ERROR ... mkdir $$STAGE failed"; \
@@ -699,10 +708,17 @@ run-light: all
echo "chown root $$temp/*" >> $$STAGE/setup.sh; \
echo "cp -p $$temp/* $(sbindir) || exit 1" >> $$STAGE/setup.sh; \
temp=`echo $(sysconfdir) | sed s,^/,,`; \
- echo "chown root $$temp/*" >> $$STAGE/setup.sh; \
+ echo "chown -R root $$temp/*" >> $$STAGE/setup.sh; \
configfile=`echo @myconffile@ | sed 's%^REQ_FROM_SERVER%%'`; \
- echo "test -f $$configfile || cp -p $$temp/* $$configfile" >> $$STAGE/setup.sh; \
- echo "./samhain-install.sh --express --verbose install-boot || echo 'Cannot install init script'" >> $$STAGE/setup.sh; \
+ echo "cp -pr $$temp/* @sysconfdir@" >> $$STAGE/setup.sh; \
+ echo "./samhain-install.sh --express --verbose install-boot" >> $$STAGE/setup.sh; \
+ echo "if [ \$$? -ne 0 ]" >> $$STAGE/setup.sh; \
+ echo "then" >> $$STAGE/setup.sh; \
+ echo " echo 'Installation finished, but could not install boot-time init scripts'" >> $$STAGE/setup.sh; \
+ echo " exit 2" >> $$STAGE/setup.sh; \
+ echo "fi" >> $$STAGE/setup.sh; \
+ echo "echo 'Installation finished'" >> $$STAGE/setup.sh; \
+ echo "exit 0" >> $$STAGE/setup.sh; \
cp $(top_srcdir)/mkinstalldirs $$STAGE/; \
cp $(top_srcdir)/install-sh $$STAGE/; \
cp ./samhain-install.sh $$STAGE/; \
@@ -712,7 +728,7 @@ run-light: all
chmod +x $$STAGE/mkinstalldirs; \
chmod +x $$STAGE/install-sh; \
$(top_srcdir)/scripts/makeself/makeself.sh --header $(top_srcdir)/scripts/makeself/makeself-header.sh --nocomp --nomd5 --notemp $$STAGE $(PACKAGE)-$(VERSION).run "$(PACKAGE)_$(VERSION)_self_extracting_installer" ./setup.sh && \
- rm -r $(PACKAGE)-$(VERSION)
+ rm -r $$STAGE
emerge-prepare: dist
@echo "Building $(PACKAGE)-$(VERSION)"; \
@@ -796,6 +812,7 @@ deb-light:
fi; \
echo $(sysconfdir) | sed s,^/,, >> debian/dirs; \
echo etc/init.d >> debian/dirs; \
+ echo lib/systemd/system >> debian/dirs; \
echo $(mydatadir) | sed s,^/,, >> debian/dirs; \
echo $(mylogdir) | sed s,^/,, >> debian/dirs; \
echo $(mylockdir) | sed s,^/,, >> debian/dirs; \
@@ -812,6 +829,7 @@ deb:
fi; \
echo $(sysconfdir) | sed s,^/,, >> debian/dirs; \
echo etc/init.d >> debian/dirs; \
+ echo lib/systemd/system >> debian/dirs; \
echo $(mydatadir) | sed s,^/,, >> debian/dirs; \
echo $(mylogdir) | sed s,^/,, >> debian/dirs; \
echo $(mylockdir) | sed s,^/,, >> debian/dirs; \
@@ -831,7 +849,6 @@ deb:
echo $(top_srcdir)/docs/MANUAL-2_4.pdf >> debian/docs; \
echo $(top_srcdir)/docs/README.gcc_bug >> debian/docs; \
echo $(top_srcdir)/docs/README.LZO >> debian/docs; \
- echo $(top_srcdir)/docs/README.sstrip >> debian/docs; \
echo $(top_srcdir)/docs/README.UPGRADE >> debian/docs; \
echo $(top_srcdir)/docs/README.win2K >> debian/docs; \
$(MAKE) deb-run
@@ -841,17 +858,19 @@ deb-run:
if test "x$$maintainer" = x; then \
maintainer="$(DEFAULT_MAINTAINER)"; \
fi; \
- echo "$(PACKAGE) ($(VERSION)-$(BUILD_NUM)) stable; urgency=low" > debian/changelog; \
+ codename=`lsb_release -a 2>/dev/null | grep Codename | cut -f 2`; \
+ if test "x$$codename" = x; then \
+ codename="stable"; \
+ fi; \
+ echo "$(PACKAGE) ($(VERSION)-$(BUILD_NUM)) $$codename; urgency=low" > debian/changelog; \
echo >> debian/changelog; \
echo " * Initial release." >> debian/changelog; \
echo >> debian/changelog; \
echo " -- $$maintainer `date -R`" >> debian/changelog; \
echo >> debian/changelog; \
- echo "Local variables:" >> debian/changelog; \
- echo "mode: debian-changelog" >> debian/changelog; \
- echo "End:" >> debian/changelog; \
cp $(top_srcdir)/COPYING debian/copyright; \
- touch debian/README.debian; \
+ echo "9" > debian/compat; \
+ echo "Nothing to see here." > debian/README.debian; \
echo "Document: @install_name@-manual" > debian/@install_name@.doc-base; \
echo "Title: @install_name@ Manual" >> debian/@install_name@.doc-base; \
echo "Author: Rainer Wichmann" >> debian/@install_name@.doc-base; \
@@ -876,15 +895,16 @@ deb-run:
echo "Section: admin" >> debian/control; \
echo "Priority: optional" >> debian/control; \
echo "Maintainer: $$maintainer" >> debian/control; \
- echo "Standards-Version: 3.2.1" >> debian/control; \
+ echo "Build-Depends: debhelper (>> 9)" >> debian/control; \
+ echo "Standards-Version: 3.9.8" >> debian/control; \
echo >> debian/control; \
echo "Package: @install_name@" >> debian/control; \
echo "Architecture: any" >> debian/control; \
- echo "Depends: libc6" >> debian/control; \
+ echo "Depends: \$${shlibs:Depends}, \$${misc:Depends}" >> debian/control; \
echo "Description: File integrity checker" >> debian/control; \
echo " A file integrity checker" >> debian/control; \
echo "running debuild -us -uc"; \
- debuild --preserve-envvar=PASSWORD -us -uc -b; \
+ export DEB_BUILD_MAINT_OPTIONS=optimize=-all; debuild --preserve-envvar=PASSWORD -us -uc -b; \
DEBFILE=`find ../ -follow -maxdepth 1 -cnewer ./debian/control 2>/dev/null | grep '@install_name@_$(VERSION)' | grep '\.deb'`; \
if test x"$$DEBFILE" = x; then \
echo "Error ... cannot find package file"; \
@@ -892,7 +912,7 @@ deb-run:
else \
echo "Package $$DEBFILE built."; \
cp $$DEBFILE ./$(PACKAGE)-$(VERSION)-$(BUILD_NUM).deb; \
- ln -s ./$(PACKAGE)-$(VERSION)-$(BUILD_NUM).deb ./$(PACKAGE)-$(VERSION).deb; \
+ ln --backup=numbered -fs ./$(PACKAGE)-$(VERSION)-$(BUILD_NUM).deb ./$(PACKAGE)-$(VERSION).deb; \
fi; \
echo
@@ -918,9 +938,17 @@ rpmspec-light: samhain.spec
rpm-light: rpmspec-light distrpm
rpmbuild -ta ./$(PACKAGE)-$(VERSION).tar.gz;
@RPMTOP=`cat ~/.rpmmacros 2>/dev/null | grep '%_topdir' | awk '{ print $$2}'`; \
- if test x"$$RPMTOP" = x; then RPMTOP=/usr/src; fi; \
- if ! test -d "$$RPMTOP"; then \
- RPMTOP=`echo $$HOME/rpmbuild`; \
+ if test x"$$RPMTOP" = x; then \
+ try_RPMTOP=`echo $${HOME}/rpmbuild`; \
+ else \
+ if test ! -d "$${try_RPMTOP}"; then \
+ try_RPMTOP=`echo $${HOME}/rpmbuild`; \
+ fi; \
+ fi; \
+ if test -d "$${try_RPMTOP}"; then \
+ RPMTOP="$${try_RPMTOP}"; \
+ else \
+ RPMTOP=/usr/src; \
fi; \
echo "Searching the RPM package below $$RPMTOP ..."; \
RPMFILE=`find $$RPMTOP -follow -maxdepth 4 -cnewer ./samhain.spec 2>/dev/null | grep '@install_name@-$(VERSION)' | grep '\.rpm' | grep -v '\.src\.'`; \
@@ -938,9 +966,17 @@ rpm-light: rpmspec-light distrpm
rpm: rpmspec-full distrpm
rpmbuild -ta ./$(PACKAGE)-$(VERSION).tar.gz;
@RPMTOP=`cat ~/.rpmmacros 2>/dev/null | grep '%_topdir' | awk '{ print $$2}'`; \
- if test x"$$RPMTOP" = x; then RPMTOP=/usr/src; fi; \
- if ! test -d "$$RPMTOP"; then \
- RPMTOP=`echo $$HOME/rpmbuild`; \
+ if test x"$$RPMTOP" = x; then \
+ try_RPMTOP=`echo $${HOME}/rpmbuild`; \
+ else \
+ if test ! -d "$${try_RPMTOP}"; then \
+ try_RPMTOP=`echo $${HOME}/rpmbuild`; \
+ fi; \
+ fi; \
+ if test -d "$${try_RPMTOP}"; then \
+ RPMTOP="$${try_RPMTOP}"; \
+ else \
+ RPMTOP=/usr/src; \
fi; \
echo "Searching the RPM package below $$RPMTOP ..."; \
RPMFILE=`find $$RPMTOP -follow -maxdepth 4 -cnewer ./samhain.spec 2>/dev/null | grep '@install_name@-$(VERSION)' | grep '\.rpm' | grep -v '\.src\.'`; \
@@ -1100,9 +1136,6 @@ sh_MK.h: config.h
echo "#endif" >> sh_MK.h
-sstrip: $(srcsrc)/sstrip.c Makefile
- $(BUILD_CC) -I. -o sstrip $(srcsrc)/sstrip.c
-
encode: $(srcsrc)/encode.c Makefile
$(BUILD_CC) -I. -o encode $(srcsrc)/encode.c
@@ -1229,13 +1262,11 @@ exepack_mkdata: $(srcsrc)/exepack_mkdata.c $(srcinc)/lzoconf.h $(srcinc)/minilzo
#
# prepare the data to be packed
#
-exepack.data: $(SAMHAIN) exepack_mkdata sstrip
+exepack.data: $(SAMHAIN) exepack_mkdata
@echo "cp ./$(SAMHAIN) ./samhain.pk.data"; \
cp ./$(SAMHAIN) ./samhain.pk.data; \
echo "strip ./samhain.pk.data"; \
strip ./samhain.pk.data > /dev/null 2>&1 || echo "... is already stripped"; \
- echo "./sstrip ./samhain.pk.data"; \
- ./sstrip ./samhain.pk.data > /dev/null 2>&1 || echo "sstrip returned false"; \
echo "./exepack_mkdata ./samhain.pk.data ./exepack.data 0"; \
./exepack_mkdata ./samhain.pk.data ./exepack.data 0; \
echo "rm -f ./samhain.pk.data"; \
@@ -1256,20 +1287,17 @@ exepack_fill: $(srcsrc)/exepack_fill.c minilzo.o exepack
echo "$(LINK) exepack_fill.o minilzo.o"; \
$(LINK) exepack_fill.o minilzo.o
-samhain.pk: $(SAMHAIN) exepack exepack_fill sstrip
+samhain.pk: $(SAMHAIN) exepack exepack_fill
@echo "cp ./$(SAMHAIN) ./samhain.pk.data"; \
cp ./$(SAMHAIN) ./samhain.pk.data; \
echo "strip ./samhain.pk.data"; \
strip ./samhain.pk.data > /dev/null 2>&1 || echo "... is already stripped"; \
- echo "./sstrip ./samhain.pk.data"; \
- ./sstrip ./samhain.pk.data > /dev/null 2>&1 || echo "sstrip returned false"; \
test -f exepack.out && rm exepack.out; \
echo "./exepack_fill exepack samhain.pk.data exepack.out"; \
./exepack_fill exepack samhain.pk.data exepack.out; \
chmod +x exepack.out; \
echo "strip exepack.out"; \
strip exepack.out > /dev/null 2>&1 || echo "... is already stripped"; \
- ./sstrip exepack.out > /dev/null 2>&1 || echo "sstrip returned false"; \
echo "mv exepack.out samhain.pk"; \
rm -f samhain.pk; mv exepack.out samhain.pk
@@ -1465,15 +1493,20 @@ distcheck: dist
&& $(MAKE) install
-rm -rf $(distdir)
-rm -f $(distdir).tar.gz.asc
- @gpg -a --detach-sign $(distdir).tar.gz; \
- $(TAR) chof $(distdir).tar $(distdir).tar.gz $(distdir).tar.gz.asc; \
- rm -f $(distdir).tar.gz; \
- rm -f $(distdir).tar.gz.asc; \
- gzip --best $(distdir).tar
- mv $(distdir).tar.gz $(PACKAGE)_signed-$(VERSION).tar.gz
- @echo "========================"; \
- echo "$(PACKAGE)_signed-$(VERSION).tar.gz is ready for distribution"; \
- echo "========================"
+ gpg -a --detach-sign $(distdir).tar.gz;
+ $(TAR) chof $(distdir).tar $(distdir).tar.gz $(distdir).tar.gz.asc;
+ @if test x"$$?" != x0; then \
+ rm -f $(distdir).tar.gz; \
+ echo "ERROR creating $(PACKAGE)_signed-$(VERSION).tar.gz"; \
+ else \
+ rm -f $(distdir).tar.gz; \
+ rm -f $(distdir).tar.gz.asc; \
+ gzip --best $(distdir).tar; \
+ mv $(distdir).tar.gz $(PACKAGE)_signed-$(VERSION).tar.gz; \
+ echo "========================"; \
+ echo "$(PACKAGE)_signed-$(VERSION).tar.gz is ready for distribution"; \
+ echo "========================"; \
+ fi; \
#
# create a tarfile for the distibution
@@ -1531,6 +1564,7 @@ samhain.startLSB samhain.startGentoo samhain.startLinux samhain.startHPUX \
samhain.startIRIX samhain.startMACOSX
SCRIPTFILES=redhat_i386.client.spec check_samhain.pl samhainadmin.pl \
+samhainadmin-gpg.pl samhainadmin-sig.pl \
yuleadmin.pl samhain.ebuild samhain.ebuild-light samhain.spec
distdir: distfilecheck
@@ -1604,34 +1638,38 @@ distfilecheck: $(top_srcdir)/config.h.in $(top_srcdir)/depend.sum
# DO NOT DELETE THIS LINE
-samhain.o: $(srcsrc)/samhain.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_pthread.h $(srcinc)/sh_utils.h $(srcinc)/sh_error.h $(srcinc)/sh_unix.h $(srcinc)/sh_files.h $(srcinc)/sh_getopt.h $(srcinc)/sh_readconf.h $(srcinc)/sh_hash.h $(srcinc)/sh_dbIO.h $(srcinc)/sh_restrict.h $(srcinc)/sh_nmail.h $(srcinc)/sh_tiger.h $(srcinc)/sh_gpg.h $(srcinc)/sh_mem.h $(srcinc)/sh_xfer.h $(srcinc)/sh_tools.h $(srcinc)/sh_hash.h $(srcinc)/sh_extern.h $(srcinc)/sh_modules.h $(srcinc)/sh_ignore.h $(srcinc)/sh_prelink.h $(srcinc)/sh_sem.h sh_MK.h $(srcinc)/sh_schedule.h
-sh_unix.o: $(srcsrc)/sh_unix.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_error.h $(srcinc)/sh_unix.h $(srcinc)/sh_utils.h $(srcinc)/sh_mem.h $(srcinc)/sh_hash.h $(srcinc)/sh_tools.h $(srcinc)/sh_restrict.h $(srcinc)/sh_ipvx.h $(srcinc)/sh_tiger.h $(srcinc)/sh_prelink.h $(srcinc)/sh_pthread.h $(srcinc)/sh_sem.h $(srcinc)/sh_static.h $(srcinc)/sh_prelude.h $(srcinc)/zAVLTree.h $(srcinc)/sh_ignore.h
+
+samhain.o: $(srcsrc)/samhain.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_pthread.h $(srcinc)/sh_utils.h $(srcinc)/sh_error.h $(srcinc)/sh_unix.h $(srcinc)/sh_files.h $(srcinc)/sh_getopt.h $(srcinc)/sh_readconf.h $(srcinc)/sh_hash.h $(srcinc)/sh_dbIO.h $(srcinc)/sh_restrict.h $(srcinc)/sh_nmail.h $(srcinc)/sh_tiger.h $(srcinc)/sh_sig.h $(srcinc)/sh_mem.h $(srcinc)/sh_xfer.h $(srcinc)/sh_tools.h $(srcinc)/sh_hash.h $(srcinc)/sh_extern.h $(srcinc)/sh_modules.h $(srcinc)/sh_ignore.h $(srcinc)/sh_prelink.h $(srcinc)/sh_sem.h sh_MK.h $(srcinc)/sh_schedule.h
+sh_unix.o: $(srcsrc)/sh_unix.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_error.h $(srcinc)/sh_unix.h $(srcinc)/sh_utils.h $(srcinc)/sh_mem.h $(srcinc)/sh_hash.h $(srcinc)/sh_tools.h $(srcinc)/sh_restrict.h $(srcinc)/sh_ipvx.h $(srcinc)/sh_tiger.h $(srcinc)/sh_prelink.h $(srcinc)/sh_pthread.h $(srcinc)/sh_sem.h $(srcinc)/sh_static.h $(srcinc)/sh_prelude.h $(srcinc)/zAVLTree.h $(srcinc)/sh_subuid.h $(srcinc)/sh_ignore.h
sh_utils.o: $(srcsrc)/sh_utils.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_error.h $(srcinc)/sh_utils.h $(srcinc)/sh_unix.h $(srcinc)/sh_tiger.h $(srcinc)/sh_entropy.h $(srcinc)/sh_pthread.h
sh_error.o: $(srcsrc)/sh_error.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_cat.h $(srcinc)/sh_database.h $(srcinc)/sh_error.h $(srcinc)/sh_utils.h $(srcinc)/sh_unix.h $(srcinc)/sh_tiger.h $(srcinc)/sh_nmail.h $(srcinc)/sh_xfer.h $(srcinc)/sh_prelude.h $(srcinc)/sh_pthread.h $(srcinc)/sh_tools.h $(srcinc)/sh_extern.h $(srcinc)/sh_checksum.h
sh_files.o: $(srcsrc)/sh_files.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_pthread.h $(srcinc)/sh_error.h $(srcinc)/sh_utils.h $(srcinc)/sh_unix.h $(srcinc)/sh_files.h $(srcinc)/sh_tiger.h $(srcinc)/sh_hash.h $(srcinc)/sh_ignore.h $(srcinc)/sh_inotify.h $(srcinc)/zAVLTree.h $(srcinc)/sh_dbIO.h $(srcinc)/CuTest.h
sh_getopt.o: $(srcsrc)/sh_getopt.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_error.h $(srcinc)/sh_getopt.h $(srcinc)/sh_unix.h $(srcinc)/sh_files.h $(srcinc)/sh_utils.h $(srcinc)/sh_mail.h $(srcinc)/sh_xfer.h $(srcinc)/sh_hash.h $(srcinc)/sh_dbIO.h $(srcinc)/sh_dbCheck.h $(srcinc)/sh_dbCreate.h $(srcinc)/sh_sem.h $(srcinc)/sh_extern.h
-sh_readconf.o: $(srcsrc)/sh_readconf.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_calls.h $(srcinc)/sh_error.h $(srcinc)/sh_extern.h $(srcinc)/sh_unix.h $(srcinc)/sh_files.h $(srcinc)/sh_xfer.h $(srcinc)/sh_gpg.h $(srcinc)/sh_hash.h $(srcinc)/sh_dbIO.h $(srcinc)/sh_ignore.h $(srcinc)/sh_database.h $(srcinc)/sh_mail.h $(srcinc)/sh_modules.h $(srcinc)/sh_nmail.h $(srcinc)/sh_prelink.h $(srcinc)/sh_prelude.h $(srcinc)/sh_tiger.h $(srcinc)/sh_tools.h $(srcinc)/sh_utils.h $(srcinc)/sh_restrict.h $(srcinc)/sh_socket.h
+sh_readconf.o: $(srcsrc)/sh_readconf.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_calls.h $(srcinc)/sh_error.h $(srcinc)/sh_extern.h $(srcinc)/sh_unix.h $(srcinc)/sh_files.h $(srcinc)/sh_xfer.h $(srcinc)/sh_sig.h $(srcinc)/sh_hash.h $(srcinc)/sh_dbIO.h $(srcinc)/sh_ignore.h $(srcinc)/sh_database.h $(srcinc)/sh_mail.h $(srcinc)/sh_modules.h $(srcinc)/sh_nmail.h $(srcinc)/sh_prelink.h $(srcinc)/sh_prelude.h $(srcinc)/sh_tiger.h $(srcinc)/sh_tools.h $(srcinc)/sh_utils.h $(srcinc)/sh_restrict.h $(srcinc)/sh_socket.h
sh_tiger0.o: $(srcsrc)/sh_tiger0.c Makefile config_xor.h $(srcinc)/sh_tiger.h $(srcinc)/sh_unix.h $(srcinc)/sh_error.h $(srcinc)/sh_utils.h $(srcinc)/sh_pthread.h $(srcinc)/sh_string.h $(srcinc)/sh_checksum.h
sh_tiger1.o: $(srcsrc)/sh_tiger1.c Makefile config_xor.h
sh_tiger2.o: $(srcsrc)/sh_tiger2.c Makefile config_xor.h
sh_tiger1_64.o: $(srcsrc)/sh_tiger1_64.c Makefile config_xor.h
sh_tiger2_64.o: $(srcsrc)/sh_tiger2_64.c Makefile config_xor.h
-sh_hash.o: $(srcsrc)/sh_hash.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_utils.h $(srcinc)/sh_unix.h $(srcinc)/sh_dbIO_int.h $(srcinc)/sh_dbIO.h $(srcinc)/sh_hash.h $(srcinc)/sh_error.h $(srcinc)/sh_tiger.h $(srcinc)/sh_gpg.h $(srcinc)/sh_unix.h $(srcinc)/sh_files.h $(srcinc)/sh_ignore.h $(srcinc)/sh_pthread.h $(srcinc)/sh_xfer.h $(srcinc)/sh_hash.h $(srcinc)/sh_checksum.h
+sh_hash.o: $(srcsrc)/sh_hash.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_utils.h $(srcinc)/sh_unix.h $(srcinc)/sh_dbIO_int.h $(srcinc)/sh_dbIO.h $(srcinc)/sh_hash.h $(srcinc)/sh_error.h $(srcinc)/sh_tiger.h $(srcinc)/sh_sig.h $(srcinc)/sh_unix.h $(srcinc)/sh_files.h $(srcinc)/sh_ignore.h $(srcinc)/sh_pthread.h $(srcinc)/sh_xfer.h $(srcinc)/sh_hash.h $(srcinc)/sh_checksum.h
sh_mail.o: $(srcsrc)/sh_mail.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_error.h $(srcinc)/sh_unix.h $(srcinc)/sh_tiger.h $(srcinc)/sh_mail.h $(srcinc)/sh_utils.h $(srcinc)/sh_fifo.h $(srcinc)/sh_tools.h $(srcinc)/sh_pthread.h $(srcinc)/sh_filter.h $(srcinc)/sh_mail_int.h $(srcinc)/sh_nmail.h $(srcinc)/sh_ipvx.h $(srcinc)/sh_static.h $(srcinc)/sh_tools.h
+sh_nmail.o: $(srcsrc)/sh_nmail.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_pthread.h $(srcinc)/sh_mem.h $(srcinc)/sh_mail.h $(srcinc)/sh_tiger.h $(srcinc)/sh_string.h $(srcinc)/sh_utils.h $(srcinc)/sh_fifo.h $(srcinc)/sh_filter.h $(srcinc)/sh_mail_int.h $(srcinc)/zAVLTree.h
sh_mem.o: $(srcsrc)/sh_mem.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_error.h $(srcinc)/sh_utils.h $(srcinc)/sh_mem.h $(srcinc)/sh_pthread.h
sh_entropy.o: $(srcsrc)/sh_entropy.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_utils.h $(srcinc)/sh_unix.h $(srcinc)/sh_tiger.h $(srcinc)/sh_calls.h $(srcinc)/sh_pthread.h $(srcinc)/sh_static.h $(srcinc)/sh_pthread.h $(srcinc)/CuTest.h
-sh_forward.o: $(srcsrc)/sh_forward.c Makefile config_xor.h $(srcinc)/sh_ipvx.h $(srcinc)/samhain.h $(srcinc)/sh_tiger.h $(srcinc)/sh_utils.h $(srcinc)/sh_unix.h $(srcinc)/sh_forward.h $(srcinc)/sh_srp.h $(srcinc)/sh_fifo.h $(srcinc)/sh_tools.h $(srcinc)/sh_entropy.h $(srcinc)/sh_html.h $(srcinc)/sh_nmail.h $(srcinc)/sh_socket.h $(srcinc)/sh_static.h $(srcinc)/rijndael-api-fst.h $(srcinc)/sh_readconf.h $(srcinc)/zAVLTree.h $(srcinc)/sh_extern.h
+sh_xfer_client.o: $(srcsrc)/sh_xfer_client.c Makefile config_xor.h $(srcinc)/sh_ipvx.h $(srcinc)/samhain.h $(srcinc)/sh_tiger.h $(srcinc)/sh_utils.h $(srcinc)/sh_unix.h $(srcinc)/sh_xfer.h $(srcinc)/sh_srp.h $(srcinc)/sh_fifo.h $(srcinc)/sh_tools.h $(srcinc)/sh_entropy.h $(srcinc)/sh_html.h $(srcinc)/sh_nmail.h $(srcinc)/sh_socket.h $(srcinc)/sh_static.h $(srcinc)/rijndael-api-fst.h
+sh_xfer_server.o: $(srcsrc)/sh_xfer_server.c Makefile config_xor.h $(srcinc)/sh_ipvx.h $(srcinc)/samhain.h $(srcinc)/sh_tiger.h $(srcinc)/sh_utils.h $(srcinc)/sh_unix.h $(srcinc)/sh_xfer.h $(srcinc)/sh_srp.h $(srcinc)/sh_fifo.h $(srcinc)/sh_tools.h $(srcinc)/sh_entropy.h $(srcinc)/sh_html.h $(srcinc)/sh_nmail.h $(srcinc)/sh_socket.h $(srcinc)/sh_static.h $(srcinc)/sh_guid.h $(srcinc)/rijndael-api-fst.h $(srcinc)/sh_readconf.h $(srcinc)/zAVLTree.h $(srcinc)/sh_extern.h
+sh_xfer_syslog.o: $(srcsrc)/sh_xfer_syslog.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_tools.h $(srcinc)/sh_utils.h $(srcinc)/sh_ipvx.h
sh_modules.o: $(srcsrc)/sh_modules.c Makefile config_xor.h $(srcinc)/sh_modules.h $(srcinc)/sh_pthread.h $(srcinc)/sh_utmp.h $(srcinc)/sh_mounts.h $(srcinc)/sh_userfiles.h $(srcinc)/sh_suidchk.h $(srcinc)/sh_processcheck.h $(srcinc)/sh_portcheck.h $(srcinc)/sh_logmon.h $(srcinc)/sh_registry.h $(srcinc)/sh_fInotify.h
sh_utmp.o: $(srcsrc)/sh_utmp.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_utils.h $(srcinc)/sh_error.h $(srcinc)/sh_modules.h $(srcinc)/sh_utmp.h $(srcinc)/sh_pthread.h $(srcinc)/sh_inotify.h
-sh_kern.o: $(srcsrc)/sh_kern.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_pthread.h $(srcinc)/sh_utils.h $(srcinc)/sh_error.h $(srcinc)/sh_modules.h $(srcinc)/sh_kern.h sh_ks_xor.h $(srcinc)/sh_unix.h $(srcinc)/sh_hash.h
+sh_login_track.o: $(srcsrc)/sh_login_track.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_pthread.h $(srcinc)/sh_utils.h $(srcinc)/sh_unix.h $(srcinc)/sh_string.h $(srcinc)/sh_tools.h $(srcinc)/sh_ipvx.h $(srcinc)/sh_error_min.h $(srcinc)/CuTest.h $(srcinc)/CuTest.h
sh_suidchk.o: $(srcsrc)/sh_suidchk.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_pthread.h $(srcinc)/sh_utils.h $(srcinc)/sh_error.h $(srcinc)/sh_modules.h $(srcinc)/sh_suidchk.h $(srcinc)/sh_hash.h $(srcinc)/sh_dbIO.h $(srcinc)/sh_unix.h $(srcinc)/sh_files.h $(srcinc)/sh_schedule.h $(srcinc)/sh_calls.h $(srcinc)/zAVLTree.h
sh_srp.o: $(srcsrc)/sh_srp.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_tiger.h $(srcinc)/sh_mem.h $(srcinc)/sh_utils.h $(srcinc)/sh_srp.h $(srcinc)/bignum.h $(srcinc)/CuTest.h
sh_fifo.o: $(srcsrc)/sh_fifo.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_mem.h $(srcinc)/sh_unix.h $(srcinc)/sh_utils.h $(srcinc)/sh_string.h $(srcinc)/sh_fifo.h $(srcinc)/CuTest.h
sh_tools.o: $(srcsrc)/sh_tools.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_mem.h $(srcinc)/sh_error.h $(srcinc)/sh_tools.h $(srcinc)/sh_utils.h $(srcinc)/sh_tiger.h $(srcinc)/sh_static.h $(srcinc)/sh_pthread.h $(srcinc)/sh_ipvx.h $(srcinc)/rijndael-api-fst.h $(srcinc)/rijndael-api-fst.h
sh_html.o: $(srcsrc)/sh_html.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_xfer.h $(srcinc)/sh_error.h $(srcinc)/sh_unix.h $(srcinc)/sh_utils.h $(srcinc)/sh_html.h $(srcinc)/zAVLTree.h
-sh_gpg.o: $(srcsrc)/sh_gpg.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_utils.h $(srcinc)/sh_error.h $(srcinc)/sh_tiger.h $(srcinc)/sh_static.h $(srcinc)/sh_gpg.h
+sh_sig.o: $(srcsrc)/sh_sig.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_utils.h $(srcinc)/sh_error.h $(srcinc)/sh_tiger.h $(srcinc)/sh_static.h $(srcinc)/sh_sig.h
sh_cat.o: $(srcsrc)/sh_cat.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_error.h $(srcinc)/sh_cat.h
-sh_calls.o: $(srcsrc)/sh_calls.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_error.h $(srcinc)/sh_calls.h $(srcinc)/sh_ipvx.h $(srcinc)/sh_sub.h $(srcinc)/sh_utils.h
+sh_calls.o: $(srcsrc)/sh_calls.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_error.h $(srcinc)/sh_ipvx.h $(srcinc)/sh_sub.h $(srcinc)/sh_utils.h
sh_extern.o: $(srcsrc)/sh_extern.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_utils.h $(srcinc)/sh_unix.h $(srcinc)/sh_tiger.h $(srcinc)/sh_extern.h $(srcinc)/sh_calls.h $(srcinc)/sh_filter.h $(srcinc)/sh_static.h
sh_database.o: $(srcsrc)/sh_database.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_cat.h $(srcinc)/sh_error.h $(srcinc)/sh_utils.h
sh_err_log.o: $(srcsrc)/sh_err_log.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_error.h $(srcinc)/sh_utils.h $(srcinc)/sh_tiger.h
@@ -1643,7 +1681,6 @@ mkhdr.o: $(srcsrc)/mkhdr.c Makefile config.h
samhain_setpwd.o: $(srcsrc)/samhain_setpwd.c Makefile config_xor.h
samhain_stealth.o: $(srcsrc)/samhain_stealth.c Makefile config_xor.h
encode.o: $(srcsrc)/encode.c Makefile
-sstrip.o: $(srcsrc)/sstrip.c Makefile config.h
trustfile.o: $(srcsrc)/trustfile.c Makefile config_xor.h $(srcinc)/sh_calls.h $(srcinc)/slib.h $(srcinc)/sh_static.h $(srcinc)/sh_pthread.h
exepack.o: $(srcsrc)/exepack.c Makefile config.h $(srcinc)/minilzo.h $(srcinc)/exepack.data
exepack_fill.o: $(srcsrc)/exepack_fill.c Makefile config.h config.h $(srcinc)/minilzo.h
@@ -1659,31 +1696,26 @@ yulectl.o: $(srcsrc)/yulectl.c Makefile config_xor.h
sh_mounts.o: $(srcsrc)/sh_mounts.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_utils.h $(srcinc)/sh_error.h $(srcinc)/sh_modules.h $(srcinc)/sh_mounts.h
sh_userfiles.o: $(srcsrc)/sh_userfiles.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_modules.h $(srcinc)/sh_userfiles.h $(srcinc)/sh_utils.h $(srcinc)/sh_schedule.h $(srcinc)/sh_error.h $(srcinc)/sh_hash.h $(srcinc)/sh_files.h $(srcinc)/sh_static.h $(srcinc)/sh_pthread.h
sh_prelude.o: $(srcsrc)/sh_prelude.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_cat.h $(srcinc)/sh_error_min.h $(srcinc)/sh_prelude.h $(srcinc)/sh_static.h
-kern_head.o: $(srcsrc)/kern_head.c Makefile config.h $(srcinc)/kern_head.h $(srcinc)/kern_head.h
sh_prelink.o: $(srcsrc)/sh_prelink.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_tiger.h $(srcinc)/sh_extern.h $(srcinc)/sh_utils.h $(srcinc)/sh_unix.h
sh_static.o: $(srcsrc)/sh_static.c Makefile config_xor.h $(srcinc)/sh_pthread.h
-sh_async.o: $(srcsrc)/sh_async.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_calls.h $(srcinc)/sh_error.h
-sh_processcheck.o: $(srcsrc)/sh_processcheck.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_modules.h $(srcinc)/sh_processcheck.h $(srcinc)/sh_utils.h $(srcinc)/sh_error.h $(srcinc)/sh_extern.h $(srcinc)/sh_calls.h $(srcinc)/sh_pthread.h $(srcinc)/CuTest.h
sh_portcheck.o: $(srcsrc)/sh_portcheck.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_error.h $(srcinc)/sh_mem.h $(srcinc)/sh_calls.h $(srcinc)/sh_utils.h $(srcinc)/sh_modules.h $(srcinc)/sh_static.h $(srcinc)/sh_pthread.h $(srcinc)/sh_ipvx.h $(srcinc)/CuTest.h
+sh_port2proc.o: $(srcsrc)/sh_port2proc.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_utils.h $(srcinc)/sh_error_min.h $(srcinc)/sh_pthread.h $(srcinc)/sh_ipvx.h $(srcinc)/samhain.h $(srcinc)/sh_utils.h $(srcinc)/sh_ipvx.h
+sh_processcheck.o: $(srcsrc)/sh_processcheck.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_modules.h $(srcinc)/sh_processcheck.h $(srcinc)/sh_utils.h $(srcinc)/sh_error.h $(srcinc)/sh_extern.h $(srcinc)/sh_calls.h $(srcinc)/sh_pthread.h $(srcinc)/CuTest.h
+sh_filter.o: $(srcsrc)/sh_filter.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_utils.h $(srcinc)/sh_mem.h $(srcinc)/sh_filter.h
sh_pthread.o: $(srcsrc)/sh_pthread.c Makefile config_xor.h $(srcinc)/sh_pthread.h $(srcinc)/sh_calls.h $(srcinc)/sh_modules.h
sh_string.o: $(srcsrc)/sh_string.c Makefile config_xor.h $(srcinc)/sh_string.h $(srcinc)/sh_mem.h $(srcinc)/CuTest.h
-dnmalloc.o: $(srcsrc)/dnmalloc.c Makefile config.h
-t-test1.o: $(srcsrc)/t-test1.c Makefile config.h $(srcinc)/malloc.h
-sh_port2proc.o: $(srcsrc)/sh_port2proc.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_utils.h $(srcinc)/sh_error_min.h $(srcinc)/sh_pthread.h $(srcinc)/sh_ipvx.h $(srcinc)/samhain.h $(srcinc)/sh_utils.h $(srcinc)/sh_ipvx.h
sh_log_parse_syslog.o: $(srcsrc)/sh_log_parse_syslog.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_pthread.h $(srcinc)/sh_log_check.h $(srcinc)/sh_utils.h $(srcinc)/sh_string.h
sh_log_parse_pacct.o: $(srcsrc)/sh_log_parse_pacct.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_pthread.h $(srcinc)/sh_log_check.h $(srcinc)/sh_utils.h $(srcinc)/sh_string.h
+sh_log_parse_samba.o: $(srcsrc)/sh_log_parse_samba.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_pthread.h $(srcinc)/sh_log_check.h $(srcinc)/sh_string.h
+sh_log_parse_generic.o: $(srcsrc)/sh_log_parse_generic.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_log_check.h $(srcinc)/sh_string.h
sh_log_parse_apache.o: $(srcsrc)/sh_log_parse_apache.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_pthread.h $(srcinc)/sh_log_check.h $(srcinc)/sh_utils.h $(srcinc)/sh_string.h
sh_log_evalrule.o: $(srcsrc)/sh_log_evalrule.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_pthread.h $(srcinc)/sh_utils.h $(srcinc)/sh_string.h $(srcinc)/sh_log_check.h $(srcinc)/sh_log_evalrule.h $(srcinc)/sh_log_correlate.h $(srcinc)/sh_log_mark.h $(srcinc)/sh_log_repeat.h $(srcinc)/zAVLTree.h
-sh_log_check.o: $(srcsrc)/sh_log_check.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_pthread.h $(srcinc)/sh_utils.h $(srcinc)/sh_unix.h $(srcinc)/sh_string.h $(srcinc)/sh_log_check.h $(srcinc)/sh_log_evalrule.h $(srcinc)/sh_log_correlate.h $(srcinc)/sh_log_mark.h $(srcinc)/sh_log_repeat.h $(srcinc)/sh_extern.h $(srcinc)/sh_modules.h
-sh_log_parse_samba.o: $(srcsrc)/sh_log_parse_samba.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_pthread.h $(srcinc)/sh_log_check.h $(srcinc)/sh_string.h
-sh_nmail.o: $(srcsrc)/sh_nmail.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_pthread.h $(srcinc)/sh_mem.h $(srcinc)/sh_mail.h $(srcinc)/sh_tiger.h $(srcinc)/sh_string.h $(srcinc)/sh_utils.h $(srcinc)/sh_fifo.h $(srcinc)/sh_filter.h $(srcinc)/sh_mail_int.h $(srcinc)/zAVLTree.h
-sh_filter.o: $(srcsrc)/sh_filter.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_utils.h $(srcinc)/sh_mem.h $(srcinc)/sh_filter.h
-sh_inotify.o: $(srcsrc)/sh_inotify.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_pthread.h $(srcinc)/sh_calls.h $(srcinc)/sh_inotify.h $(srcinc)/sh_mem.h $(srcinc)/sh_utils.h $(srcinc)/slib.h $(srcinc)/zAVLTree.h $(srcinc)/sh_calls.h $(srcinc)/sh_inotify.h $(srcinc)/CuTest.h
sh_log_correlate.o: $(srcsrc)/sh_log_correlate.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_pthread.h $(srcinc)/sh_utils.h $(srcinc)/sh_string.h $(srcinc)/sh_log_check.h $(srcinc)/sh_log_evalrule.h
sh_log_mark.o: $(srcsrc)/sh_log_mark.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_pthread.h $(srcinc)/sh_mem.h $(srcinc)/sh_string.h $(srcinc)/sh_error_min.h $(srcinc)/sh_log_check.h $(srcinc)/sh_log_evalrule.h $(srcinc)/zAVLTree.h
+sh_log_check.o: $(srcsrc)/sh_log_check.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_pthread.h $(srcinc)/sh_utils.h $(srcinc)/sh_unix.h $(srcinc)/sh_string.h $(srcinc)/sh_log_check.h $(srcinc)/sh_log_evalrule.h $(srcinc)/sh_log_correlate.h $(srcinc)/sh_log_mark.h $(srcinc)/sh_log_repeat.h $(srcinc)/sh_extern.h $(srcinc)/sh_modules.h
+dnmalloc.o: $(srcsrc)/dnmalloc.c Makefile config.h
+sh_inotify.o: $(srcsrc)/sh_inotify.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_pthread.h $(srcinc)/sh_calls.h $(srcinc)/sh_inotify.h $(srcinc)/sh_mem.h $(srcinc)/sh_utils.h $(srcinc)/slib.h $(srcinc)/zAVLTree.h $(srcinc)/sh_calls.h $(srcinc)/sh_inotify.h $(srcinc)/CuTest.h
sh_log_repeat.o: $(srcsrc)/sh_log_repeat.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_pthread.h $(srcinc)/sh_utils.h $(srcinc)/sh_string.h $(srcinc)/sh_log_check.h $(srcinc)/sh_log_evalrule.h
-sh_log_parse_generic.o: $(srcsrc)/sh_log_parse_generic.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_log_check.h $(srcinc)/sh_string.h
-sh_login_track.o: $(srcsrc)/sh_login_track.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_pthread.h $(srcinc)/sh_utils.h $(srcinc)/sh_unix.h $(srcinc)/sh_string.h $(srcinc)/sh_tools.h $(srcinc)/sh_ipvx.h $(srcinc)/sh_error_min.h $(srcinc)/CuTest.h $(srcinc)/CuTest.h
sh_audit.o: $(srcsrc)/sh_audit.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_error.h $(srcinc)/sh_extern.h $(srcinc)/sh_utils.h
sh_registry.o: $(srcsrc)/sh_registry.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_pthread.h $(srcinc)/sh_utils.h $(srcinc)/sh_unix.h $(srcinc)/sh_modules.h $(srcinc)/sh_hash.h $(srcinc)/sh_tiger.h
sh_ipvx.o: $(srcsrc)/sh_ipvx.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_static.h $(srcinc)/sh_pthread.h $(srcinc)/sh_utils.h $(srcinc)/sh_ipvx.h $(srcinc)/CuTest.h
@@ -1693,11 +1725,9 @@ sh_sub.o: $(srcsrc)/sh_sub.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)
sh_fInotify.o: $(srcsrc)/sh_fInotify.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_utils.h $(srcinc)/sh_modules.h $(srcinc)/sh_pthread.h $(srcinc)/sh_inotify.h $(srcinc)/sh_unix.h $(srcinc)/sh_hash.h $(srcinc)/sh_dbIO.h $(srcinc)/sh_files.h $(srcinc)/sh_ignore.h
sh_checksum.o: $(srcsrc)/sh_checksum.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_checksum.h $(srcinc)/sh_utils.h $(srcinc)/CuTest.h
sh_guid.o: $(srcsrc)/sh_guid.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_utils.h $(srcinc)/CuTest.h
-sh_dbIO.o: $(srcsrc)/sh_dbIO.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_utils.h $(srcinc)/sh_dbIO_int.h $(srcinc)/sh_hash.h $(srcinc)/sh_dbIO.h $(srcinc)/sh_gpg.h $(srcinc)/sh_tiger.h $(srcinc)/sh_xfer.h $(srcinc)/sh_pthread.h $(srcinc)/sh_socket.h $(srcinc)/sh_files.h $(srcinc)/zAVLTree.h
+sh_sem.o: $(srcsrc)/sh_sem.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_sem.h $(srcinc)/sh_error_min.h
+sh_dbIO.o: $(srcsrc)/sh_dbIO.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_utils.h $(srcinc)/sh_dbIO_int.h $(srcinc)/sh_hash.h $(srcinc)/sh_dbIO.h $(srcinc)/sh_sig.h $(srcinc)/sh_tiger.h $(srcinc)/sh_xfer.h $(srcinc)/sh_pthread.h $(srcinc)/sh_socket.h $(srcinc)/sh_files.h $(srcinc)/zAVLTree.h
sh_dbCheck.o: $(srcsrc)/sh_dbCheck.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_unix.h $(srcinc)/sh_utils.h $(srcinc)/sh_hash.h $(srcinc)/sh_files.h $(srcinc)/sh_tiger.h $(srcinc)/sh_dbIO.h $(srcinc)/sh_dbIO_int.h $(srcinc)/sh_pthread.h
sh_dbCreate.o: $(srcsrc)/sh_dbCreate.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_utils.h $(srcinc)/sh_hash.h $(srcinc)/sh_files.h $(srcinc)/sh_dbIO.h $(srcinc)/sh_dbIO_int.h $(srcinc)/sh_pthread.h $(srcinc)/sh_guid.h
-sh_xfer_client.o: $(srcsrc)/sh_xfer_client.c Makefile config_xor.h $(srcinc)/sh_ipvx.h $(srcinc)/samhain.h $(srcinc)/sh_tiger.h $(srcinc)/sh_utils.h $(srcinc)/sh_unix.h $(srcinc)/sh_xfer.h $(srcinc)/sh_srp.h $(srcinc)/sh_fifo.h $(srcinc)/sh_tools.h $(srcinc)/sh_entropy.h $(srcinc)/sh_html.h $(srcinc)/sh_nmail.h $(srcinc)/sh_socket.h $(srcinc)/sh_static.h $(srcinc)/rijndael-api-fst.h
-sh_xfer_server.o: $(srcsrc)/sh_xfer_server.c Makefile config_xor.h $(srcinc)/sh_ipvx.h $(srcinc)/samhain.h $(srcinc)/sh_tiger.h $(srcinc)/sh_utils.h $(srcinc)/sh_unix.h $(srcinc)/sh_xfer.h $(srcinc)/sh_srp.h $(srcinc)/sh_fifo.h $(srcinc)/sh_tools.h $(srcinc)/sh_entropy.h $(srcinc)/sh_html.h $(srcinc)/sh_nmail.h $(srcinc)/sh_socket.h $(srcinc)/sh_static.h $(srcinc)/sh_guid.h $(srcinc)/rijndael-api-fst.h $(srcinc)/sh_readconf.h $(srcinc)/zAVLTree.h $(srcinc)/sh_extern.h
-sh_xfer_syslog.o: $(srcsrc)/sh_xfer_syslog.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_tools.h $(srcinc)/sh_utils.h $(srcinc)/sh_ipvx.h
-sh_xload_client.o: $(srcsrc)/sh_xload_client.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_utils.h $(srcinc)/sh_fifo.h $(srcinc)/sh_guid.h
-sh_sem.o: $(srcsrc)/sh_sem.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_sem.h $(srcinc)/sh_error_min.h
+sh_subuid.o: $(srcsrc)/sh_subuid.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_unix.h
+t-test1.o: $(srcsrc)/t-test1.c Makefile config.h $(srcinc)/malloc.h