rpms
/
setools
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- Fix dessktop files 

- Apply fixes from bkyoung
This commit is contained in:
Daniel J Walsh 2005-12-14 14:47:13 +00:00
parent 33f896871d
commit 0863078317
5 changed files with 57 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apol.desktop
View File

@ -7,6 +7,6 @@ Exec=/usr/bin/apol
Type=Application Type=Application
Terminal=false Terminal=false
Encoding=UTF-8 Encoding=UTF-8
Categories=System;X-Red-Hat-Base;X-Red-Hat-ServerConfig; Categories=Application;SystemSetup;X-Red-Hat-Base;
X-Desktop-File-Install-Version=0.2 X-Desktop-File-Install-Version=0.2
StartupNotify=true StartupNotify=true

2
seaudit.desktop
View File

@ -7,6 +7,6 @@ Exec=/usr/bin/seaudit
Type=Application Type=Application
Terminal=false Terminal=false
Encoding=UTF-8 Encoding=UTF-8
Categories=System;X-Red-Hat-Base;X-Red-Hat-ServerConfig; Categories=Application;SystemSetup;X-Red-Hat-Base;
X-Desktop-File-Install-Version=0.2 X-Desktop-File-Install-Version=0.2
StartupNotify=true StartupNotify=true

2
sediffx.desktop
View File

@ -6,6 +6,6 @@ Exec=/usr/bin/sediffx
Type=Application Type=Application
Terminal=false Terminal=false
Encoding=UTF-8 Encoding=UTF-8
Categories=System;X-Red-Hat-Base;X-Red-Hat-ServerConfig; Categories=Application;SystemSetup;X-Red-Hat-Base;
X-Desktop-File-Install-Version=0.2 X-Desktop-File-Install-Version=0.2
StartupNotify=true StartupNotify=true

8
setools-rhat.patch
View File

@ -1,5 +1,5 @@
--- setools-2.2/seaudit/Makefile.rhat 2005-10-28 18:12:32.000000000 -0400 --- setools-2.2/seaudit/Makefile.rhat 2005-10-28 18:12:32.000000000 -0400
+++ setools-2.2/seaudit/Makefile 2005-11-03 17:16:42.000000000 -0500 +++ setools-2.2/seaudit/Makefile 2005-12-14 09:34:28.000000000 -0500
@@ -60,8 +60,8 @@ @@ -60,8 +60,8 @@
$(CC) $(CFLAGS) $(GTK_CFLAGS) $(LIBXML_FLAGS) $(INCLUDE) -c $< $(CC) $(CFLAGS) $(GTK_CFLAGS) $(LIBXML_FLAGS) $(INCLUDE) -c $<
@ -12,7 +12,7 @@
install -m 644 seaudit_help.txt $(INSTALL_LIBDIR) install -m 644 seaudit_help.txt $(INSTALL_LIBDIR)
install -m 444 dot_seaudit $(INSTALL_LIBDIR) install -m 444 dot_seaudit $(INSTALL_LIBDIR)
--- setools-2.2/apol/Makefile.rhat 2005-10-28 18:12:32.000000000 -0400 --- setools-2.2/apol/Makefile.rhat 2005-10-28 18:12:32.000000000 -0400
+++ setools-2.2/apol/Makefile 2005-11-03 17:16:42.000000000 -0500 +++ setools-2.2/apol/Makefile 2005-12-14 09:34:28.000000000 -0500
@@ -80,7 +80,7 @@ @@ -80,7 +80,7 @@
$(MAKE) -C .. libsefs $(MAKE) -C .. libsefs
@ -31,7 +31,7 @@
clean: clean:
--- setools-2.2/Makefile.rhat 2005-10-28 18:12:32.000000000 -0400 --- setools-2.2/Makefile.rhat 2005-10-28 18:12:32.000000000 -0400
+++ setools-2.2/Makefile 2005-11-03 17:57:13.000000000 -0500 +++ setools-2.2/Makefile 2005-12-14 09:34:28.000000000 -0500
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
LIBS = -lfl -lm LIBS = -lfl -lm
@ -59,7 +59,7 @@
# Top Level Targets # Top Level Targets
all: all-libs all-nogui all-gui all: all-libs all-nogui all-gui
--- setools-2.2/sediff/Makefile.rhat 2005-10-28 18:12:32.000000000 -0400 --- setools-2.2/sediff/Makefile.rhat 2005-10-28 18:12:32.000000000 -0400
+++ setools-2.2/sediff/Makefile 2005-11-03 17:16:42.000000000 -0500 +++ setools-2.2/sediff/Makefile 2005-12-14 09:34:28.000000000 -0500
@@ -24,7 +24,8 @@ @@ -24,7 +24,8 @@
install -m 755 sediff $(BINDIR); install -m 755 sediff $(BINDIR);

80
setools.spec
View File

