rpms/thinkfinger/devel thinkfinger-0.3-policykit.patch, NONE, 1.1 thinkfinger-0.3-hal.patch, 1.2, 1.3 thinkfinger.spec, 1.5, 1.6

Mike Bonnet (mikeb) fedora-extras-commits at redhat.com
Thu Sep 27 05:54:06 UTC 2007 

Author: mikeb

Update of /cvs/pkgs/rpms/thinkfinger/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19787

Modified Files:
	thinkfinger-0.3-hal.patch thinkfinger.spec 
Added Files:
	thinkfinger-0.3-policykit.patch 
Log Message:
use PolicyKit to manage fingerprint reader access

thinkfinger-0.3-policykit.patch:

--- NEW FILE thinkfinger-0.3-policykit.patch ---
diff -uNr thinkfinger-0.3.orig/data/Makefile.am thinkfinger-0.3/data/Makefile.am
--- thinkfinger-0.3.orig/data/Makefile.am	2007-09-27 01:31:28.000000000 -0400
+++ thinkfinger-0.3/data/Makefile.am	2007-09-27 01:36:58.000000000 -0400
@@ -8,4 +8,7 @@
 halpolicydir = $(datadir)/hal/fdi/policy/10osvendor
 halpolicy_DATA = 00-thinkfinger.fdi
 
-EXTRA_DIST = 60-thinkfinger.perms 00-thinkfinger.fdi
+policykitdir = $(datadir)/PolicyKit/policy
+policykit_DATA = thinkfinger.policy
+
+EXTRA_DIST = 60-thinkfinger.perms 00-thinkfinger.fdi thinkfinger.policy
diff -uNr thinkfinger-0.3.orig/data/Makefile.in thinkfinger-0.3/data/Makefile.in
--- thinkfinger-0.3.orig/data/Makefile.in	2007-09-27 01:31:28.000000000 -0400
+++ thinkfinger-0.3/data/Makefile.in	2007-09-27 01:40:56.000000000 -0400
@@ -50,10 +50,11 @@
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 am__installdirs = "$(DESTDIR)$(consolepermsdir)" \
-	"$(DESTDIR)$(halpolicydir)"
+	"$(DESTDIR)$(halpolicydir)" "$(DESTDIR)$(policykitdir)"
 consolepermsDATA_INSTALL = $(INSTALL_DATA)
 halpolicyDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(consoleperms_DATA) $(halpolicy_DATA)
+policykitDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(consoleperms_DATA) $(halpolicy_DATA) $(policykit_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ACL_LIBS = @ACL_LIBS@
@@ -178,7 +179,9 @@
 @USE_CONSOLE_PERMS_TRUE at consoleperms_DATA = 60-thinkfinger.perms
 halpolicydir = $(datadir)/hal/fdi/policy/10osvendor
 halpolicy_DATA = 00-thinkfinger.fdi
-EXTRA_DIST = 60-thinkfinger.perms 00-thinkfinger.fdi
+policykitdir = $(datadir)/PolicyKit/policy
+policykit_DATA = thinkfinger.policy
+EXTRA_DIST = 60-thinkfinger.perms 00-thinkfinger.fdi thinkfinger.policy
 all: all-am
 
 .SUFFIXES:
@@ -251,6 +254,23 @@
 	  echo " rm -f '$(DESTDIR)$(halpolicydir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(halpolicydir)/$$f"; \
 	done
+install-policykitDATA: $(policykit_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(policykitdir)" || $(MKDIR_P) "$(DESTDIR)$(policykitdir)"
+	@list='$(policykit_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(policykitDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(policykitdir)/$$f'"; \
+	  $(policykitDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(policykitdir)/$$f"; \
+	done
+
+uninstall-policykitDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(policykit_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(policykitdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(policykitdir)/$$f"; \
+	done
 tags: TAGS
 TAGS:
 
@@ -288,7 +308,7 @@
 check: check-am
 all-am: Makefile $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(consolepermsdir)" "$(DESTDIR)$(halpolicydir)"; do \
+	for dir in "$(DESTDIR)$(consolepermsdir)" "$(DESTDIR)$(halpolicydir)" "$(DESTDIR)$(policykitdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -333,7 +353,8 @@
 
 info-am:
 
-install-data-am: install-consolepermsDATA install-halpolicyDATA
+install-data-am: install-consolepermsDATA install-halpolicyDATA \
+	install-policykitDATA
 
 install-dvi: install-dvi-am
 
@@ -367,7 +388,8 @@
 
 ps-am:
 
-uninstall-am: uninstall-consolepermsDATA uninstall-halpolicyDATA
+uninstall-am: uninstall-consolepermsDATA uninstall-halpolicyDATA \
+	uninstall-policykitDATA
 
 .MAKE: install-am install-strip
 
@@ -378,11 +400,12 @@
 	install-dvi install-dvi-am install-exec install-exec-am \
 	install-halpolicyDATA install-html install-html-am \
 	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-consolepermsDATA uninstall-halpolicyDATA
+	install-pdf-am install-policykitDATA install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	uninstall uninstall-am uninstall-consolepermsDATA \
+	uninstall-halpolicyDATA uninstall-policykitDATA
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff -uNr thinkfinger-0.3.orig/data/thinkfinger.policy thinkfinger-0.3/data/thinkfinger.policy
--- thinkfinger-0.3.orig/data/thinkfinger.policy	1969-12-31 19:00:00.000000000 -0500
+++ thinkfinger-0.3/data/thinkfinger.policy	2007-09-27 01:35:27.000000000 -0400
@@ -0,0 +1,15 @@
+<?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.thinkfinger">
+    <description>Directly access the fingerprint reader</description>
+    <message>System policy prevents access to the fingerprint reader</message>
+    <defaults>
+      <allow_inactive>no</allow_inactive>
+      <allow_active>yes</allow_active>
+    </defaults>
+  </action>
+</policyconfig>
diff -uNr thinkfinger-0.3.orig/docs/Makefile.in thinkfinger-0.3/docs/Makefile.in
--- thinkfinger-0.3.orig/docs/Makefile.in	2007-03-30 04:22:27.000000000 -0400
+++ thinkfinger-0.3/docs/Makefile.in	2007-09-27 01:40:56.000000000 -0400
@@ -61,6 +61,7 @@
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
+ACL_LIBS = @ACL_LIBS@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
diff -uNr thinkfinger-0.3.orig/docs/autodocs/Makefile.in thinkfinger-0.3/docs/autodocs/Makefile.in
--- thinkfinger-0.3.orig/docs/autodocs/Makefile.in	2007-03-30 04:22:27.000000000 -0400
+++ thinkfinger-0.3/docs/autodocs/Makefile.in	2007-09-27 01:40:56.000000000 -0400
@@ -44,6 +44,7 @@
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
+ACL_LIBS = @ACL_LIBS@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
diff -uNr thinkfinger-0.3.orig/libthinkfinger/Makefile.in thinkfinger-0.3/libthinkfinger/Makefile.in
--- thinkfinger-0.3.orig/libthinkfinger/Makefile.in	2007-03-30 04:22:27.000000000 -0400
+++ thinkfinger-0.3/libthinkfinger/Makefile.in	2007-09-27 01:40:56.000000000 -0400
@@ -85,6 +85,7 @@
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
+ACL_LIBS = @ACL_LIBS@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
diff -uNr thinkfinger-0.3.orig/pam/Makefile.in thinkfinger-0.3/pam/Makefile.in
--- thinkfinger-0.3.orig/pam/Makefile.in	2007-03-30 04:22:27.000000000 -0400
+++ thinkfinger-0.3/pam/Makefile.in	2007-09-27 01:40:56.000000000 -0400
@@ -80,6 +80,7 @@
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
+ACL_LIBS = @ACL_LIBS@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@

thinkfinger-0.3-hal.patch:

Index: thinkfinger-0.3-hal.patch
===================================================================
RCS file: /cvs/pkgs/rpms/thinkfinger/devel/thinkfinger-0.3-hal.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- thinkfinger-0.3-hal.patch	27 Sep 2007 03:36:44 -0000	1.2
+++ thinkfinger-0.3-hal.patch	27 Sep 2007 05:53:33 -0000	1.3
@@ -1,6 +1,6 @@
 --- thinkfinger-0.3/data/00-thinkfinger.fdi.hal	1970-01-01 01:00:00.000000000 +0100
 +++ thinkfinger-0.3/data/00-thinkfinger.fdi	2007-09-22 12:41:33.000000000 +0200
-@@ -0,0 +1,17 @@
+@@ -0,0 +1,18 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<deviceinfo version="0.2">
 +  <device>
@@ -13,6 +13,7 @@
 +      <match key="usb_device.product_id" int="8214"> <!-- Fingerprint Reader -->
 +        <append key="info.capabilities" type="strlist">access_control</append>
 +        <merge key="access_control.file" type="copy_property">linux.device_file</merge>
++        <merge key="access_control.type" type="string">thinkfinger</merge>
 +      </match>
 +    </match>
 +


Index: thinkfinger.spec
===================================================================
RCS file: /cvs/pkgs/rpms/thinkfinger/devel/thinkfinger.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- thinkfinger.spec	27 Sep 2007 03:36:44 -0000	1.5
+++ thinkfinger.spec	27 Sep 2007 05:53:33 -0000	1.6
@@ -11,12 +11,14 @@
 Patch1:         thinkfinger-0.3-acl.patch
 Patch2:         thinkfinger-0.3-has-device.patch
 Patch3:         thinkfinger-0.3-hal.patch
+Patch4:         thinkfinger-0.3-policykit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libusb-devel >= 0.1.11
 BuildRequires:  libacl-devel
 BuildRequires:  pam-devel
 BuildRequires:  doxygen
 Requires:       hal
+Requires:       PolicyKit
 
 %description
 ThinkFinger is a driver for the UPEK/SGS Thomson Microelectronics fingerprint
@@ -68,6 +70,7 @@
 touch -r configure.in.stamp configure.in
 %patch2 -p1 -b .has-device
 %patch3 -p1 -b .hal
+%patch4 -p1 -b .policykit
 %{__install} -pm 644 %{SOURCE1} README.Fedora
 
 
@@ -116,6 +119,7 @@
 %{_sysconfdir}/pam_thinkfinger
 %{_sysconfdir}/security/console.perms.d/*
 %{_datadir}/hal/fdi/policy/10osvendor/*
+%{_datadir}/PolicyKit/policy/*
 %config %attr(0755,root,root)/etc/sysconfig/modules/thinkfinger.modules 
 
 %files devel
@@ -130,6 +134,7 @@
 %changelog
 * Wed Sep 26 2007 Mike Bonnet <mikeb at redhat.com> - 0.3-5
 - put fdi file in policy/ directory
+- use PolicyKit to manage fingerprint reader access
 
 * Wed Sep  5 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.3-4
 - Patched to allow non-root users, making screensavers work. Patches by William Jon McCann and Mike Bonnet (RH #256107)

More information about the fedora-extras-commits mailing list