[Pkg-utopia-commits] r3051 - in /packages/unstable/hal/debian: ./ patches/

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Wed Apr 8 08:18:38 UTC 2009 

Author: biebl
Date: Wed Apr  8 08:18:38 2009
New Revision: 3051

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=3051
Log:
Enable support for PolicyKit, ConsoleKit and dynamic ACL management.

* Enable support for PolicyKit, ConsoleKit and dynamic ACL management.
* Remove obsolete patches, we use PolicyKit now to control access to hal.
  - debian/patches/01_hal_debian_dbuspolicy.patch
  - debian/patches/55_nonpolkit-mount-policy.patch
  - debian/patches/71-hal.conf.in-qualify-all-send_interface-.-with-s.patch
  - debian/patches/72-Allow-anyone-to-introspect-the-hal-daemon-even-with.patch
  - debian/patches/73-Let-root-call-any-hal-method.patch
  - debian/patches/74-powerdev.patch
  - debian/patches/75-at_console.patch
* debian/hal.postinst
  - Do no longer create the system groups plugdev and powerdev as PolicyKit
    is used now.
  - Grant hal access to query the PolicyKit database.
* debian/README.Debian
  - Remove section regarding group plugdev and powerdev.
* debian/control
  - Add Build-Depends on libpolkit-dev (>= 0.7) and
    libck-connector-dev (>= 0.3).
  - Add Depends on policykit (>= 0.7), consolekit (>= 0.3) and acl.
* debian/hal.install
  - Install policy files in /usr/share/PolicyKit.
* debian/hal.manpages
  - Install hal-is-caller-privileged.1 man page.
* debian/patches/10-no-polkit-policy-file-validate-check.patch
  - Allow to compile hal without having the complete policykit package
    installed.
* debian/rules
  - Pass --enable-policy-kit, --enable-console-kit and
    --enable-acl-management to ./configure.

Added:
    packages/unstable/hal/debian/patches/10-no-polkit-policy-file-validate-check.patch
Removed:
    packages/unstable/hal/debian/patches/01_hal_debian_dbuspolicy.patch
    packages/unstable/hal/debian/patches/55_nonpolkit-mount-policy.patch
    packages/unstable/hal/debian/patches/71-hal.conf.in-qualify-all-send_interface-.-with-s.patch
    packages/unstable/hal/debian/patches/72-Allow-anyone-to-introspect-the-hal-daemon-even-with.patch
    packages/unstable/hal/debian/patches/73-Let-root-call-any-hal-method.patch
    packages/unstable/hal/debian/patches/74-powerdev.patch
    packages/unstable/hal/debian/patches/75-at_console.patch
Modified:
    packages/unstable/hal/debian/README.Debian
    packages/unstable/hal/debian/changelog
    packages/unstable/hal/debian/control
    packages/unstable/hal/debian/hal.install
    packages/unstable/hal/debian/hal.manpages
    packages/unstable/hal/debian/hal.postinst
    packages/unstable/hal/debian/patches/series
    packages/unstable/hal/debian/rules

Modified: packages/unstable/hal/debian/README.Debian
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/README.Debian?rev=3051&op=diff
==============================================================================
--- packages/unstable/hal/debian/README.Debian (original)
+++ packages/unstable/hal/debian/README.Debian Wed Apr  8 08:18:38 2009
@@ -1,10 +1,4 @@
  
- The powermanagement callouts are in the default hal config
- (org.freedesktop.Hal.Device.SystemPowerManagement and
- org.freedesktop.Hal.Device.LaptopPanel) can be used by users in group
- powerdev. The storage callouts (org.freedesktop.Hal.Device.Volume.*) can by
- used by users in the group plugdev.
-
  The acpi addon won't use the kernel acpi events interface but the acpid's
  event  socket if acpid is installed. If acpid is removed, hal needs to be
  restarted to enable monitoring of acpi events again. And if apci is installed,

Modified: packages/unstable/hal/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/changelog?rev=3051&op=diff
==============================================================================
--- packages/unstable/hal/debian/changelog (original)
+++ packages/unstable/hal/debian/changelog Wed Apr  8 08:18:38 2009
@@ -28,6 +28,35 @@
     - Remove the chown call, let the init script take care of it.
   * debian/hal.postrm
     - Cleanup /var/run/hald upon removal.
