new release

8 files changed, 222 insertions, 2 deletions

diff --git a/sys-apps/hal/files/digest-hal-0.2.97 b/sys-apps/hal/files/digest-hal-0.2.97
deleted file mode 100644
index 377a8445a224..000000000000
--- a/sys-apps/hal/files/digest-hal-0.2.97
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d156860f508ea384282a367774fe85bb hal-0.2.97.tar.gz 1238713
diff --git a/sys-apps/hal/files/digest-hal-0.2.98 b/sys-apps/hal/files/digest-hal-0.2.98
deleted file mode 100644
index 7eaa6f7cc441..000000000000
--- a/sys-apps/hal/files/digest-hal-0.2.98
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cc289e50e00330032604e02392ffde3a hal-0.2.98.tar.gz 1221966
diff --git a/sys-apps/hal/files/digest-hal-0.4.0 b/sys-apps/hal/files/digest-hal-0.4.0
new file mode 100644
index 000000000000..6942fe7f23aa
--- /dev/null
+++ b/sys-apps/hal/files/digest-hal-0.4.0
@@ -0,0 +1 @@
+MD5 2ced1620a85cd547c53aa72787d8b06e hal-0.4.0.tar.gz 1319354
diff --git a/sys-apps/hal/files/hal-0.4.0-allow-floppy-drives.patch b/sys-apps/hal/files/hal-0.4.0-allow-floppy-drives.patch
new file mode 100644
index 000000000000..6a8dff4cc6ec
--- /dev/null
+++ b/sys-apps/hal/files/hal-0.4.0-allow-floppy-drives.patch
@@ -0,0 +1,17 @@
+Index: fdi/90defaultpolicy/storage-policy.fdi
+===================================================================
+RCS file: /cvs/hal/hal/fdi/90defaultpolicy/storage-policy.fdi,v
+retrieving revision 1.5
+diff -u -p -r1.5 storage-policy.fdi
+--- fdi/90defaultpolicy/storage-policy.fdi	15 Oct 2004 20:46:08 -0000	1.5
++++ fdi/90defaultpolicy/storage-policy.fdi	18 Oct 2004 23:51:33 -0000
+@@ -30,6 +30,9 @@
+       <match key="storage.bus" string="sata">
+ 	<merge key="storage.policy.should_mount" type="bool">true</merge>
+       </match>
++      <match key="storage.bus" string="platform">
++	<merge key="storage.policy.should_mount" type="bool">true</merge>
++      </match>
+     </match>
+ 
+     <!-- Handle drives with non-partitioned media  -->
diff --git a/sys-apps/hal/files/hal-0.4.0-clean-on-startup.patch b/sys-apps/hal/files/hal-0.4.0-clean-on-startup.patch
new file mode 100644
index 000000000000..237c5712524e
--- /dev/null
+++ b/sys-apps/hal/files/hal-0.4.0-clean-on-startup.patch
@@ -0,0 +1,92 @@
+? changes
+? foo.c
+? hal-0.4.0-clean-on-startup.patch
+? hal-0.4.0.tar.gz
+? hal-storage.pc
+? intltool-extract
+? intltool-extract.in
+? intltool-merge
+? intltool-merge.in
+? intltool-update
+? intltool-update.in
+? mkinstalldirs
+? doc/api/Doxyfile
+? doc/api/Makefile
+? doc/api/Makefile.in
+? doc/api/html
+? doc/conf/Makefile
+? doc/conf/Makefile.in
+? doc/spec/Makefile
+? doc/spec/Makefile.in
+? doc/spec/hal-spec.xml
+? doc/spec/spec.tar
+? fdi/30osvendor/Makefile
+? fdi/30osvendor/Makefile.in
+? fdi/40oem/Makefile
+? fdi/40oem/Makefile.in
+? fdi/50user/Makefile
+? fdi/50user/Makefile.in
+? fdi/90defaultpolicy/Makefile
+? fdi/90defaultpolicy/Makefile.in
+? fdi/95userpolicy/Makefile
+? fdi/95userpolicy/Makefile.in
+? hald/foo
+? libhal-storage/.deps
+? libhal-storage/.libs
+? libhal-storage/Makefile
+? libhal-storage/Makefile.in
+? libhal-storage/libhal-storage.la
+? libhal-storage/libhal-storage.lo
+? po/Makefile
+? po/Makefile.in
+? po/Makefile.in.in
+? po/POTFILES
+? po/da.gmo
+? po/de.gmo
+? po/fr.gmo
+? po/hal.pot
+? po/nl.gmo
+? tools/foo
+? tools/fstab-sync
+? tools/fstab-sync.8
+? tools/linux/hal-hotplug-map
+Index: tools/fstab-sync.c
+===================================================================
+RCS file: /cvs/hal/hal/tools/fstab-sync.c,v
+retrieving revision 1.23
+diff -u -p -r1.23 fstab-sync.c
+--- tools/fstab-sync.c	14 Oct 2004 18:37:28 -0000	1.23
++++ tools/fstab-sync.c	15 Oct 2004 00:33:54 -0000
+@@ -74,11 +74,6 @@ static boolean verbose = FALSE;
+ #define TEMP_FSTAB_PREFIX ".fstab.hal."
+ #define TEMP_FSTAB_MAX_LENGTH 64
+ 
+-#undef FSTAB_SYNC_MOUNT_ROOT
+-#undef FSTAB_SYNC_MOUNT_MANAGED_KEYWORD
+-#undef FSTAB_SYNC_MOUNT_MANAGED_KEYWORD_SEC
+-#undef FSTAB_SYNC_MOUNT_ACCESS
+-
+ #ifndef TRUE
+ #define TRUE 1
+ #endif
+@@ -1657,10 +1652,8 @@ main (int argc, const char *argv[])
+         N_("add an entry to fstab"), N_("UDI")},
+       {"remove", 'r', POPT_ARG_STRING, &udi_to_remove, 0,
+         N_("remove an entry from fstab"), N_("UDI")},
+-#ifdef FSTAB_SYNC_USE_NOOP_MOUNT_OPTION
+       {"clean", 'c', POPT_ARG_NONE, &should_clean, 0,
+         N_("Remove all generated entries from fstab")},
+-#endif
+       {"verbose", 'v', POPT_ARG_NONE, &verbose, 0,
+         N_("Report detailed information about operation progress")},
+ 
+@@ -1694,9 +1687,7 @@ main (int argc, const char *argv[])
+       
+       /* when invoked for the /org/freedesktop/Hal/devices/computer UDI we clean the fstab */
+       if (getenv ("HALD_STARTUP") != NULL && strcmp (hal_device_udi, "/org/freedesktop/Hal/devices/computer") == 0) {
+-#ifdef FSTAB_SYNC_USE_NOOP_MOUNT_OPTION
+ 	should_clean = TRUE;
+-#endif
+       } else {
+       
+ 	/* when we are invoked by hald, make some early tests using the
diff --git a/sys-apps/hal/files/hal-0.4.0-fix-fstab-sync-crasher.patch b/sys-apps/hal/files/hal-0.4.0-fix-fstab-sync-crasher.patch
new file mode 100644
index 000000000000..34d13b326e01
--- /dev/null
+++ b/sys-apps/hal/files/hal-0.4.0-fix-fstab-sync-crasher.patch
@@ -0,0 +1,70 @@
+Index: tools/fstab-sync.c
+===================================================================
+RCS file: /cvs/hal/hal/tools/fstab-sync.c,v
+retrieving revision 1.25
+diff -u -p -r1.25 fstab-sync.c
+--- tools/fstab-sync.c	15 Oct 2004 20:53:45 -0000	1.25
++++ tools/fstab-sync.c	19 Oct 2004 00:17:10 -0000
+@@ -1653,27 +1653,23 @@ main (int argc, const char *argv[])
+   openlog (PROGRAM_NAME, LOG_PID, LOG_USER);
+   
+   struct poptOption options[] = {
+-      {"add", 'a', POPT_ARG_STRING, &udi_to_add, 0,
+-        N_("add an entry to fstab"), N_("UDI")},
+-      {"remove", 'r', POPT_ARG_STRING, &udi_to_remove, 0,
+-        N_("remove an entry from fstab"), N_("UDI")},
+-      {"clean", 'c', POPT_ARG_NONE, &should_clean, 0,
+-        N_("Remove all generated entries from fstab")},
+-      {"verbose", 'v', POPT_ARG_NONE, &verbose, 0,
+-        N_("Report detailed information about operation progress")},
++      {"add",     'a', POPT_ARG_STRING, &udi_to_add,    0, N_("add an entry to fstab"), N_("UDI")},
++      {"remove",  'r', POPT_ARG_STRING, &udi_to_remove, 0, N_("remove an entry from fstab"), N_("UDI")},
++      {"clean",   'c', POPT_ARG_NONE,   &should_clean,  0, N_("Remove all generated entries from fstab"), NULL},
++      {"verbose", 'v', POPT_ARG_NONE,   &verbose,       0, N_("Report detailed information about operation progress"), NULL},
+ 
+       POPT_AUTOHELP
+ 
+-      {NULL, '\0', 0, NULL},
++      {NULL, '\0', 0, NULL, 0, NULL, NULL}
+   };
+ 
+   popt_context = poptGetContext (PROGRAM_NAME, argc, argv, options, 0);
+-
++	  
+   while ((i = poptGetNextOpt (popt_context)) != -1)
+     {
+       if (i < -1)
+         {
+-          poptPrintHelp (popt_context, stderr, 0);
++	  poptPrintHelp (popt_context, stderr, 0);
+           return 1;
+         }
+     }
+@@ -1760,7 +1756,6 @@ main (int argc, const char *argv[])
+ 			  break;
+ 		  }
+ 	  }
+-  poptFreeContext (popt_context);
+ 
+   hal_context = hal_initialize (NULL, FALSE);
+   fsy_mount_root = hal_drive_policy_default_get_mount_root (hal_context);
+@@ -1792,8 +1787,8 @@ main (int argc, const char *argv[])
+     retval = clean ();
+   else
+     {
+-      poptPrintHelp (popt_context, stderr, 0);
+-      return 1;
++	poptPrintHelp (popt_context, stderr, 0);
++	return 1;
+     }
+ 
+   if (hal_device_udi != NULL) {
+@@ -1816,6 +1811,8 @@ main (int argc, const char *argv[])
+     fstab_update_debug (_("\n"));
+   }
+ 
++  poptFreeContext (popt_context);
++
+ out:
+   return retval;
+ }
diff --git a/sys-apps/hal/files/hal-0.4.0-old_storage_policy.patch b/sys-apps/hal/files/hal-0.4.0-old_storage_policy.patch
new file mode 100644
index 000000000000..a2df781eb710
--- /dev/null
+++ b/sys-apps/hal/files/hal-0.4.0-old_storage_policy.patch
@@ -0,0 +1,17 @@
+--- hal-0.4.0/fdi/90defaultpolicy/storage-policy.fdi	2004-10-14 23:59:29.000000000 +0200
++++ hal-0.4.0/fdi/90defaultpolicy/storage-policy.fdi.patched	2004-10-21 12:48:16.223876512 +0200
+@@ -6,11 +6,12 @@
+   <device>
+     <match key="info.udi" string="/org/freedesktop/Hal/devices/computer">
+       <merge key="storage.policy.default.mount_root" type="string">/media</merge>
+-      <merge key="storage.policy.default.use_managed_keyword" type="bool">true</merge>
++      <merge key="storage.policy.default.use_managed_keyword" type="bool">false</merge>
+       <merge key="storage.policy.default.managed_keyword.primary" type="string">managed</merge>
+       <merge key="storage.policy.default.managed_keyword.secondary" type="string">kudzu</merge>
+       <merge key="storage.policy.default.mount_option.noauto" type="bool">true</merge>
+-      <merge key="storage.policy.default.mount_option.pamconsole" type="bool">true</merge>
++      <merge key="storage.policy.default.mount_option.pamconsole" type="bool">false</merge>
++      <merge key="storage.policy.default.mount_option.user" type="bool">true</merge>
+       <merge key="storage.policy.default.mount_option.exec" type="bool">true</merge>
+     </match>
+   </device>
diff --git a/sys-apps/hal/files/hal-0.4.0-storage-policy-never-use-uuid.patch b/sys-apps/hal/files/hal-0.4.0-storage-policy-never-use-uuid.patch
new file mode 100644
index 000000000000..e006dd24f939
--- /dev/null
+++ b/sys-apps/hal/files/hal-0.4.0-storage-policy-never-use-uuid.patch
@@ -0,0 +1,25 @@
+Index: fdi/90defaultpolicy/storage-policy.fdi
+===================================================================
+RCS file: /cvs/hal/hal/fdi/90defaultpolicy/storage-policy.fdi,v
+retrieving revision 1.4
+diff -u -r1.4 storage-policy.fdi
+--- fdi/90defaultpolicy/storage-policy.fdi	14 Oct 2004 21:58:55 -0000	1.4
++++ fdi/90defaultpolicy/storage-policy.fdi	15 Oct 2004 20:43:16 -0000
+@@ -83,13 +83,10 @@
+ 	  <merge key="volume.policy.should_mount" type="bool">true</merge>
+ 	  <merge key="volume.policy.mount_filesystem" type="copy_property">volume.fstype</merge>
+ 	  
+-	  <!-- Fallback is '<storage.drive_type>', e.g. disk, compact_flash etc. -->
+-	  <merge key="volume.policy.desired_mount_point" type="copy_property">@block.storage_device:storage.drive_type</merge>
+-	  
+-	  <!-- Better: if available use UUID -->
+-          <match key="volume.uuid" empty="false">
+-            <merge key="volume.policy.desired_mount_point" type="copy_property">volume.uuid</merge>
+-          </match>
++	  <!-- Fallback is '<storage.bus>', appended with 'disk', e.g. usbdisk,
++	       idedisk, scsidisk etc. -->
++	  <merge key="volume.policy.desired_mount_point" type="copy_property">@block.storage_device:storage.bus</merge>
++	  <append key="volume.policy.desired_mount_point" type="string">disk</append>
+ 	  
+           <!-- Best: If available use filesystem label -->
+           <match key="volume.label" empty="false">