diff options
Diffstat (limited to 'net/netatalk3/files')
| -rw-r--r-- | net/netatalk3/files/netatalk.in | 39 | ||||
| -rw-r--r-- | net/netatalk3/files/pam.conf | 14 | ||||
| -rw-r--r-- | net/netatalk3/files/patch-config_meson.build | 46 | ||||
| -rw-r--r-- | net/netatalk3/files/patch-etc_uams_meson.build | 138 | ||||
| -rw-r--r-- | net/netatalk3/files/patch-meson.build | 117 | 
5 files changed, 0 insertions, 354 deletions
| diff --git a/net/netatalk3/files/netatalk.in b/net/netatalk3/files/netatalk.in deleted file mode 100644 index 36a36747f34d..000000000000 --- a/net/netatalk3/files/netatalk.in +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh - -# PROVIDE: netatalk -# REQUIRE: DAEMON %%ZEROCONF%% -# KEYWORD: shutdown -# -# AFP fileserver for Mac clients.  Add the following to /etc/rc.conf to -# enable: -# -# netatalk_enable="YES" -# - -netatalk_enable=${netatalk_enable-"NO"} - -. /etc/rc.subr - -name=netatalk -rcvar=netatalk_enable - -load_rc_config ${name} - -command=%%PREFIX%%/sbin/${name} - -extra_commands="reload" -reload_cmd="netatalk_reload" - -netatalk_reload() -{ -        local status - -        if ! status=`run_rc_command status 2>&1`; then -                echo $status -                return 1 -        fi -        echo 'Reloading netatalk.' -        kill -HUP $rc_pid -} - -run_rc_command "$1" diff --git a/net/netatalk3/files/pam.conf b/net/netatalk3/files/pam.conf deleted file mode 100644 index 05120315054d..000000000000 --- a/net/netatalk3/files/pam.conf +++ /dev/null @@ -1,14 +0,0 @@ -# PAM configuration for the "netatalk" service -# - -# auth -auth		include		system - -# account -account		include		system - -# password -password	include		system - -# session -session		include		system diff --git a/net/netatalk3/files/patch-config_meson.build b/net/netatalk3/files/patch-config_meson.build deleted file mode 100644 index 16883e06495e..000000000000 --- a/net/netatalk3/files/patch-config_meson.build +++ /dev/null @@ -1,46 +0,0 @@ ---- config/meson.build.orig	2024-09-24 08:58:45 UTC -+++ config/meson.build -@@ -7,39 +7,17 @@ custom_target( - custom_target( -     'dbus_session', -     input: 'dbus-session.conf.tmpl', --    output: 'dbus-session.conf', -+    output: 'dbus-session.conf.netatalk', -     command: sed_command, -     capture: true, -     install: true, -     install_dir: pkgconfdir, - ) -  --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) --endif -+install_data(afp_conf, rename: 'afp.conf.sample', install_dir: pkgconfdir) -+install_data('extmap.conf', rename: 'extmap.conf.sample', install_dir: pkgconfdir) -  --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) -  - if ( -     fs.exists('/etc/ld.so.conf.d') diff --git a/net/netatalk3/files/patch-etc_uams_meson.build b/net/netatalk3/files/patch-etc_uams_meson.build deleted file mode 100644 index e936f29f4566..000000000000 --- a/net/netatalk3/files/patch-etc_uams_meson.build +++ /dev/null @@ -1,138 +0,0 @@ ---- etc/uams/meson.build.orig	2024-08-05 19:30:23 UTC -+++ etc/uams/meson.build -@@ -20,7 +20,7 @@ library( -     name_suffix: lib_suffix, -     override_options: 'b_lundef=false', -     install: true, --    install_dir: libdir / 'netatalk', -+    install_dir: libexecdir / 'netatalk-uams', - ) -  - uams_passwd_sources = ['uams_passwd.c'] -@@ -34,7 +34,7 @@ library( -     name_suffix: lib_suffix, -     override_options: 'b_lundef=false', -     install: true, --    install_dir: libdir / 'netatalk', -+    install_dir: libexecdir / 'netatalk-uams', - ) -  - ssl_links = [] -@@ -57,7 +57,7 @@ if have_ssl -         name_suffix: lib_suffix, -         override_options: 'b_lundef=false', -         install: true, --        install_dir: libdir / 'netatalk', -+        install_dir: libexecdir / 'netatalk-uams', -         build_rpath: rpath_libdir, -         install_rpath: rpath_libdir, -     ) -@@ -72,7 +72,7 @@ if have_ssl -         name_suffix: lib_suffix, -         override_options: 'b_lundef=false', -         install: true, --        install_dir: libdir / 'netatalk', -+        install_dir: libexecdir / 'netatalk-uams', -         build_rpath: rpath_libdir, -         install_rpath: rpath_libdir, -     ) -@@ -90,7 +90,7 @@ if have_ssl -             name_suffix: lib_suffix, -             override_options: 'b_lundef=false', -             install: true, --            install_dir: libdir / 'netatalk', -+            install_dir: libexecdir / 'netatalk-uams', -             build_rpath: rpath_libdir, -             install_rpath: rpath_libdir, -         ) -@@ -98,14 +98,14 @@ if have_ssl -         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', -         ) -     endif -@@ -123,7 +123,7 @@ if have_libgcrypt -         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'] -@@ -137,20 +137,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 -         install_symlink( -             'uams_dhx2.so', --            install_dir: libdir / 'netatalk', -+            install_dir: libexecdir / 'netatalk-uams', -             pointing_to: 'uams_dhx2_passwd.so', -         ) -     endif -@@ -168,20 +168,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', --            install_dir: libdir / 'netatalk', -+            install_dir: libexecdir / 'netatalk-uams', -             pointing_to: 'uams_pam.so', -         ) -     endif - elif build_shared_lib -     install_symlink( -         'uams_clrtxt.so', --        install_dir: libdir / 'netatalk', -+        install_dir: libexecdir / 'netatalk-uams', -         pointing_to: 'uams_passwd.so', -     ) - endif -@@ -198,7 +198,7 @@ if have_pgp_uam -         name_suffix: lib_suffix, -         override_options: 'b_lundef=false', -         install: true, --        install_dir: libdir / 'netatalk', -+        install_dir: libexecdir / 'netatalk-uams', -     ) - endif -  -@@ -215,6 +215,6 @@ if have_krb5_uam -         name_suffix: lib_suffix, -         override_options: 'b_lundef=false', -         install: true, --        install_dir: libdir / 'netatalk', -+        install_dir: libexecdir / 'netatalk-uams', -     ) - endif diff --git a/net/netatalk3/files/patch-meson.build b/net/netatalk3/files/patch-meson.build deleted file mode 100644 index 078d34e171f2..000000000000 --- a/net/netatalk3/files/patch-meson.build +++ /dev/null @@ -1,117 +0,0 @@ ---- meson.build.orig	2024-09-24 08:58:45 UTC -+++ meson.build -@@ -39,6 +39,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') - sbindir = prefix / get_option('sbindir') -@@ -78,7 +79,7 @@ statedir = '-D_PATH_STATEDIR="' + localstatedir + '/ne - dversion = '-DVERSION="' + netatalk_version + '"' - messagedir = '-DSERVERTEXT="' + localstatedir + '/netatalk/msg/"' - statedir = '-D_PATH_STATEDIR="' + localstatedir + '/netatalk/"' --uamdir = '-D_PATH_AFPDUAMPATH="' + libdir + '/netatalk/"' -+uamdir = '-D_PATH_AFPDUAMPATH="' + libexecdir + '/netatalk-uams/"' -  - ############ - # Includes # -@@ -368,6 +369,7 @@ bdb_subdirs = [ -     '/usr', - ] - bdb_subdirs = [ -+    '%%DB_NAME%%', -     'db4.6', -     'db4.7', -     'db4.8', -@@ -479,6 +481,11 @@ if crypt.found() - if crypt.found() -     cdata.set('HAVE_CRYPT_H', 1) -     cdata.set('HAVE_LIBCRYPT', 1) -+else -+    crypt = cc.find_library('crypt', has_headers: 'unistd.h', required: false) -+    if crypt.found() -+        cdata.set('HAVE_LIBCRYPT', 1) -+    endif - endif -  - des = cc.find_library('des', required: false) -@@ -704,12 +711,12 @@ dns_sd_libs = [] -  - dns_sd_libs = [] -  --dns_sd = cc.find_library('dns_sd', required: false) -+dns_sd = cc.find_library('dns_sd', dirs: libsearch_dirs, required: false) - if dns_sd.found() -     dns_sd_libs += dns_sd - endif -  --system = cc.find_library('system', required: false) -+system = cc.find_library('system', dirs: libsearch_dirs, required: false) - if dns_sd.found() -     dns_sd_libs += system - endif -@@ -726,6 +733,8 @@ have_dns = ( -     ) - ) -  -+threads = dependency('threads', required: true) -+ - if not enable_zeroconf -     have_zeroconf = false - else -@@ -735,6 +744,7 @@ else -         cdata.set('HAVE_MDNS', 1) -         freebsd_zeroconf_daemon = 'mdnsd' -         zeroconf_provider += 'mDNS' -+        dns_sd_libs += threads -     else -         have_zeroconf = avahi.found() -         if avahi.found() -@@ -802,19 +812,7 @@ else -             required: false, -         ) -  --        if tracker.found() --            cdata.set( --                'TRACKER_MANAGING_COMMAND', --                '"tracker daemon"', --            ) --            cdata.set( --                'TRACKER_PREFIX', --                '"' --                + tracker_sparql.get_variable(pkgconfig: 'prefix') --                + '"', --            ) --            tracker_manager += 'tracker' --        elif tracker3.found() -+        if tracker3.found() -             cdata.set('HAVE_TRACKER3', 1) -             cdata.set( -                 'TRACKER_MANAGING_COMMAND', -@@ -855,7 +853,6 @@ else -             endif -         endif -     endif --endif -  - have_spotlight = ( -     tracker_sparql.found() -@@ -864,6 +861,8 @@ have_spotlight = ( -     and flex.found() -     and bison.found() - ) -+endif -+ - if have_spotlight -     cdata.set('WITH_SPOTLIGHT', 1) - endif -@@ -1556,6 +1555,7 @@ if not enable_pam -  - if not enable_pam -     have_pam = false -+    pam = dependency('', required: false) - else -     if host_os != 'sunos' -         pam_paths = [ | 
