diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2024-06-17 12:48:20 -0400 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2024-06-17 12:48:20 -0400 |
| commit | a255fc39c641695d0e633a8f3b559f378d4ebeda (patch) | |
| tree | df303b9e1a97f3b829e3b4ad8ceecdebe0714ddc /net/netatalk3/files/patch-meson.build | |
| parent | security/p5-Crypt-OpenSSL-Random: update to 0.17 (diff) | |
net/netatalk3: Update to 3.2.0
See https://github.com/Netatalk/netatalk/releases/tag/netatalk-3-2-0 for
the list of changes in this release.
A big change was a move to Meson for build. This introduced some new
breakages, but I think I have fixed them. Runtime tests show
functionality is on par with 3.1.
Diffstat (limited to 'net/netatalk3/files/patch-meson.build')
| -rw-r--r-- | net/netatalk3/files/patch-meson.build | 81 |
1 files changed, 81 insertions, 0 deletions
diff --git a/net/netatalk3/files/patch-meson.build b/net/netatalk3/files/patch-meson.build new file mode 100644 index 000000000000..da457a0f49d6 --- /dev/null +++ b/net/netatalk3/files/patch-meson.build @@ -0,0 +1,81 @@ +--- meson.build.orig 2024-06-01 04:56:52 UTC ++++ meson.build +@@ -40,6 +40,7 @@ sbindir = prefix / get_option('sbindir') + 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 + dversion = '-DVERSION="' + 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 # +@@ -487,6 +488,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) +@@ -763,19 +769,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', +@@ -816,15 +810,16 @@ else + endif + endif + endif +-endif +- +-have_spotlight = ( ++ have_spotlight = ( + tracker_sparql.found() + and tracker_ok + and talloc.found() + and flex.found() + and bison.found() + ) ++endif ++ ++ + if have_spotlight + cdata.set('WITH_SPOTLIGHT', 1) + endif +@@ -1833,6 +1828,8 @@ int deny_severity = 0; + tcpwrap_code = ''' + int allow_severity = 0; + int deny_severity = 0; ++ ++int hosts_access(); + + int main(void) { + |