diff --git a/net/netatalk3/Makefile b/net/netatalk3/Makefile index 63087cf1e3ae..71f6af279661 100644 --- a/net/netatalk3/Makefile +++ b/net/netatalk3/Makefile @@ -1,103 +1,103 @@ PORTNAME= netatalk -PORTVERSION= 3.1.15 +PORTVERSION= 3.1.16 PORTEPOCH= 1 CATEGORIES= net MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:S/./-/g} PKGNAMESUFFIX= 3 MAINTAINER= marcus@FreeBSD.org COMMENT= File server for Mac OS X WWW= http://netatalk.sourceforge.net/ LICENSE= GPLv2 LIB_DEPENDS= libgcrypt.so:security/libgcrypt \ libevent.so:devel/libevent USES= bdb:5+ cpe gettext gmake iconv libtool perl5 pkgconfig shebangfix ssl tar:bzip2 GNU_CONFIGURE= yes USE_LDCONFIG= yes USE_RC_SUBR= netatalk INSTALL_TARGET=install-strip CPE_VENDOR= netatalk_project CONFIGURE_ARGS+= --with-pkgconfdir=${PREFIX}/etc \ --with-libgcrypt-dir=${LOCALBASE} \ --with-uams-path=${PREFIX}/libexec/netatalk-uams \ --with-bdb=${LOCALBASE} \ ${ICONV_CONFIGURE_BASE} \ --localstatedir=/var \ --disable-bundled-libevent \ --with-libevent-header=${LOCALBASE}/include \ --with-libevent-lib=${LOCALBASE}/lib \ --with-ssl-dir=${OPENSSLBASE} \ --without-dtrace OPTIONS_DEFINE=PAM KERBEROS5 LDAP SENDFILE KERBEROS DBUS MYSQL ACL LIBWRAP OPTIONS_DEFAULT=AVAHI DBUS KERBEROS LIBWRAP 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 OPTIONS_SUB= yes KERBEROS5_CONFIGURE_ON= --enable-krbV-uam KERBEROS_CONFIGURE_WITH=kerberos KERBEROS_LIB_DEPENDS=libgpg-error.so:security/libgpg-error PAM_CONFIGURE_WITH=pam AVAHI_CONFIGURE_ON= --enable-zeroconf=${LOCALBASE} AVAHI_CFLAGS= -I${LOCALBASE}/include -L${LOCALBASE}/lib AVAHI_LIB_DEPENDS= libavahi-client.so:net/avahi-app AVAHI_SUB_LIST= ZEROCONF="avahi_daemon" MDNSRESPONDER_CONFIGURE_ON= --enable-zeroconf=${LOCALBASE} MDNSRESPONDER_CONFIGURE_ENV= ac_cv_lib_avahi_client_avahi_client_new=no MDNSRESPONDER_CFLAGS= -I${LOCALBASE}/include -L${LOCALBASE}/lib MDNSRESPONDER_LIB_DEPENDS= libdns_sd.so:net/mDNSResponder MDNSRESPONDER_SUB_LIST= ZEROCONF="mdnsd" LDAP_CONFIGURE_ON= --with-ldap=${LOCALBASE} LDAP_CFLAGS= -I${LOCALBASE}/include -L${LOCALBASE}/lib LDAP_USES= ldap LDAP_CONFIGURE_OFF= --without-ldap SENDFILE_CONFIGURE_ENABLE=sendfile 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} MYSQL_USES= mysql MYSQL_CONFIGURE_OFF=--with-mysql-config=/nonexistent ACL_LIB_DEPENDS= libsunacl.so:sysutils/libsunacl ACL_CONFIGURE_WITH=acls LIBWRAP_CONFIGURE_ENABLE=tcp-wrappers SHEBANG_GLOB= afpstats CONFLICTS= jday yudit # bin/dbd man/man1/uniconv.1.gz .include .if ${PORT_OPTIONS:MAVAHI}=="" && ${PORT_OPTIONS:MMDNSRESPONDER}=="" SUB_LIST+= ZEROCONF="" CONFIGURE_ARGS+=--disable-zeroconf .endif post-patch: @${REINPLACE_CMD} -e 's|%%DB_NAME%%|${BDB_INCLUDE_DIR:T}| ; \ s|%%DB_LIB%%|-l${BDB_LIB_NAME}|g ; \ s|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/configure @${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} ${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 d3906c6ac73f..0df8669d374d 100644 --- a/net/netatalk3/distinfo +++ b/net/netatalk3/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1686673994 -SHA256 (netatalk-3.1.15.tar.bz2) = d8d4a5cc0fd86b0d90e017d64c1f4623e8cdbfbda570fc423ade1151a93d19f5 -SIZE (netatalk-3.1.15.tar.bz2) = 1303385 +TIMESTAMP = 1694632765 +SHA256 (netatalk-3.1.16.tar.bz2) = 006aa0fa1e60606fccb1c39bc5fec3ccf552e7012e0d98950f1a96cd60b86056 +SIZE (netatalk-3.1.16.tar.bz2) = 1266168 diff --git a/net/netatalk3/files/patch-configure b/net/netatalk3/files/patch-configure index 2d6848c75f0f..814542715554 100644 --- a/net/netatalk3/files/patch-configure +++ b/net/netatalk3/files/patch-configure @@ -1,11 +1,45 @@ ---- configure.orig 2022-03-22 04:51:09 UTC -+++ configure -@@ -17368,7 +17368,7 @@ if test "x$bdb_required" = "xyes"; then +--- configure.orig 2023-09-11 13:10:58.000000000 -0400 ++++ configure 2023-09-13 15:28:59.173250000 -0400 +@@ -18111,8 +18111,15 @@ fi + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + int allow_severity = 0; int deny_severity = 0; extern char hosts_access(void); +- ,hosts_access(); ++ int ++main (void) ++{ ++hosts_access(); + ++ ; ++ return 0; ++} ++ + _ACEOF + if ac_fn_c_try_link "$LINENO" + then : +@@ -18125,8 +18132,15 @@ else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + int allow_severity = 0; int deny_severity = 0; extern char hosts_access(void); +- ,hosts_access(); ++ int ++main (void) ++{ ++hosts_access(); + ++ ; ++ return 0; ++} ++ + _ACEOF + if ac_fn_c_try_link "$LINENO" + then : +@@ -19064,7 +19078,7 @@ if test "x$bdb_required" = "xyes"; then trybdbdir="" dobdbsearch=yes bdb_search_dirs="/usr/local /usr" - search_subdirs="/ /db6.1 /db6 /db5 /db5.3 /db5.2 /db5.1 /db51 /db5.0 /db50 /db4.8 /db48 /db4.7 /db47 /db4.6 /db46 /db4" + search_subdirs="/%%DB_NAME%% / /db6.1 /db6 /db5 /db5.3 /db5.2 /db5.1 /db51 /db5.0 /db50 /db4.8 /db48 /db4.7 /db47 /db4.6 /db46 /db4" bdbfound=no savedcflags="$CFLAGS" diff --git a/net/netatalk3/pkg-plist b/net/netatalk3/pkg-plist index c999f968333f..ec452c46558b 100644 --- a/net/netatalk3/pkg-plist +++ b/net/netatalk3/pkg-plist @@ -1,89 +1,87 @@ bin/ad bin/afpldaptest bin/afppasswd %%DBUS%%bin/afpstats bin/apple_dump -bin/asip-status.pl -bin/cnid2_create +bin/asip-status bin/dbd bin/macusers bin/netatalk-config @sample etc/afp.conf.sample %%DBUS%%etc/dbus-1/system.d/netatalk-dbus.conf %%DBUS%%etc/dbus-session.conf.netatalk @sample etc/extmap.conf.sample %%PAM%%@sample etc/pam.d/netatalk.sample libexec/netatalk-uams/uams_clrtxt.so libexec/netatalk-uams/uams_dhx.so libexec/netatalk-uams/uams_dhx2.so %%PAM%%libexec/netatalk-uams/uams_dhx2_pam.a %%PAM%%libexec/netatalk-uams/uams_dhx2_pam.so libexec/netatalk-uams/uams_dhx2_passwd.a libexec/netatalk-uams/uams_dhx2_passwd.so %%PAM%%libexec/netatalk-uams/uams_dhx_pam.a %%PAM%%libexec/netatalk-uams/uams_dhx_pam.so libexec/netatalk-uams/uams_dhx_passwd.a libexec/netatalk-uams/uams_dhx_passwd.so %%KERBEROS5%%libexec/netatalk-uams/uams_gss.a %%KERBEROS5%%libexec/netatalk-uams/uams_gss.so libexec/netatalk-uams/uams_guest.a libexec/netatalk-uams/uams_guest.so %%PAM%%libexec/netatalk-uams/uams_pam.a %%PAM%%libexec/netatalk-uams/uams_pam.so libexec/netatalk-uams/uams_passwd.a libexec/netatalk-uams/uams_passwd.so libexec/netatalk-uams/uams_randnum.a libexec/netatalk-uams/uams_randnum.so include/atalk/acl.h include/atalk/adouble.h include/atalk/afp.h include/atalk/bstrlib.h include/atalk/cnid.h include/atalk/compat.h 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/netatalk_conf.h include/atalk/paths.h include/atalk/standards.h include/atalk/uam.h include/atalk/unicode.h include/atalk/unix.h include/atalk/util.h include/atalk/vfs.h include/atalk/volume.h lib/libatalk.a lib/libatalk.so -lib/libatalk.so.18 -lib/libatalk.so.18.0.0 +lib/libatalk.so.0 +lib/libatalk.so.0.0.0 man/man1/ad.1.gz man/man1/afpldaptest.1.gz man/man1/afppasswd.1.gz %%DBUS%%man/man1/afpstats.1.gz man/man1/apple_dump.1.gz -man/man1/asip-status.pl.1.gz +man/man1/asip-status.1.gz man/man1/dbd.1.gz man/man1/macusers.1.gz man/man1/netatalk-config.1.gz -man/man1/uniconv.1.gz man/man5/afp.conf.5.gz man/man5/afp_signature.conf.5.gz man/man5/afp_voluuid.conf.5.gz man/man5/extmap.conf.5.gz man/man8/afpd.8.gz man/man8/cnid_dbd.8.gz man/man8/cnid_metad.8.gz man/man8/netatalk.8.gz sbin/afpd sbin/cnid_dbd sbin/cnid_metad sbin/netatalk share/aclocal/netatalk.m4 /var/netatalk/CNID/README /var/netatalk/README @dir /var/netatalk/CNID @dir /var/netatalk