Integrate downstream NetBSD patches

diff --git a/bin/psorder/psorder.c b/bin/psorder/psorder.c
index 8d39b2840d11a11f48217577f3246bdd73621d6e..4a37bab579fc59dfd8124ecfda4b6a33e0027c78 100644 (file)
--- a/bin/psorder/psorder.c
+++ b/bin/psorder/psorder.c
@@ -1,5 +1,5 @@
 /*
- * $Id: psorder.c,v 1.9 2009-10-14 02:24:05 didg Exp $
+ * $Id: psorder.c,v 1.10 2010-04-12 14:28:47 franklahm Exp $
  *
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
  * All Rights Reserved.
@@ -35,6 +35,7 @@
 #include <sys/uio.h>
 #include <sys/file.h>
 #include <ctype.h>
+#include <limits.h>
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif /* HAVE_FCNTL_H */
@@ -111,7 +112,11 @@ filesetup( char *inputfile, int *infd, char *tfile, int *tfd)
        make temporary file
  */
 
-    strncpy( tfile, template, MAXNAMLEN );
+#if defined(NAME_MAX)
+    (void *)strncpy( tfile, template, NAME_MAX );
+#else
+    (void *)strncpy( tfile, template, MAXNAMLEN );
+#endif
     if (( *tfd = mkstemp( tfile )) == -1 ) {
        fprintf( stderr, "can't create temporary file %s\n", tfile );
        filecleanup( -1, -1, "" );
@@ -494,7 +499,11 @@ psorder(char *path)
 {
     int                        tempfd;
     int                        inputfd;
+#if defined(NAME_MAX)
+    char               tempfile[NAME_MAX];
+#else
     char               tempfile[MAXNAMLEN];
+#endif
 
     filesetup( path, &inputfd, tempfile, &tempfd );
     readps( inputfd, tempfd, tempfile );

diff --git a/configure.in b/configure.in
index a29500277ba3a1ff80c0f18e12ea40bc987eef77..99d3f0272d93e30d9d995a7f591d1906d8c692b8 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.242 2010-04-07 14:25:24 hat001 Exp $
+dnl $Id: configure.in,v 1.243 2010-04-12 14:28:42 franklahm Exp $
 dnl configure.in for netatalk
 
 AC_INIT(etc/afpd/main.c)
@@ -795,8 +795,8 @@ dnl ----- NetBSD specific -----
 if test x"$this_os" = "xnetbsd"; then 
        AC_MSG_RESULT([ * NetBSD specific configuration])
        AC_DEFINE(BSD4_4, 1, [BSD compatiblity macro])
-       AC_DEFINE(NETBSD, 1, [Define if OS is FreeBSD])
-       CFLAGS="-I\$(top_srcdir)/sys/netbsd -I/usr/include/kerberosIV $CFLAGS"
+       AC_DEFINE(NETBSD, 1, [Define if OS is NetBSD])
+       CFLAGS="-I\$(top_srcdir)/sys/netbsd $CFLAGS"
        need_dash_r=yes 
 
        dnl ----- NetBSD does not have crypt.h, uses unistd.h -----

diff --git a/etc/afpd/unix.h b/etc/afpd/unix.h
index e6417998a0c347767f5db9ffae5284bcf93ca169..c663ecac2371ac98dc7915ee72ac700fb9b8116f 100644 (file)
--- a/etc/afpd/unix.h
+++ b/etc/afpd/unix.h
@@ -1,5 +1,5 @@
 /*
- * $Id: unix.h,v 1.22 2009-10-13 22:55:37 didg Exp $
+ * $Id: unix.h,v 1.23 2010-04-12 14:28:47 franklahm Exp $
  */
 
 #ifndef AFPD_UNIX_H
@@ -44,7 +44,9 @@ typedef int   mode_t;
 #include <sys/mnttab.h>
 #endif /* __svr4__ || HAVE_SYS_MNTTAB_H */
 
-
+#if defined(__DragonFly__)
+#define dqblk ufs_dqblk
+#endif
 
 #if defined(HAVE_SYS_MOUNT_H) || defined(BSD4_4) || \
     defined(linux) || defined(ultrix)

diff --git a/include/atalk/paths.h b/include/atalk/paths.h
index d1ea062184b15adc0c2037d2e1ad2ae938bf3da8..2d7d91bdff7e1a22649f0cf845076761df3f634c 100644 (file)
--- a/include/atalk/paths.h
+++ b/include/atalk/paths.h
@@ -16,7 +16,7 @@
 
 /* lock file path. this should be re-organized a bit. */
 #if ! defined (_PATH_LOCKDIR)
-#  if defined (FHS_COMPATIBILITY)
+#  if defined (FHS_COMPATIBILITY) || defined (__NetBSD__)
 #    define _PATH_LOCKDIR      "/var/run/"
 #  elif defined (BSD4_4)
 #    ifdef MACOSX_SERVER
@@ -51,7 +51,7 @@
  */
 #define _PATH_ATALKDEBUG       "/tmp/atalkd.debug"
 #define _PATH_ATALKDTMP                "atalkd.tmp"
-#ifdef FHS_COMPATIBILITY
+#if defined (FHS_COMPATIBILITY) || defined (__NetBSD__)
 #  define _PATH_ATALKDLOCK     ATALKPATHCAT(_PATH_LOCKDIR,"atalkd.pid")
 #else
 #  define _PATH_ATALKDLOCK     ATALKPATHCAT(_PATH_LOCKDIR,"atalkd")
@@ -61,7 +61,7 @@
  * psorder paths
  */
 #define _PATH_TMPPAGEORDER     "/tmp/psorderXXXXXX"
-#ifdef FHS_COMPATIBILITY
+#if defined (FHS_COMPATIBILITY) || defined (__NetBSD__)
 #  define _PATH_PAPDLOCK       ATALKPATHCAT(_PATH_LOCKDIR,"papd.pid")
 #else
 #  define _PATH_PAPDLOCK       ATALKPATHCAT(_PATH_LOCKDIR,"papd")
@@ -71,7 +71,7 @@
  * afpd paths
  */
 #define _PATH_AFPTKT           "/tmp/AFPtktXXXXXX"
-#ifdef FHS_COMPATIBILITY
+#if defined (FHS_COMPATIBILITY) || defined (__NetBSD__)
 #  define _PATH_AFPDLOCK       ATALKPATHCAT(_PATH_LOCKDIR,"afpd.pid")
 #else
 #  define _PATH_AFPDLOCK       ATALKPATHCAT(_PATH_LOCKDIR,"afpd")

diff --git a/macros/cups.m4 b/macros/cups.m4
index b46e4f2f7ad57e12c9777b5d9ce7c67cc020a1af..5507aa4dac49e37e57cc378863e1524bab5a2fdb 100644 (file)
--- a/macros/cups.m4
+++ b/macros/cups.m4
@@ -1,4 +1,4 @@
-dnl $Id: cups.m4,v 1.2 2005-04-28 20:50:05 bfernhomberg Exp $
+dnl $Id: cups.m4,v 1.3 2010-04-12 14:28:47 franklahm Exp $
 dnl Autoconf macros to check for CUPS
 
 AC_DEFUN([NETATALK_AC_CUPS], [
@@ -45,7 +45,7 @@ AC_DEFUN([NETATALK_AC_CUPS], [
                [  --with-spooldir=PATH     path for spooldir used for CUPS support (LOCALSTATEDIR/spool/netatalk)],[
 
                if test "$withval" = "no"; then
-                      if test x"$spool_required" == x"yes"; then
+                      if test x"$spool_required" = x"yes"; then
                               AC_MSG_ERROR([*** CUPS support requires a spooldir ***])
                       else
                               AC_DEFINE(DISABLE_SPOOL, 1, [Define to enable spooldir support])

diff --git a/macros/db3-check.m4 b/macros/db3-check.m4
index 126c496b3f95c1a2781f390731789b359f82106d..7d355b62bac201e29fe139fced8cd27bee19fc1a 100644 (file)
--- a/macros/db3-check.m4
+++ b/macros/db3-check.m4
@@ -1,4 +1,4 @@
-dnl $Id: db3-check.m4,v 1.22 2010-04-03 07:11:36 franklahm Exp $
+dnl $Id: db3-check.m4,v 1.23 2010-04-12 14:28:48 franklahm Exp $
 dnl Autoconf macros to check for the Berkeley DB library
 
 dnl -- check header for minimum version and return version in
@@ -28,7 +28,7 @@ AC_DEFUN([NETATALK_BDB_TRY_LINK],[
     atalk_cv_bdb_version=no
     maj=$atalk_cv_bdb_MAJOR
     min=$atalk_cv_bdb_MINOR
-    atalk_cv_bdb_try_libs="db$maj$min db$maj.$min db-$maj$min db-$maj.$min db"
+    atalk_cv_bdb_try_libs="db$maj$min db$maj.$min db-$maj$min db-$maj.$min db$maj-$maj.$min db"
 
     for lib in $atalk_cv_bdb_try_libs ; do
         LIBS="-l$lib $savedlibs"