Update to upstream
* semanage: fix indentation error in seobject
This commit is contained in:
parent
b6236f9023
commit
3507aa6632
@ -1713,7 +1713,7 @@ index adcb416..c5e18d9 100644
|
||||
.SH EXAMPLE
|
||||
.nf
|
||||
diff --git a/policycoreutils/semanage/seobject.py b/policycoreutils/semanage/seobject.py
|
||||
index 1c83682..e4b6c0d 100644
|
||||
index 5847ba0..e4b6c0d 100644
|
||||
--- a/policycoreutils/semanage/seobject.py
|
||||
+++ b/policycoreutils/semanage/seobject.py
|
||||
@@ -30,11 +30,10 @@ from IPy import IP
|
||||
@ -1746,15 +1746,6 @@ index 1c83682..e4b6c0d 100644
|
||||
def __init__(self, store):
|
||||
global handle
|
||||
|
||||
@@ -182,7 +183,7 @@ class semanageRecords:
|
||||
|
||||
if not semanageRecords.transaction and store != "":
|
||||
semanage_select_store(handle, store, SEMANAGE_CON_DIRECT);
|
||||
- semanageRecords.store = store
|
||||
+ semanageRecords.store = store
|
||||
|
||||
if not semanage_is_managed(handle):
|
||||
semanage_handle_destroy(handle)
|
||||
@@ -332,6 +333,7 @@ class permissiveRecords(semanageRecords):
|
||||
name = semanage_module_get_name(mod)
|
||||
if name and name.startswith("permissive_"):
|
||||
@ -1914,7 +1905,7 @@ index f84cd7e..3565f5e 100644
|
||||
indent:
|
||||
../../scripts/Lindent $(wildcard *.[ch])
|
||||
diff --git a/policycoreutils/setfiles/restore.c b/policycoreutils/setfiles/restore.c
|
||||
index ce44c04..8066162 100644
|
||||
index ce44c04..bca1694 100644
|
||||
--- a/policycoreutils/setfiles/restore.c
|
||||
+++ b/policycoreutils/setfiles/restore.c
|
||||
@@ -1,5 +1,6 @@
|
||||
@ -2090,6 +2081,15 @@ index ce44c04..8066162 100644
|
||||
goto out;
|
||||
|
||||
/*
|
||||
@@ -218,7 +249,7 @@ static int restore(FTSENT *ftsent)
|
||||
r_opts->progname, my_file, newcon, strerror(errno));
|
||||
goto skip;
|
||||
}
|
||||
- ret = 1;
|
||||
+ ret = 0;
|
||||
out:
|
||||
freecon(newcon);
|
||||
return ret;
|
||||
@@ -487,22 +518,6 @@ int add_exclude(const char *directory)
|
||||
return 0;
|
||||
}
|
||||
|
@ -6,8 +6,8 @@
|
||||
|
||||
Summary: SELinux policy core utilities
|
||||
Name: policycoreutils
|
||||
Version: 2.1.6
|
||||
Release: 3%{?dist}
|
||||
Version: 2.1.7
|
||||
Release: 1%{?dist}
|
||||
License: GPLv2
|
||||
Group: System Environment/Base
|
||||
# Based on git repository with tag 20101221
|
||||
@ -352,6 +352,10 @@ fi
|
||||
/bin/systemctl try-restart restorecond.service >/dev/null 2>&1 || :
|
||||
|
||||
%changelog
|
||||
* Fri Sep 30 2011 Dan Walsh <dwalsh@redhat.com> - 2.1.7-1
|
||||
-Update to upstream
|
||||
* semanage: fix indentation error in seobject
|
||||
|
||||
* Thu Sep 29 2011 Dan Walsh <dwalsh@redhat.com> - 2.1.6-3
|
||||
- Ignore permissive commands in interfaces
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user