+  * Enable support for PolicyKit, ConsoleKit and dynamic ACL management.
+  * Remove obsolete patches, we use PolicyKit now to control access to hal.
+    - debian/patches/01_hal_debian_dbuspolicy.patch
+    - debian/patches/55_nonpolkit-mount-policy.patch
+    - debian/patches/71-hal.conf.in-qualify-all-send_interface-.-with-s.patch
+    - debian/patches/72-Allow-anyone-to-introspect-the-hal-daemon-even-with.patch
+    - debian/patches/73-Let-root-call-any-hal-method.patch
+    - debian/patches/74-powerdev.patch
+    - debian/patches/75-at_console.patch
+  * debian/hal.postinst
+    - Do no longer create the system groups plugdev and powerdev as PolicyKit
+      is used now.
+    - Grant hal access to query the PolicyKit database.
+  * debian/README.Debian
+    - Remove section regarding group plugdev and powerdev.
+  * debian/control
+    - Add Build-Depends on libpolkit-dev (>= 0.7) and
+      libck-connector-dev (>= 0.3).
+    - Add Depends on policykit (>= 0.7), consolekit (>= 0.3) and acl.
+  * debian/hal.install
+    - Install policy files in /usr/share/PolicyKit.
+  * debian/hal.manpages
+    - Install hal-is-caller-privileged.1 man page.
+  * debian/patches/10-no-polkit-policy-file-validate-check.patch
+    - Allow to compile hal without having the complete policykit package
+      installed.
+  * debian/rules
+    - Pass --enable-policy-kit, --enable-console-kit and
+      --enable-acl-management to ./configure.
 
  -- Michael Biebl <biebl at debian.org>  Wed, 07 Jan 2009 23:55:22 +0100
 

Modified: packages/unstable/hal/debian/control
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/control?rev=3051&op=diff
==============================================================================
--- packages/unstable/hal/debian/control (original)
+++ packages/unstable/hal/debian/control Wed Apr  8 08:18:38 2009
@@ -22,7 +22,9 @@
  gtk-doc-tools,
  libsmbios-dev (>= 2.0.3) [amd64 i386 lpia],
  gperf,
- quilt
+ quilt,
+ libpolkit-dev (>= 0.7),
+ libck-connector-dev (>= 0.3)
 Standards-Version: 3.8.1
 Vcs-Svn: svn://svn.debian.org/svn/pkg-utopia/packages/unstable/hal
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal
@@ -30,7 +32,7 @@
 
 Package: hal
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, pciutils, usbutils, udev (>= 0.065), dbus (>= 0.61), lsb-base (>= 3.2-14), hal-info (>= 20070402), pm-utils, mount (>= 2.13)
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, pciutils, usbutils, udev (>= 0.125), dbus (>= 0.61), lsb-base (>= 3.2-14), hal-info (>= 20070402), pm-utils, mount (>= 2.13), policykit (>= 0.7), consolekit (>= 0.3), acl
 Recommends: eject, libsmbios-bin [amd64 i386 lpia]
 Suggests: gnome-device-manager
 Description: Hardware Abstraction Layer

Modified: packages/unstable/hal/debian/hal.install
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/hal.install?rev=3051&op=diff
==============================================================================
--- packages/unstable/hal/debian/hal.install (original)
+++ packages/unstable/hal/debian/hal.install Wed Apr  8 08:18:38 2009
@@ -3,6 +3,7 @@
 debian/tmp/usr/sbin/
 debian/tmp/sbin/umount.hal usr/sbin
 debian/tmp/usr/lib/hal/
-debian/tmp/usr/share/hal/fdi
+debian/tmp/usr/share/hal/fdi/
+debian/tmp/usr/share/PolicyKit/
 debian/preferences.fdi  etc/hal/fdi/policy
 debian/debian-storage-policy-ignore-fixed-crypto-drives.fdi usr/share/hal/fdi/policy/10osvendor

Modified: packages/unstable/hal/debian/hal.manpages
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/hal.manpages?rev=3051&op=diff
==============================================================================
--- packages/unstable/hal/debian/hal.manpages (original)
+++ packages/unstable/hal/debian/hal.manpages Wed Apr  8 08:18:38 2009
@@ -4,6 +4,7 @@
 debian/tmp/usr/share/man/man1/hal-find-by-property.1
 debian/tmp/usr/share/man/man1/hal-get-property.1
 debian/tmp/usr/share/man/man1/hal-is-caller-locked-out.1
+debian/tmp/usr/share/man/man1/hal-is-caller-privileged.1
 debian/tmp/usr/share/man/man1/hal-lock.1
 debian/tmp/usr/share/man/man1/hal-set-property.1
 debian/tmp/usr/share/man/man1/lshal.1

Modified: packages/unstable/hal/debian/hal.postinst
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/hal.postinst?rev=3051&op=diff
==============================================================================
--- packages/unstable/hal/debian/hal.postinst (original)
+++ packages/unstable/hal/debian/hal.postinst Wed Apr  8 08:18:38 2009
@@ -33,12 +33,6 @@
             --gecos "Hardware abstraction layer" \
             --group haldaemon
 
