rpms/rkhunter/devel rkhunter-1.1.9-0.fdr.1.src.md5, NONE, 1.1 rkhunter-1.1.9-app_check_default.patch, NONE, 1.1 rkhunter-1.1.9-prelink_cleanup.patch, NONE, 1.1 rkhunter-1.1.9-shared_man_search.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 rkhunter.spec, 1.2, 1.3 sources, 1.2, 1.3 rkhunter-1.1.8-0.fdr.1.src.md5, 1.1, NONE rkhunter-1.1.8-app_check_default.patch, 1.1, NONE rkhunter-1.1.8-prelink_cleanup.patch, 1.1, NONE rkhunter-1.1.8-shared_man_search.patch, 1.1, NONE

Michael Schwendt (mschwendt) fedora-extras-commits at redhat.com
Fri Jan 7 08:31:37 UTC 2005 

Author: mschwendt

Update of /cvs/extras/rpms/rkhunter/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv13254/devel

Modified Files:
	.cvsignore rkhunter.spec sources 
Added Files:
	rkhunter-1.1.9-0.fdr.1.src.md5 
	rkhunter-1.1.9-app_check_default.patch 
	rkhunter-1.1.9-prelink_cleanup.patch 
	rkhunter-1.1.9-shared_man_search.patch 
Removed Files:
	rkhunter-1.1.8-0.fdr.1.src.md5 
	rkhunter-1.1.8-app_check_default.patch 
	rkhunter-1.1.8-prelink_cleanup.patch 
	rkhunter-1.1.8-shared_man_search.patch 
Log Message:
auto-import rkhunter-1.1.9-1 on branch devel from rkhunter-1.1.9-1.src.rpm


--- NEW FILE rkhunter-1.1.9-0.fdr.1.src.md5 ---
2e24806cb1267124fba6132009e30f1b  ../SOURCES/rkhunter-1.1.9.tar.gz
0728cef20dde6817c36ef5787286b6f6  ../SOURCES/rkhunter-scan_on_boot-rc.local.tar.gz
22ad8521939744a7889d4fd8e6dad619  ../SOURCES/rkhunter-1.1.9-shared_man_search.patch
b1525a7b472b96c669d6b7cd9048d6ed  ../SOURCES/rkhunter-1.1.8-showfiles.patch
a76e5bcece252676355fd97b791f1000  ../SOURCES/rkhunter-1.1.8-whitelist_dir-conf.patch
7d2857462a1555dff41b467d6272b35d  ../SOURCES/rkhunter-1.1.9-app_check_default.patch
2559461d3064ee82eda4d227c40a21d9  ../SOURCES/rkhunter-1.1.9-prelink_cleanup.patch

rkhunter-1.1.9-app_check_default.patch:

--- NEW FILE rkhunter-1.1.9-app_check_default.patch ---
--- files/rkhunter.orig	2004-12-28 12:45:21.000000000 -0500
+++ files/rkhunter	2004-12-31 13:53:16.000000000 -0500
@@ -49,7 +49,7 @@
 # Skip passwd/group check
 PASSWDCHECK_SKIP=0
 # Application check
-APPLICATION_CHECK=1
+APPLICATION_CHECK=0
 
 USE_PATCHED_SOFTWARE=0
 
@@ -186,6 +186,9 @@
           shift
 	  ROOTDIR=$1
           ;;
+      --run-application-check | --runapplicationcheck | --run-applicationcheck)
+          APPLICATION_CHECK=1
+          ;;
       --scan-knownbad-files)
           PERFORMKNOWNBAD=1
           ;;
@@ -4957,7 +4960,8 @@
     echo $ECHOOPT "--report-mode*            : Don't show uninteresting information for reports"
     echo $ECHOOPT "--report-warnings-only*   : Show only warnings (lesser output than --report-mode,"
     echo $ECHOOPT "                            more than --quiet)"
