From: Donnie Berkholz Date: Thu, 30 Nov 2006 07:57:31 +0000 (+0000) Subject: Restore a couple of files needed for 0.5.5.1-r3 that must've been accidentally removed. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f497317c25b6788ca2da0009e5a440668c352de4;p=gentoo.git Restore a couple of files needed for 0.5.5.1-r3 that must've been accidentally removed. Package-Manager: portage-2.1.2_rc2-r2 --- diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog index 3f7915f35edd..b042e6d9e6d4 100644 --- a/sys-apps/hal/ChangeLog +++ b/sys-apps/hal/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-apps/hal # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.110 2006/11/20 22:16:30 compnerd Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.111 2006/11/30 07:57:31 dberkholz Exp $ + + 30 Nov 2006; Donnie Berkholz ; + +files/hal-0.5.5.1-RBC.patch, +files/hal-unmount.dev: + Restore a couple of files needed for 0.5.5.1-r3 that must've been + accidentally removed. 20 Nov 2006; Saleem Abdulrasool hal-0.5.7-r3.ebuild: Fix dbus dependencies for dbus-1.0 release diff --git a/sys-apps/hal/Manifest b/sys-apps/hal/Manifest index 999d9016b7a3..3ac490baba03 100644 --- a/sys-apps/hal/Manifest +++ b/sys-apps/hal/Manifest @@ -6,6 +6,10 @@ AUX hal-0.5.1-old_storage_policy.patch 856 RMD160 d73708510cbfebc897fe20070e3c69 MD5 25cb64ec27a48a80126b6de5ff6c3340 files/hal-0.5.1-old_storage_policy.patch 856 RMD160 d73708510cbfebc897fe20070e3c6997559f8296 files/hal-0.5.1-old_storage_policy.patch 856 SHA256 6ea5cd467e1b7b34308c9ecc0eaf2442a3272b7c02ef75d7c0af16566e523cc2 files/hal-0.5.1-old_storage_policy.patch 856 +AUX hal-0.5.5.1-RBC.patch 660 RMD160 36368684295dcfa4809ba0fe7b6a2575d2091e1e SHA1 a845a7a324c9b9069b8a4c366d3f7e800200c2cf SHA256 6e0b71024bc857e72ce694282f098e3d5fb17b7a2dec579193878f0812360799 +MD5 54eaacd46e87bd8025da51f2f9aaf56b files/hal-0.5.5.1-RBC.patch 660 +RMD160 36368684295dcfa4809ba0fe7b6a2575d2091e1e files/hal-0.5.5.1-RBC.patch 660 +SHA256 6e0b71024bc857e72ce694282f098e3d5fb17b7a2dec579193878f0812360799 files/hal-0.5.5.1-RBC.patch 660 AUX hal-0.5.7-hald-scripts.patch 8636 RMD160 339765377e3573b382df987903f301860601668f SHA1 c2ffb779f423e07b38f12a852d942928394abc63 SHA256 d0b713f84c7bc782ba7b13f439630a995588097db2141f4a97c110036f64001a MD5 521a06ba0845bd3246d6ed4b589f110f files/hal-0.5.7-hald-scripts.patch 8636 RMD160 339765377e3573b382df987903f301860601668f files/hal-0.5.7-hald-scripts.patch 8636 @@ -58,6 +62,10 @@ AUX hal-0.5.7.1-sr-driver.patch 654 RMD160 86a98b6ceb98f797badd3e1c653f181d49813 MD5 a6cfdd91f94b01684e1c3063dd07cbd8 files/hal-0.5.7.1-sr-driver.patch 654 RMD160 86a98b6ceb98f797badd3e1c653f181d498138b1 files/hal-0.5.7.1-sr-driver.patch 654 SHA256 52191c2230af31f0bf18f39a5f0e6d24728da5c7e0de627be55046561318ca55 files/hal-0.5.7.1-sr-driver.patch 654 +AUX hal-unmount.dev 397 RMD160 78286dd9527bbb421082e73b0d08e06cd514d275 SHA1 31169a28448fb1eb1dfee5d1699de9a02449a6b7 SHA256 747a4c483f8a558f2c75666e9547e539475f112363f1dbfc6ea19ca393c8e89b +MD5 7ee3fd5b5ee117f14633350e5b335c2f files/hal-unmount.dev 397 +RMD160 78286dd9527bbb421082e73b0d08e06cd514d275 files/hal-unmount.dev 397 +SHA256 747a4c483f8a558f2c75666e9547e539475f112363f1dbfc6ea19ca393c8e89b files/hal-unmount.dev 397 AUX hald 522 RMD160 3d15723862416de29b6e2d18c53aec05b05216c3 SHA1 81d0023ef240790cf9e49d2e62e64760851038e1 SHA256 92f584b631026307485faa9ba386353b6d833349999e052fae0e8e9f82f83b6e MD5 35750516d24e67c9f24f5f1e0da22ca0 files/hald 522 RMD160 3d15723862416de29b6e2d18c53aec05b05216c3 files/hald 522 @@ -81,10 +89,10 @@ EBUILD hal-0.5.7.1-r2.ebuild 5927 RMD160 541c023e3f7a2981087a65f6d028cc3496e2ac8 MD5 732c9bda37514b0be81e57a1d94de4a9 hal-0.5.7.1-r2.ebuild 5927 RMD160 541c023e3f7a2981087a65f6d028cc3496e2ac89 hal-0.5.7.1-r2.ebuild 5927 SHA256 82099a78707b22e69f532cb9a09c682933ffd5096fa9c1a3de78a8b492a1902a hal-0.5.7.1-r2.ebuild 5927 -MISC ChangeLog 16789 RMD160 39ac8dc3424650dcec47ed32f17f8fcac7c25763 SHA1 8b28adb68e33f466ff3e745b9cf7cfa6c480333c SHA256 0d404f2cba04590528f50b8f26664dd3768ea1b0472609664187d1948278e805 -MD5 46efce7e61052103d0ba6f5b480044a0 ChangeLog 16789 -RMD160 39ac8dc3424650dcec47ed32f17f8fcac7c25763 ChangeLog 16789 -SHA256 0d404f2cba04590528f50b8f26664dd3768ea1b0472609664187d1948278e805 ChangeLog 16789 +MISC ChangeLog 16994 RMD160 1a83a1106ff9c45116e16aae7dc0622c160dc802 SHA1 5b994d370baab0a29caba09144e79b81b5c07937 SHA256 d820f1ef5846d774dc4f6ef8cff567f6a2aae1dd0d3aa496c9ee1e4399475a34 +MD5 ccc2198edac0e72df88221c19698192e ChangeLog 16994 +RMD160 1a83a1106ff9c45116e16aae7dc0622c160dc802 ChangeLog 16994 +SHA256 d820f1ef5846d774dc4f6ef8cff567f6a2aae1dd0d3aa496c9ee1e4399475a34 ChangeLog 16994 MISC metadata.xml 223 RMD160 ca8850c4808c8972fe9995c456578ff23cb4b3fb SHA1 28aa498172fa4c6f437adb79913ae16f4deb0c0c SHA256 49dd14861ed993df9f3509f82bb7f77e524b4b6c0e137677bb9f873d9cd8541d MD5 885e3073744523eaf2450514a311758b metadata.xml 223 RMD160 ca8850c4808c8972fe9995c456578ff23cb4b3fb metadata.xml 223 diff --git a/sys-apps/hal/files/hal-0.5.5.1-RBC.patch b/sys-apps/hal/files/hal-0.5.5.1-RBC.patch new file mode 100644 index 000000000000..ce906e3e5ed7 --- /dev/null +++ b/sys-apps/hal/files/hal-0.5.5.1-RBC.patch @@ -0,0 +1,18 @@ +Index: hald/linux2/blockdev.c +=================================================================== +RCS file: /cvs/hal/hal/hald/linux2/blockdev.c,v +retrieving revision 1.27 +diff -u -3 -p -r1.27 blockdev.c +--- hald/linux2/blockdev.c 2 Nov 2005 15:38:13 -0000 1.27 ++++ hald/linux2/blockdev.c 28 Nov 2005 23:04:24 -0000 +@@ -827,7 +827,8 @@ hotplug_event_begin_add_blockdev (const + + /* These magic values are documented in the kernel source */ + switch (type) { +- case 0: /* Disk */ ++ case 0: /* Disk */ ++ case 14: /* Simple Direct Access Device, set it to disk */ + hal_device_property_set_string (d, "storage.drive_type", "disk"); + break; + + diff --git a/sys-apps/hal/files/hal-unmount.dev b/sys-apps/hal/files/hal-unmount.dev new file mode 100644 index 000000000000..04d1fa81b597 --- /dev/null +++ b/sys-apps/hal/files/hal-unmount.dev @@ -0,0 +1,17 @@ +#!/bin/sh + +# sanity check. DEVNAME should start with a / +[ "$DEVNAME" != "${DEVNAME#/}" ] || exit 0 + +# Lazily unmount drives which are removed, but still mounted +if [ "$ACTION" = remove ] \ + && (grep -q "^$DEVNAME" /proc/mounts || grep -q "^$DEVNAME" /etc/mtab); then + if [ -x /usr/bin/pumount ] ; then + /usr/bin/pumount -l "$DEVNAME"; + else + /bin/umount -l "$DEVNAME"; + fi +fi + +exit 0 +