<pre style='margin:0'>
Craig Treleaven (ctreleaven) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/2369e08e454a7e64bac6a00c6ad2fe4c87d5de5c">https://github.com/macports/macports-ports/commit/2369e08e454a7e64bac6a00c6ad2fe4c87d5de5c</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 2369e08e454 prelude-manager: Use MacPorts libev and net-snmp (#22332)
</span>2369e08e454 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2369e08e454a7e64bac6a00c6ad2fe4c87d5de5c
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Tue Jan 23 07:10:42 2024 -0600
<span style='display:block; white-space:pre;color:#404040;'> prelude-manager: Use MacPorts libev and net-snmp (#22332)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes build failure on recent macOS whose net-snmp-config is broken.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/69153
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Switch pkgconfig dependency to path:-based to accommodate pkgconf.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Add libtool dependency because prelude-manager links with libltdl.dylib.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Add net-snmp dependency and --enable-snmp configure arg for clarity.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Add libev dependency and --with-libev configure arg to tell it to use
</span><span style='display:block; white-space:pre;color:#404040;'> MacPorts libev and patch Makefile.am to avoid trying to build the
</span><span style='display:block; white-space:pre;color:#404040;'> bundled libev which would fail. Add LIBEV_CFLAGS and LIBEV_LIBS
</span><span style='display:block; white-space:pre;color:#404040;'> environment variables because the configure script expects to find libev
</span><span style='display:block; white-space:pre;color:#404040;'> via pkg-config but libev doesn't provide a pkg-config file.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Remove --mandir=${prefix}/share/man configure arg; that's the default.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Add --with-libwrap=${prefix} configure arg to suppress an ld warning
</span><span style='display:block; white-space:pre;color:#404040;'> that otherwise appears due to an improperly written configure script.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Suppress warning about intentional implicit declaration of strchr.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Use destroot.keepdirs to create the turd file in ${destroot}${prefix}
</span><span style='display:block; white-space:pre;color:#404040;'> /var/spool/prelude-manager rather than doing it manually.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Co-authored-by: Craig Treleaven <ctreleaven@macports.org>
</span>---
security/prelude-manager/Portfile | 34 ++++++++++++++++++++-------
security/prelude-manager/files/no-libev.patch | 14 +++++++++++
2 files changed, 40 insertions(+), 8 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/prelude-manager/Portfile b/security/prelude-manager/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 90bd65df702..b93ab1b36e3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/prelude-manager/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/prelude-manager/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span>
name prelude-manager
version 5.2.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories security
license GPL-2+
maintainers {ctreleaven @ctreleaven} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,30 +32,48 @@ checksums md5 adfbb45ce1607ccf5607a9bd2f9aa800 \
</span> sha256 91f7f7d736f4e29a9a9a345f8eb5f7a72ee5487c3b4a0284abd2e40f58943db0 \
size 1564874
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build path:bin/pkg-config:pkgconfig
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:libprelude \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:libev \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libprelude \
</span> port:libpreludedb \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libtool \
</span> port:libxml2 \
path:lib/pkgconfig/gnutls.pc:gnutls \
port:libgeoip \
port:libmaxminddb \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:net-snmp \
</span> port:tcp_wrappers
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles no-libev.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Avoid build errors on various configurations
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# and we are patching Makefile.am.
</span> use_autoreconf yes
autoreconf.args -fvi
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.macports.org/wiki/WimplicitFunctionDeclaration#strchr
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.checks.implicit_function_declaration.whitelist-append strchr
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# prelude-manager's configure script expects to find libev via pkg-config but
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# libev does not provide a pkg-config file.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# http://lists.schmorp.de/pipermail/libev/2009q1/000572.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# http://lists.schmorp.de/pipermail/libev/2009q4/000804.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LIBEV_CFLAGS=${configure.cppflags}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LIBEV_LIBS=-lev"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args --disable-silent-rules \
--enable-libmaxminddb \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --mandir=${prefix}/share/man \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --localstatedir=${prefix}/var
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-snmp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --localstatedir=${prefix}/var \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-libev \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-libwrap=${prefix}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.keepdirs \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/var/run/prelude-manager
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.keepdirs ${destroot}${prefix}/var/spool/prelude-manager \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/var/run/prelude-manager
</span>
post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system "touch ${destroot}${prefix}/var/spool/prelude-manager/.turd"
</span> reinplace "s|= /var|= ${prefix}/var|g" ${destroot}${prefix}/etc/prelude-manager/prelude-manager.conf
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/prelude-manager/files/no-libev.patch b/security/prelude-manager/files/no-libev.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..7f87fb01677
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/prelude-manager/files/no-libev.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Do not try to build the libev subdirectory; we are using MacPorts libev.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fixes:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+make[2]: *** No rule to make target `all'. Stop.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.am.orig 2020-09-09 09:42:01.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile.am 2024-01-22 23:58:56.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ACLOCAL_AMFLAGS = -I m4 -I libmissing/m4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-SUBDIRS = docs libev libmissing m4 plugins src
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SUBDIRS = docs libmissing m4 plugins src
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EXTRA_DIST = AUTHORS COPYING HACKING.README INSTALL NEWS README \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ selinux/prelude-manager.te \
</span></pre><pre style='margin:0'>
</pre>