From nobody Mon Aug 05 19:45:16 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wd6NX55KLz5SZl8; Mon, 05 Aug 2024 19:45:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wd6NX4hWtz55nv; Mon, 5 Aug 2024 19:45:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722887116; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=70UvN42S5fh7M6G4pqiCoWLIJupPRBmh28oDRwozXo8=; b=uyLS5ym3mZJuL3HLcOtlSGXes2KuQWjupmrl+yfDIs/9pcpqPubXkvby4IgJ5zWyfFl/Zg fPm+R48xttvjHWHzHXSzns54UO3jmoHYpiH1oxJOeK3TliGxyp94MQRvQV/l9IFOBMH5R6 2SD7JuB92iiYovofuxNGU+ilgpXEzjxS4kRKcZ98TVTSS254psVIpoSDDCBYCvlBaXSjlg IyIBKiLeWvw27Y+FAg8QahoU5BpIv/JylBvrT4IBcObRbXVY1mFMaSMIm/DDl9NyV8bP0S JaA74ASnkclDm1+Rime4yRSCagY/QHkZxVkbdv2wu7S/9N9KNcPsrBJFZaFHFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722887116; a=rsa-sha256; cv=none; b=c6q8+b1XLKUkXFtx+vBplWJrToOJItKKi0OMWz2EUu1N+/CdjGawQXh7xEWZe4kBTJxzTv g4WBHDQCnJQOr4eVKYn0oUSSe9otIxmN/tvx+5SnU55dOruOZeDW0zL9JgWe9G+a8KnYcP bs/ItMIxWCXZqfHritZ+W5Z2FGqbAqjMRXeJDiC++1hN0vMhUFa4Gqyin+8mtCs0JaNwne WnmhZROJvOZ/NzgN8VyRY/Fk0qpI7IjGQc5pn3Rpxm4yuyd9XHO9zkU/eQi445gIdgg/LU rc9VRThHNrP9Smk7aMIM/qCHVT1752IEyaAzF+XYOrx45c6RsJ0qK/WFqmPzkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722887116; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=70UvN42S5fh7M6G4pqiCoWLIJupPRBmh28oDRwozXo8=; b=dcL7RNZdnElZ4ysCB3ZWerZntgENgQdE6zWVDQ+/UKXTVrHTETc+DjpsIL0Mx0eyHOQyJ0 5Q6d3QrZ2oC3Jj6iunieCepkyfOVqayA8cPJBs/Bz/Nzp4V9Nyp8Xl0EH80i9seNZjzYSk /LuU7QGj1FgUgnZ+SxeqZgjrZifl1oaUBiqU5RyAVEQTsw6CugsL7vNdhqP74smW6QP/3t a7WWdErDr5NB/UVHWoXLIeBXIL9jR/nG/DpTXVZFbliTwIZQpbzaJu05kVdmNwzvJ98bV4 cIqBVuVDWcZMLg/76XqNeRH7cDYRrtf5/aAGGZN2VMkMdHvygsJW3Bg3EwyzIw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Wd6NX4BlWzc9L; Mon, 5 Aug 2024 19:45:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 475JjGgu055283; Mon, 5 Aug 2024 19:45:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 475JjGuk055280; Mon, 5 Aug 2024 19:45:16 GMT (envelope-from git) Date: Mon, 5 Aug 2024 19:45:16 GMT Message-Id: <202408051945.475JjGuk055280@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Joe Marcus Clarke Subject: git: 58493c5f3e14 - main - net/netatalk3: Update to 3.2.5 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marcus X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 58493c5f3e14aec5dbe852cfcb3d84f2504eee69 Auto-Submitted: auto-generated The branch main has been updated by marcus: URL: https://cgit.FreeBSD.org/ports/commit/?id=58493c5f3e14aec5dbe852cfcb3d84f2504eee69 commit 58493c5f3e14aec5dbe852cfcb3d84f2504eee69 Author: Joe Marcus Clarke AuthorDate: 2024-08-05 19:44:23 +0000 Commit: Joe Marcus Clarke CommitDate: 2024-08-05 19:44:23 +0000 net/netatalk3: Update to 3.2.5 See https://github.com/Netatalk/netatalk/releases/tag/netatalk-3-2-5 for a list of changes in this release. --- net/netatalk3/Makefile | 5 +- net/netatalk3/distinfo | 6 +- net/netatalk3/files/patch-etc_uams_meson.build | 275 +++++++------------------ net/netatalk3/files/patch-meson.build | 44 ++-- 4 files changed, 97 insertions(+), 233 deletions(-) diff --git a/net/netatalk3/Makefile b/net/netatalk3/Makefile index 42023fdcfb2b..750911d14585 100644 --- a/net/netatalk3/Makefile +++ b/net/netatalk3/Makefile @@ -1,5 +1,5 @@ PORTNAME= netatalk -PORTVERSION= 3.2.4 +PORTVERSION= 3.2.5 PORTEPOCH= 1 CATEGORIES= net MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/netatalk-${PORTVERSION:S/./-/g}/ @@ -28,6 +28,7 @@ MESON_ARGS= -Dwith-libgcrypt-path=${LOCALBASE} \ -Dpkg_config_path=${LOCALBASE}/libdata/pkgconfig \ -Dwith-shadow=false \ -Dwith-pgp-uam=false \ + -Ddefault_library=both \ --localstatedir=/var \ --infodir=${PREFIX}/share/info @@ -68,7 +69,7 @@ DBUS_MESON_ON= -Dwith-dbus-daemon-path=${LOCALBASE}/bin/dbus-daemon \ -Dwith-dbus-sysconf-path=${LOCALBASE}/etc/dbus-1/system.d DBUS_MESON_OFF= -Dwith-afpstats=false MYSQL_USES= mysql -MYSQL_MESON_OFF=-Dwith-mysql-config=/nonexistent +MYSQL_MESON_ON=-Dwith-cnid-mysql-backend=true ACL_LIB_DEPENDS= libsunacl.so:sysutils/libsunacl ACL_MESON_OFF=-Dwith-acls=false LIBWRAP_MESON_OFF=-Dwith-tcp-wrappers=false diff --git a/net/netatalk3/distinfo b/net/netatalk3/distinfo index 97983a781fc2..5754043d372a 100644 --- a/net/netatalk3/distinfo +++ b/net/netatalk3/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1722343946 -SHA256 (netatalk-3.2.4.tar.xz) = 966fe021a641fa628fdda3c908dcba8399e3c07c54b743339fff1645d92850b0 -SIZE (netatalk-3.2.4.tar.xz) = 1904376 +TIMESTAMP = 1722886168 +SHA256 (netatalk-3.2.5.tar.xz) = 57de9a7ed411029d6176e429a14ef314460251d8aebe7139aeadc35633d9584b +SIZE (netatalk-3.2.5.tar.xz) = 1906256 diff --git a/net/netatalk3/files/patch-etc_uams_meson.build b/net/netatalk3/files/patch-etc_uams_meson.build index a171dbf1684a..e936f29f4566 100644 --- a/net/netatalk3/files/patch-etc_uams_meson.build +++ b/net/netatalk3/files/patch-etc_uams_meson.build @@ -1,120 +1,60 @@ ---- etc/uams/meson.build.orig 2024-07-18 15:25:55 UTC +--- etc/uams/meson.build.orig 2024-08-05 19:30:23 UTC +++ etc/uams/meson.build -@@ -7,7 +7,7 @@ uams_guest = shared_module( - name_prefix: '', - name_suffix: 'so', - install: true, -- install_dir: libdir / 'netatalk', -+ install_dir: libexecdir / 'netatalk-uams', - ) - - uams_guest = static_library( -@@ -16,7 +16,7 @@ uams_guest = static_library( - include_directories: root_includes, - name_prefix: '', +@@ -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'] -@@ -29,7 +29,7 @@ uams_passwd = shared_module( - name_prefix: '', - name_suffix: 'so', - install: true, -- install_dir: libdir / 'netatalk', -+ install_dir: libexecdir / 'netatalk-uams', - ) - - uams_passwd = static_library( -@@ -39,7 +39,7 @@ uams_passwd = static_library( - dependencies: [crypt], - name_prefix: '', +@@ -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 = [] -@@ -61,7 +61,7 @@ if have_ssl - name_prefix: '', - name_suffix: 'so', - install: true, -- install_dir: libdir / 'netatalk', -+ install_dir: libexecdir / 'netatalk-uams', - build_rpath: libdir, - install_rpath: libdir, - ) -@@ -73,7 +73,7 @@ if have_ssl - link_with: ssl_links, - name_prefix: '', - install: true, -- install_dir: libdir / 'netatalk', -+ install_dir: libexecdir / 'netatalk-uams', - build_rpath: libdir, - install_rpath: libdir, - ) -@@ -87,7 +87,7 @@ if have_ssl - name_prefix: '', - name_suffix: 'so', - install: true, -- install_dir: libdir / 'netatalk', -+ install_dir: libexecdir / 'netatalk-uams', - ) - uams_dhx_passwd = static_library( - 'uams_dhx_passwd', -@@ -97,7 +97,7 @@ if have_ssl - link_with: ssl_links, - name_prefix: '', +@@ -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, ) - endif - if have_pam -@@ -113,7 +113,7 @@ if have_ssl - name_prefix: '', - name_suffix: 'so', - install: true, -- install_dir: libdir / 'netatalk', -+ install_dir: libexecdir / 'netatalk-uams', - build_rpath: libdir, - install_rpath: libdir, - ) -@@ -125,7 +125,7 @@ if have_ssl - link_with: ssl_links, - name_prefix: '', - install: true, -- install_dir: libdir / 'netatalk', -+ install_dir: libexecdir / 'netatalk-uams', - build_rpath: libdir, - install_rpath: libdir, - ) -@@ -139,7 +139,7 @@ if have_ssl - name_prefix: '', - name_suffix: 'so', - install: true, -- install_dir: libdir / 'netatalk', -+ install_dir: libexecdir / 'netatalk-uams', - ) - uams_dhx_pam = static_library( - 'uams_dhx_pam', -@@ -149,19 +149,19 @@ if have_ssl - link_with: ssl_links, - name_prefix: '', - install: true, +@@ -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 - - install_symlink( - 'uams_dhx.so', -- install_dir: libdir / 'netatalk', -+ install_dir: libexecdir / 'netatalk-uams', - pointing_to: 'uams_dhx_pam.so', - ) - else + elif build_shared_lib install_symlink( 'uams_dhx.so', - install_dir: libdir / 'netatalk', @@ -122,48 +62,32 @@ pointing_to: 'uams_dhx_passwd.so', ) endif -@@ -178,7 +178,7 @@ if have_libgcrypt - name_prefix: '', - name_suffix: 'so', - install: true, -- install_dir: libdir / 'netatalk', -+ install_dir: libexecdir / 'netatalk-uams', - ) - - uams_dhx2_passwd = static_library( -@@ -188,7 +188,7 @@ if have_libgcrypt - dependencies: [crypt, libgcrypt], - name_prefix: '', +@@ -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'] -@@ -201,7 +201,7 @@ if have_libgcrypt - name_prefix: '', - name_suffix: 'so', +@@ -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', ) - uams_dhx2_pam = static_library( -@@ -211,18 +211,18 @@ if have_libgcrypt - dependencies: [pam, libgcrypt], - name_prefix: '', - install: true, -- install_dir: libdir / 'netatalk', -+ install_dir: libexecdir / 'netatalk-uams', - ) - - install_symlink( - 'uams_dhx2.so', -- install_dir: libdir / 'netatalk', -+ install_dir: libexecdir / 'netatalk-uams', - pointing_to: 'uams_dhx2_pam.so', - ) - else + 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', @@ -171,103 +95,42 @@ pointing_to: 'uams_dhx2_passwd.so', ) endif -@@ -239,7 +239,7 @@ if have_pam - name_prefix: '', - name_suffix: 'so', +@@ -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', ) - uams_pam = static_library( -@@ -249,18 +249,18 @@ if have_pam - dependencies: pam, - name_prefix: '', - install: true, -- install_dir: libdir / 'netatalk', -+ install_dir: libexecdir / 'netatalk-uams', - ) - - install_symlink( - 'uams_clrtxt.so', -- install_dir: libdir / 'netatalk', -+ install_dir: libexecdir / 'netatalk-uams', - pointing_to: 'uams_pam.so', - ) - else - install_symlink( - 'uams_clrtxt.so', -- install_dir: libdir / 'netatalk', -+ install_dir: libexecdir / 'netatalk-uams', - pointing_to: 'uams_passwd.so', - ) - endif -@@ -278,7 +278,7 @@ if have_ssl - name_prefix: '', - name_suffix: 'so', - install: true, -- install_dir: libdir / 'netatalk', -+ install_dir: libexecdir / 'netatalk-uams', - build_rpath: libdir, - install_rpath: libdir, - ) -@@ -290,7 +290,7 @@ if have_ssl - link_with: ssl_links, - name_prefix: '', - install: true, -- install_dir: libdir / 'netatalk', -+ install_dir: libexecdir / 'netatalk-uams', - build_rpath: libdir, - install_rpath: libdir, - ) -@@ -304,7 +304,7 @@ if have_ssl - name_prefix: '', - name_suffix: 'so', - install: true, -- install_dir: libdir / 'netatalk', -+ install_dir: libexecdir / 'netatalk-uams', - ) - uams_randnum = static_library( - 'uams_randnum', -@@ -314,7 +314,7 @@ if have_ssl - link_with: ssl_links, - name_prefix: '', - install: true, + if build_shared_lib + install_symlink( + 'uams_clrtxt.so', - install_dir: libdir / 'netatalk', + install_dir: libexecdir / 'netatalk-uams', + pointing_to: 'uams_pam.so', ) endif - endif -@@ -330,7 +330,7 @@ if enable_pgp_uam - name_prefix: '', - name_suffix: 'so', - install: true, -- install_dir: libdir / 'netatalk', -+ install_dir: libexecdir / 'netatalk-uams', - ) - - uams_pgp = static_library( -@@ -340,7 +340,7 @@ if enable_pgp_uam - dependencies: [crypt, ssl_deps], - name_prefix: '', - install: true, + elif build_shared_lib + install_symlink( + 'uams_clrtxt.so', - install_dir: libdir / 'netatalk', + install_dir: libexecdir / 'netatalk-uams', + pointing_to: 'uams_passwd.so', ) endif - -@@ -356,7 +356,7 @@ if have_krb5_uam - name_prefix: '', - name_suffix: 'so', +@@ -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 - uams_gss = static_library( -@@ -367,6 +367,6 @@ if have_krb5_uam - c_args: kerberos_c_args, - name_prefix: '', +@@ -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', diff --git a/net/netatalk3/files/patch-meson.build b/net/netatalk3/files/patch-meson.build index 11f251e8fb08..0c04a21feaa1 100644 --- a/net/netatalk3/files/patch-meson.build +++ b/net/netatalk3/files/patch-meson.build @@ -1,6 +1,6 @@ ---- meson.build.orig 2024-07-18 15:25:55 UTC +--- meson.build.orig 2024-08-01 10:16:47 UTC +++ meson.build -@@ -35,6 +35,7 @@ libdir = prefix / get_option('libdir') +@@ -39,6 +39,7 @@ libdir = prefix / get_option('libdir') datadir = prefix / get_option('datadir') includedir = prefix / get_option('includedir') libdir = prefix / get_option('libdir') @@ -8,7 +8,7 @@ localstatedir = prefix / get_option('localstatedir') mandir = prefix / get_option('mandir') sbindir = prefix / get_option('sbindir') -@@ -74,7 +75,7 @@ statedir = '-D_PATH_STATEDIR="' + localstatedir + '/ne +@@ -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/"' @@ -17,15 +17,15 @@ ############ # Includes # -@@ -374,6 +375,7 @@ bdb_subdirs = [ +@@ -380,6 +381,7 @@ bdb_subdirs = [ '/usr', ] bdb_subdirs = [ -+ '%%DB_NAME%%', ++ 'db18', 'db4.6', 'db4.7', 'db4.8', -@@ -492,6 +494,11 @@ if crypt.found() +@@ -499,6 +501,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) -@@ -724,12 +731,12 @@ dns_sd_libs = [] +@@ -731,12 +738,12 @@ dns_sd_libs = [] dns_sd_libs = [] @@ -52,7 +52,16 @@ if dns_sd.found() dns_sd_libs += system endif -@@ -755,6 +762,7 @@ else +@@ -753,6 +760,8 @@ have_dns = ( + ) + ) + ++threads = dependency('threads', required: true) ++ + if not enable_zeroconf + have_zeroconf = false + else +@@ -762,6 +771,7 @@ else cdata.set('HAVE_MDNS', 1) freebsd_zeroconf_daemon = 'mdnsd' zeroconf_provider += 'mDNS' @@ -60,7 +69,7 @@ else have_zeroconf = avahi.found() if avahi.found() -@@ -822,19 +830,7 @@ else +@@ -829,19 +839,7 @@ else required: false, ) @@ -81,7 +90,7 @@ cdata.set('HAVE_TRACKER3', 1) cdata.set( 'TRACKER_MANAGING_COMMAND', -@@ -875,7 +871,6 @@ else +@@ -882,7 +880,6 @@ else endif endif endif @@ -89,7 +98,7 @@ have_spotlight = ( tracker_sparql.found() -@@ -884,6 +879,8 @@ have_spotlight = ( +@@ -891,6 +888,8 @@ have_spotlight = ( and flex.found() and bison.found() ) @@ -98,16 +107,7 @@ if have_spotlight cdata.set('WITH_SPOTLIGHT', 1) endif -@@ -1375,7 +1372,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 - -@@ -1578,6 +1575,7 @@ if not enable_pam +@@ -1592,6 +1591,7 @@ if not enable_pam if not enable_pam have_pam = false @@ -115,7 +115,7 @@ else if host_os != 'sunos' pam_paths = [ -@@ -1941,6 +1939,8 @@ int deny_severity = 0; +@@ -1955,6 +1955,8 @@ int deny_severity = 0; tcpwrap_code = ''' int allow_severity = 0; int deny_severity = 0;