<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c7f06016fa06224c70ad49ad330bdcc66a9b13f4">https://github.com/macports/macports-ports/commit/c7f06016fa06224c70ad49ad330bdcc66a9b13f4</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 c7f06016fa0 bahamut: Update to 2.2.2
</span>c7f06016fa0 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c7f06016fa06224c70ad49ad330bdcc66a9b13f4
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Jul 6 23:31:30 2023 -0500
<span style='display:block; white-space:pre;color:#404040;'> bahamut: Update to 2.2.2
</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/43330
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/58964
</span>---
irc/bahamut/Portfile | 106 ++++++++++++++++++++++++-------
irc/bahamut/files/externs.patch | 22 +++++++
irc/bahamut/files/implicit.patch | 21 ++++++
irc/bahamut/files/make-cert.patch | 13 ++++
irc/bahamut/files/patch-CPPFLAGS.diff | 10 ++-
irc/bahamut/files/patch-src-m_who.c.diff | 11 ----
irc/bahamut/files/patch-support.c.diff | 18 ------
7 files changed, 145 insertions(+), 56 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/irc/bahamut/Portfile b/irc/bahamut/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 91bfeeb7d68..f19df0d46dd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/irc/bahamut/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/irc/bahamut/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,52 +1,110 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup DALnet bahamut 2.2.2 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 22c5022130dbdb3fe5671891c4855916c5dacb13 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 825a5fb8b6ceefbada76ad9f9c66d6aa44f8432304a647467a1294088e284f63 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 809222
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name bahamut
</span> conflicts expect whois
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.0.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers ryandesign openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {ryandesign @ryandesign} openmaintainer
</span> categories irc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> license GPL
description Bahamut is an Internet Relay Chat Daemon (IRCd) designed for DALnet.
long_description ${description}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://www.dal.net/?page=Bahamut
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites http://code.dal.net/release/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 4280b8229a99d56e1334e6fc68023661a2a35ad5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 4c085425c31c48b241b63a85bc693510732051b79636b341cdc4f1ee534dc4b8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from releases
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib path:lib/libssl.dylib:openssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib path:lib/libssl.dylib:openssl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib
</span>
patchfiles patch-CPPFLAGS.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-support.c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ externs.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ implicit.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ make-cert.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Use real system headers not bundled macOS-incompatible copies.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://github.com/DALnet/bahamut/issues/230
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set regexps [list]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set headers [list arpa/inet.h arpa/nameser.h resolv.h sys/cdefs.h sys/queue.h]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach header ${headers} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set headertail [file tail ${header}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${worksrcpath}/include/${headertail}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -q "s| \.\./include/${headertail}||" ${worksrcpath}/src/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend regexps "s|^\[\[:space:\]\]*#include\[\[:space:\]\]*\"${headertail}\"|#include <${header}>|"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set sources [glob ${worksrcpath}/include/*.h ${worksrcpath}/src/*.c]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E -q -locale C [join ${regexps} {;}] {*}${sources}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Undefined symbols:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# "_first_visible_channel", referenced from:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# _m_who in m_who.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-src-m_who.c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# The code uses the HEADER struct and maybe other old stuff.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/DALnet/bahamut/issues/230
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cppflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBIND_8_COMPAT
</span>
configure.args --enable-openssl=${prefix}
configure.universal_args-delete --disable-dependency-tracking
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set bins [list tools/mkpasswd]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set sbins [list src/ircd]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set confs [list ircd.motd ircd.smotd make-cert.cnf opers.txt reference.conf template.conf]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set bindir ${prefix}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set sbindir ${prefix}/sbin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set confdir ${prefix}/etc/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # make exits with 0 status even if build failed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://github.com/DALnet/bahamut/issues/221
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach f [list {*}${bins} {*}${sbins}] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![file exists ${worksrcpath}/${f}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "${f} did not get built"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Doesn't support DESTDIR.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/DALnet/bahamut/issues/231
</span> destroot.destdir INSTALL_DIR=${destroot}${prefix}
post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach f {ircd mkpasswd make-cert.sh} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${destroot}${prefix}/${f} ${destroot}${prefix}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Everything gets installed into the same directory.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://github.com/DALnet/bahamut/issues/234
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach f [list {*}${bins} make-cert.sh] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${destroot}${prefix}/[file tail ${f}] ${destroot}${bindir}
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach f {ircd.motd make-cert.cnf opers.txt reference.conf template.conf} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${destroot}${prefix}/${f} ${destroot}${prefix}/etc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach f ${sbins} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${destroot}${prefix}/[file tail ${f}] ${destroot}${sbindir}
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|${destroot}${prefix}|${prefix}/etc|g" ${destroot}${prefix}/bin/make-cert.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${destroot}${confdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach f ${confs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${destroot}${prefix}/${f} ${destroot}${confdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|${destroot}${prefix}|${confdir}|g" ${destroot}${prefix}/bin/make-cert.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Fix detection of res_mkquery: it *is* in libresolv on macOS.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://github.com/DALnet/bahamut/issues/229
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_cv_lib_resolv_res_mkquery=yes
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url [lindex ${master_sites} 0]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex ${name}-(\[0-9.\]+)${extract.suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+startupitem.create yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+startupitem.executable ${sbindir}/ircd -t -f ${confdir}/ircd.conf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+startupitem.pidfile clean ${confdir}/ircd.pid
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+notes "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+To configure ${name}, copy ${confdir}/template.conf to ${confdir}/ircd.conf and make changes.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+To create the certificate, run:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sudo ${bindir}/make-cert.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/irc/bahamut/files/externs.patch b/irc/bahamut/files/externs.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..c563d7f8be9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/irc/bahamut/files/externs.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Remove conflicting definitions of system functions and variables. The system
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+headers already provide the correct ones.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/DALnet/bahamut/issues/230
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/res.c.orig 2022-08-16 10:40:51.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/res.c 2023-07-06 14:50:35.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -58,15 +58,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define RES_HOSTLEN 127 /* big enough to handle addresses in in6.arpa */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern int dn_expand(char *, char *, char *, char *, int);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern int dn_skipname(char *, char *);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-res_mkquery(int, char *, int, int, char *, int,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- struct rrec *, char *, int);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef AIX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern int errno, h_errno;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int highest_fd;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern aClient *local[];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/irc/bahamut/files/implicit.patch b/irc/bahamut/files/implicit.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..03f6f6b343c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/irc/bahamut/files/implicit.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: type specifier missing, defaults to 'int'; ISO C99 and later do not support implicit int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: call to undeclared library function 'exit' with type 'void (int) __attribute__((noreturn))'; ISO C99 and later do not support implicit function declarations
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/DALnet/bahamut/pull/220
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2022-08-16 10:42:18.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2023-07-03 08:48:13.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5548,10 +5548,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/types.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <errno.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-main()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int main()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *s = sys_errlist[0];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- exit(0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _ACEOF
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/irc/bahamut/files/make-cert.patch b/irc/bahamut/files/make-cert.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e5327d9627e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/irc/bahamut/files/make-cert.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Look for make-cert.cnf in $DPATH, and exit if an error occurred.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/DALnet/bahamut/issues/232
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tools/make-cert.tmpl.orig 2022-08-16 10:40:51.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tools/make-cert.tmpl 2023-07-06 21:31:15.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -26,6 +26,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exit 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-openssl req -new -x509 -days 1825 -nodes -config make-cert.cnf -out "$DPATH/ircd.crt" -keyout "$DPATH/ircd.key" $RANDCMD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++openssl req -new -x509 -days 1825 -nodes -config "$DPATH/make-cert.cnf" -out "$DPATH/ircd.crt" -keyout "$DPATH/ircd.key" $RANDCMD || exit $?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ openssl x509 -subject -dates -fingerprint -noout -in "$DPATH/ircd.crt"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/irc/bahamut/files/patch-CPPFLAGS.diff b/irc/bahamut/files/patch-CPPFLAGS.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index b564fc2280c..13ccd250a1e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/irc/bahamut/files/patch-CPPFLAGS.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/irc/bahamut/files/patch-CPPFLAGS.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,9 +1,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Makefile.in.orig 2012-11-25 16:51:16.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Makefile.in 2012-11-27 18:43:29.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Add the project's own -I flags before those that might be in $CPPFLAGS.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fixes build failure when nds2-client is installed, for example.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/DALnet/bahamut/pull/223
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Makefile.in.orig 2022-08-16 10:40:51.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Makefile.in 2023-07-03 07:46:47.000000000 -0500
</span> @@ -8,7 +8,7 @@
INSTALL_BIN=@INSTALL_PROGRAM@
INSTALL_DIR=@INSTALL_DIR@
<span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS=@CFLAGS@ -fno-strict-aliasing
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS=@CFLAGS@
</span> -CPPFLAGS=@CPPFLAGS@ -I../include
+CPPFLAGS=-I../include @CPPFLAGS@
LDFLAGS=@LDFLAGS@
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/irc/bahamut/files/patch-src-m_who.c.diff b/irc/bahamut/files/patch-src-m_who.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0ae3e55cd21..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/irc/bahamut/files/patch-src-m_who.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/m_who.c.orig 2012-11-27 19:53:36.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/m_who.c 2012-11-27 19:53:47.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -642,7 +642,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--inline char *first_visible_channel(aClient *cptr, aClient *sptr)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static inline char *first_visible_channel(aClient *cptr, aClient *sptr)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Link *lp;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int secret = 0;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/irc/bahamut/files/patch-support.c.diff b/irc/bahamut/files/patch-support.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0cf1b75b48a..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/irc/bahamut/files/patch-support.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/support.c.orig 2013-02-07 12:35:15.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/support.c 2013-02-08 00:45:40.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -34,7 +34,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern void outofmemory();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if !defined( HAVE_STRTOKEN )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * * strtoken.c -- walk through a string of tokens, using a set
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * of separators
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -70,7 +69,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *save = pos;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return (tmp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* !HAVE_STRTOKEN */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if !defined( HAVE_STRTOK )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* NOT encouraged to use! */
</span></pre><pre style='margin:0'>
</pre>