-    echo $ECHOOPT "--skip-application-check* : Don't run application version checks"
+#    echo $ECHOOPT "--skip-application-check* : Don't run application version checks"
+    echo $ECHOOPT "--run-application-check*  : Run application version checks"
     echo $ECHOOPT "--skip-keypress*          : Don't wait after every test (non-interactive)"
     echo $ECHOOPT "--quick*                  : Perform quick scan (instead of full scan)"
     echo $ECHOOPT "--quiet*                  : Be quiet (only show warnings)"    

rkhunter-1.1.9-prelink_cleanup.patch:

--- NEW FILE rkhunter-1.1.9-prelink_cleanup.patch ---
--- files/rkhunter.orig	2004-12-28 12:45:21.000000000 -0500
+++ files/rkhunter	2004-12-31 13:38:30.000000000 -0500
@@ -2304,6 +2304,8 @@
 	  lastfile="${file}"
  
 	done
+	
+	[ -f ${TMPDIR}/prelink.tst ] && rm -f ${TMPDIR}/prelink.tst
 
 	if [ ${WARNING} -eq 1 ]; then
 	  displaytext "--------------------------------------------------------------------------------"

rkhunter-1.1.9-shared_man_search.patch:

--- NEW FILE rkhunter-1.1.9-shared_man_search.patch ---
--- files/rkhunter.orig	2004-12-28 12:45:21.000000000 -0500
+++ files/rkhunter	2004-12-31 13:25:53.000000000 -0500
@@ -4127,7 +4127,7 @@
 	
 	displaytext -n "   Scanning for hidden files..."
 
-	SEARCHINDIRS="/dev /bin /usr /usr/man /usr/man/man1 /usr/man/man8 /usr/bin /usr/sbin /sbin /etc"
+	SEARCHINDIRS="/dev /bin /usr /usr/share/man /usr/share/man/man1 /usr/share/man/man8 /usr/bin /usr/sbin /sbin /etc"
 	# Only reset status once
 	STATUS=0
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:17:52 -0000	1.2
+++ .cvsignore	7 Jan 2005 08:31:35 -0000	1.3
@@ -1,2 +1,2 @@
-rkhunter-1.1.8.tar.gz
 rkhunter-scan_on_boot-rc.local.tar.gz
+rkhunter-1.1.9.tar.gz


Index: rkhunter.spec
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/devel/rkhunter.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rkhunter.spec	10 Dec 2004 22:03:10 -0000	1.2
+++ rkhunter.spec	7 Jan 2005 08:31:35 -0000	1.3
@@ -4,7 +4,7 @@
 AutoReqProv:    no
 
 Name:           rkhunter
-Version:        1.1.8
+Version:        1.1.9
 Release:        1
 Epoch:          0
 Summary:        Rootkit Hunter scans for rootkits, backdoors and local exploits.
@@ -12,14 +12,14 @@
 Group:          Applications/System
 License:        GPL
 URL:            http://www.rootkit.nl/
-Source0:        http://downloads.rootkit.nl/rkhunter-1.1.8.tar.gz
+Source0:        http://downloads.rootkit.nl/rkhunter-1.1.9.tar.gz
 Source1:        rkhunter-scan_on_boot-rc.local.tar.gz
-Source2:        rkhunter-1.1.8-0.fdr.1.src.md5
+Source2:        rkhunter-1.1.9-0.fdr.1.src.md5
 Patch1:         rkhunter-1.1.8-whitelist_dir-conf.patch
 Patch2:         rkhunter-1.1.8-showfiles.patch
-Patch3:         rkhunter-1.1.8-shared_man_search.patch
-Patch4:         rkhunter-1.1.8-app_check_default.patch
-Patch5:         rkhunter-1.1.8-prelink_cleanup.patch
+Patch3:         rkhunter-1.1.9-shared_man_search.patch
+Patch4:         rkhunter-1.1.9-app_check_default.patch
+Patch5:         rkhunter-1.1.9-prelink_cleanup.patch
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -59,18 +59,21 @@
 
 %{__perl} -pi.orig -e '
 	s|\@RKLIB\@|%{_libdir}/%{name}|g;
-	s|\@RCDIR\@|%{_sysconfdir}/rc.d|g;
 	s|\@LGDIR\@|%{_localstatedir}/log|g;
