Added patch to fix pmount-hal, fixes bug #157456.

Package-Manager: portage-2.1.1-r2

diff --git a/sys-apps/pmount/ChangeLog b/sys-apps/pmount/ChangeLog
index 17afe344a0b04912d22de3db81a41414e0b2845f..41c050f0e5e4e0845a0a3edd334e662ccb88a00a 100644 (file)
--- a/sys-apps/pmount/ChangeLog
+++ b/sys-apps/pmount/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/pmount
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pmount/ChangeLog,v 1.35 2006/10/31 01:11:26 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pmount/ChangeLog,v 1.36 2006/12/11 02:57:08 steev Exp $
+
+  11 Dec 2006; Steev Klimaszewski <steev@gentoo.org>
+  +files/pmount-0.9.13-no_close.patch, pmount-0.9.13.ebuild:
+  Add a patch to remove dbus_connection_close.  This fixes bug #157456.  Thanks
+  to Dustin C. Hatch for reporting.
 
   31 Oct 2006; Doug Goldstein <cardoe@gentoo.org> pmount-0.9.9.ebuild,
   pmount-0.9.11.ebuild, pmount-0.9.13.ebuild:

diff --git a/sys-apps/pmount/Manifest b/sys-apps/pmount/Manifest
index 39f18b1fa0aabe2c15b65b0a4753a42a653d45a3..d29cac73d319691646afa8c3e4109d93ff2c4da9 100644 (file)
--- a/sys-apps/pmount/Manifest
+++ b/sys-apps/pmount/Manifest
@@ -1,6 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX pmount-0.9.13-no_close.patch 456 RMD160 324aeac41b435a89937abb936cf16c45511905a9 SHA1 60d73c5d05e0c58d4bfdd3f977e0c8a15fb03ab8 SHA256 33962c5f3cf9d29e65c21f72b2c2a479b10bb635c158a70be49085e286a4dec6
+MD5 31166113f3f57bc4dd291fadfecff599 files/pmount-0.9.13-no_close.patch 456
+RMD160 324aeac41b435a89937abb936cf16c45511905a9 files/pmount-0.9.13-no_close.patch 456
+SHA256 33962c5f3cf9d29e65c21f72b2c2a479b10bb635c158a70be49085e286a4dec6 files/pmount-0.9.13-no_close.patch 456
 DIST pmount-0.9.11.tar.gz 414959 RMD160 b222171274581259bbbe5980183923fb25342ec3 SHA1 6fdadde0a9f0147f92f88b562d8ec4db031c9649 SHA256 a7c8521316114102f3bd19f350b7fe21d38c39a30b055d89613a3eb62f4c9d88
 DIST pmount-0.9.13.tar.gz 415671 RMD160 40bfeacbd8f569d7a2a81574e08689197551e9b7 SHA1 840ff5a8f5499200a6711c2584935004f642bded SHA256 ff6f37fcf89da639e54fca68dafb9093036d3d250305c8f29efd6a58b3c35fa0
 DIST pmount-0.9.9.tar.gz 416898 RMD160 f24e7bab64d4163a1f32a2a69fbd0e12c0ca2049 SHA1 d27ff42a7367bf3a248e643bc2527b5b36e27691 SHA256 19a15780cd1083bfbef432436402db665dac131013a005b4cd27ad49341d465d
@@ -8,18 +9,18 @@ EBUILD pmount-0.9.11.ebuild 1444 RMD160 900e2f168c0a1c1c9452256d879556d1019db2c5
 MD5 5a5f8eba081e6d2d6242ca2dcd851d12 pmount-0.9.11.ebuild 1444
 RMD160 900e2f168c0a1c1c9452256d879556d1019db2c5 pmount-0.9.11.ebuild 1444
 SHA256 a585da05f3830aa579eb19dcaa4812a05b4d2f9602bb3f2cb08368c108d2425c pmount-0.9.11.ebuild 1444
-EBUILD pmount-0.9.13.ebuild 1511 RMD160 53b8f8a27b021dbb65b12672083d01f556a4f4b9 SHA1 ce010b6755fa969306e27b6b87a19c0686aaf346 SHA256 4611faf8570b2d131247ff3bec38870f69875df2f3b6ba88970e591045e25908
-MD5 eab0b520923c76ef32af20de04c5a5ad pmount-0.9.13.ebuild 1511
-RMD160 53b8f8a27b021dbb65b12672083d01f556a4f4b9 pmount-0.9.13.ebuild 1511
-SHA256 4611faf8570b2d131247ff3bec38870f69875df2f3b6ba88970e591045e25908 pmount-0.9.13.ebuild 1511
+EBUILD pmount-0.9.13.ebuild 1556 RMD160 1733eac2939a399a3d07eed59013b3f05e88fc15 SHA1 01eb1f7f71e4a83269abf3a946231d04a79fdb7f SHA256 6928875757ecc9285f44376dfc41470193067677f89c9503fedc81e1e46b2934
+MD5 6c4e5e30509a6fd1a33c88ddbfb74cc9 pmount-0.9.13.ebuild 1556
+RMD160 1733eac2939a399a3d07eed59013b3f05e88fc15 pmount-0.9.13.ebuild 1556
+SHA256 6928875757ecc9285f44376dfc41470193067677f89c9503fedc81e1e46b2934 pmount-0.9.13.ebuild 1556
 EBUILD pmount-0.9.9.ebuild 1435 RMD160 e371a3622db8ebb379db2564702e57a1a769d597 SHA1 0dc296e679fc1905feb733ac689385a903c4bb66 SHA256 3c270133cbf03184763df48f6575f9f77c3dda80c3c1f11e3b085265d2c3e861
 MD5 845ed8bec75cb8677bbb902949c57928 pmount-0.9.9.ebuild 1435
 RMD160 e371a3622db8ebb379db2564702e57a1a769d597 pmount-0.9.9.ebuild 1435
 SHA256 3c270133cbf03184763df48f6575f9f77c3dda80c3c1f11e3b085265d2c3e861 pmount-0.9.9.ebuild 1435
