--- rpms/rkhunter/sme7/rkhunter.spec	2007/12/17 22:24:22	1.4
+++ rpms/rkhunter/sme7/rkhunter.spec	2008/01/29 19:43:19	1.7
@@ -7,7 +7,7 @@
 
 %define name rkhunter
 %define ver 1.3.0
-%define rel 2
+%define rel 5
 %define epoch 0
 
 # Don't change this define or also:
@@ -29,6 +29,7 @@ License: GPL
 Group: Applications/System
 Source0: %{name}-%{version}.tar.gz
 Patch0: rkhunter-installer.patch
+Patch1: rkhunter-nolib.patch
 BuildArch: noarch
 Requires: filesystem, bash, grep, findutils, net-tools, coreutils, e2fsprogs, modutils, procps, binutils, wget, perl
 Provides: %{name}
@@ -54,6 +55,7 @@ Rootkit Hunter is released as a GPL lice
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 
@@ -61,16 +63,17 @@ Rootkit Hunter is released as a GPL lice
 sh ./installer.sh --layout RPM --install
 
 sed -i 's_#ALLOWPROCLISTEN=/sbin/dhclient_ALLOWPROCLISTEN=/sbin/dhclient_' ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}.conf
-sed -i 's_#ALLOWPROCLISTEN=/usr/sbin/pppoe_ALLOWPROCLISTEN=/usr/sbin/pppoe_' ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}.conf
+sed -i 's_#ALLOWPROCLISTEN=/usr/sbin/pppoe_ALLOWPROCLISTEN=/sbin/pppoe_' ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}.conf
 sed -i 's_#ALLOWHIDDENFILE=/usr/share/man/man1/..1.gz_ALLOWHIDDENFILE=/usr/share/man/man1/..1.gz_' ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}.conf
 sed -i '/#ALLOWPROCLISTEN=\/usr\/bin\/dhcpcd/iALLOWPROCLISTEN=\/usr\/sbin\/dhcpd' ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}.conf
 sed -i '/#ALLOWPROCDELFILE=\/usr\/sbin\/mysqld/aALLOWPROCDELFILE=\/usr\/sbin\/httpd' ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}.conf
+sed -i '/#ALLOWPROCLISTEN=\/usr\/local\/bin\/wpa_supplicant/aALLOWPROCLISTEN=\/usr\/sbin\/asterisk' ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}.conf
 
 # Make a cron.daily file to mail us the reports
 %{__mkdir} -p "${RPM_BUILD_ROOT}/%{_sysconfdir}/cron.daily"
 %{__cat} > "${RPM_BUILD_ROOT}/%{_sysconfdir}/cron.daily/01-rkhunter" <<EOF
 #!/bin/sh
-%{_bindir}/rkhunter --cronjob --update --disable apps,system_commands --rwo
+%{_bindir}/rkhunter --cronjob --update --disable apps,suspscan,system_commands --rwo
 exit 0
 EOF
 %{__chmod} a+rwx,g-w,o-rwx ${RPM_BUILD_ROOT}%{_sysconfdir}/cron.daily/01-rkhunter
@@ -79,8 +82,8 @@ EOF
 %post
 # Only do this on an initial install
 if [ $1 -eq 1 ]; then
-	%{__cp} -p /etc/passwd /var/lib/rkhunter/tmp >/dev/null 2>&1 || :
-	%{__cp} -p /etc/group /var/lib/rkhunter/tmp >/dev/null 2>&1 || :
+	%{__cp} -p /etc/passwd /var/rkhunter/tmp >/dev/null 2>&1 || :
+	%{__cp} -p /etc/group /var/rkhunter/tmp >/dev/null 2>&1 || :
 fi
 
 
@@ -88,7 +91,7 @@ fi
 # Only do this when removing the RPM
 if [ $1 -eq 0 ]; then
 	%{__rm} -f /var/log/rkhunter.log /var/log/rkhunter.log.old >/dev/null 2>&1
-	%{__rm} -rf /var/lib/rkhunter/* >/dev/null 2>&1
+	%{__rm} -rf /var/rkhunter/* >/dev/null 2>&1
 fi
 
 
@@ -113,16 +116,26 @@ fi
 %attr(644,root,root) %doc %{_prefix}/share/man/man8/%{name}.8.gz
 %attr(755,root,root) %dir %{docdir}
 %attr(644,root,root) %doc %{docdir}/*
-%attr(750,root,root) %dir %{_var}/lib/%{name}
-%attr(750,root,root) %dir %{_var}/lib/%{name}/db
-%attr(640,root,root) %{_var}/lib/%{name}/db/*.dat
-%attr(750,root,root) %dir %{_var}/lib/%{name}/db/i18n
-%attr(640,root,root) %{_var}/lib/%{name}/db/i18n/*
-%attr(750,root,root) %dir %{_var}/lib/%{name}/tmp
+%attr(750,root,root) %dir %{_var}/%{name}
+%attr(750,root,root) %dir %{_var}/%{name}/db
+%attr(640,root,root) %{_var}/%{name}/db/*.dat
+%attr(750,root,root) %dir %{_var}/%{name}/db/i18n
+%attr(640,root,root) %{_var}/%{name}/db/i18n/*
+%attr(750,root,root) %dir %{_var}/%{name}/tmp
 %{_sysconfdir}/cron.daily/01-rkhunter
 
 
 %changelog
+* Tue Jan 29 2008 Shad L. Lords <slords@mail.com> 1.3.0-5
+- Correct pppoe binary location.
+- Add asterisk binary to allow deleted files. [SME: 3795]
+
+* Mon Jan 7 2008 Shad L. Lords <slords@mail.com> 1.3.0-4
+- Disable scan for suspicious files until fixed [SME: 3713]
+
+* Mon Dec 17 2007 Shad L. Lords <slords@mail.com> 1.3.0-3
+- Change /var/lib to /var to be consistent with previous versions
+
 * Mon Dec 17 2007 Shad L. Lords <slords@mail.com> 1.3.0-2
 - Add a few more services for sme tests