CVS commit: pkgsrc/net/netatalk3

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

Module Name:    pkgsrc
Committed By:   hauke
Date:           Thu May  4 16:53:07 UTC 2023

Modified Files:
        pkgsrc/net/netatalk3: Makefile distinfo
        pkgsrc/net/netatalk3/patches: patch-bin_ad_ad__cp.c
            patch-etc_afpd_quota.c
Removed Files:
        pkgsrc/net/netatalk3/patches: patch-libatalk_bstring_bstrlib.c
            patch-libatalk_util_netatalk__conf.c

Log Message:
Update net/netatalk3 to 3.1.15

What's Changed

FIX: CVE-2022-43634
FIX: CVE-2022-45188
NEW: Support for macOS hosts, Intel and Apple silicon, GitHub#281
FIX: configure.ac: update deprecated autoconf syntax
UPD: configure.ac: Support linking with system shared libraries
Introduces the --with-talloc option
FIX: macros: largefile-check macro for largefile (clang 16)
UPD: macros: Update pthread macro to the latest from gnu.org
FIX: initscripts: Modernize Systemd service file.
FIX: libatalk/conf: include sys/file.h for LOCK_EX
FIX: libatalk: Change log level for realpath() error, SF bug#666
FIX: libatalk: Change log level for real_name error, SF bug#596
FIX: libatalk: The my_bool type is deprecated as of MySQL 8.0.1, GitHub#129
UPD: libatalk: allow afpd to read read-protected afp.conf, SF bug#546
UPD: libatalk: Make the "valid users" option work in the Homes
section, SF bug#449
UPD: libatalk: Check that FPDisconnectOldSession is successful, SF bug#634
UPD: libatalk: Bring iniparser library codebase in line with current version 4.1
FIX: afpd: Provide MNTTYPE_NFS on OmniOS to make quota work, GitHub#117
FIX: afpd: Avoid triggering realpath() lookups with empty path, GitHub#277
FIX: spotlight: Spotlight searches can cause afpd to segfault, GitHub#56
UPD: spotlight: add support for tracker3, SF patch#147
FIX: macusers: Fix output for long usernames
FIX: macusers: account for usernames with non-word characters
FIX: macusers: Support NetBSD
FIX: Fix all function declarations without a prototype
FIX: Fix C99 compliance issues
FIX: Fix gcc10 compiler warnings
UPD: Remove acsiidocs sources and release notes script
FIX: manpages: afp.conf: Parameters are not quoted, SF bug#617
FIX: manpages: afp.conf: Document $u in home name, GitHub#123
FIX: manpages: afp.conf: Document the usage of guest user, GitHub#298
FIX: Document how the mysql cnid backend is configured, GitHub#69
FIX: Fix user-visible typos in log output and man pages.
FIX: Fix spelling, syntax, and dead URLs in html manual.
NEW: Create README.md
NEW: Set up GitHub workflow and static analysis with Sonarcloud


To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 pkgsrc/net/netatalk3/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/net/netatalk3/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/netatalk3/patches/patch-bin_ad_ad__cp.c
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/netatalk3/patches/patch-etc_afpd_quota.c
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/net/netatalk3/patches/patch-libatalk_bstring_bstrlib.c \
    pkgsrc/net/netatalk3/patches/patch-libatalk_util_netatalk__conf.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.54 pkgsrc/net/netatalk3/Makefile:1.55
--- pkgsrc/net/netatalk3/Makefile:1.54  Wed Apr 19 08:11:10 2023
+++ pkgsrc/net/netatalk3/Makefile       Thu May  4 16:53:07 2023
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.54 2023/04/19 08:11:10 adam Exp $
+# $NetBSD: Makefile,v 1.55 2023/05/04 16:53:07 hauke Exp $
 
-DISTNAME=      netatalk-3.1.14
-PKGREVISION=   2
+DISTNAME=      netatalk-3.1.15
 PKGNAME=       ${DISTNAME:C/-/3-/}
 CATEGORIES=    net
-MASTER_SITES=  ${MASTER_SITE_GITHUB:=Netatalk/}Netatalk/releases/download/netatalk-3-1-14/
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=Netatalk/}Netatalk/releases/download/${DISTNAME:S/./-/g}/
 
 MAINTAINER=    hauke%NetBSD.org@localhost
 HOMEPAGE=      http://netatalk.sourceforge.net/

