Re: Current status (v2) of OpenBSD BEAST

[Nedko Arnaudov <nedko users sourceforge net>]

New versions of patches, this time including changelog entries.
--- ChangeLog.orig	Wed Dec 31 01:04:06 2003
+++ ChangeLog	Wed Dec 31 01:05:47 2003
@@ -1,3 +1,8 @@
+Wed Dec 31 01:05:14 2003  Nedko Arnaudov  <nedko@users.sourceforge.net>
+
+	* configure.in (AC_BSE_SNDDEV_CHECK): Detect OSS emulation that is
+	not implemented in sys/soundcard.h but in soundcard.h
+
 Mon Dec 29 20:58:04 2003  Tim Janik  <timj@gtk.org>
 
 	* beast-gtk/bstutils.c (bst_action_list_add_cat): fix oversized pixel
--- configure.in.orig	Mon Dec 29 13:21:57 2003
+++ configure.in	Wed Dec 31 01:03:14 2003
@@ -383,7 +383,7 @@
     bse_have_pcmdev=
 	
     dnl OSS-Lite driver check
-    AC_CHECK_HEADER(sys/soundcard.h, have_oss_header=yes, have_oss_header=no)
+    AC_CHECK_HEADERS(sys/soundcard.h soundcard.h, have_oss_header=yes, have_oss_header=no)
     AC_ARG_ENABLE(osspcm,
 	[  --enable-osspcm=DEVICE  force DEVICE as OSS PCM device name],
 	[AC_MSG_WARN([Ignoring detection of PCM device])],
--- bse/ChangeLog.orig	Wed Dec 31 01:04:16 2003
+++ bse/ChangeLog	Wed Dec 31 01:08:38 2003
@@ -1,3 +1,9 @@
+Wed Dec 31 01:06:51 2003  Nedko Arnaudov  <nedko@users.sourceforge.net>
+
+	* bsemididevice-oss.c:
+	* bsepcmdevice-oss.c: Use configure detection of OSS emulation
+	that is not implemented in sys/soundcard.h but in soundcard.h
+
 Mon Dec 29 21:00:23 2003  Tim Janik  <timj@gtk.org>
 
 	* bsesniffer.idl:
--- bse/bsepcmdevice-oss.c.orig	Mon Aug 25 18:13:14 2003
+++ bse/bsepcmdevice-oss.c	Wed Dec 31 01:03:14 2003
@@ -25,7 +25,11 @@
 BSE_DUMMY_TYPE (BsePcmDeviceOSS);
 #else   /* BSE_PCM_DEVICE_CONF_OSS */
 
+#if HAVE_SYS_SOUNDCARD_H
 #include	<sys/soundcard.h>
+#elif HAVE_SOUNDCARD_H
+#include	<soundcard.h>
+#endif
 #include	<sys/ioctl.h>
 #include	<sys/types.h>
 #include	<sys/time.h>
--- bse/bsemididevice-oss.c.orig	Mon Aug 25 18:13:14 2003
+++ bse/bsemididevice-oss.c	Wed Dec 31 01:03:14 2003
@@ -27,7 +27,11 @@
 BSE_DUMMY_TYPE (BseMidiDeviceOSS);
 #else   /* BSE_MIDI_DEVICE_CONF_OSS */
 
+#if HAVE_SYS_SOUNDCARD_H
 #include	<sys/soundcard.h>
+#elif HAVE_SOUNDCARD_H
+#include	<soundcard.h>
+#endif
 #include	<sys/ioctl.h>
 #include	<sys/types.h>
 #include	<sys/time.h>
--- ChangeLog.orig	Wed Dec 31 01:17:11 2003
+++ ChangeLog	Wed Dec 31 01:15:47 2003
@@ -1,3 +1,8 @@
+Wed Dec 31 01:15:19 2003  Nedko Arnaudov  <nedko@users.sourceforge.net>
+
+	* configure.in (AC_DOC_REQUIREMENTS): Detect getpwnam_r and
+	getpwnam functions availability.
+
 Mon Dec 29 20:58:04 2003  Tim Janik  <timj@gtk.org>
 
 	* beast-gtk/bstutils.c (bst_action_list_add_cat): fix oversized pixel
--- configure.in.orig	Mon Dec 29 13:21:57 2003
+++ configure.in	Wed Dec 31 01:17:02 2003
@@ -539,6 +539,8 @@
 AC_BEAST_REQUIREMENTS
 AC_DOC_REQUIREMENTS
 
+AC_CHECK_FUNCS(getpwnam_r getpwnam)
+
 # Automake @VARIABLE@ exports.
 AC_SUBST(CFLAGS)
 AC_SUBST(CPPFLAGS)
--- sfi/ChangeLog.orig	Wed Dec 31 01:17:32 2003
+++ sfi/ChangeLog	Wed Dec 31 01:19:22 2003
@@ -1,3 +1,8 @@
+Wed Dec 31 01:18:38 2003  Nedko Arnaudov  <nedko@users.sourceforge.net>
+
+	* sfifilecrawler.c (get_user_home): Use configure detection of
+	getpwnam_r and getpwnam functions availability.
+
 Mon Dec 29 21:16:07 2003  Tim Janik  <timj@gtk.org>
 
 	* sfidl-module.cc: s/canonify_type/canonify_name/. made more functions
--- sfi/sfifilecrawler.c.orig	Mon Oct 27 20:58:13 2003
+++ sfi/sfifilecrawler.c	Wed Dec 31 01:17:02 2003
@@ -581,7 +581,8 @@
                gboolean     use_fallbacks)
 {
   struct passwd *p = NULL;
-  if (user && 1 /* getpwnam_r check */)
+#if HAVE_GETPWNAM_R
+  if (user)
     {
       char buffer[8192];
       struct passwd spwd;
@@ -588,12 +589,14 @@
       if (getpwnam_r (user, &spwd, buffer, 8192, &p) == 0 && p)
         return g_strdup (p->pw_dir);
     }
-  if (user && 1 /* getpwnam check */)
+#elif HAVE_GETPWNAM
+  if (user)
     {
       p = getpwnam (user);
       if (p)
         return g_strdup (p->pw_dir);
     }
+#endif
   if (!user)
     return g_strdup (g_get_home_dir ());
   return use_fallbacks ? g_strdup (g_get_home_dir ()) : NULL;

-- 
Nedko Arnaudov