netatalk 3.0.4 hacked to build on NetBSD 6.0.2

[Donald Lee <MacPPC2%c.icompute.com@localhost>]

My trouble with timestamps in Netatalk do not appear to be fixed, but I
can now build netatalk 3.0.4, and install, and run, from source without error,
and the fixes in 3.0.4 seem to make nettalk (AFAICT) pretty robust. (3.0.3
had some signal 11 problems when I tested a few weeks ago)

I build with: (and it installs in /usr/local

        ./configure --with-bdb=/usr/pkg --with-init-style=netbsd
        make
        make install


The patches are below.  They are clearly not optimal, but I don't know how
all the #ifdef stuff works for cross platform building.  I think someone
familiar with that will have to look at it anyway, so I just include the
straight up hack.

I filed a send-pr - pkg/47854.

http://gnats.NetBSD.org/cgi-bin/query-pr-single.pl?number=47854

-dgl-

----- patch-----
--- ./bin/afppasswd/afppasswd.c.orig    2013-01-04 08:38:53.000000000 -0600
+++ ./bin/afppasswd/afppasswd.c 2013-05-25 18:43:03.000000000 -0500
@@ -37,6 +37,11 @@
 
 #include <des.h>
 
+#define Key_schedule DES_key_schedule
+#define key_sched(kkkk, ssss) DES_key_sched((kkkk), &(ssss))
+#define ecb_encrypt(nnnn1, nnnn2, ssss, ffff) DES_ecb_encrypt((nnnn1), 
(nnnn2), &(ssss), (ffff))
+#define C_Block DES_cblock
+
 #ifdef USE_CRACKLIB
 #include <crack.h>
 #endif /* USE_CRACKLIB */

--- ./distrib/initscripts/Makefile.in.orig      2013-05-24 08:32:58.000000000 
-0500
+++ ./distrib/initscripts/Makefile.in   2013-05-24 22:47:01.000000000 -0500
@@ -712,7 +712,7 @@
 @USE_SUSE_SYSV_TRUE@   rm -f $(DESTDIR)$(sysvdir)/$(sysv_SCRIPTS)
 
 @USE_NETBSD_TRUE@netatalk: rc.netbsd
-@USE_NETBSD_TRUE@      cp -f $< $@
+@USE_NETBSD_TRUE@      cp -f rc.netbsd $@
 @USE_NETBSD_TRUE@      chmod a+x $@
 
 @USE_NETBSD_TRUE@install-data-hook:

--- ./distrib/initscripts/rc.netbsd.tmpl.orig   2013-01-04 08:37:06.000000000 
-0600
+++ ./distrib/initscripts/rc.netbsd.tmpl        2013-05-25 00:18:16.000000000 
-0500
@@ -13,7 +13,7 @@
 command=":SBINDIR:/netatalk"
 etcdir=":ETCDIR:"
 pidfile="/var/run/${name}.pid"
-required_files="$etcdir/afp.conf
+required_files="$etcdir/afp.conf"
 
 load_rc_config $name
 run_rc_command "$1"

--- ./etc/uams/uams_randnum.c.orig      2013-03-07 01:03:19.000000000 -0600
+++ ./etc/uams/uams_randnum.c   2013-05-25 18:47:44.000000000 -0500
@@ -27,6 +27,11 @@
 
 #include <des.h>
 
+#define Key_schedule DES_key_schedule
+#define key_sched(kkkk, ssss) DES_key_sched((kkkk), &(ssss))
+#define ecb_encrypt(nnnn1, nnnn2, ssss, ffff) DES_ecb_encrypt((nnnn1), 
(nnnn2), &(ssss), (ffff))
+#define C_Block DES_cblock
+
 #ifdef USE_CRACKLIB
 #include <crack.h>
 #endif /* USE_CRACKLIB */