[arch-commits] Commit in udisks/trunk (3 files)
Ionut Biru
ibiru at archlinux.org
Thu Dec 2 12:47:32 UTC 2010
Date: Thursday, December 2, 2010 @ 07:47:32
Author: ibiru
Revision: 101905
upgpkg: udisks 1.0.2-1
update to 1.0.2
Modified:
udisks/trunk/PKGBUILD
Deleted:
udisks/trunk/lvm2_api_support.patch
udisks/trunk/no-floppy.patch
------------------------+
PKGBUILD | 19 ++-----
lvm2_api_support.patch | 119 -----------------------------------------------
no-floppy.patch | 30 -----------
3 files changed, 7 insertions(+), 161 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-12-02 12:08:50 UTC (rev 101904)
+++ PKGBUILD 2010-12-02 12:47:32 UTC (rev 101905)
@@ -2,28 +2,23 @@
# Maintainer: Jan de Groot <jgc at archlinux.org>
pkgname=udisks
-pkgver=1.0.1
-pkgrel=5
+pkgver=1.0.2
+pkgrel=1
pkgdesc="Disk Management Service"
arch=('i686' 'x86_64')
url="http://www.freedesktop.org/wiki/Software/udisks"
license=('GPL')
-depends=('udev>=157' 'sg3_utils>=1.29' 'glib2>=2.24.1' 'dbus-glib>=0.86' 'polkit>=0.96' 'parted>=2.3' 'device-mapper>=2.02.60' 'libatasmart>=0.17' 'lsof' 'lvm2>=2.02.66')
+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')
makedepends=('intltool' 'docbook-xsl')
options=(!libtool)
replaces=('devicekit-disks')
-source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz
- lvm2_api_support.patch
- no-floppy.patch)
-sha256sums=('d9bf1ab56667dfa12e99461c503736e3964cf94dd41f30a1229a0e173429b841'
- 'bf090cbc51b497a3af9c732d1a382f5a2363ac7235cddbc9355584135e17ce1b'
- '14965d91ade4eb9ea3165edffe83c9446c7a9048e97f6fae937c87e60fda9135')
+source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz)
+sha256sums=('7dc1a150a6a31b2727144603fa5a8f9852696fc5bdc4a11917b9b0f1b8e3dcf1')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- patch -Np1 -i "${srcdir}/lvm2_api_support.patch"
- patch -Np1 -i "${srcdir}/no-floppy.patch"
- export CFLAGS="$CFLAGS -fno-strict-aliasing"
+
+# export CFLAGS="$CFLAGS -fno-strict-aliasing"
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
--libexecdir=/usr/lib/udisks --disable-static
#fix location for bash_completion helper
Deleted: lvm2_api_support.patch
===================================================================
--- lvm2_api_support.patch 2010-12-02 12:08:50 UTC (rev 101904)
+++ lvm2_api_support.patch 2010-12-02 12:47:32 UTC (rev 101905)
@@ -1,119 +0,0 @@
-From 2b2fcf80841972b70ad695a5a1ed74487d4fd37a Mon Sep 17 00:00:00 2001
-From: David Zeuthen <davidz at redhat.com>
-Date: Wed, 19 May 2010 17:01:31 +0000
-Subject: Update to latest LVM2 API
-
-See
-
- http://lists.freedesktop.org/archives/devkit-devel/2010-April/000783.html
----
-diff --git a/configure.ac b/configure.ac
-index 469be5f..a9141bf 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -170,7 +170,7 @@ AC_SUBST(DEVMAPPER_LIBS)
- have_lvm2=no
- AC_ARG_ENABLE(lvm2, AS_HELP_STRING([--disable-lvm2], [disable LVM2 support]))
- if test "x$enable_lvm2" != "xno"; then
-- PKG_CHECK_MODULES(LVM2, lvm2app >= 2.1,
-+ PKG_CHECK_MODULES(LVM2, lvm2app >= 2.2,
- [AC_DEFINE(HAVE_LVM2, 1, [Define if LVM2 is available]) have_lvm2=yes],
- have_lvm2=no)
- AC_SUBST(LVM2_CFLAGS)
-diff --git a/src/probers/udisks-lvm-pv-export.c b/src/probers/udisks-lvm-pv-export.c
-index 5675fb8..ee6d8ed 100644
---- a/src/probers/udisks-lvm-pv-export.c
-+++ b/src/probers/udisks-lvm-pv-export.c
-@@ -47,7 +47,7 @@ find_vg_for_pv_uuid (lvm_t lvm_ctx,
- struct lvm_pv_list *pv_list;
- dm_list_iterate_items (pv_list, pvs)
- {
-- char *uuid;
-+ const char *uuid;
- pv_t pv = pv_list->pv;
-
- uuid = lvm_pv_get_uuid (pv);
-@@ -58,10 +58,8 @@ find_vg_for_pv_uuid (lvm_t lvm_ctx,
- if (out_pv != NULL)
- *out_pv = pv;
- ret = vg;
-- dm_free (uuid);
- goto out;
- }
-- dm_free (uuid);
- }
- }
- }
-@@ -79,12 +77,12 @@ find_vg_for_pv_uuid (lvm_t lvm_ctx,
- static void
- print_vg (vg_t vg)
- {
-- char *s;
-+ const char *s;
- struct dm_list *pvs;
- struct dm_list *lvs;
-
-- s = lvm_vg_get_uuid (vg); g_print ("UDISKS_LVM2_PV_VG_UUID=%s\n", s); dm_free (s);
-- s = lvm_vg_get_name (vg); g_print ("UDISKS_LVM2_PV_VG_NAME=%s\n", s); dm_free (s);
-+ s = lvm_vg_get_uuid (vg); g_print ("UDISKS_LVM2_PV_VG_UUID=%s\n", s);
-+ s = lvm_vg_get_name (vg); g_print ("UDISKS_LVM2_PV_VG_NAME=%s\n", s);
- g_print ("UDISKS_LVM2_PV_VG_SIZE=%" G_GUINT64_FORMAT "\n", lvm_vg_get_size (vg));
- g_print ("UDISKS_LVM2_PV_VG_FREE_SIZE=%" G_GUINT64_FORMAT "\n", lvm_vg_get_free_size (vg));
- g_print ("UDISKS_LVM2_PV_VG_EXTENT_SIZE=%" G_GUINT64_FORMAT "\n", lvm_vg_get_extent_size (vg));
-@@ -117,17 +115,14 @@ print_vg (vg_t vg)
- str = g_string_new (NULL);
- dm_list_iterate_items (pv_list, pvs)
- {
-- char *uuid;
-+ const char *uuid;
- guint64 size;
- guint64 free_size;
- pv_t pv = pv_list->pv;
-
- uuid = lvm_pv_get_uuid (pv);
- if (uuid != NULL)
-- {
-- g_string_append_printf (str, "uuid=%s", uuid);
-- dm_free (uuid);
-- }
-+ g_string_append_printf (str, "uuid=%s", uuid);
- size = lvm_pv_get_size (pv);
- g_string_append_printf (str, ";size=%" G_GUINT64_FORMAT, size);
- free_size = lvm_pv_get_free (pv);
-@@ -173,8 +168,8 @@ print_vg (vg_t vg)
- str = g_string_new (NULL);
- dm_list_iterate_items (lv_list, lvs)
- {
-- char *uuid;
-- char *name;
-+ const char *uuid;
-+ const char *name;
- gboolean is_active;
- guint64 size;
- lv_t lv = lv_list->lv;
-@@ -195,11 +190,6 @@ print_vg (vg_t vg)
- g_string_append_printf (str, "active=%d", is_active);
- g_string_append_c (str, ' ');
- }
--
-- if (uuid != NULL)
-- dm_free (uuid);
-- if (name != NULL)
-- dm_free (name);
- }
- g_print ("UDISKS_LVM2_PV_VG_LV_LIST=%s\n", str->str);
- g_string_free (str, TRUE);
-@@ -212,9 +202,9 @@ print_vg (vg_t vg)
- static void
- print_pv (pv_t pv)
- {
-- char *s;
-+ const char *s;
-
-- s = lvm_pv_get_uuid (pv); g_print ("UDISKS_LVM2_PV_UUID=%s\n", s); dm_free (s);
-+ s = lvm_pv_get_uuid (pv); g_print ("UDISKS_LVM2_PV_UUID=%s\n", s);
- g_print ("UDISKS_LVM2_PV_NUM_MDA=%" G_GUINT64_FORMAT "\n", lvm_pv_get_mda_count (pv));
-
- /* TODO: ask for more API in liblvm - pvdisplay(8) suggests more information
---
-cgit v0.8.3-6-g21f6
Deleted: no-floppy.patch
===================================================================
--- no-floppy.patch 2010-12-02 12:08:50 UTC (rev 101904)
+++ no-floppy.patch 2010-12-02 12:47:32 UTC (rev 101905)
@@ -1,30 +0,0 @@
-From ca93d4e2d9e7f483b2fde1725da086e2cca44164 Mon Sep 17 00:00:00 2001
-From: Martin Pitt <martin.pitt at ubuntu.com>
-Date: Wed, 02 Jun 2010 13:56:07 +0000
-Subject: Fix long hangs on probing nonexistant floppy drives
-
-A lot of modern machines do not have a floppy drive any more, but still have a
-floppy controller somewhere (or at least the BIOS pretends to). Trying to
-open(/dev/fd0) on these machines causes long hangs, which lead to long desktop
-startup times.
-
-To fix this, avoid probing floppies for media in update_info().
-
-https://launchpad.net/bugs/539515
----
-diff --git a/src/device.c b/src/device.c
-index 763385c..0e87f1d 100644
---- a/src/device.c
-+++ b/src/device.c
-@@ -4471,7 +4471,8 @@ update_info (Device *device)
- {
- media_available = FALSE;
-
-- if (!g_udev_device_get_property_as_boolean (device->priv->d, "ID_CDROM"))
-+ if (!g_udev_device_get_property_as_boolean (device->priv->d, "ID_CDROM") &&
-+ !g_udev_device_get_property_as_boolean (device->priv->d, "ID_DRIVE_FLOPPY"))
- {
- int fd;
- fd = open (device->priv->device_file, O_RDONLY);
---
-cgit v0.8.3-6-g21f6
More information about the arch-commits
mailing list