net/netatalk3: Update to 3.2.2

See https://github.com/Netatalk/netatalk/releases/tag/netatalk-3-2-2 for
a list of changes in this release.

5 files changed, 20 insertions, 36 deletions

diff --git a/net/netatalk3/Makefile b/net/netatalk3/Makefile
index cdb8e6579319..101680edfdf6 100644
--- a/net/netatalk3/Makefile
+++ b/net/netatalk3/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	netatalk
-PORTVERSION=	3.2.1
-PORTREVISION=	1
+PORTVERSION=	3.2.2
 PORTEPOCH=	1
 CATEGORIES=	net
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/netatalk-${PORTVERSION:S/./-/g}/
diff --git a/net/netatalk3/distinfo b/net/netatalk3/distinfo
index 887dc6cf4088..cf9916b8aafc 100644
--- a/net/netatalk3/distinfo
+++ b/net/netatalk3/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1719739026
-SHA256 (netatalk-3.2.1.tar.xz) = 166efe3c282e385fdc6118b002d74a78c1b95561aa6f170ad0f210e5255b516c
-SIZE (netatalk-3.2.1.tar.xz) = 1919812
+TIMESTAMP = 1720267420
+SHA256 (netatalk-3.2.2.tar.xz) = 2803a80718a8e5c3bb5774c3b2eec19ae622fb5a34618f72c4210a8e94c8e15d
+SIZE (netatalk-3.2.2.tar.xz) = 1906644
diff --git a/net/netatalk3/files/patch-bin_meson.build b/net/netatalk3/files/patch-bin_meson.build
deleted file mode 100644
index 30e56c12f969..000000000000
--- a/net/netatalk3/files/patch-bin_meson.build
+++ /dev/null
@@ -1,9 +0,0 @@
---- bin/meson.build.orig	2024-06-17 15:51:32 UTC
-+++ bin/meson.build
-@@ -2,5 +2,5 @@ endif
- if have_ssl
-     subdir('afppasswd')
- endif
--subdir('cnid')
-+#subdir('cnid')
- subdir('misc')
diff --git a/net/netatalk3/files/patch-meson.build b/net/netatalk3/files/patch-meson.build
index 929085981db4..377971ad78ed 100644
--- a/net/netatalk3/files/patch-meson.build
+++ b/net/netatalk3/files/patch-meson.build
@@ -1,4 +1,4 @@
---- meson.build.orig	2024-06-29 05:58:36 UTC
+--- meson.build.orig	2024-07-06 04:04:08 UTC
 +++ meson.build
 @@ -40,6 +40,7 @@ sbindir = prefix / get_option('sbindir')
  mandir = prefix / get_option('mandir')
@@ -25,7 +25,7 @@
      'db4.6',
      'db4.7',
      'db4.8',
-@@ -504,6 +506,11 @@ if crypt.found()
+@@ -505,6 +507,11 @@ if crypt.found()
  if crypt.found()
      cdata.set('HAVE_CRYPT_H', 1)
      cdata.set('HAVE_LIBCRYPT', 1)
@@ -37,7 +37,7 @@
  endif
  
  des = cc.find_library('des', required: false)
-@@ -725,12 +732,12 @@ dns_sd_libs = []
+@@ -733,12 +740,12 @@ dns_sd_libs = []
  
  dns_sd_libs = []
  
@@ -52,7 +52,7 @@
  if dns_sd.found()
      dns_sd_libs += system
  endif
-@@ -755,6 +762,7 @@ else
+@@ -764,6 +771,7 @@ else
          cdata.set('HAVE_MDNS', 1)
          freebsd_zeroconf_daemon = 'mdnsd'
          zeroconf_provider += 'mDNS'
@@ -60,7 +60,7 @@
      else
          have_zeroconf = avahi.found()
          if avahi.found()
-@@ -822,19 +830,7 @@ else
+@@ -831,19 +839,7 @@ else
              required: false,
          )
  
@@ -81,7 +81,7 @@
              cdata.set('HAVE_TRACKER3', 1)
              cdata.set(
                  'TRACKER_MANAGING_COMMAND',
-@@ -875,7 +871,6 @@ else
+@@ -884,7 +880,6 @@ else
              endif
          endif
      endif
@@ -89,7 +89,7 @@
  
  have_spotlight = (
      tracker_sparql.found()
-@@ -884,6 +879,8 @@ have_spotlight = (
+@@ -893,6 +888,8 @@ have_spotlight = (
      and flex.found()
      and bison.found()
  )
@@ -98,7 +98,7 @@
  if have_spotlight
      cdata.set('WITH_SPOTLIGHT', 1)
  endif
-@@ -1370,7 +1367,7 @@ if iconv_path != ''
+@@ -1384,7 +1381,7 @@ if iconv_path != ''
      endif
      iconv = declare_dependency(
          link_args: libiconv_link_args,
@@ -107,21 +107,15 @@
      )
  endif
  
-@@ -1679,11 +1676,11 @@ enable_shadow = get_option('with-shadow')
+@@ -1587,6 +1584,7 @@ if not enable_pam
  
- enable_shadow = get_option('with-shadow')
- 
--if enable_shadow
-+if not enable_shadow
-     have_shadow = false
+ if not enable_pam
+     have_pam = false
++    pam = dependency('', required: false)
  else
-     have_shadow = (cc.has_header('shadow.h'))
--    if with_shadow
-+    if enable_shadow
-         cdata.set('SHADOWPW', 1)
-         uams_options += ' SHADOW'
-     else
-@@ -1926,6 +1923,8 @@ int deny_severity = 0;
+     if host_os != 'sunos'
+         pam_paths = [
+@@ -1950,6 +1948,8 @@ int deny_severity = 0;
      tcpwrap_code = '''
  int allow_severity = 0;
  int deny_severity = 0;
diff --git a/net/netatalk3/pkg-plist b/net/netatalk3/pkg-plist
index b60284191e8b..eacb3172d2e9 100644
--- a/net/netatalk3/pkg-plist
+++ b/net/netatalk3/pkg-plist
@@ -4,6 +4,7 @@ bin/afppasswd
 %%DBUS%%bin/afpstats
 bin/apple_dump
 bin/asip-status
+bin/cnid2_create
 bin/dbd
 bin/macusers
 bin/netatalk-config
@@ -37,7 +38,6 @@ include/atalk/acl.h
 include/atalk/adouble.h
 include/atalk/afp.h
 include/atalk/bstrlib.h
-include/atalk/cast.h
 include/atalk/cnid.h
 include/atalk/dictionary.h
 include/atalk/ea.h