git: cbc5f3f94c05 - main - net/netatalk4: Update to 4.2.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 31 Mar 2025 16:44:28 UTC
The branch main has been updated by marcus:
URL: https://cgit.FreeBSD.org/ports/commit/?id=cbc5f3f94c05ff41ef10d803aac7eedc8f062df6
commit cbc5f3f94c05ff41ef10d803aac7eedc8f062df6
Author: Joe Marcus Clarke <marcus@FreeBSD.org>
AuthorDate: 2025-03-31 16:42:38 +0000
Commit: Joe Marcus Clarke <marcus@FreeBSD.org>
CommitDate: 2025-03-31 16:44:07 +0000
net/netatalk4: Update to 4.2.0
See https://github.com/Netatalk/netatalk/releases/tag/netatalk-4-2-0 for
a list of changes in this release.
---
net/netatalk4/Makefile | 9 ++++-----
net/netatalk4/distinfo | 6 +++---
net/netatalk4/files/patch-config_meson.build | 22 ++++++++++++++++++--
net/netatalk4/files/patch-etc_uams_meson.build | 20 +++++++++---------
net/netatalk4/files/patch-meson.build | 28 ++++++++------------------
net/netatalk4/pkg-plist | 5 ++---
6 files changed, 47 insertions(+), 43 deletions(-)
diff --git a/net/netatalk4/Makefile b/net/netatalk4/Makefile
index 07fc7a6f9e0a..866b5f560795 100644
--- a/net/netatalk4/Makefile
+++ b/net/netatalk4/Makefile
@@ -1,6 +1,5 @@
PORTNAME= netatalk
-PORTVERSION= 4.1.2
-PORTREVISION= 1
+PORTVERSION= 4.2.0
CATEGORIES= net
MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/netatalk-${PORTVERSION:S/./-/g}/
PKGNAMESUFFIX= 4
@@ -11,9 +10,10 @@ WWW= https://netatalk.io/
LICENSE= GPLv2
-BUILD_DEPENDS= docbook-xsl>=0:textproc/docbook-xsl
+BUILD_DEPENDS= cmark:textproc/cmark
LIB_DEPENDS= libgcrypt.so:security/libgcrypt \
- libevent.so:devel/libevent
+ libevent.so:devel/libevent \
+ libiniparser.so:devel/iniparser
USES= bdb:18 cpe gettext iconv:wchar_t meson perl5 pkgconfig shebangfix ssl tar:xz
USE_GNOME= libxslt:build
@@ -28,7 +28,6 @@ MESON_ARGS= -Dwith-libgcrypt-path=${LOCALBASE} \
-Dwith-dtrace=false \
-Dwith-init-hooks=false \
-Dpkg_config_path=${LOCALBASE}/libdata/pkgconfig \
- -Dwith-shadow=false \
-Dwith-webmin=false \
-Dwith-cups=false \
-Dwith-testsuite=false \
diff --git a/net/netatalk4/distinfo b/net/netatalk4/distinfo
index 2cceb6d2a71c..23c449260af1 100644
--- a/net/netatalk4/distinfo
+++ b/net/netatalk4/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1740930680
-SHA256 (netatalk-4.1.2.tar.xz) = a825f6ff7efedb09bb9ca75727ab43126797000f89775db72c8d9520bf481e9c
-SIZE (netatalk-4.1.2.tar.xz) = 922960
+TIMESTAMP = 1743438055
+SHA256 (netatalk-4.2.0.tar.xz) = 768a91014e298dc1d14ef28ebe330ddad49928e3c34f307353b8bdd317f50a52
+SIZE (netatalk-4.2.0.tar.xz) = 934020
diff --git a/net/netatalk4/files/patch-config_meson.build b/net/netatalk4/files/patch-config_meson.build
index a8dc29c35c28..d10c4aae7ff5 100644
--- a/net/netatalk4/files/patch-config_meson.build
+++ b/net/netatalk4/files/patch-config_meson.build
@@ -1,6 +1,6 @@
---- config/meson.build.orig 2025-02-10 20:41:20 UTC
+--- config/meson.build.orig 2025-03-31 05:27:01 UTC
+++ config/meson.build
-@@ -4,59 +4,23 @@ afp_conf = configure_file(
+@@ -4,77 +4,23 @@ afp_conf = configure_file(
configuration: cdata,
)
@@ -51,6 +51,24 @@
- static_conf_files += ['atalkd.conf', 'macipgw.conf', 'papd.conf']
-endif
-
+-cups_libdir = ''
+-
+-if host_os in ['netbsd']
+- cups_libdir = '/usr/pkg/libexec'
+-elif host_os in ['linux']
+- cups_libdir = '/usr/lib'
+-endif
+-
+-if have_appletalk and have_cups and cups_libdir != ''
+- configure_file(
+- input: 'pap.in',
+- output: 'pap',
+- configuration: cdata,
+- install: true,
+- install_dir: cups_libdir / 'cups/backend',
+- )
+-endif
+-
-foreach file : static_conf_files
- if (
- fs.exists(pkgconfdir / file)
diff --git a/net/netatalk4/files/patch-etc_uams_meson.build b/net/netatalk4/files/patch-etc_uams_meson.build
index 91ae27204e92..59fee181fb51 100644
--- a/net/netatalk4/files/patch-etc_uams_meson.build
+++ b/net/netatalk4/files/patch-etc_uams_meson.build
@@ -1,6 +1,6 @@
---- etc/uams/meson.build.orig 2025-02-10 20:41:20 UTC
+--- etc/uams/meson.build.orig 2025-03-31 05:27:01 UTC
+++ etc/uams/meson.build
-@@ -20,7 +20,7 @@ library(
+@@ -25,7 +25,7 @@ library(
name_suffix: lib_suffix,
override_options: 'b_lundef=false',
install: true,
@@ -9,7 +9,7 @@
)
uams_passwd_sources = ['uams_passwd.c']
-@@ -34,7 +34,7 @@ library(
+@@ -39,7 +39,7 @@ library(
name_suffix: lib_suffix,
override_options: 'b_lundef=false',
install: true,
@@ -18,7 +18,7 @@
)
if have_libgcrypt
-@@ -51,7 +51,7 @@ if have_libgcrypt
+@@ -56,7 +56,7 @@ if have_libgcrypt
name_suffix: lib_suffix,
override_options: 'b_lundef=false',
install: true,
@@ -27,7 +27,7 @@
)
library(
-@@ -63,7 +63,7 @@ if have_libgcrypt
+@@ -68,7 +68,7 @@ if have_libgcrypt
name_suffix: lib_suffix,
override_options: 'b_lundef=false',
install: true,
@@ -36,7 +36,7 @@
)
library(
-@@ -75,7 +75,7 @@ if have_libgcrypt
+@@ -80,7 +80,7 @@ if have_libgcrypt
name_suffix: lib_suffix,
override_options: 'b_lundef=false',
install: true,
@@ -45,7 +45,7 @@
)
if have_pam
uams_dhx2_pam_sources = ['uams_dhx2_pam.c']
-@@ -89,20 +89,20 @@ if have_libgcrypt
+@@ -94,20 +94,20 @@ if have_libgcrypt
name_suffix: lib_suffix,
override_options: 'b_lundef=false',
install: true,
@@ -69,7 +69,7 @@
pointing_to: 'uams_dhx2_passwd.so',
)
endif
-@@ -118,20 +118,20 @@ if have_libgcrypt
+@@ -123,20 +123,20 @@ if have_libgcrypt
name_suffix: lib_suffix,
override_options: 'b_lundef=false',
install: true,
@@ -93,7 +93,7 @@
pointing_to: 'uams_dhx_passwd.so',
)
endif
-@@ -150,20 +150,20 @@ if have_pam
+@@ -155,20 +155,20 @@ if have_pam
name_suffix: lib_suffix,
override_options: 'b_lundef=false',
install: true,
@@ -117,7 +117,7 @@
pointing_to: 'uams_passwd.so',
)
endif
-@@ -181,6 +181,6 @@ if have_krb5_uam
+@@ -186,6 +186,6 @@ if have_krb5_uam
name_suffix: lib_suffix,
override_options: 'b_lundef=false',
install: true,
diff --git a/net/netatalk4/files/patch-meson.build b/net/netatalk4/files/patch-meson.build
index e37e854f53c3..da36be7b9a98 100644
--- a/net/netatalk4/files/patch-meson.build
+++ b/net/netatalk4/files/patch-meson.build
@@ -1,6 +1,6 @@
---- meson.build.orig 2025-02-10 20:41:20 UTC
+--- meson.build.orig 2025-03-31 05:27:01 UTC
+++ meson.build
-@@ -66,6 +66,7 @@ libdir = prefix / get_option('libdir')
+@@ -69,6 +69,7 @@ libdir = prefix / get_option('libdir')
datadir = prefix / get_option('datadir')
includedir = prefix / get_option('includedir')
libdir = prefix / get_option('libdir')
@@ -8,7 +8,7 @@
mandir = prefix / get_option('mandir')
sbindir = prefix / get_option('sbindir')
sysconfdir = prefix / get_option('sysconfdir')
-@@ -138,7 +139,7 @@ statedir = '-D_PATH_STATEDIR="' + localstatedir + '/ne
+@@ -141,7 +142,7 @@ statedir = '-D_PATH_STATEDIR="' + localstatedir + '/ne
dversion = '-DVERSION="' + netatalk_version + '"'
messagedir = '-DSERVERTEXT="' + localstatedir + '/netatalk/msg/"'
statedir = '-D_PATH_STATEDIR="' + localstatedir + '/netatalk/"'
@@ -17,7 +17,7 @@
############
# Includes #
-@@ -464,6 +465,7 @@ bdb_subdirs = [
+@@ -394,6 +395,7 @@ bdb_subdirs = [
endif
bdb_subdirs = [
@@ -25,19 +25,7 @@
'db62',
'db6.2',
'db61',
-@@ -641,6 +643,11 @@ if crypt.found()
- if crypt.found()
- cdata.set('HAVE_CRYPT_H', 1)
- cdata.set('HAVE_LIBCRYPT', 1)
-+else
-+ crypt = cc.find_library('crypt', has_headers: 'unistd.h', required: false)
-+ if crypt.found()
-+ cdata.set('HAVE_LIBCRYPT', 1)
-+ endif
- endif
-
- #
-@@ -819,12 +826,12 @@ dns_sd_libs = []
+@@ -775,12 +777,12 @@ dns_sd_libs = []
dns_sd_libs = []
@@ -52,7 +40,7 @@
if dns_sd.found()
dns_sd_libs += system
endif
-@@ -838,6 +845,8 @@ have_dns = (
+@@ -794,6 +796,8 @@ have_dns = (
)
)
@@ -61,7 +49,7 @@
if enable_zeroconf
if avahi.found()
have_zeroconf = true
-@@ -854,6 +863,7 @@ if enable_zeroconf
+@@ -807,6 +811,7 @@ if enable_zeroconf
cdata.set('HAVE_MDNS', 1)
cdata.set('freebsd_zeroconf', 'mdnsd')
zeroconf_provider += 'mDNS'
@@ -69,7 +57,7 @@
endif
endif
-@@ -1709,6 +1719,7 @@ if not enable_pam
+@@ -1535,6 +1540,7 @@ if not enable_pam
if not enable_pam
have_pam = false
diff --git a/net/netatalk4/pkg-plist b/net/netatalk4/pkg-plist
index b8c8b66431ba..4bcafaaaeb28 100644
--- a/net/netatalk4/pkg-plist
+++ b/net/netatalk4/pkg-plist
@@ -5,6 +5,7 @@ bin/afppasswd
%%DBUS%%bin/afpstats
bin/asip-status
bin/dbd
+bin/fce_listen
bin/macusers
@sample etc/afp.conf.sample
%%DBUS%%etc/dbus-1/system.d/netatalk-dbus.conf
@@ -45,7 +46,6 @@ include/atalk/dictionary.h
include/atalk/ea.h
include/atalk/globals.h
include/atalk/hash.h
-include/atalk/iniparser.h
include/atalk/list.h
include/atalk/logger.h
include/atalk/nbp.h
@@ -54,7 +54,6 @@ include/atalk/netddp.h
include/atalk/pap.h
include/atalk/queue.h
include/atalk/rtmp.h
-include/atalk/standards.h
include/atalk/uam.h
include/atalk/unicode.h
include/atalk/unix.h
@@ -83,6 +82,7 @@ share/man/man1/afppasswd.1.gz
share/man/man1/afptest.1.gz
share/man/man1/asip-status.1.gz
share/man/man1/dbd.1.gz
+share/man/man1/fce_listen.1.gz
share/man/man1/macusers.1.gz
share/man/man3/atalk_aton.3.gz
share/man/man3/nbp_name.3.gz
@@ -91,7 +91,6 @@ share/man/man5/afp.conf.5.gz
share/man/man5/afp_signature.conf.5.gz
share/man/man5/afp_voluuid.conf.5.gz
share/man/man5/extmap.conf.5.gz
-share/man/man5/macipgw.conf.5.gz
share/man/man8/afpd.8.gz
share/man/man8/cnid_dbd.8.gz
share/man/man8/cnid_metad.8.gz