CVS commit: pkgsrc/net/netatalk3

["Hauke Fath" <hauke%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   hauke
Date:           Fri Dec 21 09:59:21 UTC 2018

Modified Files:
        pkgsrc/net/netatalk3: Makefile distinfo
        pkgsrc/net/netatalk3/patches: patch-etc_afpd_quota.c

Log Message:
Unbreak the build on OmniOS.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/net/netatalk3/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/netatalk3/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/netatalk3/patches/patch-etc_afpd_quota.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/netatalk3/Makefile
diff -u pkgsrc/net/netatalk3/Makefile:1.17 pkgsrc/net/netatalk3/Makefile:1.18
--- pkgsrc/net/netatalk3/Makefile:1.17  Fri Dec 21 09:18:52 2018
+++ pkgsrc/net/netatalk3/Makefile       Fri Dec 21 09:59:21 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2018/12/21 09:18:52 hauke Exp $
+# $NetBSD: Makefile,v 1.18 2018/12/21 09:59:21 hauke Exp $
 
 DISTNAME=      netatalk-3.1.12
 PKGNAME=        ${DISTNAME:C/-/3-/}
-#PKGREVISION=  1
+PKGREVISION=   1
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=netatalk/}
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/net/netatalk3/distinfo
diff -u pkgsrc/net/netatalk3/distinfo:1.6 pkgsrc/net/netatalk3/distinfo:1.7
--- pkgsrc/net/netatalk3/distinfo:1.6   Fri Dec 21 09:18:52 2018
+++ pkgsrc/net/netatalk3/distinfo       Fri Dec 21 09:59:21 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2018/12/21 09:18:52 hauke Exp $
+$NetBSD: distinfo,v 1.7 2018/12/21 09:59:21 hauke Exp $
 
 SHA1 (netatalk-3.1.12.tar.bz2) = cc1fe1ebdbdb4da9cf82835c440e82ba28a832c5
 RMD160 (netatalk-3.1.12.tar.bz2) = 30f44674f76f7d70d02772ddf2ff249e4aef3a50
@@ -10,7 +10,7 @@ SHA1 (patch-config_Makefile.in) = 81fff5
 SHA1 (patch-config_pam_Makefile.in) = 8f69225c333b327b4c57ef12994666cc521e5c70
 SHA1 (patch-distrib_initscripts_Makefile.in) = fbeffa06a051fb61819d09e0396695cbe564780e
 SHA1 (patch-distrib_initscripts_netatalk.xml.tmpl) = dd7591e12eca3c1e7d7bc768cd1e060979dc383e
-SHA1 (patch-etc_afpd_quota.c) = bd93ed958229f73898cdc424a582e14186ac703c
+SHA1 (patch-etc_afpd_quota.c) = d7c87086c8eb1ff68e46c5972fcd0b2e18c592e5
 SHA1 (patch-etc_cnid__dbd_cnid__metad.c) = 6c28332ca3e11d11f3b5bb13fa01783dbb94c30f
 SHA1 (patch-etc_netatalk_netatalk.c) = 2bdbfc035e4bea9859cf970cd6b9a6503244185e
 SHA1 (patch-include_atalk_util.h) = a7a0763c5866288ad89a8b6b90c71767ee4d9d64

Index: pkgsrc/net/netatalk3/patches/patch-etc_afpd_quota.c
diff -u pkgsrc/net/netatalk3/patches/patch-etc_afpd_quota.c:1.2 pkgsrc/net/netatalk3/patches/patch-etc_afpd_quota.c:1.3
--- pkgsrc/net/netatalk3/patches/patch-etc_afpd_quota.c:1.2     Mon Nov  7 12:46:52 2016
+++ pkgsrc/net/netatalk3/patches/patch-etc_afpd_quota.c Fri Dec 21 09:59:21 2018
@@ -1,10 +1,23 @@
-$NetBSD: patch-etc_afpd_quota.c,v 1.2 2016/11/07 12:46:52 christos Exp $
+$NetBSD: patch-etc_afpd_quota.c,v 1.3 2018/12/21 09:59:21 hauke Exp $
+
+SunOS derivatives need to explicitely include mntent.h for MNTTYPE_NFS
 
 NetBSD uses a different quota API.
 
---- etc/afpd/quota.c.orig      2013-04-09 12:56:18.000000000 +0000
+--- etc/afpd/quota.c.orig      2018-12-13 21:33:47.000000000 +0000
 +++ etc/afpd/quota.c
-@@ -36,10 +36,13 @@
+@@ -21,6 +21,10 @@
+ #include <unistd.h>
+ #include <fcntl.h>
+ 
++#if defined(HAVE_SYS_MNTTAB_H) || defined(__svr4__)
++#include <sys/mntent.h>
++#endif
++
+ #include <atalk/logger.h>
+ #include <atalk/afp.h>
+ #include <atalk/compat.h>
+@@ -36,10 +40,13 @@
  
  static int
  getfreespace(const AFPObj *obj, struct vol *vol, VolSpace *bfree, VolSpace *btotal,
@@ -21,7 +34,7 @@ NetBSD uses a different quota API.
        time_t now;
  
        if (time(&now) == -1) {
-@@ -48,64 +51,102 @@ getfreespace(const AFPObj *obj, struct v
+@@ -48,64 +55,102 @@ getfreespace(const AFPObj *obj, struct v
                return -1;
        }