diff --git a/net/netatalk3/Makefile b/net/netatalk3/Makefile index c9edba957be1..829506b49eaf 100644 --- a/net/netatalk3/Makefile +++ b/net/netatalk3/Makefile @@ -1,106 +1,106 @@ PORTNAME= netatalk -PORTVERSION= 3.2.9 +PORTVERSION= 3.2.10 PORTEPOCH= 1 CATEGORIES= net MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/netatalk-${PORTVERSION:S/./-/g}/ PKGNAMESUFFIX= 3 MAINTAINER= marcus@FreeBSD.org COMMENT= File server for Mac OS X WWW= https://netatalk.io/ LICENSE= GPLv2 LIB_DEPENDS= libgcrypt.so:security/libgcrypt \ libevent.so:devel/libevent USES= bdb:18 cpe gettext iconv:wchar_t meson perl5 pkgconfig shebangfix ssl tar:xz USE_LDCONFIG= yes USE_RC_SUBR= netatalk #INSTALL_TARGET=install-strip CPE_VENDOR= netatalk_project MESON_ARGS= -Dwith-libgcrypt-path=${LOCALBASE} \ -Dwith-bdb-path=${LOCALBASE} \ -Dwith-libiconv-path=${LOCALBASE} \ -Dwith-dtrace=false \ -Dwith-init-hooks=false \ -Dpkg_config_path=${LOCALBASE}/libdata/pkgconfig \ -Dwith-shadow=false \ -Dwith-pgp-uam=false \ -Ddefault_library=both \ --localstatedir=/var \ --infodir=${PREFIX}/share/info OPTIONS_DEFINE=PAM KERBEROS5 LDAP SENDFILE KERBEROS DBUS MYSQL ACL LIBWRAP SPOTLIGHT OPTIONS_DEFAULT=AVAHI DBUS KERBEROS LIBWRAP SENDFILE OPTIONS_RADIO=ZEROCONF OPTIONS_RADIO_ZEROCONF=AVAHI MDNSRESPONDER ZEROCONF_DESC= Zeroconf(Bonjour) support MYSQL_DESC= Enable MySQL CNID backend support SENDFILE_DESC= Enable Sendfile support ACL_DESC= Enable ACL support SPOTLIGHT_DESC= Enable Spotlight search support OPTIONS_SUB= yes KERBEROS5_MESON_ON= -Dwith-krbV-uam=true \ -Dwith-kerberos=true KERBEROS5_MESON_OFF= -Dwith-krbV-uam=false \ -Dwith-kerberos=false KERBEROS_LIB_DEPENDS=libgpg-error.so:security/libgpg-error PAM_MESON_ON= -Dwith-pam-path=${LOCALBASE} PAM_MESON_OFF= -Dwith-pam=false AVAHI_CFLAGS= -I${LOCALBASE}/include -L${LOCALBASE}/lib AVAHI_LIB_DEPENDS= libavahi-client.so:net/avahi-app AVAHI_SUB_LIST= ZEROCONF="avahi_daemon" MDNSRESPONDER_CFLAGS= -I${LOCALBASE}/include -L${LOCALBASE}/lib MDNSRESPONDER_LIB_DEPENDS= libdns_sd.so:net/mDNSResponder MDNSRESPONDER_SUB_LIST= ZEROCONF="mdnsd" LDAP_MESON_ON= -Dwith-ldap-path=${LOCALBASE} LDAP_MESON_OFF= -Dwith-ldap=false LDAP_CFLAGS= -I${LOCALBASE}/include -L${LOCALBASE}/lib LDAP_USES= ldap SENDFILE_MESON_OFF=-Dwith-sendfile=false DBUS_USES= gnome python DBUS_USE= GNOME=glib20 DBUS_LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \ libdbus-1.so:devel/dbus DBUS_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/dbus/_dbus.py:devel/py-dbus@${PY_FLAVOR} DBUS_MESON_ON= -Dwith-dbus-daemon-path=${LOCALBASE}/bin/dbus-daemon \ -Dwith-dbus-sysconf-path=${LOCALBASE}/etc/dbus-1/system.d DBUS_MESON_OFF= -Dwith-afpstats=false MYSQL_USES= mysql MYSQL_MESON_ON=-Dwith-cnid-mysql-backend=true ACL_LIB_DEPENDS= libsunacl.so:sysutils/libsunacl ACL_MESON_OFF=-Dwith-acls=false LIBWRAP_MESON_OFF=-Dwith-tcp-wrappers=false SPOTLIGHT_LIB_DEPENDS= libtracker-sparql-3.0.so:sysutils/tracker3 SPOTLIGHT_MESON_OFF= -Dwith-spotlight=false SHEBANG_GLOB= afpstats CONFLICTS= jday yudit # bin/dbd man/man1/uniconv.1.gz .include .if ${PORT_OPTIONS:MAVAHI}=="" && ${PORT_OPTIONS:MMDNSRESPONDER}=="" SUB_LIST+= ZEROCONF="" MESON_ARGS+=-Dwith-zeroconf=false .endif post-patch: @${REINPLACE_CMD} -e 's|%%DB_NAME%%|${BDB_INCLUDE_DIR:T}|' \ ${WRKSRC}/meson.build # @${REINPLACE_CMD} -e 's|\.dist|\.sample|g' \ # ${WRKSRC}/config/Makefile.in # @${REINPLACE_CMD} -e 's|%%PYTHONCMD%%|${PYTHONCMD}|' \ # ${WRKSRC}/contrib/shell_utils/afpstats post-install: ${INSTALL_SCRIPT} ${BUILD_WRKSRC}/contrib/macusers/macusers \ ${STAGEDIR}${PREFIX}/bin/macusers .if ${PORT_OPTIONS:MPAM} ${INSTALL_DATA} ${FILESDIR}/pam.conf ${STAGEDIR}${PREFIX}/etc/pam.d/netatalk.sample .endif .include diff --git a/net/netatalk3/distinfo b/net/netatalk3/distinfo index f97e5e5cec25..9cc0e2fe6486 100644 --- a/net/netatalk3/distinfo +++ b/net/netatalk3/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1726432850 -SHA256 (netatalk-3.2.9.tar.xz) = 58f60afa8540e442dc6548fe42c3eaf807628f5f89e4a0e79012e5588e532831 -SIZE (netatalk-3.2.9.tar.xz) = 1961972 +TIMESTAMP = 1727181648 +SHA256 (netatalk-3.2.10.tar.xz) = 7e2783237e3615010cbd5a6a9ba0b801daa282381d808b9c36459b0be8dc170f +SIZE (netatalk-3.2.10.tar.xz) = 1961828 diff --git a/net/netatalk3/files/patch-config_meson.build b/net/netatalk3/files/patch-config_meson.build index 820301e7e8b6..16883e06495e 100644 --- a/net/netatalk3/files/patch-config_meson.build +++ b/net/netatalk3/files/patch-config_meson.build @@ -1,46 +1,46 @@ ---- config/meson.build.orig 2024-07-18 15:25:55 UTC +--- config/meson.build.orig 2024-09-24 08:58:45 UTC +++ config/meson.build @@ -7,39 +7,17 @@ custom_target( custom_target( 'dbus_session', input: 'dbus-session.conf.tmpl', - output: 'dbus-session.conf', + output: 'dbus-session.conf.netatalk', command: sed_command, capture: true, install: true, install_dir: pkgconfdir, ) -if ( - fs.exists(pkgconfdir / 'afp.conf') - and not get_option('with-overwrite') -) - message('will not replace existing', pkgconfdir / 'afp.conf') -else - install_data(afp_conf, install_dir: pkgconfdir) -endif +install_data(afp_conf, rename: 'afp.conf.sample', install_dir: pkgconfdir) +install_data('extmap.conf', rename: 'extmap.conf.sample', install_dir: pkgconfdir) -if ( - fs.exists(pkgconfdir / 'extmap.conf') - and not get_option('with-overwrite') -) - message('will not replace existing', pkgconfdir / 'extmap.conf') -else - install_data('extmap.conf', install_dir: pkgconfdir) -endif - -if ( - fs.exists(dbus_sysconfpath / 'netatalk-dbus.conf') - and not get_option('with-overwrite') -) - message('will not replace existing', dbus_sysconfpath / 'netatalk-dbus.conf') -else - install_data('netatalk-dbus.conf', install_dir: dbus_sysconfpath) -endif +install_data('netatalk-dbus.conf', install_dir: dbus_sysconfpath) - install_data('README', install_dir: localstatedir / 'netatalk') - + if ( + fs.exists('/etc/ld.so.conf.d') diff --git a/net/netatalk3/files/patch-meson.build b/net/netatalk3/files/patch-meson.build index 9428f32181b9..078d34e171f2 100644 --- a/net/netatalk3/files/patch-meson.build +++ b/net/netatalk3/files/patch-meson.build @@ -1,126 +1,117 @@ ---- meson.build.orig 2024-08-01 10:16:47 UTC +--- meson.build.orig 2024-09-24 08:58:45 UTC +++ meson.build @@ -39,6 +39,7 @@ libdir = prefix / get_option('libdir') datadir = prefix / get_option('datadir') includedir = prefix / get_option('includedir') libdir = prefix / get_option('libdir') +libexecdir = prefix / get_option('libexecdir') localstatedir = prefix / get_option('localstatedir') mandir = prefix / get_option('mandir') sbindir = prefix / get_option('sbindir') @@ -78,7 +79,7 @@ statedir = '-D_PATH_STATEDIR="' + localstatedir + '/ne dversion = '-DVERSION="' + netatalk_version + '"' messagedir = '-DSERVERTEXT="' + localstatedir + '/netatalk/msg/"' statedir = '-D_PATH_STATEDIR="' + localstatedir + '/netatalk/"' -uamdir = '-D_PATH_AFPDUAMPATH="' + libdir + '/netatalk/"' +uamdir = '-D_PATH_AFPDUAMPATH="' + libexecdir + '/netatalk-uams/"' ############ # Includes # -@@ -380,6 +381,7 @@ bdb_subdirs = [ +@@ -368,6 +369,7 @@ bdb_subdirs = [ '/usr', ] bdb_subdirs = [ + '%%DB_NAME%%', 'db4.6', 'db4.7', 'db4.8', -@@ -499,6 +501,11 @@ if crypt.found() +@@ -479,6 +481,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 des = cc.find_library('des', required: false) -@@ -731,12 +738,12 @@ dns_sd_libs = [] +@@ -704,12 +711,12 @@ dns_sd_libs = [] dns_sd_libs = [] -dns_sd = cc.find_library('dns_sd', required: false) +dns_sd = cc.find_library('dns_sd', dirs: libsearch_dirs, required: false) if dns_sd.found() dns_sd_libs += dns_sd endif -system = cc.find_library('system', required: false) +system = cc.find_library('system', dirs: libsearch_dirs, required: false) if dns_sd.found() dns_sd_libs += system endif -@@ -753,6 +760,8 @@ have_dns = ( +@@ -726,6 +733,8 @@ have_dns = ( ) ) +threads = dependency('threads', required: true) + if not enable_zeroconf have_zeroconf = false else -@@ -762,6 +771,7 @@ else +@@ -735,6 +744,7 @@ else cdata.set('HAVE_MDNS', 1) freebsd_zeroconf_daemon = 'mdnsd' zeroconf_provider += 'mDNS' + dns_sd_libs += threads else have_zeroconf = avahi.found() if avahi.found() -@@ -829,19 +839,7 @@ else +@@ -802,19 +812,7 @@ else required: false, ) - if tracker.found() - cdata.set( - 'TRACKER_MANAGING_COMMAND', - '"tracker daemon"', - ) - cdata.set( - 'TRACKER_PREFIX', - '"' - + tracker_sparql.get_variable(pkgconfig: 'prefix') - + '"', - ) - tracker_manager += 'tracker' - elif tracker3.found() + if tracker3.found() cdata.set('HAVE_TRACKER3', 1) cdata.set( 'TRACKER_MANAGING_COMMAND', -@@ -882,7 +880,6 @@ else +@@ -855,7 +853,6 @@ else endif endif endif -endif have_spotlight = ( tracker_sparql.found() -@@ -891,6 +888,8 @@ have_spotlight = ( +@@ -864,6 +861,8 @@ have_spotlight = ( and flex.found() and bison.found() ) +endif + if have_spotlight cdata.set('WITH_SPOTLIGHT', 1) endif -@@ -1592,6 +1591,7 @@ if not enable_pam +@@ -1556,6 +1555,7 @@ if not enable_pam if not enable_pam have_pam = false + pam = dependency('', required: false) else if host_os != 'sunos' pam_paths = [ -@@ -1955,6 +1955,8 @@ int deny_severity = 0; - tcpwrap_code = ''' - int allow_severity = 0; - int deny_severity = 0; -+ -+int hosts_access(); - - int main(void) { -