Re: pkg/46072: net/netatalk build broken on netbsd-6

[Makoto Fujiwara <makoto%ki.nu@localhost>]

The following reply was made to PR pkg/46072; it has been noted by GNATS.

From: Makoto Fujiwara <makoto%ki.nu@localhost>
To: gnats-bugs%netbsd.org@localhost
Cc: 
Subject: Re: pkg/46072: net/netatalk build broken on netbsd-6
Date: Tue, 17 Apr 2012 01:41:10 +0900

   It is inconvenient for me not able to compile netatalk on
 6.0_BETA, so I'm using attched patch. Please correct me if wrong
 or review it, thanks.
 ---
 Makoto Fujiwara, 
 Chiba, Japan, Narita Airport and Disneyland prefecture.
 
 Index: net/netatalk/distinfo
 ===================================================================
 RCS file: /e/cvsync/cvsync/pkgsrc/net/netatalk/distinfo,v
 retrieving revision 1.44
 diff -u -r1.44 distinfo
 --- net/netatalk/distinfo      16 Dec 2011 05:21:37 -0000      1.44
 +++ net/netatalk/distinfo      16 Apr 2012 16:30:19 -0000
 @@ -18,4 +18,5 @@
  SHA1 (patch-bj) = abbc2809b6b7fe75ec2d2f8f2fa8d6cd9d6de7b0
  SHA1 (patch-bk) = c3fb7c3a42f148171fa99b6121b099dd4998947a
  SHA1 (patch-etc_afpd_quota_c) = 0d0a4d5cb8b8f2a9793096b61c326eecc403587c
 +SHA1 (patch-etc_afpd_unix_h) = bd15e874899a7303bbc6b23817550ee622c55612
  SHA1 (patch-macros_quota-check.m4) = 40d1e404905398be03aad6d472bf42af920c7b20
 Index: net/netatalk/patches/patch-etc_afpd_unix_h
 ===================================================================
 RCS file: net/netatalk/patches/patch-etc_afpd_unix_h
 diff -N net/netatalk/patches/patch-etc_afpd_unix_h
 --- /dev/null  1 Jan 1970 00:00:00 -0000
 +++ net/netatalk/patches/patch-etc_afpd_unix_h 16 Apr 2012 16:30:12 -0000
 @@ -0,0 +1,45 @@
 +$NetBSD$
 +
 +Get struct dqblk defined, especially for 6.0_BETA or later, 
 +See the following log message for ufs/ufs/quota1.h
 +-------------
 +revision 1.3
 +date: 2011/03/24 17:05:45;  author: bouyer;  state: Exp;  lines: +12 -4
 +branches:  1.3.2;  1.3.6;
 +Add a new libquota library, which contains some blocks to build and/or
 +.... (omitted)...
 +quota/quota.h as appropriate. ufs/ufs/quota.h still installed because
 +it's needed by other installed ufs headers.
 +ufs/ufs/quota1.h still installed as a quick&dirty way to get a code
 +using the old quotactl() to compile (just include ufs/ufs/quota1.h instead of
 +ufs/ufs/quota.h - old code won't compile without this change and this is
 +on purpose).
 +...
 +----------------------------
 +revision 1.2
 +date: 2011/03/06 17:08:39;  author: bouyer;  state: Exp;  lines: +100 -0
 +merge the bouyer-quota2 branch. This adds a new on-disk format
 +to store disk quota usage and limits, integrated with ffs
 +metadata. Usage is checked by fsck_ffs (no more quotacheck)
 +and is covered by the WAPBL journal. Enabled with kernel
 +option QUOTA2 (added where QUOTA was enabled in kernel config files),
 +turned on with tunefs(8) on a per-filesystem
 +basis. mount_mfs(8) can also turn quotas on.
 +
 +See http://mail-index.netbsd.org/tech-kern/2011/02/19/msg010025.html
 +for details.
 +----------------------------
 +
 +--- etc/afpd/unix.h.orig      2011-08-18 21:23:44.000000000 +0900
 ++++ etc/afpd/unix.h   2012-04-16 13:39:22.000000000 +0900
 +@@ -48,6 +48,10 @@
 + #define dqblk ufs_dqblk
 + #endif
 + 
 ++#if defined(__NetBSD__) && (__NetBSD_Version__ >=599004800)
 ++#include <ufs/ufs/quota1.h>
 ++#endif
 ++
 + #if defined(HAVE_SYS_MOUNT_H) || defined(BSD4_4) || \
 +     defined(linux) || defined(ultrix)
 + #include <sys/mount.h>