rpms/sectool/F-9 sectool-0.7.4-aliases.patch, NONE, 1.1 sectool.spec, 1.8, 1.9

Peter Vrabec (pvrabec) fedora-extras-commits at redhat.com
Thu May 22 14:41:59 UTC 2008


Author: pvrabec

Update of /cvs/extras/rpms/sectool/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31154

Modified Files:
	sectool.spec 
Added Files:
	sectool-0.7.4-aliases.patch 
Log Message:
fix aliases fullpath issue


sectool-0.7.4-aliases.patch:

--- NEW FILE sectool-0.7.4-aliases.patch ---
diff --git a/tests/aliases.sh b/tests/aliases.sh
index ea578ce..6d9c274 100755
--- a/tests/aliases.sh
+++ b/tests/aliases.sh
@@ -41,9 +41,10 @@ bash -i -c 'alias' | sed 's/^alias//' |
 		if [[ "$is_command" == "1" ]]
 		then
 			fullpath="`which $command 2>&1`"
-			
+			commandWithoutPath="`basename $command`"	
+
 			# does is exist?
-			if [[ "`echo "$fullpath" |grep -c "no $command in"`" == "1" ]]
+			if [[ "`echo "$fullpath" |grep -c "no $commandWithoutPath in"`" == "1" ]]
 			then
 				if [[ "$command" != "alias" ]] # fedora uses something strange for 'which'..
 				then


Index: sectool.spec
===================================================================
RCS file: /cvs/extras/rpms/sectool/F-9/sectool.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sectool.spec	22 May 2008 12:41:50 -0000	1.8
+++ sectool.spec	22 May 2008 14:41:19 -0000	1.9
@@ -1,10 +1,13 @@
 Summary: A security audit system and intrusion detection system
 Name: sectool
 Version: 0.7.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: https://hosted.fedoraproject.org/sectool/wiki/WikiStart
+
 Source0: %{name}-%{version}.tar.bz2
 Patch1: sectool-0.7.4-filesystem.patch
+Patch2: sectool-0.7.4-aliases.patch
+
 License: GPLv2+
 Group: Applications/System
 Requires: python2 gettext coreutils rpm-python
@@ -32,6 +35,7 @@
 %prep
 %setup -q
 %patch1 -p1 -b .filesystem
+%patch2 -p1 -b .aliases
 
 %build
 make %{?_smp_mflags}
@@ -93,6 +97,9 @@
 
 
 %changelog
+* Thu May 22 2008 Peter Vrabec <pvrabec at redhat.com> - 0.7.4-3
+- fix aliases fullpath issue
+
 * Thu May 22 2008 Peter Vrabec <pvrabec at redhat.com> - 0.7.4-2
 - filesystem: distinguish between world and group +w permission
 




More information about the scm-commits mailing list