Date: Thursday, November 22, 2012 @ 09:39:05 Author: tomegun Revision: 171893
archrelease: copy trunk to testing-i686, testing-x86_64 Added: udisks/repos/testing-i686/ udisks/repos/testing-i686/PKGBUILD (from rev 171892, udisks/trunk/PKGBUILD) udisks/repos/testing-i686/drop-pci-db.patch (from rev 171892, udisks/trunk/drop-pci-db.patch) udisks/repos/testing-i686/udisks.service (from rev 171892, udisks/trunk/udisks.service) udisks/repos/testing-x86_64/ udisks/repos/testing-x86_64/PKGBUILD (from rev 171892, udisks/trunk/PKGBUILD) udisks/repos/testing-x86_64/drop-pci-db.patch (from rev 171892, udisks/trunk/drop-pci-db.patch) udisks/repos/testing-x86_64/udisks.service (from rev 171892, udisks/trunk/udisks.service) ----------------------------------+ testing-i686/PKGBUILD | 44 +++++++++++++++++++++++++++++++++++++ testing-i686/drop-pci-db.patch | 28 +++++++++++++++++++++++ testing-i686/udisks.service | 10 ++++++++ testing-x86_64/PKGBUILD | 44 +++++++++++++++++++++++++++++++++++++ testing-x86_64/drop-pci-db.patch | 28 +++++++++++++++++++++++ testing-x86_64/udisks.service | 10 ++++++++ 6 files changed, 164 insertions(+) Copied: udisks/repos/testing-i686/PKGBUILD (from rev 171892, udisks/trunk/PKGBUILD) =================================================================== --- testing-i686/PKGBUILD (rev 0) +++ testing-i686/PKGBUILD 2012-11-22 14:39:05 UTC (rev 171893) @@ -0,0 +1,44 @@ +# $Id$ +# Maintainer: Tom Gundersen <t...@jklm.no> + +pkgname=udisks +pkgver=1.0.4 +pkgrel=6 +pkgdesc="Disk Management Service" +arch=('i686' 'x86_64') +url="http://www.freedesktop.org/wiki/Software/udisks" +license=('GPL') +depends=('systemd' 'util-linux' 'sg3_utils' 'glib2' 'dbus-glib' 'polkit' 'parted' 'device-mapper' 'libatasmart' 'lsof') +makedepends=('intltool' 'docbook-xsl') +options=(!libtool) +source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz udisks.service drop-pci-db.patch) + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libexecdir=/usr/lib/udisks --disable-static + + patch -p1 < ../drop-pci-db.patch + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make profiledir=/usr/share/bash-completion/completions DESTDIR="${pkgdir}" install + chmod 644 "${pkgdir}/usr/share/bash-completion/completions/udisks-bash-completion.sh" + + # move udev helpers and rules to /usr/lib + mv "${pkgdir}"/lib/udev "${pkgdir}"/usr/lib/ + rm -r "${pkgdir}"/lib + + install -Dm644 "$srcdir/udisks.service" "$pkgdir/usr/lib/systemd/system/udisks.service" + echo "SystemdService=udisks.service" \ + >> "$pkgdir/usr/share/dbus-1/system-services/org.freedesktop.UDisks.service" + + # install the /media folder + install -d -m 755 $pkgdir/media +} +md5sums=('86c63b2b5484f2060499a052b5b6256b' + '5d80832b4d4da72beeb45c15b63a1481' + '773cccd70afd18ace4332037feff67ec') Copied: udisks/repos/testing-i686/drop-pci-db.patch (from rev 171892, udisks/trunk/drop-pci-db.patch) =================================================================== --- testing-i686/drop-pci-db.patch (rev 0) +++ testing-i686/drop-pci-db.patch 2012-11-22 14:39:05 UTC (rev 171893) @@ -0,0 +1,28 @@ +commit c73b5ab54378ec6d7df9948c46ce87f98587af9a +Author: Tom Gundersen <t...@jklm.no> +Date: 2 days ago + + udev: remove redundant call to deprecated pci-db + + The binary is no longer shipped with systemd/udev. The functionality + is taken over by a builtin, which is ran for all devices, rendering + this rule superfluous. + + Cc: Jan de Groot <j...@archlinux.org> + Signed-off-by: Tom Gundersen <t...@jklm.no> + +diff --git a/data/80-udisks.rules b/data/80-udisks.rules +index d1c8c5d..4bf2b37 100644 +--- a/data/80-udisks.rules ++++ b/data/80-udisks.rules +@@ -1,10 +1,6 @@ + # Do not edit this file, it will be overwritten on updates + # + +-# import names for PCI storage controllers +-# +-SUBSYSTEM=="pci", ACTION=="add|change", ENV{ID_MODEL_FROM_DATABASE}=="", ATTR{class}=="0x01*", IMPORT{program}="pci-db %p" +- + # Set eSATA port type for known eSATA CardBus adapters - first we want to ensure + # the device is on a cardbus controller (upper PCI device) - then we check + # vid/pid (lower PCI device) Copied: udisks/repos/testing-i686/udisks.service (from rev 171892, udisks/trunk/udisks.service) =================================================================== --- testing-i686/udisks.service (rev 0) +++ testing-i686/udisks.service 2012-11-22 14:39:05 UTC (rev 171893) @@ -0,0 +1,10 @@ +[Unit] +Description=UDisks + +[Service] +Type=dbus +BusName=org.freedesktop.UDisks +ExecStart=/usr/lib/udisks/udisks-daemon + +[Install] +WantedBy=graphical.target Copied: udisks/repos/testing-x86_64/PKGBUILD (from rev 171892, udisks/trunk/PKGBUILD) =================================================================== --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2012-11-22 14:39:05 UTC (rev 171893) @@ -0,0 +1,44 @@ +# $Id$ +# Maintainer: Tom Gundersen <t...@jklm.no> + +pkgname=udisks +pkgver=1.0.4 +pkgrel=6 +pkgdesc="Disk Management Service" +arch=('i686' 'x86_64') +url="http://www.freedesktop.org/wiki/Software/udisks" +license=('GPL') +depends=('systemd' 'util-linux' 'sg3_utils' 'glib2' 'dbus-glib' 'polkit' 'parted' 'device-mapper' 'libatasmart' 'lsof') +makedepends=('intltool' 'docbook-xsl') +options=(!libtool) +source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz udisks.service drop-pci-db.patch) + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libexecdir=/usr/lib/udisks --disable-static + + patch -p1 < ../drop-pci-db.patch + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make profiledir=/usr/share/bash-completion/completions DESTDIR="${pkgdir}" install + chmod 644 "${pkgdir}/usr/share/bash-completion/completions/udisks-bash-completion.sh" + + # move udev helpers and rules to /usr/lib + mv "${pkgdir}"/lib/udev "${pkgdir}"/usr/lib/ + rm -r "${pkgdir}"/lib + + install -Dm644 "$srcdir/udisks.service" "$pkgdir/usr/lib/systemd/system/udisks.service" + echo "SystemdService=udisks.service" \ + >> "$pkgdir/usr/share/dbus-1/system-services/org.freedesktop.UDisks.service" + + # install the /media folder + install -d -m 755 $pkgdir/media +} +md5sums=('86c63b2b5484f2060499a052b5b6256b' + '5d80832b4d4da72beeb45c15b63a1481' + '773cccd70afd18ace4332037feff67ec') Copied: udisks/repos/testing-x86_64/drop-pci-db.patch (from rev 171892, udisks/trunk/drop-pci-db.patch) =================================================================== --- testing-x86_64/drop-pci-db.patch (rev 0) +++ testing-x86_64/drop-pci-db.patch 2012-11-22 14:39:05 UTC (rev 171893) @@ -0,0 +1,28 @@ +commit c73b5ab54378ec6d7df9948c46ce87f98587af9a +Author: Tom Gundersen <t...@jklm.no> +Date: 2 days ago + + udev: remove redundant call to deprecated pci-db + + The binary is no longer shipped with systemd/udev. The functionality + is taken over by a builtin, which is ran for all devices, rendering + this rule superfluous. + + Cc: Jan de Groot <j...@archlinux.org> + Signed-off-by: Tom Gundersen <t...@jklm.no> + +diff --git a/data/80-udisks.rules b/data/80-udisks.rules +index d1c8c5d..4bf2b37 100644 +--- a/data/80-udisks.rules ++++ b/data/80-udisks.rules +@@ -1,10 +1,6 @@ + # Do not edit this file, it will be overwritten on updates + # + +-# import names for PCI storage controllers +-# +-SUBSYSTEM=="pci", ACTION=="add|change", ENV{ID_MODEL_FROM_DATABASE}=="", ATTR{class}=="0x01*", IMPORT{program}="pci-db %p" +- + # Set eSATA port type for known eSATA CardBus adapters - first we want to ensure + # the device is on a cardbus controller (upper PCI device) - then we check + # vid/pid (lower PCI device) Copied: udisks/repos/testing-x86_64/udisks.service (from rev 171892, udisks/trunk/udisks.service) =================================================================== --- testing-x86_64/udisks.service (rev 0) +++ testing-x86_64/udisks.service 2012-11-22 14:39:05 UTC (rev 171893) @@ -0,0 +1,10 @@ +[Unit] +Description=UDisks + +[Service] +Type=dbus +BusName=org.freedesktop.UDisks +ExecStart=/usr/lib/udisks/udisks-daemon + +[Install] +WantedBy=graphical.target