diff --git a/refpolicy/Changelog b/refpolicy/Changelog
index 172e64a1..cde6128a 100644
--- a/refpolicy/Changelog
+++ b/refpolicy/Changelog
@@ -19,6 +19,7 @@
dbskk
dovecot
distcc
+ i18n_input
irqbalance
lpd
networkmanager
diff --git a/refpolicy/policy/modules/kernel/corenetwork.te.in b/refpolicy/policy/modules/kernel/corenetwork.te.in
index 48737a5f..a5040fb2 100644
--- a/refpolicy/policy/modules/kernel/corenetwork.te.in
+++ b/refpolicy/policy/modules/kernel/corenetwork.te.in
@@ -1,5 +1,5 @@
-policy_module(corenetwork,1.0)
+policy_module(corenetwork,1.0.1)
########################################
#
@@ -68,7 +68,7 @@ network_port(http_cache, tcp,3128,s0, udp,3130,s0, tcp,8080,s0, tcp,8118,s0) # 8
network_port(http, tcp,80,s0, tcp,443,s0, tcp,488,s0, tcp,8008,s0)
network_port(howl, tcp,5335,s0, udp,5353,s0)
network_port(hplip, tcp,50000,s0, tcp,50002,s0)
-type i18n_input_port_t, port_type; dnl network_port(i18n_input) # no defined portcon in current strict
+network_port(i18n_input, tcp,9010,s0)
network_port(imaze, tcp,5323,s0, udp,5323,s0)
network_port(inetd_child, tcp,7,s0, udp,7,s0, tcp,9,s0, udp,9,s0, tcp,13,s0, udp,13,s0, tcp,19,s0, udp,19,s0, tcp,37,s0, udp,37,s0, tcp,512,s0, tcp,543,s0, tcp,544,s0, tcp,891,s0, udp,891,s0, tcp,892,s0, udp,892,s0, tcp,2105,s0, tcp,5666,s0)
network_port(innd, tcp,119,s0)
diff --git a/refpolicy/policy/modules/services/canna.te b/refpolicy/policy/modules/services/canna.te
index afbab294..f0004d82 100644
--- a/refpolicy/policy/modules/services/canna.te
+++ b/refpolicy/policy/modules/services/canna.te
@@ -1,5 +1,4 @@
-
policy_module(canna,1.0)
########################################
@@ -105,9 +104,3 @@ optional_policy(`selinuxutil',`
optional_policy(`udev',`
udev_read_db(canna_t)
')
-
-ifdef(`TODO',`
-optional_policy(`canna',`
- canna_stream_connect(i18n_input_t)
-')
-')
diff --git a/refpolicy/policy/modules/services/i18n_input.fc b/refpolicy/policy/modules/services/i18n_input.fc
new file mode 100644
index 00000000..024eb188
--- /dev/null
+++ b/refpolicy/policy/modules/services/i18n_input.fc
@@ -0,0 +1,19 @@
+#
+# /usr
+#
+
+/usr/bin/iiimd\.bin -- gen_context(system_u:object_r:i18n_input_exec_t,s0)
+/usr/bin/httx -- gen_context(system_u:object_r:i18n_input_exec_t,s0)
+/usr/bin/htt_xbe -- gen_context(system_u:object_r:i18n_input_exec_t,s0)
+/usr/bin/iiimx -- gen_context(system_u:object_r:i18n_input_exec_t,s0)
+
+/usr/lib/iiim/iiim-xbe -- gen_context(system_u:object_r:i18n_input_exec_t,s0)
+
+/usr/sbin/htt -- gen_context(system_u:object_r:i18n_input_exec_t,s0)
+/usr/sbin/htt_server -- gen_context(system_u:object_r:i18n_input_exec_t,s0)
+
+#
+# /var
+#
+
+/var/run/iiim(/.*)? gen_context(system_u:object_r:i18n_input_var_run_t,s0)
diff --git a/refpolicy/policy/modules/services/i18n_input.if b/refpolicy/policy/modules/services/i18n_input.if
new file mode 100644
index 00000000..a65ca50c
--- /dev/null
+++ b/refpolicy/policy/modules/services/i18n_input.if
@@ -0,0 +1,19 @@
+## IIIMF htt server
+
+########################################
+##
+## Use i18n_input over a TCP connection.
+##
+##
+## Domain allowed access.
+##
+#
+interface(`i18n_use',`
+ gen_require(`
+ type i18n_input_t;
+ ')
+
+ allow $1 i18n_input_t:tcp_socket { connectto recvfrom };
+ allow i18n_input_t $1:tcp_socket { acceptfrom recvfrom };
+ kernel_tcp_recvfrom($1)
+')
diff --git a/refpolicy/policy/modules/services/i18n_input.te b/refpolicy/policy/modules/services/i18n_input.te
new file mode 100644
index 00000000..9501590e
--- /dev/null
+++ b/refpolicy/policy/modules/services/i18n_input.te
@@ -0,0 +1,122 @@
+
+policy_module(i18n_input,1.0.0)
+
+########################################
+#
+# Declarations
+#
+
+type i18n_input_t;
+type i18n_input_exec_t;
+init_daemon_domain(i18n_input_t,i18n_input_exec_t)
+
+type i18n_input_var_run_t;
+files_pid_file(i18n_input_var_run_t)
+
+########################################
+#
+# i18n_input local policy
+#
+
+allow i18n_input_t self:capability { kill setgid setuid };
+dontaudit i18n_input_t self:capability sys_tty_config;
+allow i18n_input_t self:process { signal_perms setsched setpgid };
+allow i18n_input_t self:fifo_file rw_file_perms;
+allow i18n_input_t self:unix_dgram_socket create_socket_perms;
+allow i18n_input_t self:unix_stream_socket create_stream_socket_perms;
+allow i18n_input_t self:tcp_socket create_stream_socket_perms;
+allow i18n_input_t self:udp_socket create_socket_perms;
+
+allow i18n_input_t i18n_input_var_run_t:dir create_dir_perms;
+allow i18n_input_t i18n_input_var_run_t:file create_file_perms;
+allow i18n_input_t i18n_input_var_run_t:sock_file create_file_perms;
+files_create_pid(i18n_input_t,i18n_input_var_run_t)
+
+can_exec(i18n_input_t, i18n_input_exec_t)
+
+kernel_read_kernel_sysctl(i18n_input_t)
+kernel_read_system_state(i18n_input_t)
+kernel_tcp_recvfrom(i18n_input_t)
+
+corenet_tcp_sendrecv_generic_if(i18n_input_t)
+corenet_udp_sendrecv_generic_if(i18n_input_t)
+corenet_raw_sendrecv_generic_if(i18n_input_t)
+corenet_tcp_sendrecv_all_nodes(i18n_input_t)
+corenet_udp_sendrecv_all_nodes(i18n_input_t)
+corenet_raw_sendrecv_all_nodes(i18n_input_t)
+corenet_tcp_sendrecv_all_ports(i18n_input_t)
+corenet_udp_sendrecv_all_ports(i18n_input_t)
+corenet_tcp_bind_all_nodes(i18n_input_t)
+corenet_udp_bind_all_nodes(i18n_input_t)
+corenet_tcp_bind_i18n_input_port(i18n_input_t)
+corenet_tcp_connect_all_ports(i18n_input_t)
+
+dev_read_sysfs(i18n_input_t)
+
+fs_getattr_all_fs(i18n_input_t)
+fs_search_auto_mountpoints(i18n_input_t)
+
+term_dontaudit_use_console(i18n_input_t)
+
+corecmd_search_sbin(i18n_input_t)
+corecmd_search_bin(i18n_input_t)
+corecmd_exec_bin(i18n_input_t)
+
+domain_use_wide_inherit_fd(i18n_input_t)
+
+files_read_etc_files(i18n_input_t)
+files_read_etc_runtime_files(i18n_input_t)
+files_read_usr_files(i18n_input_t)
+
+init_use_fd(i18n_input_t)
+init_use_script_pty(i18n_input_t)
+init_unix_connect_script(i18n_input_t)
+
+libs_use_ld_so(i18n_input_t)
+libs_use_shared_libs(i18n_input_t)
+
+logging_send_syslog_msg(i18n_input_t)
+
+miscfiles_read_localization(i18n_input_t)
+
+sysnet_read_config(i18n_input_t)
+
+userdom_dontaudit_use_unpriv_user_fd(i18n_input_t)
+userdom_dontaudit_search_sysadm_home_dir(i18n_input_t)
+userdom_read_unpriv_user_home_files(i18n_input_t)
+
+ifdef(`targeted_policy',`
+ term_dontaudit_use_unallocated_tty(i18n_input_t)
+ term_dontaudit_use_generic_pty(i18n_input_t)
+ files_dontaudit_read_root_file(i18n_input_t)
+')
+
+tunable_policy(`use_nfs_home_dirs',`
+ fs_read_nfs_files(i18n_input_t)
+ fs_read_nfs_symlinks(i18n_input_t)
+')
+
+tunable_policy(`use_samba_home_dirs',`
+ fs_read_cifs_files(i18n_input_t)
+ fs_read_cifs_symlinks(i18n_input_t)
+')
+
+optional_policy(`canna',`
+ canna_stream_connect(i18n_input_t)
+')
+
+optional_policy(`mount',`
+ mount_send_nfs_client_request(i18n_input_t)
+')
+
+optional_policy(`nis',`
+ nis_use_ypbind(i18n_input_t)
+')
+
+optional_policy(`selinuxutil',`
+ seutil_sigchld_newrole(i18n_input_t)
+')
+
+optional_policy(`udev',`
+ udev_read_db(i18n_input_t)
+')
diff --git a/refpolicy/policy/modules/system/libraries.fc b/refpolicy/policy/modules/system/libraries.fc
index e15643dd..28c16701 100644
--- a/refpolicy/policy/modules/system/libraries.fc
+++ b/refpolicy/policy/modules/system/libraries.fc
@@ -59,6 +59,9 @@ ifdef(`distro_redhat',`
/usr/lib/win32/.* -- gen_context(system_u:object_r:shlib_t,s0)
+/usr/lib(64)?/im/.*\.so.* -- gen_context(system_u:object_r:shlib_t,s0)
+/usr/lib(64)?/iiim/.*\.so.* -- gen_context(system_u:object_r:shlib_t,s0)
+
/usr/lib(64)?/libGL(core)?/.so(\.[^/]*)* -- gen_context(system_u:object_r:texrel_shlib_t,s0)
/usr/lib(64)?(/.*)?/libnvidia.*\.so(\.[^/]*)* -- gen_context(system_u:object_r:texrel_shlib_t,s0)
diff --git a/refpolicy/policy/modules/system/userdomain.if b/refpolicy/policy/modules/system/userdomain.if
index 893834a9..a4f90d9d 100644
--- a/refpolicy/policy/modules/system/userdomain.if
+++ b/refpolicy/policy/modules/system/userdomain.if
@@ -363,6 +363,10 @@ template(`base_user_template',`
finger_tcp_connect($1_t)
')
+ optional_policy(`i18n_input',`
+ i18n_use($1_t)
+ ')
+
optional_policy(`inetd',`
inetd_tcp_connect($1_t)
inetd_udp_sendto($1_t)
@@ -2401,7 +2405,9 @@ interface(`userdom_read_unpriv_user_home_files',`
attribute user_home_dir_type, user_home_type;
')
- allow $1 user_home_dir_type:dir search;
+ allow $1 user_home_dir_type:dir search_dir_perms;
+ allow $1 user_home_type:dir r_dir_perms;
+ allow $1 user_home_type:lnk_file { getattr read };
allow $1 user_home_type:file r_file_perms;
')
diff --git a/refpolicy/policy/modules/system/userdomain.te b/refpolicy/policy/modules/system/userdomain.te
index 7156e8fd..38051725 100644
--- a/refpolicy/policy/modules/system/userdomain.te
+++ b/refpolicy/policy/modules/system/userdomain.te
@@ -1,5 +1,5 @@
-policy_module(userdomain,1.0.4)
+policy_module(userdomain,1.0.5)
########################################
#