Rebuild using pristine source from Tresys

This commit is contained in:
Dan Walsh 2013-01-30 11:37:44 -05:00
parent 100f5e541c
commit 9bac5f8821
4 changed files with 7 additions and 2989 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1492,17 +1492,6 @@ diff -up setools-3.3.7/libapol/include/apol/Makefile.am.filenametrans setools-3.
terule-query.h \ terule-query.h \
type-query.h \ type-query.h \
types-relation-analysis.h \ types-relation-analysis.h \
diff -up setools-3.3.7/libapol/include/apol/Makefile.in.filenametrans setools-3.3.7/libapol/include/apol/Makefile.in
--- setools-3.3.7/libapol/include/apol/Makefile.in.filenametrans 2010-05-12 10:01:06.000000000 -0400
+++ setools-3.3.7/libapol/include/apol/Makefile.in 2011-10-26 16:25:07.834107745 -0400
@@ -378,6 +378,7 @@ apol_HEADERS = \
relabel-analysis.h \
render.h \
role-query.h \
+ ftrule-query.h \
terule-query.h \
type-query.h \
types-relation-analysis.h \
diff -up setools-3.3.7/libqpol/include/qpol/Makefile.am.filenametrans setools-3.3.7/libqpol/include/qpol/Makefile.am diff -up setools-3.3.7/libqpol/include/qpol/Makefile.am.filenametrans setools-3.3.7/libqpol/include/qpol/Makefile.am
--- setools-3.3.7/libqpol/include/qpol/Makefile.am.filenametrans 2011-10-26 16:22:28.723523155 -0400 --- setools-3.3.7/libqpol/include/qpol/Makefile.am.filenametrans 2011-10-26 16:22:28.723523155 -0400
+++ setools-3.3.7/libqpol/include/qpol/Makefile.am 2011-10-26 16:22:41.283493767 -0400 +++ setools-3.3.7/libqpol/include/qpol/Makefile.am 2011-10-26 16:22:41.283493767 -0400
@ -1514,14 +1503,3 @@ diff -up setools-3.3.7/libqpol/include/qpol/Makefile.am.filenametrans setools-3.
type_query.h \ type_query.h \
user_query.h \ user_query.h \
util.h util.h
diff -up setools-3.3.7/libqpol/include/qpol/Makefile.in.filenametrans setools-3.3.7/libqpol/include/qpol/Makefile.in
--- setools-3.3.7/libqpol/include/qpol/Makefile.in.filenametrans 2010-05-12 10:01:07.000000000 -0400
+++ setools-3.3.7/libqpol/include/qpol/Makefile.in 2011-10-26 16:22:56.375457650 -0400
@@ -376,6 +376,7 @@ qpol_HEADERS = \
role_query.h \
syn_rule_query.h \
terule_query.h \
+ ftrule_query.h \
type_query.h \
user_query.h \
util.h

View File

@ -5,7 +5,7 @@
Name: setools Name: setools
Version: %{setools_maj_ver}.%{setools_min_ver} Version: %{setools_maj_ver}.%{setools_min_ver}
Release: 33%{?dist} Release: 34%{?dist}
License: GPLv2 License: GPLv2
URL: http://oss.tresys.com/projects/setools URL: http://oss.tresys.com/projects/setools
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@ -13,7 +13,6 @@ Source: http://oss.tresys.com/projects/setools/chrome/site/dists/setools-%{versi
Source1: setools.pam Source1: setools.pam
Source2: apol.desktop Source2: apol.desktop
Source3: seaudit.desktop Source3: seaudit.desktop
#Patch1: 0001-add-setools-seinfo-and-sesearch-python-bindings.patch
Patch2: 0002-setools-should-exit-with-an-error-status-if-it-gets-.patch Patch2: 0002-setools-should-exit-with-an-error-status-if-it-gets-.patch
Patch3: 0003-Since-we-do-not-ship-neverallow-rules-all-always-fai.patch Patch3: 0003-Since-we-do-not-ship-neverallow-rules-all-always-fai.patch
Patch4: 0004-Fix-man-pages-and-getoptions.patch Patch4: 0004-Fix-man-pages-and-getoptions.patch
@ -174,7 +173,6 @@ This package includes the following graphical tools:
%prep %prep
%setup -q %setup -q
#%patch1 -p 1 -b .python
%patch2 -p 1 -b .exitstatus %patch2 -p 1 -b .exitstatus
%patch3 -p 1 -b .neverallow %patch3 -p 1 -b .neverallow
%patch4 -p 1 -b .manpage %patch4 -p 1 -b .manpage
@ -196,11 +194,10 @@ This package includes the following graphical tools:
sed -i -e "s|AC_PROG_SWIG(1.3.28)|AC_PROG_SWIG(2.0.0)|g" configure.ac sed -i -e "s|AC_PROG_SWIG(1.3.28)|AC_PROG_SWIG(2.0.0)|g" configure.ac
# and rebuild the autotooled files: # and rebuild the autotooled files:
aclocal aclocal
automake --add-missing autoreconf -if
autoconf
%build %build
automake
%configure --libdir=%{_libdir} --disable-bwidget-check --disable-selinux-check \ %configure --libdir=%{_libdir} --disable-bwidget-check --disable-selinux-check \
--enable-swig-python --enable-swig-tcl --enable-swig-python --enable-swig-tcl
# work around issue with gcc 4.3 + gnu99 + swig-generated code: # work around issue with gcc 4.3 + gnu99 + swig-generated code:
@ -313,6 +310,9 @@ rm -rf ${RPM_BUILD_ROOT}
%postun libs-tcl -p /sbin/ldconfig %postun libs-tcl -p /sbin/ldconfig
%changelog %changelog
* Wed Jan 30 2013 Dan Walsh <dwalsh@redhat.com> - 3.3.7-34
- Rebuild using pristine source from Tresys
* Tue Jan 29 2013 Dan Walsh <dwalsh@redhat.com> - 3.3.7-33 * Tue Jan 29 2013 Dan Walsh <dwalsh@redhat.com> - 3.3.7-33
- Apply swig patch to make apol work again. - Apply swig patch to make apol work again.

View File

@ -1 +1 @@
206d1b31d1dda4ace2fbf6ce02d13814 setools-3.3.7.tar.bz2 0377d7a06028825434cd7b41a80865a5 setools-3.3.7.tar.bz2