[setools/f18] Rebuild using pristine source from Tresys
Daniel J Walsh
dwalsh at fedoraproject.org
Wed Jan 30 16:51:57 UTC 2013
commit a028805d07ebc307b8bef488e62552e0de55e7cf
Author: Dan Walsh <dwalsh at redhat.com>
Date: Wed Jan 30 11:51:46 2013 -0500
Rebuild using pristine source from Tresys
...Changes-to-support-named-file_trans-rules.patch | 22 -------------
0011-setools-noship.patch | 28 ++++++++++++-----
setools.spec | 33 ++++++++++++-------
sources | 2 +-
4 files changed, 42 insertions(+), 43 deletions(-)
---
diff --git a/0006-Changes-to-support-named-file_trans-rules.patch b/0006-Changes-to-support-named-file_trans-rules.patch
index af927ef..3cd7127 100644
--- a/0006-Changes-to-support-named-file_trans-rules.patch
+++ b/0006-Changes-to-support-named-file_trans-rules.patch
@@ -1492,17 +1492,6 @@ diff -up setools-3.3.7/libapol/include/apol/Makefile.am.filenametrans setools-3.
terule-query.h \
type-query.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
--- 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
@@ -1514,14 +1503,3 @@ diff -up setools-3.3.7/libqpol/include/qpol/Makefile.am.filenametrans setools-3.
type_query.h \
user_query.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
diff --git a/0011-setools-noship.patch b/0011-setools-noship.patch
index 5febbab..b678d30 100644
--- a/0011-setools-noship.patch
+++ b/0011-setools-noship.patch
@@ -1,14 +1,14 @@
diff -up setools-3.3.7/Makefile.am.noship setools-3.3.7/Makefile.am
---- setools-3.3.7/Makefile.am.noship 2012-09-28 13:15:50.758642089 -0400
-+++ setools-3.3.7/Makefile.am 2012-09-28 13:15:50.911643035 -0400
+--- setools-3.3.7/Makefile.am.noship 2008-02-22 14:06:28.000000000 -0500
++++ setools-3.3.7/Makefile.am 2013-01-30 09:18:59.775157146 -0500
@@ -8,9 +8,8 @@ endif
if BUILD_GUI
MAYBE_GUI = seaudit
endif
-# sediffx is also built conditionally, from sediffx/Makefile.am
--SUBDIRS = libqpol libapol libsefs libpoldiff libseaudit secmds sechecker sediff man packages debian $(MAYBE_APOL) $(MAYBE_GUI) python
-+SUBDIRS = libqpol libapol libsefs libpoldiff libseaudit secmds sediff man packages debian $(MAYBE_APOL) $(MAYBE_GUI) python
+-SUBDIRS = libqpol libapol libsefs libpoldiff libseaudit secmds sechecker sediff man packages debian $(MAYBE_APOL) $(MAYBE_GUI)
++SUBDIRS = libqpol libapol libsefs libpoldiff libseaudit secmds sediff man packages debian $(MAYBE_APOL) $(MAYBE_GUI)
#old indent opts
#INDENT_OPTS = -npro -nbad -bap -sob -ss -l132 -di1 -nbc -br -nbbb -c40 -cd40 -ncdb -ce -cli0 -cp40 -ncs -d0 -nfc1 -nfca -i8 -ts8 -ci8 -lp -ip0 -npcs -npsl -sc
@@ -67,7 +67,7 @@ diff -up setools-3.3.7/Makefile.am.noship setools-3.3.7/Makefile.am
diff -up setools-3.3.7/man/Makefile.am.noship setools-3.3.7/man/Makefile.am
--- setools-3.3.7/man/Makefile.am.noship 2007-08-02 17:16:33.000000000 -0400
-+++ setools-3.3.7/man/Makefile.am 2012-09-28 13:15:50.912643041 -0400
++++ setools-3.3.7/man/Makefile.am 2013-01-30 09:16:13.696871566 -0500
@@ -1,19 +1,10 @@
if BUILD_GUI
MAYBEMANS = apol.1 \
@@ -93,7 +93,7 @@ diff -up setools-3.3.7/man/Makefile.am.noship setools-3.3.7/man/Makefile.am
-CLEANFILES = seaudit-report.8
diff -up setools-3.3.7/seaudit/Makefile.am.noship setools-3.3.7/seaudit/Makefile.am
--- setools-3.3.7/seaudit/Makefile.am.noship 2008-02-22 14:06:28.000000000 -0500
-+++ setools-3.3.7/seaudit/Makefile.am 2012-09-28 13:16:47.983863211 -0400
++++ setools-3.3.7/seaudit/Makefile.am 2013-01-30 09:16:13.697871568 -0500
@@ -1,5 +1,4 @@
setoolsdir = @setoolsdir@
-bin_PROGRAMS = seaudit-report
@@ -158,7 +158,7 @@ diff -up setools-3.3.7/seaudit/Makefile.am.noship setools-3.3.7/seaudit/Makefile
+CLEANFILES = dot_seaudit
diff -up setools-3.3.7/secmds/Makefile.am.noship setools-3.3.7/secmds/Makefile.am
--- setools-3.3.7/secmds/Makefile.am.noship 2007-08-02 17:16:33.000000000 -0400
-+++ setools-3.3.7/secmds/Makefile.am 2012-09-28 13:15:50.913643048 -0400
++++ setools-3.3.7/secmds/Makefile.am 2013-01-30 09:16:13.698871569 -0500
@@ -1,6 +1,6 @@
# various setools command line tools
@@ -188,7 +188,7 @@ diff -up setools-3.3.7/secmds/Makefile.am.noship setools-3.3.7/secmds/Makefile.a
diff -up setools-3.3.7/sediff/Makefile.am.noship setools-3.3.7/sediff/Makefile.am
--- setools-3.3.7/sediff/Makefile.am.noship 2007-04-25 15:20:20.000000000 -0400
-+++ setools-3.3.7/sediff/Makefile.am 2012-09-28 13:15:50.913643048 -0400
++++ setools-3.3.7/sediff/Makefile.am 2013-01-30 09:16:13.698871569 -0500
@@ -1,13 +1,6 @@
setoolsdir = @setoolsdir@
@@ -241,3 +241,15 @@ diff -up setools-3.3.7/sediff/Makefile.am.noship setools-3.3.7/sediff/Makefile.a
$(top_builddir)/libpoldiff/src/libpoldiff.so:
$(MAKE) -C $(top_builddir)/libpoldiff/src $(notdir $@)
+diff -up setools-3.3.7/configure.ac~ setools-3.3.7/configure.ac
+--- setools-3.3.7/configure.ac~ 2013-01-30 09:52:05.689136955 -0500
++++ setools-3.3.7/configure.ac 2013-01-30 09:56:26.853722063 -0500
+@@ -63,7 +63,7 @@ if test ${ac_cv_prog_cc_c99} = "no"; the
+ fi
+ AC_PROG_CXX
+ AC_LANG([C])
+-AC_PROG_LIBTOOL
++AC_PROG_RANLIB
+ AC_PROG_LN_S
+ AC_PROG_LEX
+ AC_PROG_YACC
diff --git a/setools.spec b/setools.spec
index 6ab414b..8ee8d11 100644
--- a/setools.spec
+++ b/setools.spec
@@ -5,7 +5,7 @@
Name: setools
Version: %{setools_maj_ver}.%{setools_min_ver}
-Release: 31%{?dist}
+Release: 34%{?dist}
License: GPLv2
URL: http://oss.tresys.com/projects/setools
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
Source2: apol.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
Patch3: 0003-Since-we-do-not-ship-neverallow-rules-all-always-fai.patch
Patch4: 0004-Fix-man-pages-and-getoptions.patch
@@ -25,6 +24,7 @@ Patch9: 0009-Fix-swig-coding-style-for-structures.patch
Patch10: 0010-selinux_current_policy_path.patch
Patch11: 0011-setools-noship.patch
Patch12: 0012-seaudit.patch
+Patch13: 0013-swig.patch
Summary: Policy analysis tools for SELinux
Group: System Environment/Base
@@ -35,8 +35,8 @@ Requires: setools-libs = %{version}-%{release} setools-libs-tcl = %{version}-%{r
%define bwidget_ver 1.8
%define gtk_ver 2.8
%define python_ver 2.3
-%define sepol_ver 2.1.5-3
-%define selinux_ver 2.1.9-9
+%define sepol_ver 2.1.8-5
+%define selinux_ver 2.1.12-10
%define sqlite_ver 3.2.0
%define swig_ver 2.0.7-3
%define tcltk_ver 8.4.9
@@ -173,7 +173,6 @@ This package includes the following graphical tools:
%prep
%setup -q
-%patch1 -p 1 -b .python
%patch2 -p 1 -b .exitstatus
%patch3 -p 1 -b .neverallow
%patch4 -p 1 -b .manpage
@@ -185,6 +184,7 @@ This package includes the following graphical tools:
%patch10 -p 1 -b .current
%patch11 -p 1 -b .noship
%patch12 -p 1 -b .seaudit
+%patch13 -p 1 -b .swig
%ifarch sparc sparcv9 sparc64 s390 s390x
for file in `find . -name Makefile.am`; do
sed -i -e 's:-fpic:-fPIC:' $file;
@@ -193,10 +193,11 @@ This package includes the following graphical tools:
# Fixup expected version of SWIG:
sed -i -e "s|AC_PROG_SWIG(1.3.28)|AC_PROG_SWIG(2.0.0)|g" configure.ac
# and rebuild the autotooled files:
-autoreconf
-
+aclocal
+autoreconf -if
%build
+automake
%configure --libdir=%{_libdir} --disable-bwidget-check --disable-selinux-check \
--enable-swig-python --enable-swig-tcl
# work around issue with gcc 4.3 + gnu99 + swig-generated code:
@@ -247,7 +248,6 @@ rm -rf ${RPM_BUILD_ROOT}
%ifarch x86_64 ppc64 sparc64 s390x
%{pkg_py_arch}/
%endif
-%{python_sitearch}/setools*.egg-info
%files libs-tcl
%defattr(-,root,root,-)
@@ -310,6 +310,15 @@ rm -rf ${RPM_BUILD_ROOT}
%postun libs-tcl -p /sbin/ldconfig
%changelog
+* Wed Jan 30 2013 Dan Walsh <dwalsh at redhat.com> - 3.3.7-34
+- Rebuild using pristine source from Tresys
+
+* Tue Jan 29 2013 Dan Walsh <dwalsh at redhat.com> - 3.3.7-33
+- Apply swig patch to make apol work again.
+
+* Mon Jan 7 2013 Dan Walsh <dwalsh at redhat.com> - 3.3.7-32
+- Rebuild with new tool chain
+
* Fri Sep 28 2012 Dan Walsh <dwalsh at redhat.com> - 3.3.7-31
- Add filename_trans to python/setools/sesearch bindings
@@ -317,7 +326,7 @@ rm -rf ${RPM_BUILD_ROOT}
- Apply Lars Jensen patch to fix seaudit
- Remove java bindings, not supported
-* Mon Sep 16 2012 Dan Walsh <dwalsh at redhat.com> - 3.3.7-29
+* Sun Sep 16 2012 Dan Walsh <dwalsh at redhat.com> - 3.3.7-29
- Remove tools that we do not want to support
* Mon Aug 20 2012 Dan Horák <dan[at]danny.cz> - 3.3.7-28
@@ -363,7 +372,7 @@ rm -rf ${RPM_BUILD_ROOT}
* Fri Apr 15 2011 Dan Walsh <dwalsh at redhat.com> - 3.3.7-15
- Rebuild for new sepol
-* Sun Apr 9 2011 Dan Walsh <dwalsh at redhat.com> - 3.3.7-14
+* Sat Apr 9 2011 Dan Walsh <dwalsh at redhat.com> - 3.3.7-14
- Rebuild for new sepol
* Sun Feb 27 2011 Dennis Gilmore <dennis at ausil.us> - 3.3.7-13
@@ -473,7 +482,7 @@ patch 1
* Wed Apr 25 2007 Jason Tang <jtang at tresys.com> 3.2-0
- update to SETools 3.2 release
-* Mon Feb 02 2007 Jason Tang <jtang at tresys.com> 3.1-1
+* Fri Feb 02 2007 Jason Tang <jtang at tresys.com> 3.1-1
- update to SETools 3.1 release
* Mon Oct 30 2006 Dan Walsh <dwalsh at redhat.com> 3.0-2.fc6
@@ -598,7 +607,7 @@ patch 1
* Tue Apr 5 2005 Dan Walsh <dwalsh at redhat.com> 2.0.0-2
- Fix buildrequires lines in spec file
-* Tue Mar 2 2005 Dan Walsh <dwalsh at redhat.com> 2.0.0-1
+* Wed Mar 2 2005 Dan Walsh <dwalsh at redhat.com> 2.0.0-1
- Update to latest from tresys
* Mon Nov 29 2004 Dan Walsh <dwalsh at redhat.com> 1.5.1-6
diff --git a/sources b/sources
index 1a9fb5f..870085d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-206d1b31d1dda4ace2fbf6ce02d13814 setools-3.3.7.tar.bz2
+0377d7a06028825434cd7b41a80865a5 setools-3.3.7.tar.bz2
More information about the scm-commits
mailing list