- Upgrade to upstream
This commit is contained in:
Daniel J Walsh
parent
afb1e48668
commit
eddb10bb7e
@ -9,3 +9,4 @@ setools-2.1.3.tar.bz2
|
||||
setools-2.2.tar.bz2
|
||||
setools-2.3.tar.bz2
|
||||
setools-2.4.tar.bz2
|
||||
setools-3.1.tar.bz2
|
||||
|
||||
@ -1,15 +1,83 @@
|
||||
--- setools-3.0/configure.ac.rhat 2006-10-13 14:59:34.000000000 -0400
|
||||
+++ setools-3.0/configure.ac 2006-10-30 13:26:43.000000000 -0500
|
||||
@@ -19,7 +19,7 @@
|
||||
--- setools-3.1/libqpol/src/policy_parse.y.rhat 2007-02-13 07:06:55.000000000 -0500
|
||||
+++ setools-3.1/libqpol/src/policy_parse.y 2007-02-13 07:11:30.000000000 -0500
|
||||
@@ -1098,11 +1098,11 @@
|
||||
ret = hashtab_insert(policydbp->p_commons.table,
|
||||
(hashtab_key_t) id, (hashtab_datum_t) comdatum);
|
||||
|
||||
libseaudit_version=3.0.0
|
||||
- if (ret == HASHTAB_PRESENT) {
|
||||
+ if (ret == SEPOL_EEXIST) {
|
||||
yyerror("duplicate common definition");
|
||||
goto bad;
|
||||
}
|
||||
- if (ret == HASHTAB_OVERFLOW) {
|
||||
+ if (ret == SEPOL_ENOMEM) {
|
||||
yyerror("hash table overflow");
|
||||
goto bad;
|
||||
}
|
||||
@@ -1130,14 +1130,14 @@
|
||||
(hashtab_key_t) perm,
|
||||
(hashtab_datum_t) perdatum);
|
||||
|
||||
-setoolsdir='${prefix}/share/setools-3.0'
|
||||
- if (ret == HASHTAB_PRESENT) {
|
||||
+ if (ret == SEPOL_EEXIST) {
|
||||
sprintf(errormsg,
|
||||
"duplicate permission %s in common %s", perm,
|
||||
id);
|
||||
yyerror(errormsg);
|
||||
goto bad_perm;
|
||||
}
|
||||
- if (ret == HASHTAB_OVERFLOW) {
|
||||
+ if (ret == SEPOL_ENOMEM) {
|
||||
yyerror("hash table overflow");
|
||||
goto bad_perm;
|
||||
}
|
||||
@@ -1259,12 +1259,12 @@
|
||||
(hashtab_key_t) id,
|
||||
(hashtab_datum_t) perdatum);
|
||||
|
||||
- if (ret == HASHTAB_PRESENT) {
|
||||
+ if (ret == SEPOL_EEXIST) {
|
||||
sprintf(errormsg, "duplicate permission %s", id);
|
||||
yyerror(errormsg);
|
||||
goto bad;
|
||||
}
|
||||
- if (ret == HASHTAB_OVERFLOW) {
|
||||
+ if (ret == SEPOL_ENOMEM) {
|
||||
yyerror("hash table overflow");
|
||||
goto bad;
|
||||
}
|
||||
--- setools-3.1/libqpol/src/policy_extend.c.rhat 2007-02-07 14:16:52.000000000 -0500
|
||||
+++ setools-3.1/libqpol/src/policy_extend.c 2007-02-13 07:09:29.000000000 -0500
|
||||
@@ -167,7 +167,7 @@
|
||||
|
||||
retv = hashtab_insert(db->p_types.table, (hashtab_key_t) tmp_name, (hashtab_datum_t) tmp_type);
|
||||
if (retv) {
|
||||
- if (retv == HASHTAB_OVERFLOW)
|
||||
+ if (retv == SEPOL_ENOMEM)
|
||||
error = db->p_types.table ? ENOMEM : EINVAL;
|
||||
else
|
||||
error = EEXIST;
|
||||
@@ -243,7 +243,7 @@
|
||||
|
||||
retv = hashtab_insert(db->p_types.table, (hashtab_key_t) tmp_name, (hashtab_datum_t) tmp_type);
|
||||
if (retv) {
|
||||
- if (retv == HASHTAB_OVERFLOW)
|
||||
+ if (retv == SEPOL_ENOMEM)
|
||||
error = db->p_types.table ? ENOMEM : EINVAL;
|
||||
else
|
||||
error = EEXIST;
|
||||
--- setools-3.1/configure.ac.rhat 2007-02-07 10:48:44.000000000 -0500
|
||||
+++ setools-3.1/configure.ac 2007-02-13 07:00:41.000000000 -0500
|
||||
@@ -20,7 +20,7 @@
|
||||
libseaudit_version=4.0.0
|
||||
libseaudit_soname=libseaudit.so.4
|
||||
|
||||
-setoolsdir='${prefix}/share/setools-3.1'
|
||||
+setoolsdir='${prefix}/share/setools'
|
||||
|
||||
version_min_sepol_major=1
|
||||
version_min_sepol_minor=12
|
||||
@@ -84,6 +84,7 @@
|
||||
@@ -88,6 +88,7 @@
|
||||
fi
|
||||
AC_MSG_RESULT(disabled)
|
||||
fi
|
||||
@ -17,7 +85,7 @@
|
||||
AC_SUBST(DEBUGCFLAGS)
|
||||
AC_SUBST(DEBUGLDFLAGS)
|
||||
QPOL_CFLAGS='-I$(top_srcdir)/libqpol/include'
|
||||
@@ -220,7 +221,10 @@
|
||||
@@ -227,7 +228,10 @@
|
||||
AC_SUBST(BWIDGET_DESTDIR)
|
||||
fi
|
||||
else
|
||||
@ -29,33 +97,3 @@
|
||||
bwidget_ver=1.8
|
||||
fi
|
||||
|
||||
@@ -249,17 +253,21 @@
|
||||
AC_ARG_WITH(sepol-devel,
|
||||
AC_HELP_STRING([--with-sepol-devel],
|
||||
[prefix where sepol development files are installed]),
|
||||
- sepol_devel="$withval",
|
||||
- sepol_devel="/usr")
|
||||
+ sepol_devel_incdir="${withval}/include"
|
||||
+ sepol_devel_libdir="${withval}/lib"
|
||||
+ ,
|
||||
+ sepol_devel_incdir="/usr/include"
|
||||
+ sepol_devel_libdir="${libdir}"
|
||||
+ )
|
||||
AC_ARG_WITH(selinux-devel,
|
||||
AC_HELP_STRING([--with-selinux-devel],
|
||||
[prefix where SELinux development files are installed]),
|
||||
- selinux_devel="$withval",
|
||||
- selinux_devel="/usr")
|
||||
-sepol_devel_incdir="${sepol_devel}/include"
|
||||
-sepol_devel_libdir="${sepol_devel}/lib"
|
||||
-selinux_devel_incdir="${selinux_devel}/include"
|
||||
-selinux_devel_libdir="${selinux_devel}/lib"
|
||||
+ selinux_devel_incdir="${withval}/include"
|
||||
+ selinux_devel_libdir="${withval}/lib"
|
||||
+ ,
|
||||
+ selinux_devel_incdir="/usr/include"
|
||||
+ selinux_devel_libdir="${libdir}"
|
||||
+ )
|
||||
AC_MSG_CHECKING([for sepol/sepol.h])
|
||||
selinux_save_CFLAGS="${CFLAGS}"
|
||||
SELINUX_LIB_FLAG="-L${sepol_devel_libdir} -L${selinux_devel_libdir}"
|
||||
|
||||
28
setools.spec
28
setools.spec
@ -1,7 +1,7 @@
|
||||
Summary: SELinux tools for managing policy
|
||||
Name: setools
|
||||
Version: 3.0
|
||||
Release: 4%{?dist}
|
||||
Version: 3.1
|
||||
Release: 1%{?dist}
|
||||
License: GPL
|
||||
Group: System Environment/Base
|
||||
URL: http://www.tresys.com/
|
||||
@ -131,13 +131,13 @@ rm -rf ${RPM_BUILD_ROOT}
|
||||
|
||||
%files gui
|
||||
%defattr(-,root,root)
|
||||
%dir /usr/share/tcl8.4/BWidget-1.8.0
|
||||
/usr/share/tcl8.4/BWidget-1.8.0/*
|
||||
%dir /usr/share/tcl8.4
|
||||
/usr/share/tcl8.4/*
|
||||
%{_bindir}/apol
|
||||
%{_bindir}/sediffx
|
||||
%{_bindir}/awish
|
||||
%{_bindir}/seaudit
|
||||
%{_bindir}/seaudit_report
|
||||
%{_bindir}/seaudit-report
|
||||
%{_sbindir}/seaudit
|
||||
%{_datadir}/applications/apol.desktop
|
||||
%{_datadir}/applications/seaudit.desktop
|
||||
@ -154,17 +154,13 @@ rm -rf ${RPM_BUILD_ROOT}
|
||||
/usr/share/setools/apol_perm_mapping_ver19
|
||||
/usr/share/setools/apol_perm_mapping_ver20
|
||||
/usr/share/setools/apol_perm_mapping_ver21
|
||||
/usr/share/setools/customize_filter_window.glade
|
||||
/usr/share/setools/*.glade
|
||||
/usr/share/setools/*.png
|
||||
/usr/share/setools/*.gif
|
||||
/usr/share/setools/dot_seaudit
|
||||
/usr/share/setools/filter_window.glade
|
||||
/usr/share/setools/multifilter_window.glade
|
||||
/usr/share/setools/prefer_window.glade
|
||||
/usr/share/setools/query_window.glade
|
||||
/usr/share/setools/report_window.glade
|
||||
/usr/share/setools/seaudit-report-service
|
||||
/usr/share/setools/seaudit-report.conf
|
||||
/usr/share/setools/seaudit-report.css
|
||||
/usr/share/setools/seaudit.glade
|
||||
/usr/share/setools/sediff.glade
|
||||
|
||||
%{_mandir}/man1/apol.1.gz
|
||||
%{_mandir}/man1/sediffx.1.gz
|
||||
@ -188,6 +184,7 @@ Headers, static libraries and API docs for SETools.
|
||||
%{_includedir}/poldiff
|
||||
%{_includedir}/qpol
|
||||
%{_includedir}/sefs
|
||||
%{_includedir}/seaudit
|
||||
%{_includedir}/selinux/apol
|
||||
|
||||
%{_libdir}/libsefs.a
|
||||
@ -222,10 +219,11 @@ Headers, static libraries and API docs for SETools.
|
||||
%{_libdir}/libqpol.so*
|
||||
%{_libdir}/libpoldiff.so*
|
||||
%{_libdir}/libsefs.so*
|
||||
%{_libdir}/libseaudit.so*
|
||||
|
||||
%changelog
|
||||
* Thu Feb 13 2007 Dan Walsh <dwalsh@redhat.com> 3.0-4
|
||||
- Fix buildrequires tk lines
|
||||
* Thu Feb 13 2007 Dan Walsh <dwalsh@redhat.com> 3.1-1
|
||||
- Upgrade to upstream
|
||||
|
||||
* Thu Feb 1 2007 Dan Walsh <dwalsh@redhat.com> 3.0-3
|
||||
- Rebuild with newer libtk
|
||||
|
||||
Loading…
Reference in New Issue
Block a user