diff options
Diffstat (limited to 'extra/udisks')
| -rw-r--r-- | extra/udisks/01-mkfs-tempdir.patch | 17 | ||||
| -rw-r--r-- | extra/udisks/PKGBUILD | 27 |
2 files changed, 35 insertions, 9 deletions
diff --git a/extra/udisks/01-mkfs-tempdir.patch b/extra/udisks/01-mkfs-tempdir.patch new file mode 100644 index 000000000..976108264 --- /dev/null +++ b/extra/udisks/01-mkfs-tempdir.patch @@ -0,0 +1,17 @@ +# Description: Daemon does not create /var/run/udisks/, so mkfs jobs fail. +# Just create the directory in /tmp, this is what /tmp is for, after all. +# Upstream: https://bugs.freedesktop.org/show_bug.cgi?id=24265 + +Index: udisks/src/helpers/job-mkfs.c +=================================================================== +--- udisks.orig/src/helpers/job-mkfs.c 2010-12-05 23:08:54.587881164 +0100 ++++ udisks/src/helpers/job-mkfs.c 2010-12-05 23:09:12.399889312 +0100 +@@ -546,7 +546,7 @@ + /* take ownership of the device if requested */ + if (take_ownership_uid != 0 || take_ownership_gid != 0) + { +- char dir[256] = PACKAGE_LOCALSTATE_DIR "/run/udisks/job-mkfs-XXXXXX"; ++ char dir[256] = "/tmp/job-mkfs-XXXXXX"; + + if (mkdtemp (dir) == NULL) + { diff --git a/extra/udisks/PKGBUILD b/extra/udisks/PKGBUILD index ea7e1bc7a..e431b7500 100644 --- a/extra/udisks/PKGBUILD +++ b/extra/udisks/PKGBUILD @@ -1,28 +1,37 @@ -# $Id: PKGBUILD 106693 2011-01-17 23:18:27Z jgc $ +# $Id: PKGBUILD 119537 2011-04-11 22:26:25Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=udisks -pkgver=1.0.2 -pkgrel=2 +pkgver=1.0.3 +pkgrel=1 pkgdesc="Disk Management Service" arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/udisks" license=('GPL') -depends=('udev>=164' 'sg3_utils>=1.29' 'glib2>=2.26.1' 'dbus-glib>=0.92' 'polkit>=0.98' 'parted>=2.3' 'device-mapper>=2.02.77' 'libatasmart>=0.17' 'lsof' 'lvm2>=2.02.77' 'eject') -makedepends=('intltool' 'docbook-xsl') +depends=('udev' 'sg3_utils' 'glib2' 'dbus-glib' 'polkit' 'parted' 'device-mapper' 'libatasmart' 'lsof' 'lvm2' 'eject') +makedepends=('intltool' 'docbook-xsl' 'gtk-doc') options=(!libtool) -replaces=('devicekit-disks') -source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz) -sha256sums=('7dc1a150a6a31b2727144603fa5a8f9852696fc5bdc4a11917b9b0f1b8e3dcf1') +#source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz) +source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz + 01-mkfs-tempdir.patch) +sha256sums=('a4d18b2de59c1567df5342f26960c6c3e70a0320f7bafe42893f2708c9b57dd5' + '786c0adb1a37e16b351c906527e3cbd17193bb51d8c1dd0889f216556c419c6c') build() { cd "${srcdir}/${pkgname}-${pkgver}" - + patch -Np1 -i "${srcdir}/01-mkfs-tempdir.patch" + ./autogen.sh ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libexecdir=/usr/lib/udisks --disable-static #fix location for bash_completion helper sed -i -e 's|profile.d|bash_completion.d|' tools/Makefile make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install + + rm -rf "${pkgdir}/var/run" } |