Revisions of maldetect

Danilo Godec's avatar Danilo Godec (danci1973) committed (revision 220)
Danilo Godec's avatar Danilo Godec (danci1973) committed (revision 219)
Danilo Godec's avatar Danilo Godec (danci1973) committed (revision 218)
Cleanup ...


M    maldetect.spec

Diff for working copy: .
Index: maldetect.spec
===================================================================

--- maldetect.spec	(revision 217)
+++ maldetect.spec	(working copy)
@@ -7,8 +7,6 @@
 Group:		Applications/File
 License:	GPL-2.0
 URL:		http://www.rfxn.com/projects/linux-malware-detect/
-
-%define		strongswan_docdir	%{_docdir}/%{name}
 
 # The author does not provide a way of download a specifc version.
 # The md5sum of the tarball in this SRPM will differ becasue the signatures
Danilo Godec's avatar Danilo Godec (danci1973) committed (revision 217)
Added dependency 'ed'


M    maldetect.spec

Diff for working copy: .
Index: maldetect.spec
===================================================================

--- maldetect.spec	(revision 216)
+++ maldetect.spec	(working copy)
@@ -93,6 +93,7 @@
 %endif
 
 Requires:	wget 
+Requires:	ed
 Requires:	tmpwatch
 Requires:	clamav
 Requires:	inotify-tools >= 3.14
Danilo Godec's avatar Danilo Godec (danci1973) committed (revision 216)
Apparently, %service_add_post is just a SuSE thing...


M    maldetect.spec

Diff for working copy: .
Index: maldetect.spec
===================================================================

--- maldetect.spec	(revision 215)
+++ maldetect.spec	(working copy)
@@ -219,7 +219,7 @@
 %if 0%{?suse_version}
 %fillup_and_insserv
 %endif
-%if 0%{?has_systemd}
+%if 0%{?suse_version} >= 1310
 %service_add_post maldetect.service
 %endif
Danilo Godec's avatar Danilo Godec (danci1973) committed (revision 215)
A little cleanup of '%post'


M    maldetect.spec

Diff for working copy: .
Index: maldetect.spec
===================================================================

--- maldetect.spec	(revision 214)
+++ maldetect.spec	(working copy)
@@ -228,8 +228,6 @@
 %set_permissions /etc/cron.daily
 %endif
 
-#/usr/bin/maldet -u
-
 %files
 %defattr(-,root,root,-)
 %doc CHANGELOG COPYING.GPL README
Danilo Godec's avatar Danilo Godec (danci1973) committed (revision 214)
Removed cron for daily restarting...

M    maldet.cron

Diff for working copy: .
Index: maldet.cron
===================================================================

--- maldet.cron	(revision 213)
+++ maldet.cron	(working copy)
@@ -1,5 +1,2 @@
 # Check webs
 35 2 * * * root /usr/bin/maldet -co quarantine_hits=0 -a /srv/www
-
-# Restart maldetect every hour - until we find a proper fix
-0 * * * * root /usr/bin/maldet_restart.sh &> /dev/null
Danilo Godec's avatar Danilo Godec (danci1973) committed (revision 213)
Try solving 'permissions' trouble with older OpenSuSE

M    maldetect.spec

Diff for working copy: .
Index: maldetect.spec
===================================================================

--- maldetect.spec	(revision 212)
+++ maldetect.spec	(working copy)
@@ -222,8 +222,11 @@
 %if 0%{?has_systemd}
 %service_add_post maldetect.service
 %endif
+
+%if 0%{?suse_version} > 120300
 %set_permissions /etc/cron.d
 %set_permissions /etc/cron.daily
+%endif
 
 #/usr/bin/maldet -u
Danilo Godec's avatar Danilo Godec (danci1973) committed (revision 212)
Try to fix bash location

M    maldet.cron.daily
M    restart_maldet.sh

Diff for working copy: .
Index: maldet.cron.daily
===================================================================

