Merge branch 'master' into f23

This commit is contained in:
Stuart D. Gathman 2016-06-24 16:23:55 -04:00
commit 5603bcf198
2 changed files with 2 additions and 2 deletions

View File

@ -24,7 +24,7 @@ diff -up ./contrib/selinux/cjdns.te.el6 ./contrib/selinux/cjdns.te
allow cjdns_t node_t:udp_socket node_bind;
allow cjdns_t port_t:udp_socket name_bind;
-allow cjdns_t unreserved_port_t:udp_socket name_bind;
allow cjdns_t self:netlink_route_socket { bind create getattr nlmsg_read read write };
allow cjdns_t self:netlink_route_socket { bind create getattr nlmsg_read read write nlmsg_write };
allow cjdns_t self:packet_socket { bind create ioctl read write };
allow cjdns_t self:tun_socket create;
diff -up ./node_build/FindPython2.js.el6 ./node_build/FindPython2.js

View File

@ -467,7 +467,7 @@ fi
%{_bindir}/graphStats
%changelog
* Thu Jun 23 2016 Stuart D. Gathman <stuart@gathman.org> 17.4-4
* Fri Jun 24 2016 Stuart D. Gathman <stuart@gathman.org> 17.4-4
- cjdns-selinux: allow cjdroute to manipulate route table
* Thu Jun 23 2016 Stuart D. Gathman <stuart@gathman.org> 17.4-3