diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 9462162..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -sectool-0.9.4.tar.bz2 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e8bbf4c --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +sectool-0.9.5.tar.bz2 diff --git a/Makefile b/Makefile deleted file mode 100644 index 0ab0e08..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: sectool -# $Id: Makefile,v 1.1 2008/01/21 17:15:20 kevin Exp $ -NAME := sectool -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/sectool-0.9.3-ext4.patch b/sectool-0.9.3-ext4.patch deleted file mode 100644 index b06d0b8..0000000 --- a/sectool-0.9.3-ext4.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up sectool-0.9.3/tests/03_filesystem.dsc.ext4 sectool-0.9.3/tests/03_filesystem.dsc ---- sectool-0.9.3/tests/03_filesystem.dsc.ext4 2009-07-14 15:18:11.472860778 +0200 -+++ sectool-0.9.3/tests/03_filesystem.dsc 2009-07-14 15:18:32.558798787 +0200 -@@ -15,7 +15,7 @@ GROUPS="filesystem packages selinux" - AUTHOR="Dan Kopecek " - - [DEFAULT] --FSTYPES="ext2 ext3 reiserfs xfs" -+FSTYPES="ext2 ext3 ext4 reiserfs xfs" - EXCLUDE="/var/lib/misc - /var/lib/mock" - INCLUDE="/bin diff --git a/sectool-0.9.4-pk1.patch b/sectool-0.9.4-pk1.patch deleted file mode 100644 index 016efee..0000000 --- a/sectool-0.9.4-pk1.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up sectool-0.9.4/Makefile.old sectool-0.9.4/Makefile ---- sectool-0.9.4/Makefile.old 2009-11-19 13:36:45.680545213 +0100 -+++ sectool-0.9.4/Makefile 2009-11-19 13:37:05.108513565 +0100 -@@ -25,7 +25,7 @@ install: - mkdir -p $(DESTDIR)$(PKGDATADIR) - mkdir -p $(DESTDIR)$(PKGDATADIR)/scheduler - #mkdir -p $(DESTDIR)$(PKGDATADIR)/tests -- mkdir -p $(DESTDIR)$(DATADIR)/PolicyKit/policy/ -+ mkdir -p $(DESTDIR)$(DATADIR)/polkit-1/actions/ - mkdir -p $(DESTDIR)$(SYSCONFDIR)/dbus-1/system.d/ - mkdir -p $(DESTDIR)$(DATADIR)/dbus-1/system-services/ - mkdir -p $(DESTDIR)$(LIBEXECDIR)/sectool/tests -@@ -78,7 +78,7 @@ install: - done && test -z "$$fail" - chmod a+x $(DESTDIR)$(PKGDATADIR)/sectool-mechanism.py - # PolicyKit -- install -p -m644 org.fedoraproject.sectool.policy $(DESTDIR)$(DATADIR)/PolicyKit/policy/ -+ install -p -m644 org.fedoraproject.sectool.policy $(DESTDIR)$(DATADIR)/polkit-1/actions/ - install -p -m644 org.fedoraproject.sectool.mechanism.conf $(DESTDIR)$(SYSCONFDIR)/dbus-1/system.d/ - install -p -m644 org.fedoraproject.sectool.mechanism.service $(DESTDIR)$(DATADIR)/dbus-1/system-services/ - diff --git a/sectool-0.9.2-optflags.patch b/sectool-0.9.5-optflags.patch similarity index 53% rename from sectool-0.9.2-optflags.patch rename to sectool-0.9.5-optflags.patch index 9779cf7..c47a3a9 100644 --- a/sectool-0.9.2-optflags.patch +++ b/sectool-0.9.5-optflags.patch @@ -1,12 +1,12 @@ -diff -up sectool-0.9.2/src/Makefile~ sectool-0.9.2/src/Makefile ---- sectool-0.9.2/src/Makefile~ 2008-11-13 11:08:40.000000000 +0200 -+++ sectool-0.9.2/src/Makefile 2009-04-23 00:19:30.000000000 +0300 +diff -up sectool-0.9.5/src/Makefile.optflags sectool-0.9.5/src/Makefile +--- sectool-0.9.5/src/Makefile.optflags 2010-06-04 11:35:47.000000000 +0200 ++++ sectool-0.9.5/src/Makefile 2010-06-04 11:51:19.428092050 +0200 @@ -1,7 +1,7 @@ include ../sectool.mk CC= gcc -CFLAGS= -Wall -O2 -ffast-math -I. -D_FILE_OFFSET_BITS=64 -DTEST_SELINUX -I/usr/include/rpm +CFLAGS= -Wall -O2 -ffast-math $(RPM_OPT_FLAGS) -I. -D_FILE_OFFSET_BITS=64 -DTEST_SELINUX -I/usr/include/rpm - LDFLAGS= -lrpm -lselinux + LDFLAGS= -lrpm -lselinux -lrpmio SRCS_sectool=sectool.c diff --git a/sectool.spec b/sectool.spec index ade5d8f..fc2f3bf 100644 --- a/sectool.spec +++ b/sectool.spec @@ -1,19 +1,18 @@ Summary: A security audit system and intrusion detection system Name: sectool -Version: 0.9.4 -Release: 4%{?dist} +Version: 0.9.5 +Release: 1%{?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 +Patch1: sectool-0.9.5-optflags.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 @@ -42,7 +41,6 @@ sectool-gui provides a GTK-based graphical user interface to sectool. %prep %setup -q %patch1 -p1 -b .optflags -%patch2 -p1 -b .pk1 %build make %{?_smp_mflags} @@ -66,6 +64,8 @@ sed -i 's,TDATA_DIR_BASE=\(.*\),TDATA_DIR_BASE=%{_localstatedir}/lib/sectool,' $ 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} @@ -93,8 +93,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 @@ -112,6 +114,23 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jun 14 2010 Peter Vrabec - 0.9.5-1 +- upgrade + +* Tue May 25 2010 Peter Vrabec - 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 - 0.9.4-7 +- Permissions test: changed permissions of directories in root + +* Mon Apr 19 2010 Maros Barabas - 0.9.4-6 +- Added -lrpmio (#564705) + +* Wed Mar 10 2010 Maros Barabas - 0.9.4-5 +- added patches for PolicyKit and dBus bugs + * Sat Jan 2 2010 Tomas Mraz - 0.9.4-4 - rebuilt with new librpm diff --git a/sources b/sources index 469a20f..3c19455 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fbd348268a8c5a5cf3004fb96a47e393 sectool-0.9.4.tar.bz2 +3f2496eaf10d690e899a0f8b3edb9853 sectool-0.9.5.tar.bz2