Index: pkgsrc/net/netatalk3/distinfo
diff -u pkgsrc/net/netatalk3/distinfo:1.14 pkgsrc/net/netatalk3/distinfo:1.15
--- pkgsrc/net/netatalk3/distinfo:1.14  Tue Apr  4 18:16:06 2023
+++ pkgsrc/net/netatalk3/distinfo       Thu May  4 16:53:07 2023
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.14 2023/04/04 18:16:06 bouyer Exp $
+$NetBSD: distinfo,v 1.15 2023/05/04 16:53:07 hauke Exp $
 
-BLAKE2s (netatalk-3.1.14.tar.gz) = 39e9ae725f0b3d87f5747c9f6ddabab3c61eb2b51f1ed63a1af362224aa7f8e9
-SHA512 (netatalk-3.1.14.tar.gz) = 2d52ba2df50cc4bedb5c68fa452d9acec80f69e826ff8cb3d0aa85f7031c98f463e502ef35128076c0aa52a36ce9540509ce8c21b915f6a2232ca70c451b89eb
-Size (netatalk-3.1.14.tar.gz) = 1800211 bytes
-SHA1 (patch-bin_ad_ad__cp.c) = bd2191a7a2731e6032f97dc66688175fc84275cc
+BLAKE2s (netatalk-3.1.15.tar.gz) = 07fe90222f1bac3db17574358f40a5b1ee40fe3ea860905bd042c58c49b7bb6e
+SHA512 (netatalk-3.1.15.tar.gz) = ccba1bb3d7136194d5897e2c560fb81f8182ec1ac19446954c910e303cb43dab5a1cf1c842d75e5040dd43ab1b55c646857b7866ddb362e35afbb4110b296015
+Size (netatalk-3.1.15.tar.gz) = 1837072 bytes
+SHA1 (patch-bin_ad_ad__cp.c) = 8f32b7b0d66bcd16a7e31af27df54dd4ff53d86f
 SHA1 (patch-config.h.in) = bd9e735c6d1c8bb8a1534f6674fa6358b29922c1
 SHA1 (patch-config_Makefile.in) = 81fff584e5cb98537a4fa671fb551ad0258ba092
 SHA1 (patch-config_pam_Makefile.in) = 8f69225c333b327b4c57ef12994666cc521e5c70
@@ -11,13 +11,11 @@ SHA1 (patch-configure) = 7d2ce8e0d06b8de
 SHA1 (patch-distrib_initscripts_Makefile.in) = fbeffa06a051fb61819d09e0396695cbe564780e
 SHA1 (patch-distrib_initscripts_netatalk.xml.tmpl) = dd7591e12eca3c1e7d7bc768cd1e060979dc383e
 SHA1 (patch-etc_afpd_afp__dsi.c) = 024cc7a0935ece2ed43d1ab3142c8d6bb1b376be
-SHA1 (patch-etc_afpd_quota.c) = 2ec8711f5ec9b25497f716cf8f728e354f1eb1c6
+SHA1 (patch-etc_afpd_quota.c) = 1779029a084e1991b343214f50ddf459ce9f6dfa
 SHA1 (patch-etc_cnid__dbd_cnid__metad.c) = 6c28332ca3e11d11f3b5bb13fa01783dbb94c30f
 SHA1 (patch-etc_cnid__dbd_usockfd.c) = a3b6c498ed73dc449b84d092f2b9e13eeae3dfc5
 SHA1 (patch-etc_netatalk_netatalk.c) = 2bdbfc035e4bea9859cf970cd6b9a6503244185e
 SHA1 (patch-include_atalk_util.h) = a7a0763c5866288ad89a8b6b90c71767ee4d9d64
-SHA1 (patch-libatalk_bstring_bstrlib.c) = eaee8075f102c1150f74e9dce4d83697c3eac3fc
 SHA1 (patch-libatalk_dsi_dsi__tcp.c) = eacb939dba2749925e36ca05fa0480b3391d0f80
 SHA1 (patch-libatalk_util_getiface.c) = 1a46bd695c96e0666b6f45493eb44501c0f4e0b5
-SHA1 (patch-libatalk_util_netatalk__conf.c) = dfc0d8b5d88de367522bb1d5417083d860d2dab8
 SHA1 (patch-macros_quota-check.m4) = a6502693ae8c7218b7c4426b134e0aa590412e1f

