diff --git a/secilc-fedora.patch b/secilc-fedora.patch new file mode 100644 index 0000000..7a03081 --- /dev/null +++ b/secilc-fedora.patch @@ -0,0 +1,37 @@ +diff --git secilc-2.5/ChangeLog secilc-2.5/ChangeLog +index a803f35..cddfd81 100644 +--- secilc-2.5/ChangeLog ++++ secilc-2.5/ChangeLog +@@ -1,3 +1,5 @@ ++ * Add documentation and test rule for portcon dccp protocol, from Richard Haines ++ + 2.5 2016-02-23 + * Convert DocBook documentation into github markdown, from Yuli Khodorkovskiy + * Add documentation for neverallowx rules, from Steve Lawrence +diff --git secilc-2.5/docs/cil_network_labeling_statements.md secilc-2.5/docs/cil_network_labeling_statements.md +index 183b350..b06dbcc 100644 +--- secilc-2.5/docs/cil_network_labeling_statements.md ++++ secilc-2.5/docs/cil_network_labeling_statements.md +@@ -155,7 +155,7 @@ These examples show named and anonymous [`nodecon`](cil_network_labeling_stateme + portcon + ------- + +-Label a udp or tcp port. ++Label a udp, tcp or dccp port. + + **Statement definition:** + +@@ -175,7 +175,7 @@ Label a udp or tcp port. + + +

protocol

+-

The protocol keyword tcp or udp.

++

The protocol keyword tcp, udp or dccp.

+ + +

port |

+@@ -199,3 +199,4 @@ These examples show named and anonymous [`portcon`](cil_network_labeling_stateme + (portcon tcp 3333 (unconfined.user object_r unconfined.object levelrange_1)) + (portcon udp 4444 (unconfined.user object_r unconfined.object ((s0) level_2))) + (portcon tcp (2000 20000) (unconfined.user object_r unconfined.object (systemlow level_3))) ++ (portcon dccp (6840 6880) (unconfined.user object_r unconfined.object ((s0) level_2))) diff --git a/secilc.spec b/secilc.spec index ecbdb13..dd2cb37 100644 --- a/secilc.spec +++ b/secilc.spec @@ -1,11 +1,16 @@ Name: secilc Version: 2.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The SELinux CIL Compiler License: BSD URL: https://github.com/SELinuxProject/selinux/wiki Source0: https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20160223/secilc-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 secilc +# HEAD https://github.com/fedora-selinux/selinux/commit/4bfb84c7ff7b33cf06b9a6b2317d24054b9db562 +Patch1: secilc-fedora.patch BuildRequires: libsepol-static >= 2.5, dblatex, flex, xmlto, pandoc @@ -54,6 +59,9 @@ make %{?_smp_mflags} DESTDIR="%{buildroot}" SBINDIR="%{buildroot}%{_sbindir}" LI %license COPYING %changelog +* Fri Apr 08 2016 - 2.5-2 +- Add documentation and test rule for portcon dccp protocol + * Tue Feb 23 2016 Petr Lautrbach 2.5-1 - Update to upstream release 2016-02-23