-MISC ChangeLog 4589 RMD160 22c7e1f1b77622bda38bedc3b32bc87e0a525223 SHA1 651ca9bb9384ca41a07f533336cc97b05aef5205 SHA256 cf08739589a554910f5fdcc27d34c8481a4c93c50e757146e0d5c6ac10c65cd7
-MD5 a6dc06658fa3f0b13456b953db2010a4 ChangeLog 4589
-RMD160 22c7e1f1b77622bda38bedc3b32bc87e0a525223 ChangeLog 4589
-SHA256 cf08739589a554910f5fdcc27d34c8481a4c93c50e757146e0d5c6ac10c65cd7 ChangeLog 4589
+MISC ChangeLog 4819 RMD160 827923c8259255d239e53fe8366c5363ca82a26c SHA1 320d2d62eb046d812f4f49430120c6d5cfa4772f SHA256 0d1dffcd52167a26209bd5f9d5d1dbe2a05a6088c8948cf705ef63fb7270931a
+MD5 1e28a6c4b32d6e68cf47f37d0ec12ac9 ChangeLog 4819
+RMD160 827923c8259255d239e53fe8366c5363ca82a26c ChangeLog 4819
+SHA256 0d1dffcd52167a26209bd5f9d5d1dbe2a05a6088c8948cf705ef63fb7270931a ChangeLog 4819
 MISC metadata.xml 253 RMD160 8b9396b35e9a5813d0be62fbdd0a91c3d15e753c SHA1 7f6c084c9a7f7118b40867f4dbc53dcba38a4e25 SHA256 18c957b52e3003a9b0cd212b7b42ee0829c8e049181003660d3d2d95d379b531
 MD5 aac86bf5e50eb9cef83a6f6800c560af metadata.xml 253
 RMD160 8b9396b35e9a5813d0be62fbdd0a91c3d15e753c metadata.xml 253
@@ -33,10 +34,3 @@ SHA256 b9421cc788e0ad0f8225fa30a8cecd7ee997be729f810eb8ff13841bb2a8afe2 files/di
 MD5 5b4518b6d2988f09ef3fd9f6ec1725f7 files/digest-pmount-0.9.9 238
 RMD160 7b16cabcdf37b3fac49a6f0fb712868f5715f3f4 files/digest-pmount-0.9.9 238
 SHA256 9b1bd84d17d45a89b325f9e60ec43dce1a88d27d0170ff3790c1f1a98dd7e17a files/digest-pmount-0.9.9 238
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFRqLBoeSe8B0zEfwRAkF2AJ4jNdjxQJ1YdEuVjU64lBmUxx19kwCdGZrU
-sS3unMi4XwOPj935Q1JQkCo=
-=V8yV
------END PGP SIGNATURE-----

diff --git a/sys-apps/pmount/files/pmount-0.9.13-no_close.patch b/sys-apps/pmount/files/pmount-0.9.13-no_close.patch
new file mode 100644 (file)
index 0000000..e03a7b3
--- /dev/null
+++ b/sys-apps/pmount/files/pmount-0.9.13-no_close.patch
@@ -0,0 +1,11 @@
+diff -ruN pmount-0.9.13.orig/src/pmount-hal.c pmount-0.9.13/src/pmount-hal.c
+--- pmount-0.9.13.orig/src/pmount-hal.c        2006-12-02 16:59:56.000000000 -0600
++++ pmount-0.9.13/src/pmount-hal.c     2006-12-02 17:00:16.000000000 -0600
+@@ -361,7 +361,6 @@
+     /* shut down hal connection */
+     libhal_ctx_shutdown( hal_ctx, &error );
+     libhal_ctx_free( hal_ctx );
+-    dbus_connection_close( dbus_conn );
+     dbus_connection_unref( dbus_conn );
+ 
+     /* go */

diff --git a/sys-apps/pmount/pmount-0.9.13.ebuild b/sys-apps/pmount/pmount-0.9.13.ebuild
index aba65f451e0269d7c324f12f2efb0f2662d3c3c5..ac95558c60ae1f8d03443800604b659333146691 100644 (file)
--- a/sys-apps/pmount/pmount-0.9.13.ebuild
+++ b/sys-apps/pmount/pmount-0.9.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pmount/pmount-0.9.13.ebuild,v 1.3 2006/10/31 01:11:26 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pmount/pmount-0.9.13.ebuild,v 1.4 2006/12/11 02:57:08 steev Exp $
 
 inherit eutils flag-o-matic
 
@@ -25,13 +25,13 @@ pkg_setup() {
 src_unpack() {
        unpack ${A}
        cd "${S}"
+       epatch ${FILESDIR}/${PN}-0.9.13-no_close.patch
        append-ldflags $(bindnow-flags)
 }
 
 src_compile() {
        econf $(use_enable hal) \
                --with-cryptsetup-prog=/bin/cryptsetup
-       
        emake || die "emake failed"
 }