Index: pkgsrc/net/netatalk3/patches/patch-bin_ad_ad__cp.c
diff -u pkgsrc/net/netatalk3/patches/patch-bin_ad_ad__cp.c:1.2 pkgsrc/net/netatalk3/patches/patch-bin_ad_ad__cp.c:1.3
--- pkgsrc/net/netatalk3/patches/patch-bin_ad_ad__cp.c:1.2      Mon Nov  7 12:46:52 2016
+++ pkgsrc/net/netatalk3/patches/patch-bin_ad_ad__cp.c  Thu May  4 16:53:07 2023
@@ -1,4 +1,4 @@
-$NetBSD: patch-bin_ad_ad__cp.c,v 1.2 2016/11/07 12:46:52 christos Exp $
+$NetBSD: patch-bin_ad_ad__cp.c,v 1.3 2023/05/04 16:53:07 hauke Exp $
 
 Treat NetBSD as FreeBSD for timeval to timespec conversion
 
@@ -8,8 +8,8 @@ Treat NetBSD as FreeBSD for timeval to t
      islink = !fdval && S_ISLNK(fs->st_mode);
      mode = fs->st_mode & (S_ISUID | S_ISGID | S_ISVTX | S_IRWXU | S_IRWXG | S_IRWXO);
  
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
+-#if defined(__FreeBSD__) || defined(__APPLE__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__)
      TIMESPEC_TO_TIMEVAL(&tv[0], &fs->st_atimespec);
      TIMESPEC_TO_TIMEVAL(&tv[1], &fs->st_mtimespec);
  #else

Index: pkgsrc/net/netatalk3/patches/patch-etc_afpd_quota.c
diff -u pkgsrc/net/netatalk3/patches/patch-etc_afpd_quota.c:1.4 pkgsrc/net/netatalk3/patches/patch-etc_afpd_quota.c:1.5
--- pkgsrc/net/netatalk3/patches/patch-etc_afpd_quota.c:1.4     Tue Apr  4 18:16:06 2023
+++ pkgsrc/net/netatalk3/patches/patch-etc_afpd_quota.c Thu May  4 16:53:07 2023
@@ -1,23 +1,10 @@
-$NetBSD: patch-etc_afpd_quota.c,v 1.4 2023/04/04 18:16:06 bouyer Exp $
-
-SunOS derivatives need to explicitely include mntent.h for MNTTYPE_NFS
+$NetBSD: patch-etc_afpd_quota.c,v 1.5 2023/05/04 16:53:07 hauke Exp $
 
 NetBSD uses a different quota API.
 
---- etc/afpd/quota.c.orig      2023-01-10 10:49:51.000000000 +0100
-+++ etc/afpd/quota.c   2023-03-29 15:54:28.917646712 +0200
-@@ -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>
-@@ -32,14 +36,17 @@
+--- etc/afpd/quota.c.orig      2023-04-28 05:16:02.000000000 +0000
++++ etc/afpd/quota.c
+@@ -36,14 +36,17 @@
  #include "unix.h"
  
  #ifdef HAVE_LIBQUOTA
@@ -39,7 +26,7 @@ NetBSD uses a different quota API.
        time_t now;
  
        if (time(&now) == -1) {
-@@ -48,33 +55,64 @@
+@@ -52,33 +55,64 @@ getfreespace(const AFPObj *obj, struct v
                return -1;
        }
  
@@ -91,11 +78,11 @@ NetBSD uses a different quota API.
  
 -    unbecome_root();
 +      quota_close(qh);
-+
-+       seteuid( prevuid );
  
 -      if (retq < 1)
 -              return retq;
++       seteuid( prevuid );
++
 +      if (qv.qv_usage >= qv.qv_hardlimit ||
 +            (qv.qv_usage >= qv.qv_softlimit && now > qv.qv_expiretime)) {
  
@@ -114,16 +101,16 @@ NetBSD uses a different quota API.
 -              *btotal = dbtob(ufsq[QUOTA_LIMIT_BLOCK].ufsqe_hardlimit);
 -              break;
 +              *btotal = dbtob(qv.qv_usage);
-       }
++      }
 +      else {
 +              *bfree = dbtob(qv.qv_hardlimit - qv.qv_usage);
 +              *btotal = dbtob(qv.qv_hardlimit);
-+      }
+       }
 +
        return 1;
  }
  
-@@ -85,12 +123,12 @@
+@@ -89,12 +123,12 @@ int uquota_getvolspace(const AFPObj *obj
        VolSpace gbfree, gbtotal;
  
        uretq = getfreespace(obj, vol, &ubfree, &ubtotal,