diff --git a/.gitignore b/.gitignore index b5c43bd..9f1858e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /libsepol-2.4.tar.gz /secilc-2.5-rc1.tar.gz /secilc-2.5.tar.gz +/secilc-2.6.tar.gz diff --git a/secilc-fedora.patch b/secilc-fedora.patch index 7a03081..e69de29 100644 --- a/secilc-fedora.patch +++ b/secilc-fedora.patch @@ -1,37 +0,0 @@ -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 807e27b..c0988b8 100644 --- a/secilc.spec +++ b/secilc.spec @@ -1,18 +1,18 @@ -%global libsepolver 2.5-10 +%global libsepolver 2.6-0 Name: secilc -Version: 2.5 -Release: 7%{?dist} +Version: 2.6 +Release: 1%{?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 +Source0: https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20161014/secilc-2.6.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 +# $ VERSION=2.6 ./make-fedora-selinux-patch.sh secilc +# FIXME: HEAD https://github.com/fedora-selinux/selinux/commit/4bfb84c7ff7b33cf06b9a6b2317d24054b9db562 +# Patch1: secilc-fedora.patch BuildRequires: libsepol-static >= %{libsepolver}, dblatex, flex, xmlto, pandoc @@ -35,7 +35,7 @@ http://github.com/SELinuxProject/cil/wiki/ for more information about the goals and features on the CIL language. %prep -%setup -q -n secilc-2.5 +%setup -q -n secilc-%{version} %build @@ -61,6 +61,9 @@ make %{?_smp_mflags} DESTDIR="%{buildroot}" SBINDIR="%{buildroot}%{_sbindir}" LI %license COPYING %changelog +* Wed Feb 15 2017 Petr Lautrbach - 2.6-1 +- Update to upstream release 2016-10-14 + * Sat Feb 11 2017 Fedora Release Engineering - 2.5-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index ce67df1..e1aa576 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -af73267cccd0e46cb455d5702565cd41 secilc-2.5.tar.gz +SHA512 (secilc-2.6.tar.gz) = 5d59320d599d15754d76d36d981a1927d9633db9813f0248c29c9ff38bc59bf394910f4d56444a97df910b48e59f128d9997a85b6bd2ee8e0dd3ae31a9a2b7d0