@ -1,9 +1,10 @@
Summary: SELinux tools for managing policy Summary: SELinux tools for managing policy
Name: setools Name: setools
Version: 2.2 Version: 2.2
Release: 3.1 Release: 4
License: GPL License: GPL
Group: System Environment/Base Group: System Environment/Base
URL: http://www.tresys.com/
Source: http://www.tresys.com/Downloads/selinux-tools/setools-%{version}.tar.bz2 Source: http://www.tresys.com/Downloads/selinux-tools/setools-%{version}.tar.bz2
Source1: setools.pam Source1: setools.pam
Source2: apol.console Source2: apol.console
@ -14,7 +15,7 @@ Source8: sediffx.console
Source9: sediffx.desktop Source9: sediffx.desktop
Prefix: %{_prefix} Prefix: %{_prefix}
BuildRoot: %{_tmppath}/%{name}-buildroot BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: checkpolicy, policycoreutils, tcl >= 8.3 Requires: checkpolicy, policycoreutils, tcl >= 8.3
Buildrequires: tk-devel >= 8.3, tcl-devel >= 8.3 Buildrequires: tk-devel >= 8.3, tcl-devel >= 8.3
BuildRequires: gtk2-devel, libglade2-devel BuildRequires: gtk2-devel, libglade2-devel
@ -26,11 +27,15 @@ Patch0: setools-rhat.patch
%description %description
Security-enhanced Linux is a patch of the Linux kernel and a number of Security-enhanced Linux is a patch of the Linux kernel and a number of
utilities with enhanced security functionality designed to add mandatory access utilities with enhanced security functionality designed to add
mandatory access
controls to Linux. The Security-enhanced Linux kernel contains new controls to Linux. The Security-enhanced Linux kernel contains new
architectural components originally developed to improve the security of the Flask architectural components originally developed to improve the security
operating system. These architectural components provide general support for the of the Flask
enforcement of many kinds of mandatory access control policies, including those operating system. These architectural components provide general
support for the
enforcement of many kinds of mandatory access control policies, including
those
based on the concepts of Type Enforcement, Role-based Access Control, and based on the concepts of Type Enforcement, Role-based Access Control, and
Multi-level Security. Multi-level Security.
@ -46,15 +51,19 @@ tools.
Summary: Graphical tools for handling SETools Summary: Graphical tools for handling SETools
Group: System Environment/Base Group: System Environment/Base
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Requires: tk >= 8.3, libglade2 Requires: tk >= 8.3, libglade2 > 2, usermode
%description gui %description gui
Security-enhanced Linux is a patch of the Linux kernel and a number of Security-enhanced Linux is a patch of the Linux kernel and a number of
utilities with enhanced security functionality designed to add mandatory access utilities with enhanced security functionality designed to add
mandatory access
controls to Linux. The Security-enhanced Linux kernel contains new controls to Linux. The Security-enhanced Linux kernel contains new
architectural components originally developed to improve the security of the Flask architectural components originally developed to improve
operating system. These architectural components provide general support for the the security of the Flask
enforcement of many kinds of mandatory access control policies, including those operating system. These architectural components provide
general support for the
enforcement of many kinds of mandatory access control policies,
including those
based on the concepts of Type Enforcement, Role-based Access Control, and based on the concepts of Type Enforcement, Role-based Access Control, and
Multi-level Security. Multi-level Security.
@ -73,8 +82,9 @@ tools.
%prep %prep
%setup -q %setup -q
%patch0 -p1 -b .rhat %patch0 -p1 -b .rhat
%build %build
make clean
make LIBDIR=%{_libdir} all make LIBDIR=%{_libdir} all
%install %install
@ -90,15 +100,18 @@ rm -f ${RPM_BUILD_ROOT}/usr/bin/findcon
rm -f ${RPM_BUILD_ROOT}/usr/bin/replcon rm -f ${RPM_BUILD_ROOT}/usr/bin/replcon
rm -f ${RPM_BUILD_ROOT}/usr/bin/searchcon rm -f ${RPM_BUILD_ROOT}/usr/bin/searchcon
rm -f ${RPM_BUILD_ROOT}/usr/bin/indexcon rm -f ${RPM_BUILD_ROOT}/usr/bin/indexcon
install -D %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d/apol install -d -m 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d
install -D %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d/seaudit install -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d/apol
install -D %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d/sediffx install -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d/seaudit
install -D %{SOURCE2} ${RPM_BUILD_ROOT}%{_sysconfdir}/security/console.apps/apol install -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d/sediffx
install -D %{SOURCE4} ${RPM_BUILD_ROOT}%{_sysconfdir}/security/console.apps/seaudit install -d -m 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/security/console.apps
install -D %{SOURCE8} ${RPM_BUILD_ROOT}%{_sysconfdir}/security/console.apps/sediffx install -m 644 %{SOURCE2} ${RPM_BUILD_ROOT}%{_sysconfdir}/security/console.apps/apol
install -D %{SOURCE5} ${RPM_BUILD_ROOT}%{_datadir}/applications/apol.desktop install -m 644 %{SOURCE4} ${RPM_BUILD_ROOT}%{_sysconfdir}/security/console.apps/seaudit
install -D %{SOURCE7} ${RPM_BUILD_ROOT}%{_datadir}/applications/seaudit.desktop install -m 644 %{SOURCE8} ${RPM_BUILD_ROOT}%{_sysconfdir}/security/console.apps/sediffx
install -D %{SOURCE9} ${RPM_BUILD_ROOT}%{_datadir}/applications/sediffx.desktop install -d -m 755 ${RPM_BUILD_ROOT}%{_datadir}/applications
install -m 664 %{SOURCE5} ${RPM_BUILD_ROOT}%{_datadir}/applications/apol.desktop
install -m 664 %{SOURCE7} ${RPM_BUILD_ROOT}%{_datadir}/applications/seaudit.desktop
install -m 664 %{SOURCE9} ${RPM_BUILD_ROOT}%{_datadir}/applications/sediffx.desktop
cd $RPM_BUILD_ROOT/%{_bindir}/ cd $RPM_BUILD_ROOT/%{_bindir}/
ln -sf consolehelper apol ln -sf consolehelper apol
ln -sf consolehelper seaudit ln -sf consolehelper seaudit
@ -122,13 +135,12 @@ rm -rf ${RPM_BUILD_ROOT}
%{_datadir}/applications/apol.desktop %{_datadir}/applications/apol.desktop
%{_datadir}/applications/seaudit.desktop %{_datadir}/applications/seaudit.desktop
%{_datadir}/applications/sediffx.desktop %{_datadir}/applications/sediffx.desktop
%config %{_sysconfdir}/pam.d/apol %config(noreplace) %{_sysconfdir}/pam.d/apol
%config %{_sysconfdir}/pam.d/seaudit %config(noreplace) %{_sysconfdir}/pam.d/seaudit
%config %{_sysconfdir}/pam.d/sediffx %config(noreplace) %{_sysconfdir}/pam.d/sediffx
%config %{_sysconfdir}/security/console.apps/apol %config(noreplace) %{_sysconfdir}/security/console.apps/apol
%config %{_sysconfdir}/security/console.apps/seaudit %config(noreplace) %{_sysconfdir}/security/console.apps/seaudit
%config %{_sysconfdir}/security/console.apps/sediffx %config(noreplace) %{_sysconfdir}/security/console.apps/sediffx
%dir /usr/share/doc/setools-%{version}
/usr/share/doc/setools-%{version}/apol* /usr/share/doc/setools-%{version}/apol*
/usr/share/doc/setools-%{version}/seaudit_help.txt /usr/share/doc/setools-%{version}/seaudit_help.txt
/usr/share/doc/setools-%{version}/types_relation_help.txt /usr/share/doc/setools-%{version}/types_relation_help.txt
@ -162,8 +174,8 @@ rm -rf ${RPM_BUILD_ROOT}
/usr/share/setools/seaudit-report.css /usr/share/setools/seaudit-report.css
/usr/share/setools/seaudit.glade /usr/share/setools/seaudit.glade
/usr/share/setools/seaudit_help.txt /usr/share/setools/seaudit_help.txt
/usr/share/setools/sechecker %attr(755,root,root) %dir /usr/share/setools/sechecker
/usr/share/setools/sechecker/profiles %attr(755,root,root) %dir /usr/share/setools/sechecker/profiles
/usr/share/setools/sechecker/profiles/all-checks.sechecker /usr/share/setools/sechecker/profiles/all-checks.sechecker
/usr/share/setools/sechecker/profiles/analysis-checks.sechecker /usr/share/setools/sechecker/profiles/analysis-checks.sechecker
/usr/share/setools/sechecker/profiles/devel-checks.sechecker /usr/share/setools/sechecker/profiles/devel-checks.sechecker
@ -183,6 +195,10 @@ Headers, static libraries and API docs for SETools.
%{_includedir}/setools %{_includedir}/setools
%{_libdir}/lib* %{_libdir}/lib*
%post devel -p /sbin/ldconfig
%postun devel -p /sbin/ldconfig
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%{_bindir}/seinfo %{_bindir}/seinfo
@ -194,6 +210,10 @@ Headers, static libraries and API docs for SETools.
/usr/share/doc/setools-%{version}/README /usr/share/doc/setools-%{version}/README
%changelog %changelog
* Wed Dec 14 2005 Dan Walsh <dwalsh@redhat.com> 2.2-4
- Fix dessktop files
- Apply fixes from bkyoung
* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com> * Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
- rebuilt - rebuilt