Fix errno. Fix label at end of compound statement. Fallback to

O_FSYNC on DragonFly for O_SYNC.

5 files changed, 57 insertions, 3 deletions

diff --git a/sysutils/medusa/distinfo b/sysutils/medusa/distinfo
index d7ddaa909bf..86247ed676c 100644
--- a/sysutils/medusa/distinfo
+++ b/sysutils/medusa/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.4 2005/02/24 13:40:54 agc Exp $
+$NetBSD: distinfo,v 1.5 2006/02/16 21:22:52 joerg Exp $
 
 SHA1 (medusa-0.5.1.tar.gz) = 8e3a1ae286c9502bceda3f3fa5f2b3559440d8d0
 RMD160 (medusa-0.5.1.tar.gz) = 395ed98ee04b507f78122c744f256415f9e25324
 Size (medusa-0.5.1.tar.gz) = 384482 bytes
 SHA1 (patch-aa) = 76a682d2b7e71488131037fed209a9d2144a97c9
 SHA1 (patch-ab) = f19d58f14f957dff3de7de9015910d4933c1b896
-SHA1 (patch-ad) = 885715122bbe31cb582e4cc75db02296e4282b4f
+SHA1 (patch-ad) = 4b143d2f041dd89188551f1a7c063e51ce95f6b3
 SHA1 (patch-ae) = 0e93570781b68d42f9ced0b705e447c965fd611c
 SHA1 (patch-af) = c4a9458e8583a6f8acd286d1fefb8abb3fbf31ed
 SHA1 (patch-ag) = 9c4ffb05d2108dbacfbf34704c6a81fc06fc6d37
@@ -15,3 +15,6 @@ SHA1 (patch-aj) = 38cd6ebdcddf8fd956f6664df20236ec66797ae4
 SHA1 (patch-ak) = 643b9fdaac6cb189754e416a2fe7fe96593c812b
 SHA1 (patch-al) = 0ea2fd1a17c9ef00c4d32dc3fcd6c8044a388e49
 SHA1 (patch-am) = efa7e6cd18dec31a098834ae2a2f0bfd1ef07d77
+SHA1 (patch-an) = 4d7d3484c4e4516c20e1999213576808631e2947
+SHA1 (patch-ao) = c220f2931967c032006b82d0e4954c45f4848c91
+SHA1 (patch-ap) = 9b5c761796d2e22605bb933a4a5a578159d6c0ac
diff --git a/sysutils/medusa/patches/patch-ad b/sysutils/medusa/patches/patch-ad
index 3d74eb22bd5..2e75eccdbde 100644
--- a/sysutils/medusa/patches/patch-ad
+++ b/sysutils/medusa/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.1.1.1 2001/05/14 17:13:21 rh Exp $
+$NetBSD: patch-ad,v 1.2 2006/02/16 21:22:52 joerg Exp $
 
 --- indexer/medusa-file-index-daemon.c.orig	Fri Apr 27 02:55:43 2001
 +++ indexer/medusa-file-index-daemon.c
@@ -30,3 +30,11 @@ $NetBSD: patch-ad,v 1.1.1.1 2001/05/14 17:13:21 rh Exp $
  #endif /* HAVE_STATVFS */
  
  #include <time.h>
+@@ -87,7 +94,6 @@ static void             exit_indexer    
+ 
+ 
+ 
+-extern int errno;
+ static gboolean create_index_even_if_disk_is_full;
+ 
+ /* Main index loop.  
diff --git a/sysutils/medusa/patches/patch-an b/sysutils/medusa/patches/patch-an
new file mode 100644
index 00000000000..5d4a5e152c4
--- /dev/null
+++ b/sysutils/medusa/patches/patch-an
@@ -0,0 +1,13 @@
+$NetBSD: patch-an,v 1.1 2006/02/16 21:22:53 joerg Exp $
+
+--- libmedusa/medusa-service-private.c.orig	2006-02-16 20:29:43.000000000 +0000
++++ libmedusa/medusa-service-private.c
+@@ -46,8 +46,6 @@
+ #endif
+ #undef MEDUSA_SERVICE_PRIVATE_DEBUG
+ 
+-extern int errno;
+-
+ static gboolean
+ root_owns_search_socket (const char *socket_path)
+ {
diff --git a/sysutils/medusa/patches/patch-ao b/sysutils/medusa/patches/patch-ao
new file mode 100644
index 00000000000..b8f7bc1005f
--- /dev/null
+++ b/sysutils/medusa/patches/patch-ao
@@ -0,0 +1,14 @@
+$NetBSD: patch-ao,v 1.1 2006/02/16 21:22:53 joerg Exp $
+
+--- medusa-idled/x-screensaver-code.c.orig	2006-02-16 20:36:20.000000000 +0000
++++ medusa-idled/x-screensaver-code.c
+@@ -799,7 +799,8 @@ x_screensaver_check_for_idle_status_chan
+                                 else
+ #endif /* HAVE_SGI_SAVER_EXTENSION */
+                                         /* Just some random event.  Never mind */
+-                                        }
++			break;
++                        }
+         }
+         if (reset_timers_for_current_event_loop) {
+                 reset_timers (server_info);
diff --git a/sysutils/medusa/patches/patch-ap b/sysutils/medusa/patches/patch-ap
new file mode 100644
index 00000000000..f91e063e895
--- /dev/null
+++ b/sysutils/medusa/patches/patch-ap
@@ -0,0 +1,16 @@
+$NetBSD: patch-ap,v 1.1 2006/02/16 21:22:53 joerg Exp $
+
+--- libmedusa-internal/medusa-io-handler.c.orig	2006-02-16 20:53:47.000000000 +0000
++++ libmedusa-internal/medusa-io-handler.c
+@@ -254,7 +254,11 @@ fopen_new_with_medusa_io_handler_header 
+ 
+         /* We open the file synchronously here to make sure the header gets
+            written before returning the FILE * */
++#if defined(__DragonFly__) && !defined(O_SYNC)
++        file_descriptor = open (file_name, O_RDWR | O_CREAT | O_FSYNC, S_IRUSR | S_IWUSR);
++#else
+         file_descriptor = open (file_name, O_RDWR | O_CREAT | O_SYNC, S_IRUSR | S_IWUSR);
++#endif
+         write_header_to_file_descriptor (file_descriptor, magic_number, version_number, 0);
+         close (file_descriptor);				  
+         stat (file_name, &file_info);