Remove old patches.

This commit is contained in:
Chris PeBenito 2018-08-26 18:22:13 -04:00
parent fd7989a413
commit 2681524649
2 changed files with 0 additions and 111 deletions

View File

@ -1,60 +0,0 @@
diff --git a/apol b/apol
index c3e58f9..d8f6496 100755
--- a/apol
+++ b/apol
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# Copyright 2015, Tresys Technology, LLC
#
# This file is part of SETools.
diff --git a/sediff b/sediff
index 34268ca..48b1a54 100755
--- a/sediff
+++ b/sediff
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# Copyright 2015-2016, Tresys Technology, LLC
#
# This file is part of SETools.
diff --git a/sedta b/sedta
index e4d4914..279019c 100755
--- a/sedta
+++ b/sedta
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# Copyright 2014-2015, Tresys Technology, LLC
#
# This file is part of SETools.
diff --git a/seinfo b/seinfo
index 2b50393..ad83496 100755
--- a/seinfo
+++ b/seinfo
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# Copyright 2014-2015, Tresys Technology, LLC
#
# This file is part of SETools.
diff --git a/seinfoflow b/seinfoflow
index 7a2d288..1c75f8e 100755
--- a/seinfoflow
+++ b/seinfoflow
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# Copyright 2014-2015, Tresys Technology, LLC
#
# This file is part of SETools.
diff --git a/sesearch b/sesearch
index 7bcdfd2..e2cd4c3 100755
--- a/sesearch
+++ b/sesearch
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# Copyright 2014-2015, Tresys Technology, LLC
#
# This file is part of SETools.

View File

@ -1,51 +0,0 @@
This libsepol patch is needed if you see these unit test failures:
======================================================================
FAIL: test_306_level_lookup_cat_not_assoc (tests.policyrep.mls.LevelFactoryTest)
Level lookup with category not associated with sensitivity.
----------------------------------------------------------------------
Traceback (most recent call last):
File "/home/pebenito/projects/setools/tests/policyrep/mls.py", line 121, in test_306_level_lookup_cat_not_assoc
self.assertRaises(InvalidLevel, level_factory, self.p.policy, "s0:c0,c4")
AssertionError: InvalidLevel not raised by level_factory
======================================================================
FAIL: test_406_range_lookup_invalid_range_low (tests.policyrep.mls.RangeFactoryTest)
Range lookup with an invalid range (low).
----------------------------------------------------------------------
Traceback (most recent call last):
File "/home/pebenito/projects/setools/tests/policyrep/mls.py", line 168, in test_406_range_lookup_invalid_range_low
self.assertRaises(InvalidRange, range_factory, self.p.policy, "s0:c13-s2:c13")
AssertionError: InvalidRange not raised by range_factory
======================================================================
FAIL: test_407_range_lookup_invalid_range_high (tests.policyrep.mls.RangeFactoryTest)
Range lookup with an invalid range (high).
----------------------------------------------------------------------
Traceback (most recent call last):
File "/home/pebenito/projects/setools/tests/policyrep/mls.py", line 173, in test_407_range_lookup_invalid_range_high
self.assertRaises(InvalidRange, range_factory, self.p.policy, "s0-s0:c13")
AssertionError: InvalidRange not raised by range_factory
----------------------------------------------------------------------
diff --git a/libsepol/src/expand.c b/libsepol/src/expand.c
index 467f7a7..3193ef5 100644
--- a/libsepol/src/expand.c
+++ b/libsepol/src/expand.c
@@ -914,10 +914,11 @@ int mls_semantic_level_expand(mls_semantic_level_t * sl, mls_level_t * l,
}
for (i = cat->low - 1; i < cat->high; i++) {
if (!ebitmap_get_bit(&levdatum->level->cat, i)) {
- ERR(h, "Category %s can not be associate with "
+ ERR(h, "Category %s can not be associated with "
"level %s",
p->p_cat_val_to_name[i],
p->p_sens_val_to_name[l->sens - 1]);
+ return -1;
}
if (ebitmap_set_bit(&l->cat, i, 1)) {
ERR(h, "Out of memory!");
--
2.3.0