- Synchronize with F-8 branch: add HAL, PolicyKit rules (#280251)

2008-01-04 08:43:15 +00:00 · 2008-01-04 08:43:15 +00:00 · 008844abc4
parent 874c097121
commit 008844abc4
4 changed files with 101 additions and 4 deletions
--- a/19-pam-acl-management.fdi
+++ b/19-pam-acl-management.fdi
@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deviceinfo version="0.2">
+
+  <device>
+
+   <match key="usb.vendor_id" int="0x054c">
+      <!-- Sony Clie 3.5 -->
+      <match key="usb.product_id" int="0x0038">
+         <append key="info.capabilities" type="strlist">access_control</append>
+         <merge key="access_control.type" type="string">pda</merge>
+         <merge key="access_control.file" type="copy_property">linux.device_file</merge>                            
+      </match>
+      <!-- Sony Clie SJ-22 -->
+      <match key="usb.product_id" int="0x0066">
+          <append key="info.capabilities" type="strlist">access_control</append>
+          <merge key="access_control.type" type="string">pda</merge>
+          <merge key="access_control.file" type="copy_property">linux.device_file</merge>
+      </match>
+   </match>
+
+   <!-- Handspring -->
+   <match key="usb.vendor_id" int="0x082d">
+      <!-- Visor -->
+      <match key="usb.product_id" int="0x0100">
+         <append key="info.capabilities" type="strlist">access_control</append>
+         <merge key="access_control.type" type="string">pda</merge>
+         <merge key="access_control.file" type="copy_property">linux.device_file</merge>                  
+      </match>
+   </match>
+
+   <!-- Known Palm PDAs from Palm, Inc. -->
+   <match key="usb.vendor_id" int="0x0830">
+      <!-- Palm m130 -->
+      <match key="usb.product_id" int="0x0050">
+        <append key="info.capabilities" type="strlist">access_control</append>
+        <merge key="access_control.type" type="string">pda</merge>
+        <merge key="access_control.file" type="copy_property">linux.device_file</merge>
+      </match>
+      <!-- Tungsten T5 -->
+      <match key="usb.product_id" int="0x0061">
+         <append key="info.capabilities" type="strlist">access_control</append>
+         <merge key="access_control.type" type="string">pda</merge>
+         <merge key="access_control.file" type="copy_property">linux.device_file</merge>                              
+      </match>
+   </match>
+
+    <match key="info.subsystem" string="usb_device">
+      <match key="info.product" contains="Palm Handheld">
+          <append key="info.capabilities" type="strlist">access_control</append>
+          <merge key="access_control.type" type="string">pda</merge>
+          <merge key="access_control.file" type="copy_property">linux.device_file</merge>
+      </match>
+    </match>
+
+  </device>
+</deviceinfo>
--- a/1
+++ b/1
@ -0,0 +1 @@
+blacklist visor
--- a/pilot-device-file.policy
+++ b/pilot-device-file.policy
@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE policyconfig PUBLIC
+ "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd">
+
+<policyconfig>
+
+  <action id="org.freedesktop.hal.device-access.pda">
+    <description>Directly access pda devices</description>
+    <message>System policy prevents access to the pda devices</message>
+    <defaults>
+      <allow_inactive>no</allow_inactive>
+      <allow_active>yes</allow_active>
+    </defaults>
+  </action>
+
+</policyconfig>
--- a/pilot-link.spec
+++ b/pilot-link.spec
@ -3,14 +3,18 @@

 Name: pilot-link
 Version: 0.12.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 2
 License: GPLv2 and GPLv2+ and LGPLv2+ and TCL
 Group: Applications/Communications
 Summary: File transfer utilities between Linux and PalmPilots
 URL: http://www.pilot-link.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source: pilot-link-%{version}.tar.bz2
+Source0: pilot-link-%{version}.tar.bz2
+Source1: 19-pam-acl-management.fdi
+Source2: pilot-device-file.policy
+Source3: blacklist-visor
+
 ExcludeArch: s390 s390x
 #Patch1: pilot-link-0.11.0-perlmd5.patch  # May be still applied
 #Patch2: pilot-link-0.11.0-perlpollute.patch  # May be still applied
@ -129,6 +133,18 @@ rm -f %{buildroot}%{_libdir}/*.a
 # remove broken prog
 rm -f %{buildroot}%{_bindir}/pilot-prc

+# Install hal rules file.
+mkdir -p %{buildroot}%{_datadir}/hal/fdi/policy/10osvendor/
+install -p -m644 %{SOURCE1} %{buildroot}%{_datadir}/hal/fdi/policy/10osvendor/19-pam-acl-management.fdi
+
+# Install PolicyKit
+mkdir -p %{buildroot}%{_datadir}/PolicyKit/policy
+install -p -m644 %{SOURCE2} %{buildroot}%{_datadir}/PolicyKit/policy/pilot-device-file.policy
+
+# Put visor to blacklist
+mkdir -p %{buildroot}%{_sysconfdir}/modprobe.d/
+install -p -m644 %{SOURCE3} %{buildroot}%{_sysconfdir}/modprobe.d/blacklist-visor
+
 %post -p /sbin/ldconfig

 %postun -p /sbin/ldconfig
@ -147,6 +163,9 @@ rm -rf %{buildroot}
 %{_bindir}/*
 %{_datadir}/pilot-link
 %{_mandir}/man?/*
+%config(noreplace) %{_datadir}/hal/fdi/policy/10osvendor/19-pam-acl-management.fdi
+%config(noreplace) %{_datadir}/PolicyKit/policy/pilot-device-file.policy
+%config(noreplace) %{_sysconfdir}/modprobe.d/blacklist-visor

 %files devel
 %defattr(-,root,root)
@ -156,6 +175,9 @@ rm -rf %{buildroot}
 %{_datadir}/aclocal/*.m4

 %changelog
+* Fri Jan  4 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 2:0.12.3-3
+- Synchronize with F-8 branch: add HAL, PolicyKit rules (#280251)
+
 * Tue Dec 11 2007 Ivana Varekova <varekova@redhat.com> - 2:0.12.3-2
 - fix md5 header file

@ -163,10 +185,10 @@ rm -rf %{buildroot}
 - update to 0.12.3
 - remove static libraries

-* Mon Nov 12 2007 Alex Lancaster <alexl@users.sourceforge.net> - 2:0.12.2-7
+* Mon Nov 12 2007 Alex Lancaster <alexlan[AT]fedoraproject org> - 2:0.12.2-7
 - Perl bindings need to be compiled after libpisock is installed

-* Mon Nov 12 2007 Alex Lancaster <alexl@users.sourceforge.net> - 2:0.12.2-6
+* Mon Nov 12 2007 Alex Lancaster <alexlan[AT]fedoraproject org> - 2:0.12.2-6
 - Enable Perl bindings
 - Include important docs such as README.usb