diff --git a/checkpolicy-fedora.patch b/checkpolicy-fedora.patch index cfbb051..a418e0e 100644 --- a/checkpolicy-fedora.patch +++ b/checkpolicy-fedora.patch @@ -14,10 +14,11 @@ index 98f5168..3b7ff8a 100644 $(LOCAL_PATH)/ \ $(LOCAL_PATH)/../libsepol/include/ \ diff --git checkpolicy-2.5/ChangeLog checkpolicy-2.5/ChangeLog -index dfe4908..429a163 100644 +index dfe4908..2f93ddb 100644 --- checkpolicy-2.5/ChangeLog +++ checkpolicy-2.5/ChangeLog -@@ -1,3 +1,9 @@ +@@ -1,3 +1,10 @@ ++ * Fix typos in test/dispol, from Petr Lautrbach. + * Set flex as default lexer, from Julien Pivotto. + * Fix checkmodule output message, from Petr Lautrbach. + * Build policy on systems not supporting DCCP protocol, from Richard Haines. @@ -149,3 +150,31 @@ index ee20fea..100e517 100644 memcpy(&newc->u.node6.addr[0], &addr.s6_addr[0], 16); memcpy(&newc->u.node6.mask[0], &mask.s6_addr[0], 16); #else +diff --git checkpolicy-2.5/test/dispol.c checkpolicy-2.5/test/dispol.c +index 86f5688..a78ce81 100644 +--- checkpolicy-2.5/test/dispol.c ++++ checkpolicy-2.5/test/dispol.c +@@ -252,11 +252,11 @@ int display_cond_expressions(policydb_t * p, FILE * fp) + int display_handle_unknown(policydb_t * p, FILE * out_fp) + { + if (p->handle_unknown == ALLOW_UNKNOWN) +- fprintf(out_fp, "Allow unknown classes and permisions\n"); ++ fprintf(out_fp, "Allow unknown classes and permissions\n"); + else if (p->handle_unknown == DENY_UNKNOWN) +- fprintf(out_fp, "Deny unknown classes and permisions\n"); ++ fprintf(out_fp, "Deny unknown classes and permissions\n"); + else if (p->handle_unknown == REJECT_UNKNOWN) +- fprintf(out_fp, "Reject unknown classes and permisions\n"); ++ fprintf(out_fp, "Reject unknown classes and permissions\n"); + return 0; + } + +@@ -349,7 +349,7 @@ int menu(void) + printf("\nSelect a command:\n"); + printf("1) display unconditional AVTAB\n"); + printf("2) display conditional AVTAB (entirely)\n"); +- printf("3) display conditional AVTAG (only ENABLED rules)\n"); ++ printf("3) display conditional AVTAB (only ENABLED rules)\n"); + printf("4) display conditional AVTAB (only DISABLED rules)\n"); + printf("5) display conditional bools\n"); + printf("6) display conditional expressions\n"); diff --git a/checkpolicy.spec b/checkpolicy.spec index 1fb2a79..9c96088 100644 --- a/checkpolicy.spec +++ b/checkpolicy.spec @@ -3,14 +3,14 @@ Summary: SELinux policy compiler Name: checkpolicy Version: 2.5 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2 Group: Development/System Source: https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20160223/checkpolicy-2.5.tar.gz # download https://raw.githubusercontent.com/fedora-selinux/scripts/master/selinux/make-fedora-selinux-patch.sh # run: # $ VERSION=2.5 ./make-fedora-selinux-patch.sh checkpolicy -# HEAD https://github.com/fedora-selinux/selinux/commit/9abe77e2a670f2f2dfb91f9cec46ee37f9c23995 +# HEAD https://github.com/fedora-selinux/selinux/commit/bd50d00badba7a148d12879b6c736ea9f2d7ee2d Patch1: checkpolicy-fedora.patch Conflicts: selinux-policy-base < 3.13.1-138 BuildRoot: %{_tmppath}/%{name}-buildroot @@ -61,6 +61,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_bindir}/sedispol %changelog +* Mon Jun 27 2016 Petr Lautrbach - 2.5-6 +- Fix typos in sedispol + * Thu Jun 23 2016 Petr Lautrbach - 2.5-5 - Set flex as default lexer - Fix checkmodule output message