--- maldet.cron.daily	(revision 211)
+++ maldet.cron.daily	(working copy)
@@ -1,4 +1,4 @@
-#!/usr/bin/bash
+#!/usr/bin/env bash
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:$PATH
 export LMDCRON=1
 inspath="/usr/lib/maldetect"

Index: restart_maldet.sh
===================================================================

--- restart_maldet.sh	(revision 211)
+++ restart_maldet.sh	(working copy)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 
 if [ -f /etc/init.d/maldet ]; then
Danilo Godec's avatar Danilo Godec (danci1973) committed (revision 211)
Spec file fix.
Danilo Godec's avatar Danilo Godec (danci1973) committed (revision 210)
Forgot one patch....


M    maldetect-inotify-watches.patch

Diff for working copy: .
Index: maldetect-inotify-watches.patch
===================================================================

--- maldetect-inotify-watches.patch	(revision 209)
+++ maldetect-inotify-watches.patch	(working copy)
@@ -0,0 +1,12 @@
+diff -Nur maldetect-1.6.1-orig/files/internals/functions maldetect-1.6.1-new/files/internals/functions
+--- maldetect-1.6.1-orig/files/internals/functions	2017-06-09 10:06:12.319586219 +0200
++++ maldetect-1.6.1-new/files/internals/functions	2017-06-09 10:06:20.839660178 +0200
+@@ -1551,7 +1551,7 @@
+ 		exit
+ 	fi
+ 	users_tot=`cat /etc/passwd | grep -ic home`
+-	inotify_user_watches=$[inotify_base_watches*users_tot]
++	inotify_user_watches=$[inotify_base_watches*users_tot+1]
+ 	
+ 	if [ "$cur_user_instances" -lt "$inotify_user_instances" ]; then
+ 		eout "{mon} set inotify max_user_instances to $inotify_user_instances" 1
Danilo Godec's avatar Danilo Godec (danci1973) committed (revision 209)
New conf file version
Danilo Godec's avatar Danilo Godec (danci1973) committed (revision 208)
PID file locaton...

M    maldetect.service

Diff for working copy: .
Index: maldetect.service
===================================================================

--- maldetect.service	(revision 207)
+++ maldetect.service	(working copy)
@@ -7,7 +7,7 @@
 ExecStart=/usr/bin/maldet --monitor $MONITOR_MODE
 ExecStop=/usr/bin/maldet --kill-monitor
 Type=forking
-PIDFile=/var/lib/maldetect/tmp/inotifywait.pid
+PIDFile=/usr/lib/maldetect/tmp/inotifywait.pid
 Restart=always
 [Install]
 WantedBy=multi-user.target
Danilo Godec's avatar Danilo Godec (danci1973) committed (revision 207)
Further path corrections...
Danilo Godec's avatar Danilo Godec (danci1973) committed (revision 206)
Removed .orig files from patch
Danilo Godec's avatar Danilo Godec (danci1973) committed (revision 205)
Fixes for 1.6.5 version ...
Danilo Godec's avatar Danilo Godec (danci1973) committed (revision 204)
Danilo Godec's avatar Danilo Godec (danci1973) committed (revision 203)
Trying to fix spec file for CentOS builds...


M    maldetect.spec

Diff for working copy: .
Index: maldetect.spec
===================================================================

--- maldetect.spec	(revision 201)
+++ maldetect.spec	(working copy)
@@ -74,7 +74,10 @@
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+
+%if 0%{?suse_version}
 PreReq:		permissions
+%endif
 
 %if 0%{?suse_version} < 1500
 PreReq:	 %insserv_prereq %fillup_prereq
Danilo Godec's avatar Danilo Godec (danci1973) committed (revision 202)
Danilo Godec's avatar Danilo Godec (danci1973) committed (revision 201)
Tried to fix spec and rpmlintrc to make it build...
Displaying revisions 1 - 20 of 220
openSUSE Build Service is sponsored by