diff --git a/net/netatalk3/Makefile b/net/netatalk3/Makefile index 711fd8c55393..d8e500a7a6b2 100644 --- a/net/netatalk3/Makefile +++ b/net/netatalk3/Makefile @@ -1,105 +1,104 @@ # Created by: stb PORTNAME= netatalk -PORTVERSION= 3.1.12 -PORTREVISION= 4 +PORTVERSION= 3.1.13 PORTEPOCH= 1 CATEGORIES= net MASTER_SITES= SF PKGNAMESUFFIX= 3 MAINTAINER= marcus@FreeBSD.org COMMENT= File server for Mac OS X 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_USE= OPENLDAP=yes 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 8c0760f86055..462dad89dea8 100644 --- a/net/netatalk3/distinfo +++ b/net/netatalk3/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1546280402 -SHA256 (netatalk-3.1.12.tar.bz2) = 1560f83a3da41be97e0b70a96e2402159b8ddc631d38538360b14784beada5d1 -SIZE (netatalk-3.1.12.tar.bz2) = 1918312 +TIMESTAMP = 1651426342 +SHA256 (netatalk-3.1.13.tar.bz2) = 89ada6bcfe1b39ad94f58c236654d1d944f2645c3e7de98b3374e0bd37d5e05d +SIZE (netatalk-3.1.13.tar.bz2) = 1218394 diff --git a/net/netatalk3/files/patch-config_Makefile.in b/net/netatalk3/files/patch-config_Makefile.in index 3e6614c3e842..da20e2b6b179 100644 --- a/net/netatalk3/files/patch-config_Makefile.in +++ b/net/netatalk3/files/patch-config_Makefile.in @@ -1,42 +1,42 @@ ---- config/Makefile.in.orig 2016-09-12 09:54:34 UTC +--- config/Makefile.in.orig 2022-03-22 04:51:08 UTC +++ config/Makefile.in -@@ -825,8 +825,8 @@ install-data-local: install-config-files +@@ -824,8 +824,8 @@ install-data-local: install-config-files uninstall-local: @for f in $(CONFFILES) $(GENFILES); do \ - echo rm -f $(DESTDIR)$(pkgconfdir)/$$f; \ - rm -f $(DESTDIR)$(pkgconfdir)/$$f; \ -+ echo rm -f $(DESTDIR)$(pkgconfdir)/$$f.dist; \ -+ rm -f $(DESTDIR)$(pkgconfdir)/$$f.dist; \ ++ echo rm -f $(DESTDIR)$(pkgconfdir)/$$f.sample; \ ++ rm -f $(DESTDIR)$(pkgconfdir)/$$f.sample; \ done rm -f $(DESTDIR)$(pkgconfdir)/dbus-session.conf rm -f $(DESTDIR)$(localstatedir)/netatalk/README -@@ -836,21 +836,16 @@ uninstall-local: +@@ -835,21 +835,16 @@ uninstall-local: install-config-files: $(CONFFILES) $(GENFILES) $(mkinstalldirs) $(DESTDIR)$(pkgconfdir) @for f in $(CONFFILES) ; do \ - if test "x$(OVERWRITE_CONFIG)" = "xyes" -o ! -f $(DESTDIR)$(pkgconfdir)/$$f; then \ - echo "$(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir)"; \ - $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(pkgconfdir); \ - else \ - echo "not overwriting $$f"; \ - fi; \ -+ echo "$(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir)/$$f.dist"; \ -+ $(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir)/$$f.dist; \ ++ echo "$(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir)/$$f.sample"; \ ++ $(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir)/$$f.sample; \ done @for f in $(GENFILES); do \ - if test "x$(OVERWRITE_CONFIG)" = "xyes" -o ! -f $(DESTDIR)$(pkgconfdir)/$$f; then \ - echo "$(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir)"; \ - $(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir); \ - else \ - echo "not overwriting $$f"; \ - fi; \ + if [ $$f != "dbus-session.conf" ]; then \ -+ echo "$(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir)/$$f.dist"; \ -+ $(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir)/$$f.dist; \ ++ echo "$(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir)/$$f.sample"; \ ++ $(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir)/$$f.sample; \ + fi; \ done + $(INSTALL_DATA) dbus-session.conf $(DESTDIR)$(pkgconfdir)/dbus-session.conf.netatalk # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/net/netatalk3/files/patch-etc_afpd_Makefile.in b/net/netatalk3/files/patch-etc_afpd_Makefile.in index 2d68da15b637..04133dd2a059 100644 --- a/net/netatalk3/files/patch-etc_afpd_Makefile.in +++ b/net/netatalk3/files/patch-etc_afpd_Makefile.in @@ -1,20 +1,20 @@ ---- etc/afpd/Makefile.in.orig 2016-09-12 09:54:35 UTC +--- etc/afpd/Makefile.in.orig 2022-03-22 04:51:08 UTC +++ etc/afpd/Makefile.in -@@ -191,7 +191,7 @@ AM_V_at = $(am__v_at_@AM_V@) +@@ -186,7 +186,7 @@ AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ am__v_at_1 = -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/include depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f -@@ -473,7 +473,7 @@ afpd_SOURCES = afp_config.c afp_dsi.c af + am__maybe_remake_depfiles = depfiles + am__depfiles_remade = ./$(DEPDIR)/afpd-acls.Po \ +@@ -489,7 +489,7 @@ afpd_SOURCES = afp_config.c afp_dsi.c afp_options.c af $(am__append_7) afpd_LDADD = $(top_builddir)/libatalk/libatalk.la @LIBGCRYPT_LIBS@ \ @QUOTA_LIBS@ @WRAP_LIBS@ @LIBADD_DL@ @ACL_LIBS@ @PTHREAD_LIBS@ \ - @GSSAPI_LIBS@ @KRB5_LIBS@ @MYSQL_LIBS@ $(am__append_2) \ + @GSSAPI_LIBS@ @KRB5_LIBS@ @MYSQL_LIBS@ @PAM_LIBS@ $(am__append_2) \ $(am__append_10) afpd_LDFLAGS = -export-dynamic $(am__append_9) afpd_CFLAGS = @GSSAPI_CFLAGS@ @KRB5_CFLAGS@ @PTHREAD_CFLAGS@ \ diff --git a/net/netatalk3/files/patch-etc_afpd_directory.h b/net/netatalk3/files/patch-etc_afpd_directory.h deleted file mode 100644 index a07c42110d61..000000000000 --- a/net/netatalk3/files/patch-etc_afpd_directory.h +++ /dev/null @@ -1,11 +0,0 @@ ---- etc/afpd/directory.h.orig 2014-12-11 11:27:44 UTC -+++ etc/afpd/directory.h -@@ -91,7 +91,7 @@ struct maccess { - #define AR_UWRITE (1<<2) - #define AR_UOWN (1<<7) - --q_t *invalid_dircache_entries; -+extern q_t *invalid_dircache_entries; - - typedef int (*dir_loop)(struct dirent *, char *, void *); - diff --git a/net/netatalk3/files/patch-etc_netatalk_Makefile.in b/net/netatalk3/files/patch-etc_netatalk_Makefile.in new file mode 100644 index 000000000000..653d80151e46 --- /dev/null +++ b/net/netatalk3/files/patch-etc_netatalk_Makefile.in @@ -0,0 +1,11 @@ +--- etc/netatalk/Makefile.in.orig 2022-05-01 17:38:31 UTC ++++ etc/netatalk/Makefile.in +@@ -433,7 +433,7 @@ netatalk_LDADD = \ + @ZEROCONF_LIBS@ \ + $(top_builddir)/libatalk/libatalk.la + +-netatalk_LDFLAGS = @LIBEVENT_LDFLAGS@ -levent ++netatalk_LDFLAGS = @LIBEVENT_LIBS@ + noinst_HEADERS = afp_zeroconf.h afp_avahi.h afp_mdns.h + all: all-am + diff --git a/net/netatalk3/files/patch-etc_uams_openssl__compat.h b/net/netatalk3/files/patch-etc_uams_openssl__compat.h index 0fa409015f32..bb402c760265 100644 --- a/net/netatalk3/files/patch-etc_uams_openssl__compat.h +++ b/net/netatalk3/files/patch-etc_uams_openssl__compat.h @@ -1,11 +1,11 @@ ---- etc/uams/openssl_compat.h.orig 2019-01-03 18:36:43.123024000 +0000 -+++ etc/uams/openssl_compat.h 2019-01-03 18:37:02.918877000 +0000 -@@ -11,7 +11,7 @@ http://www.gnu.org/licenses/old-licenses +--- etc/uams/openssl_compat.h.orig 2022-02-28 13:32:06 UTC ++++ etc/uams/openssl_compat.h +@@ -11,7 +11,7 @@ http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt #ifndef OPENSSL_COMPAT_H #define OPENSSL_COMPAT_H -#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) +#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) inline static int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g) { /* If the fields p and g in d are NULL, the corresponding input diff --git a/net/netatalk3/files/patch-libatalk_vfs_extattr.c b/net/netatalk3/files/patch-libatalk_vfs_extattr.c index ec0a9937a1f6..fbdcc7466020 100644 --- a/net/netatalk3/files/patch-libatalk_vfs_extattr.c +++ b/net/netatalk3/files/patch-libatalk_vfs_extattr.c @@ -1,19 +1,19 @@ ---- libatalk/vfs/extattr.c 2020-11-17 04:20:13 UTC -+++ libatalk/vfs/extattr.c +--- libatalk/vfs/extattr.c.orig 2022-03-22 04:50:23 UTC ++++ libatalk/vfs/extattr.c @@ -353,13 +353,13 @@ static ssize_t bsd_attr_list (int type, extattr_arg ar } /* Convert from pascal strings to C strings */ - len = list[0]; - memmove(list, list + 1, list_size); + len = (unsigned char)list[0]; + memmove(list, list + 1, list_size - 1); for(i = len; i < list_size; ) { LOG(log_maxdebug, logtype_afpd, "len: %d, i: %d", len, i); - len = list[i]; + len = (unsigned char)list[i]; list[i] = '\0'; i += len + 1; }