[arch-commits] Commit in udisks/trunk (3 files)

[Ionut Biru]

    Date: Friday, August 26, 2011 @ 13:00:06
  Author: ibiru
Revision: 136338

update to 1.0.4

Modified:
  udisks/trunk/PKGBUILD
Deleted:
  udisks/trunk/01-mkfs-tempdir.patch
  udisks/trunk/fix_well_known_filesystems.patch

----------------------------------+
 01-mkfs-tempdir.patch            |   17 -----------------
 PKGBUILD                         |   17 ++++++-----------
 fix_well_known_filesystems.patch |   12 ------------
 3 files changed, 6 insertions(+), 40 deletions(-)

Deleted: 01-mkfs-tempdir.patch
===================================================================
--- 01-mkfs-tempdir.patch	2011-08-26 15:15:41 UTC (rev 136337)
+++ 01-mkfs-tempdir.patch	2011-08-26 17:00:06 UTC (rev 136338)
@@ -1,17 +0,0 @@
-# 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)
-         {

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-08-26 15:15:41 UTC (rev 136337)
+++ PKGBUILD	2011-08-26 17:00:06 UTC (rev 136338)
@@ -2,23 +2,20 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=udisks
-pkgver=1.0.3
-pkgrel=6
+pkgver=1.0.4
+pkgrel=1
 pkgdesc="Disk Management Service"
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/udisks"
 license=('GPL')
-depends=('udev' 'sg3_utils' 'glib2' 'dbus-glib' 'polkit' 'parted' 'device-mapper' 'libatasmart' 'lsof' 'lvm2' 'eject')
-makedepends=('intltool' 'docbook-xsl' 'gtk-doc')
+depends=('udev' 'sg3_utils' 'glib2' 'dbus-glib' 'polkit' 'parted' 'device-mapper' 'libatasmart' 'lsof' 'eject')
+makedepends=('intltool' 'docbook-xsl')
 options=(!libtool)
-source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz
-        01-mkfs-tempdir.patch)
-sha256sums=('d95bceb52a70c727291b934c4c05774899a0074927c8138a219b81a784de8a4b'
-            '786c0adb1a37e16b351c906527e3cbd17193bb51d8c1dd0889f216556c419c6c')
+source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz)
+sha256sums=('854b89368733b9c3a577101b761ad5397ae75a05110c8698ac5b29de9a8bf8f5')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/01-mkfs-tempdir.patch"
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
       --libexecdir=/usr/lib/udisks --disable-static
   #fix location for bash_completion helper
@@ -30,6 +27,4 @@
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
-
-  rm -rf "${pkgdir}/var/run"
 }

Deleted: fix_well_known_filesystems.patch
===================================================================
--- fix_well_known_filesystems.patch	2011-08-26 15:15:41 UTC (rev 136337)
+++ fix_well_known_filesystems.patch	2011-08-26 17:00:06 UTC (rev 136338)
@@ -1,12 +0,0 @@
-diff -Nur udisks-1.0.3.orig/src/device.c udisks-1.0.3/src/device.c
---- udisks-1.0.3.orig/src/device.c	2011-04-05 13:16:00.000000000 -0700
-+++ udisks-1.0.3/src/device.c	2011-05-03 13:27:39.064679418 -0700
-@@ -5902,7 +5902,7 @@
-   "msdos",
-   "umsdos",
-   "vfat",
--  "exfat"
-+  "exfat",
-   "ntfs",
-   NULL,
- };