Fix the name of the spec file generated in the build script
- Add mgrepl patch to support argparse for semanage command parsing
This commit is contained in:
parent
6dcb7ec4af
commit
4254724cef
@ -250741,7 +250741,7 @@ index a179d95..9b9a09a 100755
|
|||||||
tlist = []
|
tlist = []
|
||||||
for l in map(lambda y: y[sepolicy.TARGET], filter(lambda x: set(perm).issubset(x[sepolicy.PERMS]), allows)):
|
for l in map(lambda y: y[sepolicy.TARGET], filter(lambda x: set(perm).issubset(x[sepolicy.PERMS]), allows)):
|
||||||
diff --git a/policycoreutils/sepolicy/sepolicy/generate.py b/policycoreutils/sepolicy/sepolicy/generate.py
|
diff --git a/policycoreutils/sepolicy/sepolicy/generate.py b/policycoreutils/sepolicy/sepolicy/generate.py
|
||||||
index 26f8390..837d3e3 100644
|
index 26f8390..ce328e6 100644
|
||||||
--- a/policycoreutils/sepolicy/sepolicy/generate.py
|
--- a/policycoreutils/sepolicy/sepolicy/generate.py
|
||||||
+++ b/policycoreutils/sepolicy/sepolicy/generate.py
|
+++ b/policycoreutils/sepolicy/sepolicy/generate.py
|
||||||
@@ -63,20 +63,6 @@ except IOError:
|
@@ -63,20 +63,6 @@ except IOError:
|
||||||
@ -250908,7 +250908,7 @@ index 26f8390..837d3e3 100644
|
|||||||
newsh += re.sub("TEMPLATETYPE", self.name, t1)
|
newsh += re.sub("TEMPLATETYPE", self.name, t1)
|
||||||
|
|
||||||
newsh += self.generate_user_sh()
|
newsh += self.generate_user_sh()
|
||||||
+ newsh += re.sub("TEMPLATETYPE", self.name, script.rpm)
|
+ newsh += re.sub("TEMPLATEFILE", self.file_name, script.rpm)
|
||||||
|
|
||||||
return newsh
|
return newsh
|
||||||
|
|
||||||
@ -251462,7 +251462,7 @@ index 66efe26..a446d68 100755
|
|||||||
tlist = get_types(src, "%s_socket" % protocol, [perm])
|
tlist = get_types(src, "%s_socket" % protocol, [perm])
|
||||||
if len(tlist) > 0:
|
if len(tlist) > 0:
|
||||||
diff --git a/policycoreutils/sepolicy/sepolicy/templates/script.py b/policycoreutils/sepolicy/sepolicy/templates/script.py
|
diff --git a/policycoreutils/sepolicy/sepolicy/templates/script.py b/policycoreutils/sepolicy/sepolicy/templates/script.py
|
||||||
index c139070..54fd40a 100644
|
index c139070..c79738b 100644
|
||||||
--- a/policycoreutils/sepolicy/sepolicy/templates/script.py
|
--- a/policycoreutils/sepolicy/sepolicy/templates/script.py
|
||||||
+++ b/policycoreutils/sepolicy/sepolicy/templates/script.py
|
+++ b/policycoreutils/sepolicy/sepolicy/templates/script.py
|
||||||
@@ -66,14 +66,17 @@ set -x
|
@@ -66,14 +66,17 @@ set -x
|
||||||
@ -251477,7 +251477,8 @@ index c139070..54fd40a 100644
|
|||||||
# Generate a rpm package for the newly generated policy
|
# Generate a rpm package for the newly generated policy
|
||||||
|
|
||||||
pwd=$(pwd)
|
pwd=$(pwd)
|
||||||
rpmbuild --define "_sourcedir ${pwd}" --define "_specdir ${pwd}" --define "_builddir ${pwd}" --define "_srcrpmdir ${pwd}" --define "_rpmdir ${pwd}" --define "_buildrootdir ${pwd}/.build" -ba TEMPLATETYPE_selinux.spec
|
-rpmbuild --define "_sourcedir ${pwd}" --define "_specdir ${pwd}" --define "_builddir ${pwd}" --define "_srcrpmdir ${pwd}" --define "_rpmdir ${pwd}" --define "_buildrootdir ${pwd}/.build" -ba TEMPLATETYPE_selinux.spec
|
||||||
|
+rpmbuild --define "_sourcedir ${pwd}" --define "_specdir ${pwd}" --define "_builddir ${pwd}" --define "_srcrpmdir ${pwd}" --define "_rpmdir ${pwd}" --define "_buildrootdir ${pwd}/.build" -ba TEMPLATEFILE_selinux.spec
|
||||||
+"""
|
+"""
|
||||||
|
|
||||||
+manpage="""\
|
+manpage="""\
|
||||||
|
1256
policycoreutils-semanage.patch
Normal file
1256
policycoreutils-semanage.patch
Normal file
File diff suppressed because it is too large
Load Diff
@ -7,7 +7,7 @@
|
|||||||
Summary: SELinux policy core utilities
|
Summary: SELinux policy core utilities
|
||||||
Name: policycoreutils
|
Name: policycoreutils
|
||||||
Version: 2.1.14
|
Version: 2.1.14
|
||||||
Release: 45%{?dist}
|
Release: 46%{?dist}
|
||||||
License: GPLv2
|
License: GPLv2
|
||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
# Based on git repository with tag 20101221
|
# Based on git repository with tag 20101221
|
||||||
@ -18,6 +18,7 @@ Source2: policycoreutils_man_ru2.tar.bz2
|
|||||||
Source3: system-config-selinux.png
|
Source3: system-config-selinux.png
|
||||||
Patch: policycoreutils-rhat.patch
|
Patch: policycoreutils-rhat.patch
|
||||||
Patch1: policycoreutils-sepolgen.patch
|
Patch1: policycoreutils-sepolgen.patch
|
||||||
|
Patch2: policycoreutils-semanage.patch
|
||||||
Obsoletes: policycoreutils < 2.0.61-2
|
Obsoletes: policycoreutils < 2.0.61-2
|
||||||
Conflicts: filesystem < 3
|
Conflicts: filesystem < 3
|
||||||
Provides: /sbin/fixfiles
|
Provides: /sbin/fixfiles
|
||||||
@ -53,6 +54,7 @@ to switch roles.
|
|||||||
%setup -q -a 1
|
%setup -q -a 1
|
||||||
%patch -p2 -b .rhat
|
%patch -p2 -b .rhat
|
||||||
%patch1 -p2 -b .sepolgen -d sepolgen-%{sepolgenver}
|
%patch1 -p2 -b .sepolgen -d sepolgen-%{sepolgenver}
|
||||||
|
%patch2 -p1 -b .semanage
|
||||||
|
|
||||||
%build
|
%build
|
||||||
cp %{SOURCE3} gui/
|
cp %{SOURCE3} gui/
|
||||||
@ -309,6 +311,10 @@ The policycoreutils-restorecond package contains the restorecond service.
|
|||||||
%systemd_postun_with_restart restorecond.service
|
%systemd_postun_with_restart restorecond.service
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sum May 26 2013 Dan Walsh <dwalsh@redhat.com> - 2.1.14-46
|
||||||
|
- Fix the name of the spec file generated in the build script
|
||||||
|
- Add mgrepl patch to support argparse for semanage command parsing
|
||||||
|
|
||||||
* Tue May 21 2013 Dan Walsh <dwalsh@redhat.com> - 2.1.14-45
|
* Tue May 21 2013 Dan Walsh <dwalsh@redhat.com> - 2.1.14-45
|
||||||
- Fix sandbox to always use sandbox_file_t, so generated policy will work.
|
- Fix sandbox to always use sandbox_file_t, so generated policy will work.
|
||||||
- Update Translations
|
- Update Translations
|
||||||
|
Loading…
Reference in New Issue
Block a user