-    # Add the powerdev group (power management)
-    addgroup --quiet --system powerdev || true
-
-    # Add the plugdev group (mounting removable devices)
-    addgroup --quiet --system plugdev || true
-
     # Remove old stop symlinks on upgrades
     if dpkg --compare-versions "$2" lt-nl "0.5.11-6"; then
       rm -f /etc/rc[06].d/K??hal
@@ -53,6 +47,10 @@
       invoke-rc.d dbus force-reload || true
     fi
 
+    # Allow hal to query the PolicyKit database to enforce privileges
+    if ! /usr/bin/polkit-auth --user haldaemon --explicit | grep -q 'org.freedesktop.policykit.read'; then
+     /usr/bin/polkit-auth --user haldaemon --grant 'org.freedesktop.policykit.read'
+    fi
 
   ;;
   abort-upgrade|abort-remove|abort-deconfigure)

Added: packages/unstable/hal/debian/patches/10-no-polkit-policy-file-validate-check.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/patches/10-no-polkit-policy-file-validate-check.patch?rev=3051&op=file
==============================================================================
--- packages/unstable/hal/debian/patches/10-no-polkit-policy-file-validate-check.patch (added)
+++ packages/unstable/hal/debian/patches/10-no-polkit-policy-file-validate-check.patch Wed Apr  8 08:18:38 2009
@@ -1,0 +1,29 @@
+Index: hal-0.5.12/configure.in
+===================================================================
+--- hal-0.5.12.orig/configure.in	2009-03-16 04:22:46.000000000 +0100
++++ hal-0.5.12/configure.in	2009-03-16 04:23:02.000000000 +0100
+@@ -589,7 +589,7 @@
+    AC_CHECK_PROG([POLKIT_POLICY_FILE_VALIDATE],
+ 		 [polkit-policy-file-validate], [polkit-policy-file-validate])
+    if test -z "$POLKIT_POLICY_FILE_VALIDATE"; then
+-      AC_MSG_ERROR([polkit-policy-file-validate not found])
++      AC_MSG_WARN([polkit-policy-file-validate not found])
+    fi
+ fi
+ 
+Index: hal-0.5.12/configure
+===================================================================
+--- hal-0.5.12.orig/configure	2009-03-16 04:22:46.000000000 +0100
++++ hal-0.5.12/configure	2009-03-16 04:23:12.000000000 +0100
+@@ -19507,9 +19507,8 @@
+ 
+ 
+    if test -z "$POLKIT_POLICY_FILE_VALIDATE"; then
+-      { { $as_echo "$as_me:$LINENO: error: polkit-policy-file-validate not found" >&5
+-$as_echo "$as_me: error: polkit-policy-file-validate not found" >&2;}
+-   { (exit 1); exit 1; }; }
++      { $as_echo "$as_me:$LINENO: WARNING: polkit-policy-file-validate not found" >&5
++$as_echo "$as_me: WARNING: polkit-policy-file-validate not found" >&2;}
+    fi
+ fi
+ 

Modified: packages/unstable/hal/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/patches/series?rev=3051&op=diff
==============================================================================
--- packages/unstable/hal/debian/patches/series (original)
+++ packages/unstable/hal/debian/patches/series Wed Apr  8 08:18:38 2009
@@ -1,9 +1,3 @@
-01_hal_debian_dbuspolicy.patch
+10-no-polkit-policy-file-validate-check.patch
 23_addon_acpi.patch
 40_readme_remove_hacking.patch
-55_nonpolkit-mount-policy.patch
-71-hal.conf.in-qualify-all-send_interface-.-with-s.patch
-72-Allow-anyone-to-introspect-the-hal-daemon-even-with.patch
-73-Let-root-call-any-hal-method.patch
-74-powerdev.patch
-75-at_console.patch

Modified: packages/unstable/hal/debian/rules
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/rules?rev=3051&op=diff
==============================================================================
--- packages/unstable/hal/debian/rules (original)
+++ packages/unstable/hal/debian/rules Wed Apr  8 08:18:38 2009
@@ -15,8 +15,9 @@
                              --with-hwdata=/usr/share/misc \
                              --without-macbook \
                              --without-macbookpro \
-                             --disable-policy-kit \
-                             --disable-console-kit \
+                             --enable-policy-kit \
+                             --enable-console-kit \
+                             --enable-acl-management \
                              --enable-umount-helper \
                              --enable-docbook-docs \
                              --docdir=/usr/share/doc/hal-doc

More information about the Pkg-utopia-commits mailing list