From nobody Tue Jul 30 13:35:05 2024 X-Original-To: dev-commits-ports-main@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 4WYGS92RH3z5RytH; Tue, 30 Jul 2024 13:35:05 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WYGS92Chjz4pc0; Tue, 30 Jul 2024 13:35:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722346505; 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=PtVGhlbS2g3Ck48WvOM2uwY/U6iApiAqZZuarDtOP0I=; b=IFeDWWjAfzwtEhUtJqsTGTl7VtZA1KUixWSz4pC3v/8cZABPX63Zsz7bHWsVxY9yGN43I/ feZVEZ46HBWJZ12hkj70U2qdCZt9uwOVADkaMr6vO6M2nCG4121e7BFMmftPLMRFpbgdjG VabX4iDtv9ESC0zBS99w+GueaqGwtZF+3R5m7uymii6Y1JyXt3YXqEy31bl6zNnkVcucoe fHQznZ/M73EOekam1IykUlgFDr/Xin8o7K2PXdX4hnGcu4vu9DBe6uI9JgGN/w9aJjaI0G k4uPJ0CQ7+g5qNOS9jrxLj7Uss4RmG66/Brno8kndfwgBgklk7Dteccv7a7yRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722346505; a=rsa-sha256; cv=none; b=u4zEKJWClwiJVaGSsRr5SklRWjeCg8KSfqCg+rvSMYcwgjLx46/LnHiOXPAXRmVVhNgLDF j48968biYMLtuRHZ5jXYD15mb3l5VAmCSbPACcxJpK4XFhn3CdTIc2pYdFqcggoxdrQ5X6 JnjGw6LQftODfuycZsYV9vPHm9zG7a+J3YBqyjG3wafsvL5VWVsZzjXqtNUJ8HpV+sDJel kOw8rZC5Kh/8jX2PDRo5KKgruiGulffhJLsNvl5op765iRxt9xLRdQRvpj09bSmpwEUl/y +9WQz7qhIpxTgKEbytov70E4LBPSSfvrpc1KPT37ZOProz4Shhp13JrQn7eSXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722346505; 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=PtVGhlbS2g3Ck48WvOM2uwY/U6iApiAqZZuarDtOP0I=; b=rvO3wnx1XXJ2k6L3uBxeXKkqvSrcs9DtGPdRtObSIeykjWTRh5vxF4ou5jmgrij6haEXpf MJfTIYySpPyIrWiW7aEH7z7nzY3cbAPFvK6SHA+4i4z73Z1KmANdXoqSeiGPElXjUGX25P jKr+67Xh1NUXgoX7tFesI8U0iI4A5mjAH5eV74rjkC+syo3eHVPhqgWh8mKvlw8I+R4NSM OTYF418WCMT/mxugX0SywHXasted1FkNGu31DzlRE3RBy6w8OIrzTlsO60uIQlL8s74oR7 SFJZoutdYrYmokgkmeJi770L0UAsGqyaYgSkBisQVgt26ySrFIVttBKva4VpYQ== 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 4WYGS91pd1zKPd; Tue, 30 Jul 2024 13:35:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46UDZ5AG042747; Tue, 30 Jul 2024 13:35:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46UDZ5A3042744; Tue, 30 Jul 2024 13:35:05 GMT (envelope-from git) Date: Tue, 30 Jul 2024 13:35:05 GMT Message-Id: <202407301335.46UDZ5A3042744@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: 70964cc69016 - main - net/netatalk3: Update to 3.2.4 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@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: 70964cc69016f43315813477f0e47603c7e7b53a Auto-Submitted: auto-generated The branch main has been updated by marcus: URL: https://cgit.FreeBSD.org/ports/commit/?id=70964cc69016f43315813477f0e47603c7e7b53a commit 70964cc69016f43315813477f0e47603c7e7b53a Author: Joe Marcus Clarke AuthorDate: 2024-07-30 13:33:52 +0000 Commit: Joe Marcus Clarke CommitDate: 2024-07-30 13:33:52 +0000 net/netatalk3: Update to 3.2.4 See https://github.com/Netatalk/netatalk/releases for the changes in this release and in the un-ported 3.2.3. --- net/netatalk3/Makefile | 2 +- net/netatalk3/distinfo | 6 +- net/netatalk3/files/patch-config_meson.build | 35 ++++-- net/netatalk3/files/patch-etc_uams_meson.build | 151 +++++++++++++++++-------- net/netatalk3/files/patch-meson.build | 38 +++---- net/netatalk3/pkg-plist | 2 +- 6 files changed, 152 insertions(+), 82 deletions(-) diff --git a/net/netatalk3/Makefile b/net/netatalk3/Makefile index 101680edfdf6..42023fdcfb2b 100644 --- a/net/netatalk3/Makefile +++ b/net/netatalk3/Makefile @@ -1,5 +1,5 @@ PORTNAME= netatalk -PORTVERSION= 3.2.2 +PORTVERSION= 3.2.4 PORTEPOCH= 1 CATEGORIES= net MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/netatalk-${PORTVERSION:S/./-/g}/ diff --git a/net/netatalk3/distinfo b/net/netatalk3/distinfo index cf9916b8aafc..97983a781fc2 100644 --- a/net/netatalk3/distinfo +++ b/net/netatalk3/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1720267420 -SHA256 (netatalk-3.2.2.tar.xz) = 2803a80718a8e5c3bb5774c3b2eec19ae622fb5a34618f72c4210a8e94c8e15d -SIZE (netatalk-3.2.2.tar.xz) = 1906644 +TIMESTAMP = 1722343946 +SHA256 (netatalk-3.2.4.tar.xz) = 966fe021a641fa628fdda3c908dcba8399e3c07c54b743339fff1645d92850b0 +SIZE (netatalk-3.2.4.tar.xz) = 1904376 diff --git a/net/netatalk3/files/patch-config_meson.build b/net/netatalk3/files/patch-config_meson.build index d5f5cd2d763d..820301e7e8b6 100644 --- a/net/netatalk3/files/patch-config_meson.build +++ b/net/netatalk3/files/patch-config_meson.build @@ -1,6 +1,6 @@ ---- config/meson.build.orig 2024-06-29 05:58:36 UTC +--- config/meson.build.orig 2024-07-18 15:25:55 UTC +++ config/meson.build -@@ -7,23 +7,16 @@ custom_target( +@@ -7,39 +7,17 @@ custom_target( custom_target( 'dbus_session', input: 'dbus-session.conf.tmpl', @@ -13,17 +13,34 @@ ) -if ( -- not fs.exists(pkgconfdir / 'afp.conf') -- or (get_option('with-overwrite') and fs.exists(pkgconfdir / 'afp.conf')) +- fs.exists(pkgconfdir / 'afp.conf') +- and not get_option('with-overwrite') -) -- install_data(afp_conf, install_dir: pkgconfdir) +- message('will not replace existing', pkgconfdir / 'afp.conf') -else -- message('not overwriting', 'afp.conf') +- install_data(afp_conf, install_dir: pkgconfdir) -endif +install_data(afp_conf, rename: 'afp.conf.sample', install_dir: pkgconfdir) - --install_data('extmap.conf', install_dir: pkgconfdir) +install_data('extmap.conf', rename: 'extmap.conf.sample', install_dir: pkgconfdir) - install_data('netatalk-dbus.conf', install_dir: dbus_sysconf_path) +-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') diff --git a/net/netatalk3/files/patch-etc_uams_meson.build b/net/netatalk3/files/patch-etc_uams_meson.build index 1dbf90df9078..a171dbf1684a 100644 --- a/net/netatalk3/files/patch-etc_uams_meson.build +++ b/net/netatalk3/files/patch-etc_uams_meson.build @@ -1,4 +1,4 @@ ---- etc/uams/meson.build.orig 2024-06-17 15:24:00 UTC +--- etc/uams/meson.build.orig 2024-07-18 15:25:55 UTC +++ etc/uams/meson.build @@ -7,7 +7,7 @@ uams_guest = shared_module( name_prefix: '', @@ -36,25 +36,7 @@ ) ssl_links = [] -@@ -60,7 +60,7 @@ if have_ssl - name_prefix: '', - name_suffix: 'so', - install: true, -- install_dir: libdir / 'netatalk', -+ install_dir: libexecdir / 'netatalk-uams', - build_rpath: libdir, - install_rpath: libdir, - ) -@@ -73,7 +73,7 @@ if have_ssl - link_with: ssl_links, - name_prefix: '', - install: true, -- install_dir: libdir / 'netatalk', -+ install_dir: libexecdir / 'netatalk-uams', - build_rpath: libdir, - install_rpath: libdir, - ) -@@ -89,7 +89,7 @@ if have_ssl +@@ -61,7 +61,7 @@ if have_ssl name_prefix: '', name_suffix: 'so', install: true, @@ -63,7 +45,7 @@ build_rpath: libdir, install_rpath: libdir, ) -@@ -102,20 +102,20 @@ if have_ssl +@@ -73,7 +73,7 @@ if have_ssl link_with: ssl_links, name_prefix: '', install: true, @@ -72,6 +54,59 @@ build_rpath: libdir, install_rpath: libdir, ) +@@ -87,7 +87,7 @@ if have_ssl + name_prefix: '', + name_suffix: 'so', + install: true, +- install_dir: libdir / 'netatalk', ++ install_dir: libexecdir / 'netatalk-uams', + ) + uams_dhx_passwd = static_library( + 'uams_dhx_passwd', +@@ -97,7 +97,7 @@ if have_ssl + link_with: ssl_links, + name_prefix: '', + install: true, +- install_dir: libdir / 'netatalk', ++ install_dir: libexecdir / 'netatalk-uams', + ) + endif + if have_pam +@@ -113,7 +113,7 @@ if have_ssl + name_prefix: '', + name_suffix: 'so', + install: true, +- install_dir: libdir / 'netatalk', ++ install_dir: libexecdir / 'netatalk-uams', + build_rpath: libdir, + install_rpath: libdir, + ) +@@ -125,7 +125,7 @@ if have_ssl + link_with: ssl_links, + name_prefix: '', + install: true, +- install_dir: libdir / 'netatalk', ++ install_dir: libexecdir / 'netatalk-uams', + build_rpath: libdir, + install_rpath: libdir, + ) +@@ -139,7 +139,7 @@ if have_ssl + name_prefix: '', + name_suffix: 'so', + install: true, +- install_dir: libdir / 'netatalk', ++ install_dir: libexecdir / 'netatalk-uams', + ) + uams_dhx_pam = static_library( + 'uams_dhx_pam', +@@ -149,19 +149,19 @@ if have_ssl + link_with: ssl_links, + name_prefix: '', + install: true, +- install_dir: libdir / 'netatalk', ++ install_dir: libexecdir / 'netatalk-uams', + ) + endif install_symlink( 'uams_dhx.so', @@ -87,7 +122,7 @@ pointing_to: 'uams_dhx_passwd.so', ) endif -@@ -132,7 +132,7 @@ if have_libgcrypt +@@ -178,7 +178,7 @@ if have_libgcrypt name_prefix: '', name_suffix: 'so', install: true, @@ -96,7 +131,7 @@ ) uams_dhx2_passwd = static_library( -@@ -142,7 +142,7 @@ if have_libgcrypt +@@ -188,7 +188,7 @@ if have_libgcrypt dependencies: [crypt, libgcrypt], name_prefix: '', install: true, @@ -105,7 +140,7 @@ ) if have_pam uams_dhx2_pam_sources = ['uams_dhx2_pam.c'] -@@ -155,7 +155,7 @@ if have_libgcrypt +@@ -201,7 +201,7 @@ if have_libgcrypt name_prefix: '', name_suffix: 'so', install: true, @@ -114,7 +149,7 @@ ) uams_dhx2_pam = static_library( -@@ -165,18 +165,18 @@ if have_libgcrypt +@@ -211,18 +211,18 @@ if have_libgcrypt dependencies: [pam, libgcrypt], name_prefix: '', install: true, @@ -136,7 +171,7 @@ pointing_to: 'uams_dhx2_passwd.so', ) endif -@@ -193,7 +193,7 @@ if have_pam +@@ -239,7 +239,7 @@ if have_pam name_prefix: '', name_suffix: 'so', install: true, @@ -145,7 +180,7 @@ ) uams_pam = static_library( -@@ -203,18 +203,18 @@ if have_pam +@@ -249,18 +249,18 @@ if have_pam dependencies: pam, name_prefix: '', install: true, @@ -167,25 +202,43 @@ pointing_to: 'uams_passwd.so', ) endif -@@ -231,7 +231,7 @@ if have_ssl - name_prefix: '', - name_suffix: 'so', - install: true, -- install_dir: libdir / 'netatalk', -+ install_dir: libexecdir / 'netatalk-uams', - build_rpath: libdir, - install_rpath: libdir, - ) -@@ -244,7 +244,7 @@ if have_ssl - link_with: ssl_links, - name_prefix: '', - install: true, -- install_dir: libdir / 'netatalk', -+ install_dir: libexecdir / 'netatalk-uams', - build_rpath: libdir, - install_rpath: libdir, - ) -@@ -261,7 +261,7 @@ if enable_pgp_uam +@@ -278,7 +278,7 @@ if have_ssl + name_prefix: '', + name_suffix: 'so', + install: true, +- install_dir: libdir / 'netatalk', ++ install_dir: libexecdir / 'netatalk-uams', + build_rpath: libdir, + install_rpath: libdir, + ) +@@ -290,7 +290,7 @@ if have_ssl + link_with: ssl_links, + name_prefix: '', + install: true, +- install_dir: libdir / 'netatalk', ++ install_dir: libexecdir / 'netatalk-uams', + build_rpath: libdir, + install_rpath: libdir, + ) +@@ -304,7 +304,7 @@ if have_ssl + name_prefix: '', + name_suffix: 'so', + install: true, +- install_dir: libdir / 'netatalk', ++ install_dir: libexecdir / 'netatalk-uams', + ) + uams_randnum = static_library( + 'uams_randnum', +@@ -314,7 +314,7 @@ if have_ssl + link_with: ssl_links, + name_prefix: '', + install: true, +- install_dir: libdir / 'netatalk', ++ install_dir: libexecdir / 'netatalk-uams', + ) + endif + endif +@@ -330,7 +330,7 @@ if enable_pgp_uam name_prefix: '', name_suffix: 'so', install: true, @@ -194,7 +247,7 @@ ) uams_pgp = static_library( -@@ -271,7 +271,7 @@ if enable_pgp_uam +@@ -340,7 +340,7 @@ if enable_pgp_uam dependencies: [crypt, ssl_deps], name_prefix: '', install: true, @@ -203,7 +256,7 @@ ) endif -@@ -287,7 +287,7 @@ if have_gssapi +@@ -356,7 +356,7 @@ if have_krb5_uam name_prefix: '', name_suffix: 'so', install: true, @@ -212,7 +265,7 @@ ) uams_gss = static_library( -@@ -298,6 +298,6 @@ if have_gssapi +@@ -367,6 +367,6 @@ if have_krb5_uam c_args: kerberos_c_args, name_prefix: '', install: true, diff --git a/net/netatalk3/files/patch-meson.build b/net/netatalk3/files/patch-meson.build index 377971ad78ed..11f251e8fb08 100644 --- a/net/netatalk3/files/patch-meson.build +++ b/net/netatalk3/files/patch-meson.build @@ -1,14 +1,14 @@ ---- meson.build.orig 2024-07-06 04:04:08 UTC +--- meson.build.orig 2024-07-18 15:25:55 UTC +++ meson.build -@@ -40,6 +40,7 @@ sbindir = prefix / get_option('sbindir') +@@ -35,6 +35,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') - pkgconfdir = prefix / get_option('sysconfdir') sbindir = prefix / get_option('sbindir') -+libexecdir = prefix / get_option('libexecdir') - - ################## - # Compiler flags # -@@ -70,7 +71,7 @@ statedir = '-D_PATH_STATEDIR="' + localstatedir + '/ne +@@ -74,7 +75,7 @@ statedir = '-D_PATH_STATEDIR="' + localstatedir + '/ne dversion = '-DVERSION="' + netatalk_version + '"' messagedir = '-DSERVERTEXT="' + localstatedir + '/netatalk/msg/"' statedir = '-D_PATH_STATEDIR="' + localstatedir + '/netatalk/"' @@ -17,15 +17,15 @@ ############ # Includes # -@@ -385,6 +386,7 @@ bdb_subdirs = [ +@@ -374,6 +375,7 @@ bdb_subdirs = [ '/usr', ] bdb_subdirs = [ -+ 'db18', ++ '%%DB_NAME%%', 'db4.6', 'db4.7', 'db4.8', -@@ -505,6 +507,11 @@ if crypt.found() +@@ -492,6 +494,11 @@ if crypt.found() if crypt.found() cdata.set('HAVE_CRYPT_H', 1) cdata.set('HAVE_LIBCRYPT', 1) @@ -37,7 +37,7 @@ endif des = cc.find_library('des', required: false) -@@ -733,12 +740,12 @@ dns_sd_libs = [] +@@ -724,12 +731,12 @@ dns_sd_libs = [] dns_sd_libs = [] @@ -52,7 +52,7 @@ if dns_sd.found() dns_sd_libs += system endif -@@ -764,6 +771,7 @@ else +@@ -755,6 +762,7 @@ else cdata.set('HAVE_MDNS', 1) freebsd_zeroconf_daemon = 'mdnsd' zeroconf_provider += 'mDNS' @@ -60,7 +60,7 @@ else have_zeroconf = avahi.found() if avahi.found() -@@ -831,19 +839,7 @@ else +@@ -822,19 +830,7 @@ else required: false, ) @@ -81,7 +81,7 @@ cdata.set('HAVE_TRACKER3', 1) cdata.set( 'TRACKER_MANAGING_COMMAND', -@@ -884,7 +880,6 @@ else +@@ -875,7 +871,6 @@ else endif endif endif @@ -89,7 +89,7 @@ have_spotlight = ( tracker_sparql.found() -@@ -893,6 +888,8 @@ have_spotlight = ( +@@ -884,6 +879,8 @@ have_spotlight = ( and flex.found() and bison.found() ) @@ -98,7 +98,7 @@ if have_spotlight cdata.set('WITH_SPOTLIGHT', 1) endif -@@ -1384,7 +1381,7 @@ if iconv_path != '' +@@ -1375,7 +1372,7 @@ if iconv_path != '' endif iconv = declare_dependency( link_args: libiconv_link_args, @@ -107,7 +107,7 @@ ) endif -@@ -1587,6 +1584,7 @@ if not enable_pam +@@ -1578,6 +1575,7 @@ if not enable_pam if not enable_pam have_pam = false @@ -115,7 +115,7 @@ else if host_os != 'sunos' pam_paths = [ -@@ -1950,6 +1948,8 @@ int deny_severity = 0; +@@ -1941,6 +1939,8 @@ int deny_severity = 0; tcpwrap_code = ''' int allow_severity = 0; int deny_severity = 0; diff --git a/net/netatalk3/pkg-plist b/net/netatalk3/pkg-plist index eacb3172d2e9..593f620f6b73 100644 --- a/net/netatalk3/pkg-plist +++ b/net/netatalk3/pkg-plist @@ -4,7 +4,6 @@ bin/afppasswd %%DBUS%%bin/afpstats bin/apple_dump bin/asip-status -bin/cnid2_create bin/dbd bin/macusers bin/netatalk-config @@ -58,6 +57,7 @@ include/atalk/volume.h lib/libatalk.a lib/libatalk.so lib/libatalk.so.18 +lib/libatalk.so.18.0.0 sbin/afpd sbin/cnid_dbd sbin/cnid_metad