[Pkg-utopia-commits] r582 - in packages/unstable/hal/debian: .
patches
Sjoerd Simons
sjoerd at costa.debian.org
Sun Feb 12 17:04:54 UTC 2006
Author: sjoerd
Date: 2006-02-12 17:04:53 +0000 (Sun, 12 Feb 2006)
New Revision: 582
Modified:
packages/unstable/hal/debian/changelog
packages/unstable/hal/debian/patches/01_hal_privsep.patch
Log:
* debian/patches/01_hal_privsep.patch
+ Updated. Fix deadlock when using ATAPI Zip-drives (Closes: #351296)
Modified: packages/unstable/hal/debian/changelog
===================================================================
--- packages/unstable/hal/debian/changelog 2006-02-12 10:01:14 UTC (rev 581)
+++ packages/unstable/hal/debian/changelog 2006-02-12 17:04:53 UTC (rev 582)
@@ -1,3 +1,10 @@
+hal (0.5.6-3) unstable; urgency=high
+
+ * debian/patches/01_hal_privsep.patch
+ + Updated. Fix deadlock when using ATAPI Zip-drives (Closes: #351296)
+
+ -- Sjoerd Simons <sjoerd at debian.org> Sun, 12 Feb 2006 17:52:58 +0100
+
hal (0.5.6-2) unstable; urgency=low
* debian/patches/01_hal_privsep.patch
Modified: packages/unstable/hal/debian/patches/01_hal_privsep.patch
===================================================================
--- packages/unstable/hal/debian/patches/01_hal_privsep.patch 2006-02-12 10:01:14 UTC (rev 581)
+++ packages/unstable/hal/debian/patches/01_hal_privsep.patch 2006-02-12 17:04:53 UTC (rev 582)
@@ -1,6 +1,6 @@
diff -ruN hal-0.5.6-old/Makefile.am hal-0.5.6/Makefile.am
--- hal-0.5.6-old/Makefile.am 2005-08-26 22:27:21.000000000 +0200
-+++ hal-0.5.6/Makefile.am 2006-02-01 22:49:25.000000000 +0100
++++ hal-0.5.6/Makefile.am 2006-02-12 17:58:28.000000000 +0100
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
@@ -13,7 +13,7 @@
pkgconfig_DATA = hal.pc hal-storage.pc
diff -ruN hal-0.5.6-old/Makefile.in hal-0.5.6/Makefile.in
--- hal-0.5.6-old/Makefile.in 2006-01-17 02:07:51.000000000 +0100
-+++ hal-0.5.6/Makefile.in 2006-02-01 22:49:58.000000000 +0100
++++ hal-0.5.6/Makefile.in 2006-02-12 17:58:28.000000000 +0100
@@ -295,8 +295,8 @@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
@@ -27,7 +27,7 @@
pkgconfig_DATA = hal.pc hal-storage.pc
diff -ruN hal-0.5.6-old/configure hal-0.5.6/configure
--- hal-0.5.6-old/configure 2006-01-17 01:26:24.000000000 +0100
-+++ hal-0.5.6/configure 2006-02-01 22:40:28.000000000 +0100
++++ hal-0.5.6/configure 2006-02-12 17:58:28.000000000 +0100
@@ -1201,7 +1201,7 @@
else
echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
@@ -1033,7 +1033,7 @@
sed "$ac_vpsub
diff -ruN hal-0.5.6-old/configure.in hal-0.5.6/configure.in
--- hal-0.5.6-old/configure.in 2006-01-17 01:25:32.000000000 +0100
-+++ hal-0.5.6/configure.in 2006-02-01 22:40:06.000000000 +0100
++++ hal-0.5.6/configure.in 2006-02-12 17:58:28.000000000 +0100
@@ -480,6 +480,7 @@
hal.conf
Makefile
@@ -1044,7 +1044,7 @@
hald/linux2/probing/Makefile
diff -ruN hal-0.5.6-old/hald/Makefile.am hal-0.5.6/hald/Makefile.am
--- hal-0.5.6-old/hald/Makefile.am 2005-12-08 19:23:23.000000000 +0100
-+++ hal-0.5.6/hald/Makefile.am 2006-02-01 22:35:10.000000000 +0100
++++ hal-0.5.6/hald/Makefile.am 2006-02-12 17:58:28.000000000 +0100
@@ -40,6 +40,7 @@
hald_SOURCES = \
hald_marshal.h hald_marshal.c \
@@ -1055,7 +1055,7 @@
device_store.h device_store.c \
diff -ruN hal-0.5.6-old/hald/Makefile.in hal-0.5.6/hald/Makefile.in
--- hal-0.5.6-old/hald/Makefile.in 2006-01-17 02:07:48.000000000 +0100
-+++ hal-0.5.6/hald/Makefile.in 2006-02-01 22:49:53.000000000 +0100
++++ hal-0.5.6/hald/Makefile.in 2006-02-12 17:58:28.000000000 +0100
@@ -53,9 +53,9 @@
sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(sbin_PROGRAMS)
@@ -1087,7 +1087,7 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/util.Po at am__quote@
diff -ruN hal-0.5.6-old/hald/hald.c hal-0.5.6/hald/hald.c
--- hal-0.5.6-old/hald/hald.c 2006-01-13 03:24:10.000000000 +0100
-+++ hal-0.5.6/hald/hald.c 2006-02-01 22:35:10.000000000 +0100
++++ hal-0.5.6/hald/hald.c 2006-02-12 17:58:28.000000000 +0100
@@ -1,5 +1,5 @@
/***************************************************************************
- * CVSID: $Id: hald.c,v 1.45 2006/01/12 17:48:44 dkukawka Exp $
@@ -1259,7 +1259,7 @@
diff -ruN hal-0.5.6-old/hald/hald_dbus.c hal-0.5.6/hald/hald_dbus.c
--- hal-0.5.6-old/hald/hald_dbus.c 2006-01-13 03:24:10.000000000 +0100
-+++ hal-0.5.6/hald/hald_dbus.c 2006-02-01 22:35:10.000000000 +0100
++++ hal-0.5.6/hald/hald_dbus.c 2006-02-12 17:58:28.000000000 +0100
@@ -1,5 +1,5 @@
/***************************************************************************
- * CVSID: $Id: hald_dbus.c,v 1.48 2006/01/12 17:48:44 dkukawka Exp $
@@ -1442,7 +1442,7 @@
diff -ruN hal-0.5.6-old/hald/hald_dbus.h hal-0.5.6/hald/hald_dbus.h
--- hal-0.5.6-old/hald/hald_dbus.h 2005-11-02 16:38:13.000000000 +0100
-+++ hal-0.5.6/hald/hald_dbus.h 2006-02-01 22:35:10.000000000 +0100
++++ hal-0.5.6/hald/hald_dbus.h 2006-02-12 17:58:28.000000000 +0100
@@ -1,5 +1,5 @@
/***************************************************************************
- * CVSID: $Id: hald_dbus.h,v 1.10 2005/11/02 15:38:13 david Exp $
@@ -1459,7 +1459,7 @@
#endif /* HAL_DBUS_H */
diff -ruN hal-0.5.6-old/hald/hald_runner.c hal-0.5.6/hald/hald_runner.c
--- hal-0.5.6-old/hald/hald_runner.c 1970-01-01 01:00:00.000000000 +0100
-+++ hal-0.5.6/hald/hald_runner.c 2006-02-01 22:52:24.000000000 +0100
++++ hal-0.5.6/hald/hald_runner.c 2006-02-12 17:58:28.000000000 +0100
@@ -0,0 +1,430 @@
+/***************************************************************************
+ * CVSID: $Id: hald_runner.c,v 1.5 2006/01/21 19:08:27 david Exp $
@@ -1893,7 +1893,7 @@
+}
diff -ruN hal-0.5.6-old/hald/hald_runner.h hal-0.5.6/hald/hald_runner.h
--- hal-0.5.6-old/hald/hald_runner.h 1970-01-01 01:00:00.000000000 +0100
-+++ hal-0.5.6/hald/hald_runner.h 2006-02-01 22:52:24.000000000 +0100
++++ hal-0.5.6/hald/hald_runner.h 2006-02-12 17:58:28.000000000 +0100
@@ -0,0 +1,76 @@
+/***************************************************************************
+ *
@@ -1973,7 +1973,7 @@
+#endif
diff -ruN hal-0.5.6-old/hald/haldaemon.in hal-0.5.6/hald/haldaemon.in
--- hal-0.5.6-old/hald/haldaemon.in 2005-02-25 02:55:08.000000000 +0100
-+++ hal-0.5.6/hald/haldaemon.in 2006-02-01 22:35:10.000000000 +0100
++++ hal-0.5.6/hald/haldaemon.in 2006-02-12 17:58:28.000000000 +0100
@@ -25,7 +25,7 @@
start() {
@@ -1985,7 +1985,7 @@
[ $RETVAL -eq 0 ] && touch @LOCALSTATEDIR@/lock/subsys/$servicename
diff -ruN hal-0.5.6-old/hald/linux2/blockdev.c hal-0.5.6/hald/linux2/blockdev.c
--- hal-0.5.6-old/hald/linux2/blockdev.c 2006-01-08 18:58:02.000000000 +0100
-+++ hal-0.5.6/hald/linux2/blockdev.c 2006-02-01 23:00:20.000000000 +0100
++++ hal-0.5.6/hald/linux2/blockdev.c 2006-02-12 17:59:55.000000000 +0100
@@ -1,9 +1,10 @@
/***************************************************************************
- * CVSID: $Id: blockdev.c,v 1.29 2006/01/06 18:41:23 dkukawka Exp $
@@ -2054,7 +2054,7 @@
/* Move from temporary to global device store */
hal_device_store_remove (hald_get_tdl (), d);
hal_device_store_add (hald_get_gdl (), d);
-@@ -362,22 +366,18 @@
+@@ -362,27 +366,23 @@
if (!hal_device_property_get_bool (d, "storage.media_check_enabled") &&
hal_device_property_get_bool (d, "storage.no_partitions_hint")) {
@@ -2082,6 +2082,12 @@
} else {
HAL_INFO (("Not probing storage device %s",
hal_device_property_get_string (d, "block.device")));
+
+- add_blockdev_probing_helper_done (d, FALSE, 0, (gpointer) end_token, NULL, NULL);
++ add_blockdev_probing_helper_done (d, FALSE, 0, NULL, (gpointer) end_token, NULL);
+ goto out;
+ }
+ }
@@ -397,25 +397,23 @@
HAL_INFO (("Probing storage device %s", hal_device_property_get_string (d, "block.device")));
@@ -2221,7 +2227,7 @@
out:
diff -ruN hal-0.5.6-old/hald/linux2/classdev.c hal-0.5.6/hald/linux2/classdev.c
--- hal-0.5.6-old/hald/linux2/classdev.c 2006-01-17 01:25:34.000000000 +0100
-+++ hal-0.5.6/hald/linux2/classdev.c 2006-02-01 22:35:10.000000000 +0100
++++ hal-0.5.6/hald/linux2/classdev.c 2006-02-12 17:58:28.000000000 +0100
@@ -1,5 +1,5 @@
/***************************************************************************
- * CVSID: $Id: classdev.c,v 1.40 2006/01/13 16:40:31 kay Exp $
@@ -2293,7 +2299,7 @@
void
diff -ruN hal-0.5.6-old/hald/linux2/osspec.c hal-0.5.6/hald/linux2/osspec.c
--- hal-0.5.6-old/hald/linux2/osspec.c 2006-01-13 03:24:10.000000000 +0100
-+++ hal-0.5.6/hald/linux2/osspec.c 2006-02-01 22:56:32.000000000 +0100
++++ hal-0.5.6/hald/linux2/osspec.c 2006-02-12 17:58:28.000000000 +0100
@@ -66,6 +66,7 @@
#include "../logger.h"
#include "../hald.h"
@@ -2354,7 +2360,7 @@
DBusHandlerResult
diff -ruN hal-0.5.6-old/hald/util.c hal-0.5.6/hald/util.c
--- hal-0.5.6-old/hald/util.c 2005-12-08 19:23:23.000000000 +0100
-+++ hal-0.5.6/hald/util.c 2006-02-01 22:35:10.000000000 +0100
++++ hal-0.5.6/hald/util.c 2006-02-12 17:58:28.000000000 +0100
@@ -1,5 +1,5 @@
/***************************************************************************
- * CVSID: $Id: util.c,v 1.34 2005/11/29 17:38:00 dkukawka Exp $
@@ -2684,7 +2690,7 @@
void
diff -ruN hal-0.5.6-old/hald/util.h hal-0.5.6/hald/util.h
--- hal-0.5.6-old/hald/util.h 2005-11-14 17:16:03.000000000 +0100
-+++ hal-0.5.6/hald/util.h 2006-02-01 22:35:10.000000000 +0100
++++ hal-0.5.6/hald/util.h 2006-02-12 17:58:28.000000000 +0100
@@ -1,5 +1,5 @@
/***************************************************************************
- * CVSID: $Id: util.h,v 1.15 2005/11/09 20:45:44 dkukawka Exp $
@@ -2757,7 +2763,7 @@
#endif /* UTIL_H */
diff -ruN hal-0.5.6-old/hald-runner/.cvsignore hal-0.5.6/hald-runner/.cvsignore
--- hal-0.5.6-old/hald-runner/.cvsignore 1970-01-01 01:00:00.000000000 +0100
-+++ hal-0.5.6/hald-runner/.cvsignore 2006-01-21 12:54:46.000000000 +0100
++++ hal-0.5.6/hald-runner/.cvsignore 2006-02-12 17:58:28.000000000 +0100
@@ -0,0 +1,5 @@
+.deps
+.libs
@@ -2766,7 +2772,7 @@
+hald-runner
diff -ruN hal-0.5.6-old/hald-runner/Makefile.am hal-0.5.6/hald-runner/Makefile.am
--- hal-0.5.6-old/hald-runner/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ hal-0.5.6/hald-runner/Makefile.am 2006-01-21 03:45:27.000000000 +0100
++++ hal-0.5.6/hald-runner/Makefile.am 2006-02-12 17:58:28.000000000 +0100
@@ -0,0 +1,16 @@
+## Process this file with automake to produce Makefile.in
+INCLUDES = \
@@ -2786,7 +2792,7 @@
+hald_runner_LDADD = @PACKAGE_LIBS@ @DBUS_LIBS@
diff -ruN hal-0.5.6-old/hald-runner/Makefile.in hal-0.5.6/hald-runner/Makefile.in
--- hal-0.5.6-old/hald-runner/Makefile.in 1970-01-01 01:00:00.000000000 +0100
-+++ hal-0.5.6/hald-runner/Makefile.in 2006-02-01 22:49:52.000000000 +0100
++++ hal-0.5.6/hald-runner/Makefile.in 2006-02-12 17:58:28.000000000 +0100
@@ -0,0 +1,573 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
@@ -3363,7 +3369,7 @@
+.NOEXPORT:
diff -ruN hal-0.5.6-old/hald-runner/main.c hal-0.5.6/hald-runner/main.c
--- hal-0.5.6-old/hald-runner/main.c 1970-01-01 01:00:00.000000000 +0100
-+++ hal-0.5.6/hald-runner/main.c 2006-01-30 15:49:59.000000000 +0100
++++ hal-0.5.6/hald-runner/main.c 2006-02-12 17:58:28.000000000 +0100
@@ -0,0 +1,217 @@
+/***************************************************************************
+ * CVSID: $Id: main.c,v 1.3 2006/01/23 14:54:48 kay Exp $
@@ -3584,7 +3590,7 @@
+}
diff -ruN hal-0.5.6-old/hald-runner/runner.c hal-0.5.6/hald-runner/runner.c
--- hal-0.5.6-old/hald-runner/runner.c 1970-01-01 01:00:00.000000000 +0100
-+++ hal-0.5.6/hald-runner/runner.c 2006-01-30 15:49:59.000000000 +0100
++++ hal-0.5.6/hald-runner/runner.c 2006-02-12 17:58:28.000000000 +0100
@@ -0,0 +1,347 @@
+/***************************************************************************
+ * CVSID: $Id: runner.c,v 1.6 2006/01/29 15:03:27 hughsient Exp $
@@ -3935,7 +3941,7 @@
+}
diff -ruN hal-0.5.6-old/hald-runner/runner.h hal-0.5.6/hald-runner/runner.h
--- hal-0.5.6-old/hald-runner/runner.h 1970-01-01 01:00:00.000000000 +0100
-+++ hal-0.5.6/hald-runner/runner.h 2006-01-30 15:49:59.000000000 +0100
++++ hal-0.5.6/hald-runner/runner.h 2006-02-12 17:58:28.000000000 +0100
@@ -0,0 +1,57 @@
+/***************************************************************************
+ * CVSID: $Id: runner.h,v 1.2 2006/01/23 14:54:48 kay Exp $
@@ -3996,7 +4002,7 @@
+#endif /* RUNNER_H */
diff -ruN hal-0.5.6-old/hald-runner/utils.c hal-0.5.6/hald-runner/utils.c
--- hal-0.5.6-old/hald-runner/utils.c 1970-01-01 01:00:00.000000000 +0100
-+++ hal-0.5.6/hald-runner/utils.c 2006-01-30 15:49:59.000000000 +0100
++++ hal-0.5.6/hald-runner/utils.c 2006-02-12 17:58:28.000000000 +0100
@@ -0,0 +1,89 @@
+/***************************************************************************
+ * CVSID: $Id: utils.c,v 1.2 2006/01/23 14:54:48 kay Exp $
@@ -4089,7 +4095,7 @@
+}
diff -ruN hal-0.5.6-old/hald-runner/utils.h hal-0.5.6/hald-runner/utils.h
--- hal-0.5.6-old/hald-runner/utils.h 1970-01-01 01:00:00.000000000 +0100
-+++ hal-0.5.6/hald-runner/utils.h 2006-01-21 03:45:27.000000000 +0100
++++ hal-0.5.6/hald-runner/utils.h 2006-02-12 17:58:28.000000000 +0100
@@ -0,0 +1,35 @@
+/***************************************************************************
+ * CVSID: $Id: utils.h,v 1.1 2006/01/21 02:45:27 david Exp $
More information about the Pkg-utopia-commits
mailing list