summaryrefslogtreecommitdiff
path: root/net/netatalk4/files
diff options
context:
space:
mode:
Diffstat (limited to 'net/netatalk4/files')
-rw-r--r--net/netatalk4/files/patch-config_meson.build25
-rw-r--r--net/netatalk4/files/patch-etc_uams_meson.build114
-rw-r--r--net/netatalk4/files/patch-meson.build24
3 files changed, 77 insertions, 86 deletions
diff --git a/net/netatalk4/files/patch-config_meson.build b/net/netatalk4/files/patch-config_meson.build
index 63840c721ac7..9c7edeb21c48 100644
--- a/net/netatalk4/files/patch-config_meson.build
+++ b/net/netatalk4/files/patch-config_meson.build
@@ -1,13 +1,10 @@
---- config/meson.build.orig 2025-04-13 22:12:29 UTC
+--- config/meson.build.orig 2025-08-05 13:56:32 UTC
+++ config/meson.build
-@@ -4,79 +4,23 @@ afp_conf = configure_file(
+@@ -4,76 +4,23 @@ afp_conf = configure_file(
configuration: cdata,
)
--if (
-- fs.exists(pkgconfdir / 'afp.conf')
-- and not get_option('with-overwrite')
--)
+-if (fs.exists(pkgconfdir / 'afp.conf') and not get_option('with-overwrite'))
- message('will not replace existing', pkgconfdir / 'afp.conf')
-else
- install_data(afp_conf, install_dir: pkgconfdir)
@@ -38,7 +35,10 @@
- fs.exists(dbus_sysconfpath / 'netatalk-dbus.conf')
- and not get_option('with-overwrite')
- )
-- message('will not replace existing', dbus_sysconfpath / 'netatalk-dbus.conf')
+- message(
+- 'will not replace existing',
+- dbus_sysconfpath / 'netatalk-dbus.conf',
+- )
- else
- install_data('netatalk-dbus.conf', install_dir: dbus_sysconfpath)
- endif
@@ -55,7 +55,7 @@
-
-if get_option('with-cups-libdir-path') != ''
- cups_libdir = get_option('with-cups-libdir-path')
--elif host_os in ['netbsd']
+-elif host_os == 'netbsd'
- cups_libdir = '/usr/pkg/libexec'
-else
- cups_libdir = '/usr/lib'
@@ -72,10 +72,7 @@
-endif
-
-foreach file : static_conf_files
-- if (
-- fs.exists(pkgconfdir / file)
-- and not get_option('with-overwrite')
-- )
+- if (fs.exists(pkgconfdir / file) and not get_option('with-overwrite'))
- message('will not replace existing', pkgconfdir / file)
- else
- install_data(file, install_dir: pkgconfdir)
@@ -83,5 +80,5 @@
-endforeach
+install_data('extmap.conf', rename: 'extmap.conf.sample', install_dir: pkgconfdir)
- if (
- fs.exists('/etc/ld.so.conf.d')
+ if (fs.exists('/etc/ld.so.conf.d') and get_option('with-ldsoconf'))
+ configure_file(
diff --git a/net/netatalk4/files/patch-etc_uams_meson.build b/net/netatalk4/files/patch-etc_uams_meson.build
index 59fee181fb51..888f935b966b 100644
--- a/net/netatalk4/files/patch-etc_uams_meson.build
+++ b/net/netatalk4/files/patch-etc_uams_meson.build
@@ -1,6 +1,6 @@
---- etc/uams/meson.build.orig 2025-03-31 05:27:01 UTC
+--- etc/uams/meson.build.orig 2025-08-07 15:36:39 UTC
+++ etc/uams/meson.build
-@@ -25,7 +25,7 @@ library(
+@@ -24,7 +24,7 @@ library(
name_suffix: lib_suffix,
override_options: 'b_lundef=false',
install: true,
@@ -8,8 +8,8 @@
+ install_dir: libexecdir / 'netatalk-uams',
)
- uams_passwd_sources = ['uams_passwd.c']
-@@ -39,7 +39,7 @@ library(
+ library(
+@@ -36,7 +36,7 @@ library(
name_suffix: lib_suffix,
override_options: 'b_lundef=false',
install: true,
@@ -17,8 +17,35 @@
+ install_dir: libexecdir / 'netatalk-uams',
)
- if have_libgcrypt
-@@ -56,7 +56,7 @@ if have_libgcrypt
+ library(
+@@ -48,7 +48,7 @@ library(
+ name_suffix: lib_suffix,
+ override_options: 'b_lundef=false',
+ install: true,
+- install_dir: libdir / 'netatalk',
++ install_dir: libexecdir / 'netatalk-uams',
+ )
+
+ library(
+@@ -60,7 +60,7 @@ library(
+ name_suffix: lib_suffix,
+ override_options: 'b_lundef=false',
+ install: true,
+- install_dir: libdir / 'netatalk',
++ install_dir: libexecdir / 'netatalk-uams',
+ )
+
+ library(
+@@ -72,7 +72,7 @@ library(
+ name_suffix: lib_suffix,
+ override_options: 'b_lundef=false',
+ install: true,
+- install_dir: libdir / 'netatalk',
++ install_dir: libexecdir / 'netatalk-uams',
+ )
+
+ if have_pam
+@@ -85,7 +85,7 @@ if have_pam
name_suffix: lib_suffix,
override_options: 'b_lundef=false',
install: true,
@@ -27,7 +54,7 @@
)
library(
-@@ -68,7 +68,7 @@ if have_libgcrypt
+@@ -97,7 +97,7 @@ if have_pam
name_suffix: lib_suffix,
override_options: 'b_lundef=false',
install: true,
@@ -36,77 +63,32 @@
)
library(
-@@ -80,7 +80,7 @@ if have_libgcrypt
+@@ -109,40 +109,40 @@ if have_pam
name_suffix: lib_suffix,
override_options: 'b_lundef=false',
install: true,
- install_dir: libdir / 'netatalk',
+ install_dir: libexecdir / 'netatalk-uams',
)
- if have_pam
- uams_dhx2_pam_sources = ['uams_dhx2_pam.c']
-@@ -94,20 +94,20 @@ if have_libgcrypt
- name_suffix: lib_suffix,
- override_options: 'b_lundef=false',
- install: true,
-- install_dir: libdir / 'netatalk',
-+ install_dir: libexecdir / 'netatalk-uams',
- )
- if build_shared_lib
- install_symlink(
- 'uams_dhx2.so',
-- install_dir: libdir / 'netatalk',
-+ install_dir: libexecdir / 'netatalk-uams',
- pointing_to: 'uams_dhx2_pam.so',
- )
- endif
- elif build_shared_lib
+ if build_shared_lib
install_symlink(
- 'uams_dhx2.so',
-- install_dir: libdir / 'netatalk',
-+ install_dir: libexecdir / 'netatalk-uams',
- pointing_to: 'uams_dhx2_passwd.so',
- )
- endif
-@@ -123,20 +123,20 @@ if have_libgcrypt
- name_suffix: lib_suffix,
- override_options: 'b_lundef=false',
- install: true,
+ 'uams_clrtxt.so',
- install_dir: libdir / 'netatalk',
+ install_dir: libexecdir / 'netatalk-uams',
+ pointing_to: 'uams_pam.so',
)
-
- if build_shared_lib
- install_symlink(
- 'uams_dhx.so',
-- install_dir: libdir / 'netatalk',
-+ install_dir: libexecdir / 'netatalk-uams',
- pointing_to: 'uams_dhx_pam.so',
- )
- endif
- elif build_shared_lib
install_symlink(
'uams_dhx.so',
- install_dir: libdir / 'netatalk',
+ install_dir: libexecdir / 'netatalk-uams',
- pointing_to: 'uams_dhx_passwd.so',
+ pointing_to: 'uams_dhx_pam.so',
)
- endif
-@@ -155,20 +155,20 @@ if have_pam
- name_suffix: lib_suffix,
- override_options: 'b_lundef=false',
- install: true,
-- install_dir: libdir / 'netatalk',
-+ install_dir: libexecdir / 'netatalk-uams',
- )
-
- if build_shared_lib
install_symlink(
- 'uams_clrtxt.so',
+ 'uams_dhx2.so',
- install_dir: libdir / 'netatalk',
+ install_dir: libexecdir / 'netatalk-uams',
- pointing_to: 'uams_pam.so',
+ pointing_to: 'uams_dhx2_pam.so',
)
endif
elif build_shared_lib
@@ -116,8 +98,20 @@
+ install_dir: libexecdir / 'netatalk-uams',
pointing_to: 'uams_passwd.so',
)
+ install_symlink(
+ 'uams_dhx.so',
+- install_dir: libdir / 'netatalk',
++ install_dir: libexecdir / 'netatalk-uams',
+ pointing_to: 'uams_dhx_passwd.so',
+ )
+ install_symlink(
+ 'uams_dhx2.so',
+- install_dir: libdir / 'netatalk',
++ install_dir: libexecdir / 'netatalk-uams',
+ pointing_to: 'uams_dhx2_passwd.so',
+ )
endif
-@@ -186,6 +186,6 @@ if have_krb5_uam
+@@ -158,6 +158,6 @@ if have_krb5_uam
name_suffix: lib_suffix,
override_options: 'b_lundef=false',
install: true,
diff --git a/net/netatalk4/files/patch-meson.build b/net/netatalk4/files/patch-meson.build
index da36be7b9a98..971d3a2eecf1 100644
--- a/net/netatalk4/files/patch-meson.build
+++ b/net/netatalk4/files/patch-meson.build
@@ -1,4 +1,4 @@
---- meson.build.orig 2025-03-31 05:27:01 UTC
+--- meson.build.orig 2025-08-05 13:56:32 UTC
+++ meson.build
@@ -69,6 +69,7 @@ libdir = prefix / get_option('libdir')
datadir = prefix / get_option('datadir')
@@ -17,15 +17,15 @@
############
# Includes #
-@@ -394,6 +395,7 @@ bdb_subdirs = [
- endif
+@@ -408,6 +409,7 @@ if 'dbd' in get_option('with-cnid-backends')
+ endif
- bdb_subdirs = [
-+ '%%DB_NAME%%',
- 'db62',
- 'db6.2',
- 'db61',
-@@ -775,12 +777,12 @@ dns_sd_libs = []
+ bdb_subdirs = [
++ '%%DB_NAME%%',
+ 'db62',
+ 'db6.2',
+ 'db61',
+@@ -924,12 +926,12 @@ dns_sd_libs = []
dns_sd_libs = []
@@ -40,7 +40,7 @@
if dns_sd.found()
dns_sd_libs += system
endif
-@@ -794,6 +796,8 @@ have_dns = (
+@@ -943,6 +945,8 @@ have_dns = (
)
)
@@ -49,7 +49,7 @@
if enable_zeroconf
if avahi.found()
have_zeroconf = true
-@@ -807,6 +811,7 @@ if enable_zeroconf
+@@ -956,6 +960,7 @@ if enable_zeroconf
cdata.set('HAVE_MDNS', 1)
cdata.set('freebsd_zeroconf', 'mdnsd')
zeroconf_provider += 'mDNS'
@@ -57,7 +57,7 @@
endif
endif
-@@ -1535,6 +1540,7 @@ if not enable_pam
+@@ -1562,6 +1567,7 @@ if not enable_pam
if not enable_pam
have_pam = false
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-08 10:43:44 +0000