pkg/47854: netatalk 3.0.4 from sourceforge does not build on NetBSD 6.0.x

[donlee%charm.icompute.com@localhost]

>Number:         47854
>Category:       pkg
>Synopsis:       netatalk 3.0.4 from sourceforge does not build on NetBSD 6.0.x
>Confidential:   no
>Severity:       non-critical
>Priority:       high
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sun May 26 04:05:00 +0000 2013
>Originator:     Donald Lee
>Release:        NetBSD 6.0.1
>Organization:
iCompute.com
>Environment:
NetBSD 6.0.1.  Power Mac G4, 800 MB memory.
System: NetBSD charm 6.0.1 NetBSD 6.0.1 (GENERIC) macppc
Architecture: powerpc
Machine: macppc
>Description:
        Netatalk 3.0.4 will not build as per instructions.  I used

        This failed with compile errors, and also install errors.

>How-To-Repeat:
        (download netatalk 3.0.4 - netatalk-3.0.4.tar.gz)
        tar -xvzf netatalk-3.0.4.tar.gz
        cd netatalk-3.0.4
        ./configure --with-bdb=/usr/pkg --with-init-style=netbsd
        make
        make install

>Fix:
        This set of patches causes netatalk 3.0.4 to build and install.
        I have tested it somewhat, and it appears robust.

--- ./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 */