projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f7ef39e)
add support for Gentoo Patchset applying via versioned directories (to use quilt...
authorDoug Goldstein <cardoe@gentoo.org>
Tue, 3 Apr 2007 21:29:42 +0000 (21:29 +0000)
committerDoug Goldstein <cardoe@gentoo.org>
Tue, 3 Apr 2007 21:29:42 +0000 (21:29 +0000)
Package-Manager: portage-2.1.2.3

sys-apps/hal/ChangeLog patch | blob | history
sys-apps/hal/Manifest patch | blob | history
sys-apps/hal/files/0.5.9/01_luks_mount_fix.patch [new file with mode: 0644] patch | blob
sys-apps/hal/hal-0.5.9.ebuild patch | blob | history

diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index cc006a0bb9cf07c105f85a224dcaba7b3ec83b1c..45af0c661f54d7b73c1ba462edc0782c443cec0a 100644 (file)
--- a/sys-apps/hal/ChangeLog
+++ b/sys-apps/hal/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/hal
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.143 2007/04/03 13:30:41 steev Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.144 2007/04/03 21:29:42 cardoe Exp $
+
+  03 Apr 2007; Doug Goldstein <cardoe@gentoo.org>
+  +files/0.5.9/01_luks_mount_fix.patch, hal-0.5.9.ebuild:
+  add support for Gentoo Patchset applying via versioned directories (to use
+  quilt). Fix from upstream for LUKS mounting
 
 *hal-0.5.9 (03 Apr 2007)
 
diff --git a/sys-apps/hal/Manifest b/sys-apps/hal/Manifest
index d4e5336d453daeb5f4ef48c99147fbc37214191f..e2695d61303fba90e5cf683854bbe0d1a7a8bae2 100644 (file)
--- a/sys-apps/hal/Manifest
+++ b/sys-apps/hal/Manifest
@@ -1,7 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 0.5-hald.rc 681 RMD160 f94d4a6e4ffb3beb84eeeb8e25564fa566ecc493 SHA1 fe413a84ee58cefa923cbc922a1c961fbdb17aa6 SHA256 802f83998c50a3e030d1db2f5a8364e4bb10eebecd464683445d63cf56702161
 MD5 facf81eeca7ebddff5d030acb36de31d files/0.5-hald.rc 681
 RMD160 f94d4a6e4ffb3beb84eeeb8e25564fa566ecc493 files/0.5-hald.rc 681
 SHA256 802f83998c50a3e030d1db2f5a8364e4bb10eebecd464683445d63cf56702161 files/0.5-hald.rc 681
+AUX 0.5.9/01_luks_mount_fix.patch 2605 RMD160 00d6b01a0c96123ce6ee66d1762a00988c363139 SHA1 d5b0ce4140b0db59942ef384df640a4749b0c24c SHA256 f1dfdd118055efbc97163273e0f3930f8badf2be3e4f1ca327654c221faa951e
+MD5 526e8c9b50700bca6340f6a0d73f1aa4 files/0.5.9/01_luks_mount_fix.patch 2605
+RMD160 00d6b01a0c96123ce6ee66d1762a00988c363139 files/0.5.9/01_luks_mount_fix.patch 2605
+SHA256 f1dfdd118055efbc97163273e0f3930f8badf2be3e4f1ca327654c221faa951e files/0.5.9/01_luks_mount_fix.patch 2605
 AUX fix-scsi-fake-host-event.patch 3108 RMD160 2bda406fcb2dd92c348781a6c0958d40c79d78ea SHA1 af1d5c9a2cde091bd7abe04ed5e91a4bb815b675 SHA256 199749c188e5fb4858e4c1dac8800525377daf6a680dcd13e7096e71266ed05d
 MD5 3b6df9a24978d931781dc029c85288a9 files/fix-scsi-fake-host-event.patch 3108
 RMD160 2bda406fcb2dd92c348781a6c0958d40c79d78ea files/fix-scsi-fake-host-event.patch 3108
@@ -120,14 +127,14 @@ EBUILD hal-0.5.7.1-r5.ebuild 6426 RMD160 ba28bce7126639c77de28ac2fc8d233475bb498
 MD5 709ca20b11819f2e13e381be47e19535 hal-0.5.7.1-r5.ebuild 6426
 RMD160 ba28bce7126639c77de28ac2fc8d233475bb498e hal-0.5.7.1-r5.ebuild 6426
 SHA256 6e020d3a29d82b993984f58ab8ef3659d837c11bce25f3ad25df6f4748e11207 hal-0.5.7.1-r5.ebuild 6426
-EBUILD hal-0.5.9.ebuild 5104 RMD160 c57aad8d3f113f82b115919743b7fc915b0d25be SHA1 df87f6e6f4c9c59d63f16414ab8253547e7e3e09 SHA256 2d1f113f9eba0391bb03574fd56459e595dca8ff8a2741fa4460d8128e799003
-MD5 82798fb2dbdcf36483663a9c4ed187aa hal-0.5.9.ebuild 5104
-RMD160 c57aad8d3f113f82b115919743b7fc915b0d25be hal-0.5.9.ebuild 5104
-SHA256 2d1f113f9eba0391bb03574fd56459e595dca8ff8a2741fa4460d8128e799003 hal-0.5.9.ebuild 5104
-MISC ChangeLog 22085 RMD160 20760f81c1447879bbfca4d8dddb6ef6f16b2248 SHA1 8c1e72e2eef9356788192d8e72911c4881ede97c SHA256 378cecaf22d78ac3865f76bd38b5dbea43a46290b7aedce8819f860788c86948
-MD5 630a794e0240a69300ffd18daf0eaaee ChangeLog 22085
-RMD160 20760f81c1447879bbfca4d8dddb6ef6f16b2248 ChangeLog 22085
-SHA256 378cecaf22d78ac3865f76bd38b5dbea43a46290b7aedce8819f860788c86948 ChangeLog 22085
+EBUILD hal-0.5.9.ebuild 5194 RMD160 2bf77ecee7c30686cefe0e8150bc8899eb253c0e SHA1 c40c25b85710c9b8551c3f8ad023bab8f3fc19ea SHA256 696df3fe5d94129ced9ab09ac92b445f879bd1d81014ea38a5a47db67faba884
+MD5 8b60961b54e79a88eea88a771866726b hal-0.5.9.ebuild 5194
+RMD160 2bf77ecee7c30686cefe0e8150bc8899eb253c0e hal-0.5.9.ebuild 5194
+SHA256 696df3fe5d94129ced9ab09ac92b445f879bd1d81014ea38a5a47db67faba884 hal-0.5.9.ebuild 5194
+MISC ChangeLog 22318 RMD160 b50d80584150f20a923ca1f644d804ee0dc8e26c SHA1 8c25827253b4bc62a94778de6ddedfa0bad26f7c SHA256 65e4a2a05c309821df994d04be34f3431f082802008dab409f4747bcd1e144ff
+MD5 167d779e5ed099b27504a584723974e8 ChangeLog 22318
+RMD160 b50d80584150f20a923ca1f644d804ee0dc8e26c ChangeLog 22318
+SHA256 65e4a2a05c309821df994d04be34f3431f082802008dab409f4747bcd1e144ff ChangeLog 22318
 MISC metadata.xml 345 RMD160 aa6e810e9546542453ebe5d6ca46804e99f447f2 SHA1 fef829210e8555807f9b69ba5afedffb8af8d02c SHA256 0c9aeabf473a6836c25a5db2ca86b880dec1efa9e52310725e08d1e0df93447d
 MD5 3317c4000387b670183d305ef9937b75 metadata.xml 345
 RMD160 aa6e810e9546542453ebe5d6ca46804e99f447f2 metadata.xml 345
@@ -141,3 +148,10 @@ SHA256 6fede189bf70fa0a1009bcefea0a23a8941a051256e7fafc16793324db3c61c0 files/di
 MD5 75c89219e1c767bdbfa9942258c86827 files/digest-hal-0.5.9 232
 RMD160 6244ab5be8bbc652f1130c2715f32bf881710f31 files/digest-hal-0.5.9 232
 SHA256 d862b002c9a5547954874b2a0cbadd614381d085e850539e6aef2dd9e9d52dfe files/digest-hal-0.5.9 232
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGEsbvoeSe8B0zEfwRAie4AJ9l1yRatzHhEnuEs2gR0VdeSOlacACfVeKE
+89LEKeQMFfSkfbrLfISiR7c=
+=+uXN
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/hal/files/0.5.9/01_luks_mount_fix.patch b/sys-apps/hal/files/0.5.9/01_luks_mount_fix.patch
new file mode 100644 (file)
index 0000000..c72aa91
--- /dev/null
+++ b/sys-apps/hal/files/0.5.9/01_luks_mount_fix.patch
@@ -0,0 +1,67 @@
+From: David Zeuthen <davidz@redhat.com>
+Date: Tue, 3 Apr 2007 17:18:23 +0000 (-0400)
+Subject: fix lock checking for LUKS setup/teardown
+X-Git-Tag: HAL_0_2
+X-Git-Url: http://gitweb.freedesktop.org/?p=hal.git;a=commitdiff;h=55256f3d56e3317b3e1efbf84f732b9464eacf8a
+
+fix lock checking for LUKS setup/teardown
+
+Reported here
+
+ http://lists.freedesktop.org/archives/hal/2007-April/007936.html
+---
+
+--- a/tools/hal-luks-setup
++++ b/tools/hal-luks-setup
+@@ -22,17 +22,17 @@ fi
+ # Respect the same locks as Mount()/Unmount() etc.
+ if [ -n "$HAL_METHOD_INVOKED_BY_SYSTEMBUS_CONNECTION_NAME" ] ; then
+     hal-is-caller-locked-out --udi $HAL_PROP_INFO_UDI \
+-        --interface org.freedesktop.Hal.Volume \
+-        --caller $HAL_METHOD_INVOKED_BY_SYSTEMBUS_CONNECTION_NAME
++        --interface org.freedesktop.Hal.Device.Volume \
++        --caller "$HAL_METHOD_INVOKED_BY_SYSTEMBUS_CONNECTION_NAME"
+     RET=$?
+-    if [ "$RET" != "1" ] ; then
++    if [ "$RET" != "0" ] ; then
+         locked_out
+     fi
+-    hal-is-caller-locked-out --udi $HAL_PROP_STORAGE_ORIGINATING_DEVICE \
+-        --interface org.freedesktop.Hal.Storage \
+-        --caller $HAL_METHOD_INVOKED_BY_SYSTEMBUS_CONNECTION_NAME
++    hal-is-caller-locked-out --udi $HAL_PROP_BLOCK_STORAGE_DEVICE \
++        --interface org.freedesktop.Hal.Device.Storage \
++        --caller "$HAL_METHOD_INVOKED_BY_SYSTEMBUS_CONNECTION_NAME"
+     RET=$?
+-    if [ "$RET" != "1" ] ; then
++    if [ "$RET" != "0" ] ; then
+         locked_out
+     fi
+ fi
+--- a/tools/hal-luks-teardown
++++ b/tools/hal-luks-teardown
+@@ -23,17 +23,17 @@ fi
+ # Respect the same locks as Mount()/Unmount() etc.
+ if [ -n "$HAL_METHOD_INVOKED_BY_SYSTEMBUS_CONNECTION_NAME" ] ; then
+     hal-is-caller-locked-out --udi $HAL_PROP_INFO_UDI \
+-        --interface org.freedesktop.Hal.Volume \
+-        --caller $HAL_METHOD_INVOKED_BY_SYSTEMBUS_CONNECTION_NAME
++        --interface org.freedesktop.Hal.Device.Volume \
++        --caller "$HAL_METHOD_INVOKED_BY_SYSTEMBUS_CONNECTION_NAME"
+     RET=$?
+-    if [ "$RET" != "1" ] ; then
++    if [ "$RET" != "0" ] ; then
+         locked_out
+     fi
+-    hal-is-caller-locked-out --udi $HAL_PROP_STORAGE_ORIGINATING_DEVICE \
+-        --interface org.freedesktop.Hal.Storage \
+-        --caller $HAL_METHOD_INVOKED_BY_SYSTEMBUS_CONNECTION_NAME
++    hal-is-caller-locked-out --udi $HAL_PROP_BLOCK_STORAGE_DEVICE \
++        --interface org.freedesktop.Hal.Device.Storage \
++        --caller "$HAL_METHOD_INVOKED_BY_SYSTEMBUS_CONNECTION_NAME"
+     RET=$?
+-    if [ "$RET" != "1" ] ; then
++    if [ "$RET" != "0" ] ; then
+         locked_out
+     fi
+ fi
diff --git a/sys-apps/hal/hal-0.5.9.ebuild b/sys-apps/hal/hal-0.5.9.ebuild
index 8dbf5b5e8a5b365fd0231240da04fc68b4abdb2c..19c469b0822c02c8d4cc24cd6417ec721715a344 100644 (file)
--- a/sys-apps/hal/hal-0.5.9.ebuild
+++ b/sys-apps/hal/hal-0.5.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.9.ebuild,v 1.1 2007/04/03 13:30:41 steev Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.9.ebuild,v 1.2 2007/04/03 21:29:42 cardoe Exp $
 
 inherit eutils linux-info autotools flag-o-matic
 
@@ -84,6 +84,10 @@ pkg_setup() {
 src_unpack() {
        unpack ${A}
        cd ${S}
+
+       # Gentoo Patch Set
+       EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch ${FILESDIR}/${PV}
+
        epatch ${FILESDIR}/${PN}-0.5.7-plugdev-allow-send.patch
 }
 
Unnamed repository; edit this file 'description' to name the repository.