From nobody Sun May 01 17:46:09 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 5342E1ABF19F; Sun, 1 May 2022 17:46:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Krttp1vmPz3Bvg; Sun, 1 May 2022 17:46:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651427170; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=td8SMDWnEFIiyma/jui0W0woWGn7si+Q+ybRHpxQutk=; b=vsaFUoIuvA49Hya6pt4cCLZM+OQfoYkFVYQtZkbZl/CjoJthV5TPAvrTUKjslIWmiuGGHg mn3GR3N06JjRONa7UWbNICzBDBUUFlt7gd0o+bWC0PC5icm5UwxnEyVtsfZ3+LRttBFPeq wVn+ErCLOCiM7itX1tM1H+cdVCKMKtjg3Uu6rLxFnIeNUxjA13U1GQmz8mumtm7ywBWGtK MwnVCpN1yMk5i9odnYvbCVImpMBq+BTfdMA8LqdneEgD3pIpXLZmc07R54JQ8TFMkeMC2Y NhU/V89Eliz9Nai7Upq4p97ugxAkmxXSp+wYZIGbTkEYceOe2DF0P+2xjjgs/Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1CEE01A0C4; Sun, 1 May 2022 17:46:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 241Hk9EY089126; Sun, 1 May 2022 17:46:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 241Hk9Tq089125; Sun, 1 May 2022 17:46:09 GMT (envelope-from git) Date: Sun, 1 May 2022 17:46:09 GMT Message-Id: <202205011746.241Hk9Tq089125@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Joe Marcus Clarke Subject: git: a104816328d8 - main - net/netatalk3: Update to 3.1.13 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marcus X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a104816328d8082239b451325fc5a1f6ec94859d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651427170; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=td8SMDWnEFIiyma/jui0W0woWGn7si+Q+ybRHpxQutk=; b=tMD1UraaypemWx15GhdOxq/gs6tfaSCv0kgPQIzBVszz2I/UZXNL1lrdK70SZmRzzoW2Vb n3jV4ETLgNxHlRkz7PnvDdiOP3frTvkkEYhg9HG1x4pWF+ELfLnEgi0eUSuJcNy/39MHKE B+3unFidesGm7E5h4EAAtWVvsa6jXzPy2O2zQCW/2bXL5pZrRq7yEuxKwHUwrBcFyssk/N W3gLqJJ/bA7J4e0bMmE7lmztSe+BEjEl1uTCoPgxgDQRDacBZ9R/x7RoO1UBJcr7ZX+3Hs MTU4Sm/hIIswwfYBqJP0xnaQp3Pu8sMomVa25CGuhtyM1nmnEaRdZMB6Oeg6rA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651427170; a=rsa-sha256; cv=none; b=T6Dm1+bUabTLrFnnQF4TdTc+ORRoqoyJr9eLO7KBc/WKYUxKyR60CpWfYwFlhpPssIK8oT ce7AknJ2knTN0t+ZerhAYVQel9C48AfYC4h8gXcdKazbv9mwRcnOIrcrqnNLgsmGcaIzq3 VDKMbCyeI+cqN979ud3awcZ2D6gUocVZEBFxE35yvTff6CkVGzPtRRRpu2ZX6dE8OkWaGd CNKxLaVqeaUWgdHu34nup95b4M/ahWKLw/kquxd56xq56TZF22WGPry/d0VtBInympeGYG 79tN+iuLmTZH2kFFaY5ye0Kg/fKW1BZXhwM7CsWTXLBfgjgJ1RkJn63VfZgugQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by marcus: URL: https://cgit.FreeBSD.org/ports/commit/?id=a104816328d8082239b451325fc5a1f6ec94859d commit a104816328d8082239b451325fc5a1f6ec94859d Author: Joe Marcus Clarke AuthorDate: 2022-05-01 17:44:16 +0000 Commit: Joe Marcus Clarke CommitDate: 2022-05-01 17:44:16 +0000 net/netatalk3: Update to 3.1.13 See https://netatalk.sourceforge.io/3.1/ReleaseNotes3.1.13.html for the changes in this release. Security: CVE-2021-31439 CVE-2022-23121 CVE-2022-23123 CVE-2022-23122 CVE-2022-23125 CVE-2022-23124 CVE-2022-0194 --- net/netatalk3/Makefile | 3 +-- net/netatalk3/distinfo | 6 +++--- net/netatalk3/files/patch-config_Makefile.in | 18 +++++++++--------- net/netatalk3/files/patch-etc_afpd_Makefile.in | 10 +++++----- net/netatalk3/files/patch-etc_afpd_directory.h | 11 ----------- net/netatalk3/files/patch-etc_netatalk_Makefile.in | 11 +++++++++++ net/netatalk3/files/patch-etc_uams_openssl__compat.h | 6 +++--- net/netatalk3/files/patch-libatalk_vfs_extattr.c | 4 ++-- 8 files changed, 34 insertions(+), 35 deletions(-) diff --git a/net/netatalk3/Makefile b/net/netatalk3/Makefile index 711fd8c55393..d8e500a7a6b2 100644 --- a/net/netatalk3/Makefile +++ b/net/netatalk3/Makefile @@ -1,8 +1,7 @@ # Created by: stb PORTNAME= netatalk -PORTVERSION= 3.1.12 -PORTREVISION= 4 +PORTVERSION= 3.1.13 PORTEPOCH= 1 CATEGORIES= net MASTER_SITES= SF 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,17 +1,17 @@ ---- 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 \ @@ -21,8 +21,8 @@ - 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 \ @@ -32,8 +32,8 @@ - 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 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,15 +1,15 @@ ---- 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@ \ 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,6 +1,6 @@ ---- 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 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,5 +1,5 @@ ---- 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 }