[arch-commits] Commit in parted/repos (3 files)

[Giovanni Scafora]

    Date: Wednesday, December 2, 2009 @ 18:06:03
  Author: giovanni
Revision: 60301

Merged revisions 60300 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/parted/trunk

........
  r60300 | giovanni | 2009-12-02 15:05:16 -0800 (mer, 02 dic 2009) | 2 lines
  
  upgpkg: parted 1.9.0-3
      Added a critical patch
........

Added:
  parted/repos/testing-i686/parted-1.9.0.patch
    (from rev 60300, parted/trunk/parted-1.9.0.patch)
Modified:
  parted/repos/testing-i686/	(properties)
  parted/repos/testing-i686/PKGBUILD

--------------------+
 PKGBUILD           |   10 +++++++---
 parted-1.9.0.patch |   30 ++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 3 deletions(-)


Property changes on: parted/repos/testing-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /parted/trunk:1-60149
   + /parted/trunk:1-60300

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2009-12-02 23:05:16 UTC (rev 60300)
+++ testing-i686/PKGBUILD	2009-12-02 23:06:03 UTC (rev 60301)
@@ -4,7 +4,7 @@
 
 pkgname=parted
 pkgver=1.9.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A program for creating, destroying, resizing, checking and copying partitions"
 arch=('i686' 'x86_64')
 license=('GPL3')
@@ -12,11 +12,15 @@
 depends=('device-mapper' 'e2fsprogs')
 options=('!libtool')
 install=parted.install
-source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('055305bc7bcf472ce38f9abf69a9d94d')
+source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz
+        parted-1.9.0.patch)
+md5sums=('055305bc7bcf472ce38f9abf69a9d94d'
+         '0a1622cdca6e161ae2a40083b2d046bd')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  # See http://gparted.sourceforge.net/news.php
+  patch -Np1 -i ${srcdir}/parted-1.9.0.patch || return 1
 
   ./configure --prefix=/usr \
               --disable-debug \

Copied: parted/repos/testing-i686/parted-1.9.0.patch (from rev 60300, parted/trunk/parted-1.9.0.patch)
===================================================================
--- testing-i686/parted-1.9.0.patch	                        (rev 0)
+++ testing-i686/parted-1.9.0.patch	2009-12-02 23:06:03 UTC (rev 60301)
@@ -0,0 +1,30 @@
+--- a/libparted/disk.c	2009-07-23 10:52:08.000000000 -0700
++++ b/libparted/disk.c	2009-12-02 23:53:24.000000000 -0800
+@@ -489,9 +489,25 @@
+ int
+ ped_disk_commit (PedDisk* disk)
+ {
++        /* Open the device here, so that the underlying fd is not closed
++           between commit_to_dev and commit_to_os (closing causes unwanted
++           udev events to be sent under Linux). */
++	if (!ped_device_open (disk->dev))
++		goto error;
++
+ 	if (!ped_disk_commit_to_dev (disk))
+-		return 0;
+-	return ped_disk_commit_to_os (disk);
++		goto error_close_dev;
++
++	if (!ped_disk_commit_to_os (disk))
++		goto error_close_dev;
++
++	ped_device_close (disk->dev);
++	return 1;
++
++error_close_dev:
++	ped_device_close (disk->dev);
++error:
++	return 0;
+ }
+ 
+ /**