diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2024-06-30 05:47:23 -0400 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2024-06-30 05:47:23 -0400 |
| commit | ebcf92ebfe8276f3af04945355b5f8984b5be33e (patch) | |
| tree | 54a58320839c16e086be887fb07fd1c4fae06593 /net/netatalk3/files/patch-meson.build | |
| parent | databases/pythoncego: New port (diff) | |
net/netatalk3: Update to 3.2.1
See https://github.com/Netatalk/netatalk/releases/tag/netatalk-3-2-1 for
a list of changes in this release.
Security: CVE-2024-38439
CVE-2024-38440
CVE-2024-38441
Diffstat (limited to 'net/netatalk3/files/patch-meson.build')
| -rw-r--r-- | net/netatalk3/files/patch-meson.build | 43 |
1 files changed, 29 insertions, 14 deletions
diff --git a/net/netatalk3/files/patch-meson.build b/net/netatalk3/files/patch-meson.build index ce0550a44aab..b72a231638a8 100644 --- a/net/netatalk3/files/patch-meson.build +++ b/net/netatalk3/files/patch-meson.build @@ -1,4 +1,4 @@ ---- meson.build.orig 2024-06-01 04:56:52 UTC +--- meson.build.orig 2024-06-29 05:58:36 UTC +++ meson.build @@ -40,6 +40,7 @@ sbindir = prefix / get_option('sbindir') mandir = prefix / get_option('mandir') @@ -9,7 +9,7 @@ ################## # Compiler flags # @@ -70,7 +71,7 @@ statedir = '-D_PATH_STATEDIR="' + localstatedir + '/ne - dversion = '-DVERSION="' + version + '"' + dversion = '-DVERSION="' + netatalk_version + '"' messagedir = '-DSERVERTEXT="' + localstatedir + '/netatalk/msg/"' statedir = '-D_PATH_STATEDIR="' + localstatedir + '/netatalk/"' -uamdir = '-D_PATH_AFPDUAMPATH="' + libdir + '/netatalk/"' @@ -17,15 +17,15 @@ ############ # Includes # -@@ -367,6 +368,7 @@ bdb_subdirs = [ +@@ -385,6 +386,7 @@ bdb_subdirs = [ '/usr', ] bdb_subdirs = [ -+ '%%DB_NAME%%', ++ 'db18', 'db4.6', 'db4.7', 'db4.8', -@@ -487,6 +489,11 @@ if crypt.found() +@@ -504,6 +506,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) -@@ -763,19 +770,7 @@ else +@@ -822,19 +829,7 @@ else required: false, ) @@ -58,27 +58,42 @@ cdata.set('HAVE_TRACKER3', 1) cdata.set( 'TRACKER_MANAGING_COMMAND', -@@ -816,15 +811,16 @@ else +@@ -875,7 +870,6 @@ else endif endif endif -endif -- --have_spotlight = ( -+ have_spotlight = ( + + have_spotlight = ( tracker_sparql.found() - and tracker_ok - and talloc.found() +@@ -884,6 +878,8 @@ have_spotlight = ( and flex.found() and bison.found() ) +endif + -+ if have_spotlight cdata.set('WITH_SPOTLIGHT', 1) endif -@@ -1833,6 +1829,8 @@ int deny_severity = 0; +@@ -1370,7 +1366,7 @@ if iconv_path != '' + endif + iconv = declare_dependency( + link_args: libiconv_link_args, +- include_directories: include_directories(with_libiconv / 'include'), ++ include_directories: include_directories(iconv_path / 'include'), + ) + endif + +@@ -1683,7 +1679,7 @@ else + have_shadow = false + else + have_shadow = (cc.has_header('shadow.h')) +- if with_shadow ++ if enable_shadow + cdata.set('SHADOWPW', 1) + uams_options += ' SHADOW' + else +@@ -1926,6 +1922,8 @@ int deny_severity = 0; tcpwrap_code = ''' int allow_severity = 0; int deny_severity = 0; |