-    ' rkhunter-scan_on_boot
-
-%{__perl} -pi.orig -e '
 	s|\@RCDIR\@|%{_sysconfdir}/rc.d|g;
 	s|\@ITDIR\@|%{_initrddir}|g;
 	s|\@SCDIR\@|%{_sysconfdir}/sysconfig|g;
 	s|\@RKEXE\@|%{_bindir}/%{name}|g;
-    ' rkhunter-scan_on_boot-rc.local
+    ' rkhunter-scan_on_boot \
+        rkhunter-scan_on_boot-rc.local
+
+%{__perl} -pi.orig -e '
+	s|^#$|INSTALLDIR=%{_prefix}|;
+	s|^#(TMPDIR=).+$|$1%{_var}/%{name}/tmp|;
+	s|^#(DBDIR=).+$|$1%{_var}/%{name}/db|;
+    ' files/%{name}.conf
 
-%patch1 -b .orig
+%patch1 -b .0001
 %patch2 -b .orig
 %patch3 -b .orig
 %patch4 -b .0001
@@ -86,16 +89,6 @@
 "
 EOF
 
-%{__cat} <<'EOF' >%{name}.conf
-## Next three lines installed automatically by RPM. Do not change
-## unless you know what you're doing...
-INSTALLDIR=%{_prefix}
-DBDIR=%{_var}/%{name}/db
-TMPDIR=%{_var}/%{name}/tmp
-
-EOF
-%{__cat} files/%{name}.conf >> %{name}.conf
-
 %{__cat} <<'EOF' >01-%{name}
 #!/bin/sh
 %{_bindir}/%{name} --cronjob | /bin/mail -s '%{name} Daily Run' root
@@ -143,7 +136,7 @@
 %{__install} -m750 -p files/showfiles.pl        ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/
 %{__install} -m750 -p 01-%{name}                ${RPM_BUILD_ROOT}%{_sysconfdir}/cron.daily/
 %{__install} -m750 -p rkhunter-scan_on_boot-rc.local ${RPM_BUILD_ROOT}%{_libdir}/%{name}/rc.d/rc.local
-%{__install} -m640 -p %{name}.conf              ${RPM_BUILD_ROOT}%{_sysconfdir}/
+%{__install} -m640 -p files/%{name}.conf        ${RPM_BUILD_ROOT}%{_sysconfdir}/
 %{__install} -m640 -p %{name}.sysconfig         ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/%{name}
 
 
@@ -151,7 +144,7 @@
 %{__rm} -rf $RPM_BUILD_ROOT
 # Autoclean for rpmbuild -bb
 #cd ..
-#%{__rm} -rf %{name}
+#[ ! -d %{name} ] || %{__rm} -rf %{name}
 
 
 %postun
@@ -179,6 +172,14 @@
 
 
 %changelog
+* Sun Jan 2 2005 Greg Houlette <tamaster at tekarmory.com> - 0:1.1.9-1
+- New package version release
+- Added the --run-application-check command line option
+  to listing in command help
+- Replaced 'Here' Doc editing of rkhunter.conf file
+  with in-place Perl edit
+- tweaked rpmbuild -bb Autoclean
+
 * Fri Oct 15 2004 Greg Houlette - 0:1.1.8-0.fdr.1 (revisited)
 - Removed redundant buildrequires /bin/sh, coreutils and perl
 - Revise postun scriptlet


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:17:52 -0000	1.2
+++ sources	7 Jan 2005 08:31:35 -0000	1.3
@@ -1,2 +1,2 @@
-91cae6f04582fb0b27c96784ffe5adae  rkhunter-1.1.8.tar.gz
 0728cef20dde6817c36ef5787286b6f6  rkhunter-scan_on_boot-rc.local.tar.gz
+2e24806cb1267124fba6132009e30f1b  rkhunter-1.1.9.tar.gz


--- rkhunter-1.1.8-0.fdr.1.src.md5 DELETED ---


--- rkhunter-1.1.8-app_check_default.patch DELETED ---


--- rkhunter-1.1.8-prelink_cleanup.patch DELETED ---


--- rkhunter-1.1.8-shared_man_search.patch DELETED ---

More information about the fedora-extras-commits mailing list