Fix obvious errors, increase relno

5 files changed, 12 insertions, 94 deletions

diff --git a/gps-device.if b/gps-device.if
index ce0d046..71e904a 100644
--- a/gps-device.if
+++ b/gps-device.if
@@ -19,7 +19,7 @@
 ##	</summary>
 ## </param>
 #
-interface(`gps_device_getattr_gps_dev,`
+interface(`gps_device_getattr_gps_dev',`
 	gen_require(`
 		type gps_device_t;
 	')
@@ -37,7 +37,7 @@ interface(`gps_device_getattr_gps_dev,`
 ##	</summary>
 ## </param>
 #
-interface(`gps_device_setattr_gps_dev,`
+interface(`gps_device_setattr_gps_dev',`
 	gen_require(`
 		type gps_device_t;
 	')
@@ -55,7 +55,7 @@ interface(`gps_device_setattr_gps_dev,`
 ##	</summary>
 ## </param>
 #
-interface(`gps_device_read_gps_dev,`
+interface(`gps_device_read_gps_dev',`
 	gen_require(`
 		type gps_device_t;
 	')
@@ -73,7 +73,7 @@ interface(`gps_device_read_gps_dev,`
 ##	</summary>
 ## </param>
 #
-interface(`gps_device_rw_gps_dev,`
+interface(`gps_device_rw_gps_dev',`
 	gen_require(`
 		type device_t;
 		type gps_device_t;
diff --git a/gps-device.te b/gps-device.te
index 4ec2170..a2698f0 100644
--- a/gps-device.te
+++ b/gps-device.te
@@ -1,12 +1,10 @@
-policy_module(gps-device,0.0.1)
+policy_module(gps_device,0.0.2)
 
 ########################################
 #
 # Declarations
 #
+type gps_device_t;
+dev_node(gps_device_t)
 
 
-########################################
-#
-# Myapp local policy
-#
diff --git a/gpsd-devices.if b/gpsd-devices.if
index 3eeda41..a24defd 100644
--- a/gpsd-devices.if
+++ b/gpsd-devices.if
@@ -1,83 +1 @@
-## <summary>gpsd monitor daemon</summary>
-
-########################################
-## <summary>
-##      Execute a domain transition to run gpsd.
-## </summary>
-## <param name="domain">
-## <summary>
-##      Domain allowed to transition.
-## </summary>
-## </param>
-#
-interface(`gpsd_domtrans',`
-        gen_require(`
-                type gpsd_t, gpsd_exec_t;
-        ')
-
-        domtrans_pattern($1, gpsd_exec_t, gpsd_t)
-')
-
-########################################
-## <summary>
-##      Execute gpsd in the gpsd domain, and
-##      allow the specified role the gpsd domain.
-## </summary>
-## <param name="domain">
-##      <summary>
-##      Domain allowed access
-##      </summary>
-## </param>
-## <param name="role">
-##      <summary>
-##      The role to be allowed the gpsd domain.
-##      </summary>
-## </param>
-#
-interface(`gpsd_run',`
-        gen_require(`
-                type gpsd_t;
-        ')
-
-        gpsd_domtrans($1)
-        role $2 types gpsd_t;
-')
-
-########################################
-## <summary>    
-##      Read and write to gpsd shared memory.
-## </summary>
-## <param name="domain">
-##      <summary>
-##      The type of the process performing this action.
-##      </summary>
-## </param>
-#
-interface(`gpsd_rw_shm',`
-        gen_require(`
-                type gpsd_t;
-        ')
-
-        allow $1 gpsd_t:shm rw_shm_perms;
-')
-
-########################################
-## <summary>
-##      Read/write gpsd tmpfs files.
-## </summary>
-## <param name="domain">
-##      <summary>
-##      The type of the process performing this action.
-##      </summary>
-## </param>
-#
-interface(`gpsd_rw_tmpfs_files',`
-        gen_require(`
-                type gpsd_tmpfs_t;
-        ')
-
-        fs_search_tmpfs($1)
-        allow $1 gpsd_tmpfs_t:dir list_dir_perms;
-        rw_files_pattern($1, gpsd_tmpfs_t, gpsd_tmpfs_t)
-        read_lnk_files_pattern($1, gpsd_tmpfs_t, gpsd_tmpfs_t)
-')
+## <summary>gpsd monitor daemon (use gpsd.if stuff)</summary>
diff --git a/gpsd-devices.spec b/gpsd-devices.spec
index 342fa1f..b9ef435 100644
--- a/gpsd-devices.spec
+++ b/gpsd-devices.spec
@@ -1,6 +1,6 @@
 Name:		gps-devices
 Version:	0.0.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	GPS Devices for navigation
 
 Group:		System Environment/Daemons
@@ -33,6 +33,8 @@ be added to and removed from gpsd automatically.
 
 %prep
 %setup -c -T
+cp %{SOURCE11} %{SOURCE12} %{SOURCE13} .
+cp %{SOURCE21} %{SOURCE22} %{SOURCE23} .
 cp %{SOURCE30} .
 
 
diff --git a/gpsd-devices.te b/gpsd-devices.te
index 7a1309f..1823f99 100644
--- a/gpsd-devices.te
+++ b/gpsd-devices.te
@@ -1,4 +1,4 @@
-policy_module(gpsd_devices,0.0.1)
+policy_module(gpsd_devices,0.0.2)
 
 ########################################
 #