rpms/sectool/devel sectool-0.9.4-deleted.patch, NONE, 1.1 sectool-0.9.4-permissions.patch, 1.1, 1.2 sectool.spec, 1.37, 1.38

Thu May 27 10:24:05 UTC 2010

Author: pvrabec

Update of /cvs/extras/rpms/sectool/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv11828

Modified Files:
	sectool-0.9.4-permissions.patch sectool.spec 
Added Files:
	sectool-0.9.4-deleted.patch 
Log Message:
- filter (deleted) files in netserv
- create empty log file after installation
- fix expected permissions on shadow/gshadow



sectool-0.9.4-deleted.patch:
 netserv.sh |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE sectool-0.9.4-deleted.patch ---
diff -up sectool-0.9.4/tests/netserv.sh.deleted sectool-0.9.4/tests/netserv.sh
--- sectool-0.9.4/tests/netserv.sh.deleted	2010-05-25 11:13:10.847410598 +0200
+++ sectool-0.9.4/tests/netserv.sh	2010-05-25 11:14:25.615296772 +0200
@@ -285,7 +285,10 @@ for p in ${PID[@]}; do 
    case "${FILE}" in
    	*.#prelink#.*)
    	   FILE="`echo ${FILE} | sed -n 's|^\(.*\)\.#prelink#\..*$|\1|p'`"
-   	;;
+	;;
+   	*\(deleted\))
+	   FILE="`echo ${FILE} | sed -n 's|^\(.*\)[[:space:]](deleted)$|\1|p'`"
+	;;
    esac
 
    case "`basename \"${FILE}\"`" in

sectool-0.9.4-permissions.patch:
 permissions.sh |   18 +++++++++---------
 shadow.sh      |    4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

Index: sectool-0.9.4-permissions.patch
===================================================================
RCS file: /cvs/extras/rpms/sectool/devel/sectool-0.9.4-permissions.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sectool-0.9.4-permissions.patch	23 Apr 2010 14:00:50 -0000	1.1
+++ sectool-0.9.4-permissions.patch	27 May 2010 10:24:04 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up sectool-0.9.4/tests/permissions.sh.old sectool-0.9.4/tests/permissions.sh
---- sectool-0.9.4/tests/permissions.sh.old	2010-04-23 14:11:21.809668140 +0200
-+++ sectool-0.9.4/tests/permissions.sh	2010-04-23 14:09:11.761669009 +0200
+diff -up sectool-0.9.4/tests/permissions.sh.perm sectool-0.9.4/tests/permissions.sh
+--- sectool-0.9.4/tests/permissions.sh.perm	2009-08-24 15:34:48.000000000 +0200
++++ sectool-0.9.4/tests/permissions.sh	2010-05-25 13:33:14.724541772 +0200
 @@ -25,25 +25,25 @@ E_DOESNT_EXIST=1
  E_WRONG_OWNER=2
  E_WRONG_PERM=3
@@ -36,3 +36,17 @@ diff -up sectool-0.9.4/tests/permissions
    /usr/share 755
    /usr/src 755
    /usr/local 755
