pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/net/netatalk4
Module Name: pkgsrc
Committed By: hauke
Date: Wed Mar 12 09:54:41 UTC 2025
Modified Files:
pkgsrc/net/netatalk4: Makefile PLIST distinfo options.mk
pkgsrc/net/netatalk4/patches: patch-config_meson.build
patch-meson.build
Removed Files:
pkgsrc/net/netatalk4/patches: patch-libatalk_bstring_bstrlib.c
Log Message:
net/netatalk4: Update to v4.1.2
NetBSD quota support doesn't currently work, disable it explicitly.
>From upstream's changelog <https://github.com/Netatalk/netatalk/releases>:
Netatalk 4.1.2
Add GPL v2 license grant to mysql CNID backend code by @rdmark in #1874
[4.1] webmin: Fix -router switch in Webmin atalkd module by @rdmark in #1943
[4.1] meson: Look for shared Berkeley DB library in versioned subdir too by @rdmark in #1944
[4.1] webmin: Redirect the appropriate tab when returning from actions by @rdmark in #1945
[4.1] webmin: Fix a default value helptext string by @rdmark in #1946
Netatalk 4.1.1
config: Disable default options in macipgw.conf by @rdmark in #1876
GitHub CI: Cleanup of macOS job by @rdmark in #1878
docs: Consolidate redundant CNID and encoding info by @rdmark in #1880
meson: Restore prioritized Berkeley DB detection by @rdmark in #1881
Add a security patching end-of-life policy by @rdmark in #1885
GitHub CI: Build on Ubuntu without Unicode data to avoid dirty repo by @rdmark in #1888
macipgw: Handle scenario when config file is missing by @APCCV in #1891
macipgw: Correct iniparser status check; free memory afterwards by @rdmark in #1892
GitHub CI: Bump to DragonFlyBSD vmactions runner 1.1.0 by @rdmark in #1895
Prevent illegal null pointer calls by @rdmark in #1894
Matching format specifiers in C strings by @rdmark in #1896
GitHub CI: Remove openSUSE build job by @rdmark in #1899
GitHub CI: NetBSD version agnostic PKG_PATH definition by @rdmark in #1901
macipgw: Print usage notes for the -f option by @rdmark in #1898
afpd: Log an error in dirchache when directory has invalid did by @rdmark in #1897
meson: remove hardcoded file command path. by @erichelgeson in #1907
meson: Remove libquota check that causes breakage on NetBSD by @rdmark in #1903
meson: Introduce with-bdb-include-path override option by @rdmark in #1908
Netatalk 4.1.0
testsuite: Introduce -X option for running on big-endian systems by @rdmark in #1817
GitHub CI: Use FreeBSD 14.2 vmactions runner by @rdmark in #1820
GitHub CI: Always use latest NetBSD release in runner by @rdmark in #1819
GitHub CI: Don't use absolute paths for netatalk binaries by @rdmark in #1821
Update atalkd.conf.5.xml by @thecloudexpanse in #1818
meson: Introduce with-kerberos-path option for Heimdal compatibility by @rdmark in #1822
testsuite: Cross-platform compatible file ID tests by @rdmark in #1826
GitHub CI: Bump to NetBSD 10.1 runner by @rdmark in #1827
testsuite: Don't attempt unauthorized file renaming in Error tests by @rdmark in #1828
Loosen AppleDouble checks for macOS by @NJRoadfan in #1829
meson: Remove unused linker args for bdb binaries by @rdmark in #1830
testsuite: Restore file ID checks following fix for macOS AD validation by @rdmark in #1831
testsuite: Clean up test file after execution of encoding test by @rdmark in #1832
meson: Better detection of lib paths from Homebrew build system by @rdmark in #1833
macipgw: Default port value for zip/ddp service by @APCCV in #1836
GitHub CI: Build with berkeley-db v5 on macOS by @rdmark in #1840
initscripts: Disable fork safety workaround for macOS by @rdmark in #1810
Rename apple_dump script to addump by @rdmark in #1811
webmin: Split up index page into three tabs by @rdmark in #1785
Fix reported AFP versions when AppleTalk support is disabled. by @NJRoadfan in #1846
Fix afppasswd utility by @NJRoadfan in #1845
Add native metadata storage for macOS hosts. by @NJRoadfan in #1813
docker: Bump base image to Alpine 3.21 by @rdmark in #1842
GitHub CI: Use specific pkgsrc mirror for NetBSD package by @rdmark in #1847
Remove start tracker and start dbus afp.conf options by @rdmark in #1848
Remove the ability to run AFP commands with root privileges by @rdmark in #1849
Define all lockfiles through the Meson build system by @rdmark in #1850
GitHub CI: Run zypper update before new package on openSUSE by @rdmark in #1854
Protect Netatalk metadata EA by @NJRoadfan in #1855
docs: Fixes for spelling and grammar by @EricFromCanada in #1856
launchd item: Start netatalk in non-forking mode by @EricFromCanada in #1859
meson: fix iconv detection for OpenWrt by @APCCV in #1857
docs: Clarify the behavior of the -d option for daemons by @rdmark in #1861
meson: Link papd with cups only when cups is enabled by @rdmark in #1862
Refactor retreival of native FinderInfo EA on macOS hosts. by @NJRoadfan in #1858
GitHub CI: Bump to the latest BSD vmactions runners by @rdmark in #1864
testsuite: Free memory after running tests by @rdmark in #1866
testsuite: Improve memory management in lantest by @rdmark in #1868
macipgw: Introduce a configuration file by @rdmark in #1852
GitHub CI: Run lantest and speedtest jobs by @rdmark in #1869
GitHub CI: Build with mariadb on macOS by @rdmark in #1872
libatalk: Clean up the dalloc static library by @rdmark in #1871
Resolve macOS 15 clang compiler warnings by @rdmark in #1873
Netatalk 4.0.8
meson: Allow building papd without CUPS by @rdmark in #1790
meson: Favor openldap when building on macOS by @rdmark in #1792
docs: More accurate descriptions of optional dependencies in Install chapter by @rdmark in #1798
Remove obsoleted Mac OS X Server compatibility code in module.c by @rdmark in #1794
docs: Clarify usage of D-Bus and GLib in Install chapter by @rdmark in #1799
testsuite: Retry logic for final cleanup step in test358 by @rdmark in #1797
GitHub CI: Build on Alpine Linux with localsearch/tinysparql by @rdmark in #1803
docs: Document that DocBook XSL has to be non-namespaced by @rdmark in #1804
meson: Improved libquota detection on FreeBSD and NetBSD by @rdmark in #1805
GitHub CI: Build with tracker on macOS to enable Spotlight by @rdmark in #1809
Set resource max limit to 10240 on macOS by @rdmark in #1796
meson: Refactor DocBook detection logic to stop when found by @rdmark in #1806
Netatalk 4.0.7
atalkd: Remove obsolete NO_DATA_LINK_PASSTHROUGH config flag by @rdmark in #1755
only build appletalk docs when enabled by @knight-of-ni in #1754
GitHub CI: Rename workflow from Checks to Builds by @rdmark in #1760
Remove unnecessary ifdef macro in cnid_dbd.c by @rdmark in #1758
docs: Document afppasswd -w option in the man page synopsis by @rdmark in #1757
GitHub CI: Create html manual deploy job by @rdmark in #1763
docs: Sync css styles from homepage by @rdmark in #1764
docs: Standardize formatting of all synopsis sections by @rdmark in #1765
meson: Add manual type man_only which generates only troff pages by @rdmark in #1766
docs: Refer to CONTRIBUTORS hosted on netatalk.io in man pages by @rdmark in #1767
meson: Flip order of bdb version detection, and add option hint by @rdmark in #1771
Remove bitrotted inline prototype for a libc function by @rdmark in #1769
meson: *BSD compatible libwrap check by @rdmark in #1770
GitHub CI: Build NetBSD with native mDNS Zeroconf by @rdmark in #1772
GitHub CI: Remove pkg-config override for NetBSD job by @rdmark in #1775
meson: Generate appendix doc and allow custom manual install path by @rdmark in #1783
meson: Correct capability check for SunRPC on *BSD by @rdmark in #1768
meson: Don't attempt to detect shadow password header on *BSD and macOS by @rdmark in #1778
meson: Option to specify path to perl runtime by @rdmark in #1779
meson: Configure dbus paths and config files only if dbus exists by @rdmark in #1780
meson: Don't define spooldir when building without papd by @rdmark in #1786
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/net/netatalk4/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/netatalk4/PLIST
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/netatalk4/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/netatalk4/options.mk
cvs rdiff -u -r1.1 -r1.2 \
pkgsrc/net/netatalk4/patches/patch-config_meson.build
cvs rdiff -u -r1.2 -r0 \
pkgsrc/net/netatalk4/patches/patch-libatalk_bstring_bstrlib.c
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/netatalk4/patches/patch-meson.build
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/net/netatalk4/Makefile
diff -u pkgsrc/net/netatalk4/Makefile:1.10 pkgsrc/net/netatalk4/Makefile:1.11
--- pkgsrc/net/netatalk4/Makefile:1.10 Sat Jan 25 10:28:05 2025
+++ pkgsrc/net/netatalk4/Makefile Wed Mar 12 09:54:41 2025
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.10 2025/01/25 10:28:05 riastradh Exp $
+# $NetBSD: Makefile,v 1.11 2025/03/12 09:54:41 hauke Exp $
GITHUB_PROJECT= netatalk
GITHUB_TAG= refs/tags/${DISTNAME}
-DISTNAME= netatalk-4-0-6
+DISTNAME= netatalk-4-1-2
PKGVER= ${GITHUB_TAG:C/^.+netatalk-//:C/-/./g}
PKGNAME= ${DISTNAME:C/-[0-9].*$//}-${PKGVER}
-PKGREVISION= 6
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_GITHUB:=Netatalk/}
@@ -24,6 +23,8 @@ MESON_ARGS+= -Dwith-docbook-path=${TOOL
PKG_SYSCONFSUBDIR= netatalk
+BUILD_DEFS+= VARBASE
+
EGDIR= share/examples/netatalk
CONF_FILES+= ${EGDIR}/afp.conf ${PKG_SYSCONFDIR}/afp.conf
CONF_FILES+= ${EGDIR}/extmap.conf ${PKG_SYSCONFDIR}/extmap.conf
@@ -43,8 +44,6 @@ SMF_SRCDIR= ${WRKSRC}/distrib/initscrip
SMF_METHODS= netatalk_smf
SMF_MANIFEST= netatalk.xml
-BUILD_DEFS+= VARBASE
-
.if ${OPSYS} == "NetBSD"
# See PR lib/50485
MESON_ARGS+= -Dwith-dtrace=false
@@ -65,7 +64,7 @@ SUBST_CLASSES+= perlpath
SUBST_STAGE.perlpath= pre-configure
SUBST_FILES.perlpath+= contrib/macusers/macusers.in
SUBST_FILES.perlpath+= contrib/shell_utils/afpstats.in
-SUBST_FILES.perlpath+= contrib/shell_utils/apple_dump.in
+SUBST_FILES.perlpath+= contrib/shell_utils/addump.in
SUBST_FILES.perlpath+= contrib/shell_utils/asip-status.in
SUBST_SED.perlpath= -e 's|@PERL@|${PERL5}|g'
Index: pkgsrc/net/netatalk4/PLIST
diff -u pkgsrc/net/netatalk4/PLIST:1.1 pkgsrc/net/netatalk4/PLIST:1.2
--- pkgsrc/net/netatalk4/PLIST:1.1 Thu Nov 21 15:26:08 2024
+++ pkgsrc/net/netatalk4/PLIST Wed Mar 12 09:54:41 2025
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1 2024/11/21 15:26:08 hauke Exp $
+@comment $NetBSD: PLIST,v 1.2 2025/03/12 09:54:41 hauke Exp $
${PLIST.ea}bin/ad
+bin/addump
${PLIST.appletalk}bin/aecho
${PLIST.ldap}bin/afpldaptest
bin/afppasswd
bin/afpstats
-bin/apple_dump
bin/asip-status
bin/dbd
${PLIST.appletalk}bin/getzones
@@ -34,7 +34,6 @@ include/atalk/nbp.h
include/atalk/netatalk_conf.h
include/atalk/netddp.h
include/atalk/pap.h
-include/atalk/paths.h
include/atalk/queue.h
include/atalk/rtmp.h
include/atalk/standards.h
@@ -68,6 +67,7 @@ ${PLIST.pam}lib/netatalk/uams_pam.so
lib/netatalk/uams_passwd.so
lib/netatalk/uams_randnum.so
man/man1/ad.1
+man/man1/addump.1
man/man1/aecho.1
man/man1/afp_lantest.1
man/man1/afp_logintest.1
@@ -78,7 +78,6 @@ man/man1/afpldaptest.1
man/man1/afppasswd.1
man/man1/afpstats.1
man/man1/afptest.1
-man/man1/apple_dump.1
man/man1/asip-status.1
man/man1/dbd.1
man/man1/getzones.1
@@ -96,6 +95,7 @@ man/man5/afp_signature.conf.5
man/man5/afp_voluuid.conf.5
man/man5/atalkd.conf.5
man/man5/extmap.conf.5
+man/man5/macipgw.conf.5
man/man5/papd.conf.5
man/man8/a2boot.8
man/man8/afpd.8
@@ -116,7 +116,6 @@ ${PLIST.appletalk}sbin/macipgw
sbin/netatalk
${PLIST.appletalk}sbin/papd
${PLIST.appletalk}sbin/timelord
-${PLIST.spotlight}share/dbus-1/netatalk-dbus.conf
share/doc/netatalk/CONTRIBUTORS
share/doc/netatalk/DEVELOPER
share/doc/netatalk/DOCKER.txt
@@ -127,7 +126,6 @@ share/doc/netatalk/README.txt
share/doc/netatalk/SECURITY.txt
share/examples/netatalk/afp.conf
${PLIST.appletalk}share/examples/netatalk/atalkd.conf
-${PLIST.spotlight}share/examples/netatalk/dbus-session.conf
share/examples/netatalk/extmap.conf
${PLIST.pam}share/examples/netatalk/netatalk.pam
${PLIST.appletalk}share/examples/netatalk/papd.conf
Index: pkgsrc/net/netatalk4/distinfo
diff -u pkgsrc/net/netatalk4/distinfo:1.5 pkgsrc/net/netatalk4/distinfo:1.6
--- pkgsrc/net/netatalk4/distinfo:1.5 Sun Jan 12 16:13:10 2025
+++ pkgsrc/net/netatalk4/distinfo Wed Mar 12 09:54:41 2025
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.5 2025/01/12 16:13:10 hauke Exp $
+$NetBSD: distinfo,v 1.6 2025/03/12 09:54:41 hauke Exp $
-BLAKE2s (netatalk-4-0-6.tar.gz) = 00beb8d601af7dba7f9e0c30f00c3f90fd3e786346b60997a7708674214a2df9
-SHA512 (netatalk-4-0-6.tar.gz) = d0a99bc8200d767dba8254cf21b9880267da4a18524dbbffec2049dca747f0fe3d7023d26098c5bdc1fca160d06cc019f23e9f34be9ca9f823b3071a6cc729c8
-Size (netatalk-4-0-6.tar.gz) = 1326496 bytes
-SHA1 (patch-config_meson.build) = ec5be047b65e37afc4b78f36518623169eeb0e16
+BLAKE2s (netatalk-4-1-2.tar.gz) = a0b33a04528152322b84f2e10345871f96e343d88079610cefcf1b4aef819665
+SHA512 (netatalk-4-1-2.tar.gz) = b1fde5a0b27e6e67751caf40759e8648e48f3daeb8d43041761023147dc3edac33d07f8c40ec853dffd57ec7b69ebc94c99a0d7ded72ea0ff803865e937b8aba
+Size (netatalk-4-1-2.tar.gz) = 1327961 bytes
+SHA1 (patch-config_meson.build) = 5a746388b89d094ca6847e487e6ef18d98dac0ca
SHA1 (patch-config_pam_meson.build) = f321c7bd246f1d82c287e745ea75c9561bc528a9
-SHA1 (patch-libatalk_bstring_bstrlib.c) = 8f38b0c0abea02074172b11f066f0628eb54c55c
-SHA1 (patch-meson.build) = b3836f629d44b8b63a5bc6abd4c8f23c02ff5133
+SHA1 (patch-meson.build) = 97b9dba80a438785abd04727e88c7841288b0e7d
Index: pkgsrc/net/netatalk4/options.mk
diff -u pkgsrc/net/netatalk4/options.mk:1.3 pkgsrc/net/netatalk4/options.mk:1.4
--- pkgsrc/net/netatalk4/options.mk:1.3 Sat Jan 25 10:28:05 2025
+++ pkgsrc/net/netatalk4/options.mk Wed Mar 12 09:54:41 2025
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2025/01/25 10:28:05 riastradh Exp $
+# $NetBSD: options.mk,v 1.4 2025/03/12 09:54:41 hauke Exp $
#
PKG_OPTIONS_VAR= PKG_OPTIONS.netatalk
PKG_SUPPORTED_OPTIONS= debug dnssd kerberos ldap pam
@@ -16,7 +16,7 @@ PKG_SUGGESTED_OPTIONS+= appletalk
.include "../../mk/bsd.options.mk"
-PLIST_VARS+= appletalk gssapi ldap pam spotlight
+PLIST_VARS+= appletalk gssapi ldap pam # spotlight
.if !empty(PKG_OPTIONS:Mappletalk)
# For AppleTalk pap
Index: pkgsrc/net/netatalk4/patches/patch-config_meson.build
diff -u pkgsrc/net/netatalk4/patches/patch-config_meson.build:1.1 pkgsrc/net/netatalk4/patches/patch-config_meson.build:1.2
--- pkgsrc/net/netatalk4/patches/patch-config_meson.build:1.1 Mon Dec 16 15:40:54 2024
+++ pkgsrc/net/netatalk4/patches/patch-config_meson.build Wed Mar 12 09:54:41 2025
@@ -1,10 +1,10 @@
-$NetBSD: patch-config_meson.build,v 1.1 2024/12/16 15:40:54 hauke Exp $
+$NetBSD: patch-config_meson.build,v 1.2 2025/03/12 09:54:41 hauke Exp $
Leave installation of config files to pkgsrc framework
---- config/meson.build.orig 2024-12-16 15:31:18.321903696 +0000
+--- config/meson.build.orig 2025-02-10 20:41:20.000000000 +0000
+++ config/meson.build
-@@ -10,65 +10,6 @@ dbus_session_conf = configure_file(
+@@ -4,75 +4,14 @@ afp_conf = configure_file(
configuration: cdata,
)
@@ -17,28 +17,38 @@ Leave installation of config files to pk
- install_data(afp_conf, install_dir: pkgconfdir)
-endif
-
--if (
-- fs.exists(pkgconfdir / 'dbus-session.conf')
-- and not get_option('with-overwrite')
--)
-- message('will not replace existing', pkgconfdir / 'dbus-session.conf')
--else
-- install_data(dbus_session_conf, install_dir: pkgconfdir)
--endif
+ if have_spotlight
+ dbus_session_conf = configure_file(
+ input: 'dbus-session.conf.in',
+ output: 'dbus-session.conf',
+ configuration: cdata,
+ )
-
--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)
+- if (
+- fs.exists(pkgconfdir / 'dbus-session.conf')
+- and not get_option('with-overwrite')
+- )
+- message('will not replace existing', pkgconfdir / 'dbus-session.conf')
+- else
+- install_data(dbus_session_conf, install_dir: pkgconfdir)
+- endif
+ endif
+
+-if have_afpstats
+- 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
-endif
-
-static_conf_files = ['extmap.conf']
-
-if have_appletalk
-- static_conf_files += ['atalkd.conf', 'papd.conf']
+- static_conf_files += ['atalkd.conf', 'macipgw.conf', 'papd.conf']
-endif
-
-foreach file : static_conf_files
Index: pkgsrc/net/netatalk4/patches/patch-meson.build
diff -u pkgsrc/net/netatalk4/patches/patch-meson.build:1.3 pkgsrc/net/netatalk4/patches/patch-meson.build:1.4
--- pkgsrc/net/netatalk4/patches/patch-meson.build:1.3 Sun Jan 12 16:13:10 2025
+++ pkgsrc/net/netatalk4/patches/patch-meson.build Wed Mar 12 09:54:41 2025
@@ -1,16 +1,19 @@
-$NetBSD: patch-meson.build,v 1.3 2025/01/12 16:13:10 hauke Exp $
+$NetBSD: patch-meson.build,v 1.4 2025/03/12 09:54:41 hauke Exp $
Make PREFIX path configurable.
+Quota support on NetBSD is currently broken, pull up an upstream
+change to disable it explicitly.
+
While NetBSD has libwrap, the meson code doesn't find it. The test
cond still succeeds, so add a branch that does not require the
library.
Install at.h on Linux, we do it on NetBSD, too.
---- meson.build.orig 2024-11-15 06:52:12.000000000 +0000
+--- meson.build.orig 2025-02-10 20:41:20.000000000 +0000
+++ meson.build
-@@ -169,7 +169,7 @@ elif host_os == 'netbsd'
+@@ -170,7 +170,7 @@ elif host_os == 'netbsd'
'include',
'sys',
'etc/afpd',
@@ -28,20 +31,20 @@ Install at.h on Linux, we do it on NetBS
endif
if uname.found() and uname_stdout.to_lower().contains('omnios')
-@@ -2010,7 +2010,11 @@ int main(void) {
- }
- '''
+@@ -1025,6 +1025,12 @@ endif
+
+ enable_quota = get_option('with-quota')
-- have_tcpwrap = wrap.found() and cc.links(tcpwrap_code, args: '-lwrap')
-+ # *BSD have tcpwrappers support in libc
-+ have_tcpwrap = wrap.found() and cc.links(tcpwrap_code)
-+ if not have_tcpwrap
-+ have_tcpwrap = wrap.found() and cc.links(tcpwrap_code, args: '-lwrap')
-+ endif
- if not have_tcpwrap
- have_tcpwrap = cc.links(tcpwrap_code, args: ['-lwrap', '-lnsl'])
- endif
-@@ -2077,7 +2081,6 @@ if host_os.contains('freebsd')
++if host_os == 'netbsd'
++ enable_quota = false
++ cdata.set('NO_QUOTA_SUPPORT', 1)
++ warning('quota is broken on NetBSD, see https://github.com/Netatalk/netatalk/issues/1225')
++endif
++
+ prop = cc.find_library('prop', required: false)
+ quota = cc.find_library('quota', required: false)
+ rpcsvc = cc.find_library('rpcsvc', required: false)
+@@ -2193,7 +2199,6 @@ if host_os.contains('freebsd')
cdata.set('FREEBSD', 1)
cdata.set('OPEN_NOFOLLOW_ERRNO', 'EMLINK')
elif host_os.contains('linux')
Home |
Main Index |
Thread Index |
Old Index