Attachment 255562 Details for Bug 275987 – Patch for unreal

[patch] Patch for unreal

unreal-fixup.patch (text/plain), 7.61 KB, created by Daniel Engberg on 2024-12-01 10:30:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Engberg

Created: 2024-12-01 10:30:23 UTC

Size: 7.61 KB

patch

obsolete

>diff --git a/irc/unreal/Makefile b/irc/unreal/Makefile
>index 4c890f7887f0..b181aaeccca1 100644
>--- a/irc/unreal/Makefile
>+++ b/irc/unreal/Makefile
>@@ -1,6 +1,5 @@
> PORTNAME=	unreal
>-DISTVERSION=	6.1.1.1
>-PORTREVISION=	1
>+DISTVERSION=	6.1.8.1
> CATEGORIES=	irc
> MASTER_SITES=	https://www.unrealircd.org/downloads/
> DISTNAME=	${PORTNAME}ircd-${PORTVERSION}
>@@ -20,14 +19,9 @@ LIB_DEPENDS=	libcares.so:dns/c-ares \
> 		libmaxminddb.so:net/libmaxminddb
> RUN_DEPENDS=	${LOCALBASE}/bin/geoipupdate:net/geoipupdate
> 
>-USES=		pkgconfig cpe gmake localbase ssl
>-MODULESDIR=	${PREFIX}/lib/${PORTNAME}
>-MODULESSUBDIR=	chanmodes extbans rpc usermodes
>-CONFIGDIR=	${PREFIX}/etc/${PORTNAME}
>-RUNDIR=		/var/run/ircd
>-LOGDIR=		/var/log/ircd
>-CACHEDIR=	/var/cache/ircd
>-_TMPDIR=	/tmp
>+USES=		cpe gmake localbase pkgconfig ssl
>+CPE_VENDOR=	unrealircd
>+CPE_PRODUCT=	unrealircd
> 
> EXTRACT_AFTER_ARGS=	--exclude extras/*.tar.gz
> 
>@@ -36,15 +30,21 @@ USE_RC_SUBR=	unrealircd
> 
> USERS=		ircd
> GROUPS=		ircd
>-CPE_VENDOR=	unrealircd
>-CPE_PRODUCT=	unrealircd
> 
>-SUB_LIST+=	RUNDIR=${RUNDIR}
>-SUB_LIST+=	USERS=${USERS}
>-SUB_LIST+=	GROUPS=${GROUPS}
>+MODULESDIR=	${PREFIX}/lib/${PORTNAME}
>+MODULESSUBDIR=	chanmodes extbans rpc usermodes
>+CONFIGDIR=	${PREFIX}/etc/${PORTNAME}
>+RUNDIR=		/var/run/ircd
>+LOGDIR=		/var/log/ircd
>+CACHEDIR=	/var/cache/ircd
>+_TMPDIR=	/tmp
>+
>+SUB_LIST+=	RUNDIR=${RUNDIR} \
>+		USERS=${USERS} \
>+		GROUPS=${GROUPS}
> 
> CONFIGURE_ARGS=	--with-nick-history=2000 \
>-		--with-bindir=${LOCALBASE}/bin \
>+		--with-bindir=${LOCALBASE}/libexec \
> 		--with-scriptdir=${DATADIR} \
> 		--with-confdir=${CONFIGDIR} \
> 		--with-builddir=${WRKSRC} \
>@@ -58,20 +58,23 @@ CONFIGURE_ARGS=	--with-nick-history=2000 \
> 		--with-controlfile=${RUNDIR}/ircd.ctl \
> 		--with-permissions=0600 \
> 		--with-system-cares \
>+		--with-system-argon2 \
> 		--enable-dynamic-linking \
> 		--enable-libmaxminddb=yes \
> 		--enable-ssl
> 
> OPTIONS_DEFINE=	DOCS
> 
>-PORTDOCS=	${DOCS:T}
>-DOCS=		Donation Authors coding-guidelines \
>+PORTDOCS=	*
>+DOCS=		Authors coding-guidelines \
> 		tao.of.irc translations.txt \
> 		technical/005.txt technical/base64.txt \
> 		technical/serverprotocol.txt
> 
> do-install:
>-	${INSTALL_PROGRAM} ${WRKSRC}/src/ircd ${STAGEDIR}${PREFIX}/libexec/ircd
>+	${INSTALL_PROGRAM} ${WRKSRC}/src/ircd ${STAGEDIR}${PREFIX}/libexec/unrealircd
>+	${INSTALL_PROGRAM} ${WRKSRC}/src/unrealircdctl ${STAGEDIR}${PREFIX}/libexec/unrealircdctl
>+	${INSTALL_SCRIPT} ${WRKSRC}/unrealircd ${STAGEDIR}${PREFIX}/sbin/unrealircd
> 	${MKDIR} ${STAGEDIR}${CACHEDIR}
> 	${MKDIR} ${STAGEDIR}${CONFIGDIR}
> 	${MKDIR} ${STAGEDIR}${CONFIGDIR}/aliases
>diff --git a/irc/unreal/distinfo b/irc/unreal/distinfo
>index ea31959465d2..a23f69a73a98 100644
>--- a/irc/unreal/distinfo
>+++ b/irc/unreal/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1473082474
>-SHA256 (unrealircd-6.1.1.1.tar.gz) = 0c8e4164f499f0f6a72ed6032acb034bd7e9bd10308f556a0d919a00c2eeb334
>-SIZE (unrealircd-6.1.1.1.tar.gz) = 10341432
>+TIMESTAMP = 1729629794
>+SHA256 (unrealircd-6.1.8.1.tar.gz) = f8f7a0b738614a527e2420ca3970bc735c6c5346dfa8dd9e2d5bd2eeaf992e93
>+SIZE (unrealircd-6.1.8.1.tar.gz) = 10053933
>diff --git a/irc/unreal/files/patch-doc_conf_modules.default.conf b/irc/unreal/files/patch-doc_conf_modules.default.conf
>index 86cef49700f2..5fe783aa0974 100644
>--- a/irc/unreal/files/patch-doc_conf_modules.default.conf
>+++ b/irc/unreal/files/patch-doc_conf_modules.default.conf
>@@ -1,16 +1,11 @@
>---- doc/conf/modules.default.conf.orig	2023-09-21 00:26:43 UTC
>+--- doc/conf/modules.default.conf.orig	2024-10-18 10:45:40 UTC
> +++ doc/conf/modules.default.conf
>-@@ -293,13 +293,3 @@ loadmodule "targetfloodprot"; /* set::anti-flood::targ
>- loadmodule "watch-backend"; /* used by watch and other modules */
>- loadmodule "geoip_base"; /* needed for ALL geoip functions */
>- loadmodule "websocket_common"; /* helper functions for websocket (internal) */
>--
>+@@ -299,7 +299,7 @@ loadmodule "websocket_common"; /* helper functions for
>+ loadmodule "spamreport"; /* Spam reporting to a blacklist */
>+ loadmodule "crule"; /* Rules in spamfilter::rule and deny link::rule */
>+ 
> -loadmodule "geoip_classic";
>--@if module-loaded("geoip_classic")
>--set {
>--	geoip-classic {
>--		ipv4-database "https://www.unrealircd.org/files/geo/classic/GeoIP.dat" { url-refresh 14d; }
>--		ipv6-database "https://www.unrealircd.org/files/geo/classic/GeoIPv6.dat" { url-refresh 14d; }
>--	}
>--}
>--@endif
>++# loadmodule "geoip_classic";
>+ @if module-loaded("geoip_classic")
>+ set {
>+ 	geoip-classic {
>diff --git a/irc/unreal/files/patch-doc_conf_modules.sources.list b/irc/unreal/files/patch-doc_conf_modules.sources.list
>new file mode 100644
>index 000000000000..b0c9ab9f5816
>--- /dev/null
>+++ b/irc/unreal/files/patch-doc_conf_modules.sources.list
>@@ -0,0 +1,13 @@
>+--- doc/conf/modules.sources.list.orig	2024-10-24 06:41:55 UTC
>++++ doc/conf/modules.sources.list
>+@@ -14,7 +14,9 @@
>+ # as well, then read the rules and procedure at:
>+ # https://www.unrealircd.org/docs/Rules_for_3rd_party_modules_in_unrealircd-contrib
>+ #
>+-https://modules.unrealircd.org/modules.list
>++# disable, FreeBSD ports are not allowed network activity while building
>++# (BZ 251357)
>++# https://modules.unrealircd.org/modules.list
>+ 
>+ # You can add more repositories here. However, do note that all
>+ # URLs MUST start with https://
>diff --git a/irc/unreal/files/unrealircd.in b/irc/unreal/files/unrealircd.in
>index a89a6c3c81ee..d694b7cb0606 100644
>--- a/irc/unreal/files/unrealircd.in
>+++ b/irc/unreal/files/unrealircd.in
>@@ -21,7 +21,7 @@ load_rc_config $name
> : ${unrealircd_pidfile="/var/run/ircd/ircd.pid"}
> : ${unrealircd_user="ircd"}
> 
>-command=%%PREFIX%%/libexec/ircd
>+command=%%PREFIX%%/libexec/unrealircd
> pidfile=%%RUNDIR%%/ircd.pid
> start_precmd=unreal_prestart
> 
>diff --git a/irc/unreal/pkg-plist b/irc/unreal/pkg-plist
>index dc9cd2d50550..53593b970587 100644
>--- a/irc/unreal/pkg-plist
>+++ b/irc/unreal/pkg-plist
>@@ -16,6 +16,7 @@
> %%ETCDIR%%/examples/example.conf
> %%ETCDIR%%/examples/example.es.conf
> %%ETCDIR%%/examples/example.fr.conf
>+%%ETCDIR%%/examples/example.pt.conf
> %%ETCDIR%%/examples/example.tr.conf
> %%ETCDIR%%/help/help.conf
> %%ETCDIR%%/help/help.de.conf
>@@ -32,6 +33,7 @@
> %%ETCDIR%%/modules.optional.conf
> %%ETCDIR%%/modules.sources.list
> %%ETCDIR%%/operclass.default.conf
>+%%ETCDIR%%/rpc-class.default.conf
> %%ETCDIR%%/rpc.modules.default.conf
> %%ETCDIR%%/snomasks.default.conf
> %%ETCDIR%%/spamfilter.conf
>@@ -51,6 +53,8 @@ lib/unreal/bot-tag.so
> lib/unreal/botmotd.so
> lib/unreal/cap.so
> lib/unreal/certfp.so
>+lib/unreal/central-api.so
>+lib/unreal/central-blocklist.so
> lib/unreal/chanmodes/censor.so
> lib/unreal/chanmodes/chanadmin.so
> lib/unreal/chanmodes/chanop.so
>@@ -100,6 +104,7 @@ lib/unreal/connect-flood.so
> lib/unreal/connect.so
> lib/unreal/connthrottle.so
> lib/unreal/creationtime.so
>+lib/unreal/crule.so
> lib/unreal/cycle.so
> lib/unreal/dccallow.so
> lib/unreal/dccdeny.so
>@@ -120,6 +125,8 @@ lib/unreal/extbans/realname.so
> lib/unreal/extbans/securitygroup.so
> lib/unreal/extbans/textban.so
> lib/unreal/extbans/timedban.so
>+lib/unreal/extbans/asn.so
>+lib/unreal/extbans/inherit.so
> lib/unreal/extended-monitor.so
> lib/unreal/extjwt.so
> lib/unreal/geoip-tag.so
>@@ -165,6 +172,7 @@ lib/unreal/names.so
> lib/unreal/netinfo.so
> lib/unreal/nick.so
> lib/unreal/nocodes.so
>+lib/unreal/no-implicit-names.so
> lib/unreal/oper.so
> lib/unreal/operinfo.so
> lib/unreal/opermotd.so
>@@ -208,6 +216,7 @@ lib/unreal/silence.so
> lib/unreal/sinfo.so
> lib/unreal/sjoin.so
> lib/unreal/slog.so
>+lib/unreal/spamreport.so
> lib/unreal/sqline.so
> lib/unreal/squit.so
> lib/unreal/sreply.so
>@@ -275,7 +284,9 @@ lib/unreal/whois.so
> lib/unreal/whowas.so
> lib/unreal/whowasdb.so
> lib/unreal/whox.so
>-libexec/ircd
>+libexec/unrealircd
>+libexec/unrealircdctl
>+sbin/unrealircd
> @dir /var/cache/ircd
> @dir /var/log/ircd
> @dir /var/run/ircd

Actions: View | Diff

Attachments on bug 275987: 247323 | 250663 | 251257 | 251271 | 251277 | 251357 | 254473 | 255562