+diff -up sectool-0.9.4/tests/shadow.sh.perm sectool-0.9.4/tests/shadow.sh
+--- sectool-0.9.4/tests/shadow.sh.perm	2010-05-25 13:35:48.966534888 +0200
++++ sectool-0.9.4/tests/shadow.sh	2010-05-25 13:36:02.557293905 +0200
+@@ -54,8 +54,8 @@ then
+ fi
+ 
+ # permissions on /etc/shadow and /etc/gshadow should be 400, should be owned by root:root
+-check_file_perm $shadow 400 root:root  1 $E_BAD_PERMISSIONS_SHADOW "User shadow database"
+-check_file_perm $group_shadow 400 root:root  1 $E_BAD_PERMISSIONS_SHADOW "Group shadow database"
++check_file_perm $shadow 000 root:root  1 $E_BAD_PERMISSIONS_SHADOW "User shadow database"
++check_file_perm $group_shadow 000 root:root  1 $E_BAD_PERMISSIONS_SHADOW "Group shadow database"
+ 
+ 
+ {


Index: sectool.spec
===================================================================
RCS file: /cvs/extras/rpms/sectool/devel/sectool.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- sectool.spec	23 Apr 2010 14:00:52 -0000	1.37
+++ sectool.spec	27 May 2010 10:24:05 -0000	1.38
@@ -1,9 +1,9 @@
 Summary: A security audit system and intrusion detection system
 Name: sectool
 Version: 0.9.4
-Release: 7%{?dist}
+Release: 8%{?dist}
 URL: https://hosted.fedoraproject.org/sectool/wiki/WikiStart
-Source0: %{name}-%{version}.tar.bz2
+Source0: https://fedorahosted.org/releases/s/e/sectool/%{name}-%{version}.tar.bz2
 Source1: sectool.log
 Patch1: sectool-0.9.2-optflags.patch
 Patch2: sectool-0.9.4-pk1.patch
@@ -11,13 +11,14 @@ Patch3: sectool-0.9.4-policykit-fix.patc
 Patch4: sectool-0.9.4-dbus-fix.patch
 Patch5: sectool-0.9.4-rpmio.patch
 Patch6: sectool-0.9.4-permissions.patch
+Patch7: sectool-0.9.4-deleted.patch
 License: GPLv2+
 Group: Applications/System
-Requires: gettext coreutils libselinux python-slip-dbus PolicyKit dbus
-Requires: python2 rpm-python libselinux-python glibc-headers
+Requires: gettext coreutils python-slip-dbus PolicyKit dbus
+Requires: python2 rpm-python
 BuildRequires: desktop-file-utils gettext intltool asciidoc
 BuildRequires: rpm-devel >= 4.6.0
-BuildRequires: libselinux-devel glibc-headers
+BuildRequires: libselinux-devel libselinux-python glibc-headers 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Temporarily disable check-buildroot
@@ -51,6 +52,7 @@ sectool-gui provides a GTK-based graphic
 %patch4 -p1 -b .dbus
 %patch5 -p1 -b .rpmio
 %patch6 -p1 -b .perm
+%patch7 -p1 -b .deleted
 
 %build
 make %{?_smp_mflags}
@@ -74,6 +76,8 @@ sed -i 's,TDATA_DIR_BASE=\(.*\),TDATA_DI
 sed -i 's,__ico_path = \(.*\),__ico_path = "%{_datadir}/pixmaps/sectool/",' $RPM_BUILD_ROOT%{_datadir}/sectool/guiOutput.py
 #this file is just for development
 rm $RPM_BUILD_ROOT/%{_datadir}/sectool/scheduler/selftest.py
+mkdir -p  $RPM_BUILD_ROOT/var/log/
+touch $RPM_BUILD_ROOT%{_localstatedir}/log/sectool.log
 
 %find_lang %{name}
 
@@ -101,8 +105,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libexecdir}/sectool-mechanism.py*
 %{_datadir}/sectool/sectool-mechanism.py*
 %{_mandir}/man8/sectool.8.gz
+%{_localstatedir}/log/sectool.log
+
 # PolicyKit
-%{_sysconfdir}/dbus-1/system.d/org.fedoraproject.sectool.mechanism.conf
+%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.fedoraproject.sectool.mechanism.conf
 %{_datadir}/polkit-1/actions/org.fedoraproject.sectool.policy
 %{_datadir}/dbus-1/system-services/org.fedoraproject.sectool.mechanism.service
 
@@ -120,6 +126,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue May 25 2010 Peter Vrabec <mbarabas at redhat.com> - 0.9.4-8
+- filter (deleted) files in netserv
+- create empty log file after installation
+- fix expected permissions on shadow/gshadow
+
 * Fri Apr 23 2010 Maros Barabas <mbarabas at redhat.com> - 0.9.4-7
 - Permissions test: changed permissions of directories in root
 

