Attachment 251357 Details for Bug 275987 – Patch for updating UnrealIRCD 6.1.5

[patch] Patch for updating UnrealIRCD 6.1.5

unreal.patch (text/plain), 7.91 KB, created by tanawts on 2024-06-10 14:52:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tanawts

Created: 2024-06-10 14:52:59 UTC

Size: 7.91 KB

patch

obsolete

>From 13921b48dad24a31e45bd16eba320bdff06637d6 Mon Sep 17 00:00:00 2001
>From: JR Aquino
> <root@Poudriere.odq3au12hjsepmdgmqfzke0rda.bx.internal.cloudapp.net>
>Date: Mon, 10 Jun 2024 14:50:50 +0000
>Subject: [PATCH] Patch for updating UnrealIRCD 6.1.5
>
>---
> irc/unreal/Makefile                           |  7 +--
> irc/unreal/distinfo                           |  6 +--
> irc/unreal/files/patch-configure              | 46 +++++++++++++++++++
> .../files/patch-doc_conf_modules.default.conf | 13 +++---
> .../files/patch-doc_conf_modules.sources.list | 11 +++++
> irc/unreal/pkg-plist                          |  6 +++
> 6 files changed, 74 insertions(+), 15 deletions(-)
> create mode 100644 irc/unreal/files/patch-configure
> create mode 100644 irc/unreal/files/patch-doc_conf_modules.sources.list
>
>diff --git a/irc/unreal/Makefile b/irc/unreal/Makefile
>index 4c890f7887f0..afb123c98bd2 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.5
> CATEGORIES=	irc
> MASTER_SITES=	https://www.unrealircd.org/downloads/
> DISTNAME=	${PORTNAME}ircd-${PORTVERSION}
>@@ -29,8 +28,6 @@ LOGDIR=		/var/log/ircd
> CACHEDIR=	/var/cache/ircd
> _TMPDIR=	/tmp
> 
>-EXTRACT_AFTER_ARGS=	--exclude extras/*.tar.gz
>-
> HAS_CONFIGURE=	yes
> USE_RC_SUBR=	unrealircd
> 
>@@ -64,7 +61,7 @@ CONFIGURE_ARGS=	--with-nick-history=2000 \
> 
> OPTIONS_DEFINE=	DOCS
> 
>-PORTDOCS=	${DOCS:T}
>+PORTDOCS=	*
> DOCS=		Donation Authors coding-guidelines \
> 		tao.of.irc translations.txt \
> 		technical/005.txt technical/base64.txt \
>diff --git a/irc/unreal/distinfo b/irc/unreal/distinfo
>index ea31959465d2..6551c1e74f59 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 = 1715731712
>+SHA256 (unrealircd-6.1.5.tar.gz) = 38baea9335395b12fc63673226f8b19203d25b6284de8894c3993d5c9ecf6ee8
>+SIZE (unrealircd-6.1.5.tar.gz) = 10400736
>diff --git a/irc/unreal/files/patch-configure b/irc/unreal/files/patch-configure
>new file mode 100644
>index 000000000000..023c8a52e168
>--- /dev/null
>+++ b/irc/unreal/files/patch-configure
>@@ -0,0 +1,46 @@
>+--- configure.orig	2024-05-15 00:26:08 UTC
>++++ configure
>+@@ -8159,12 +8159,12 @@ if test -n "$ARGON2_CFLAGS"; then
>+     pkg_cv_ARGON2_CFLAGS="$ARGON2_CFLAGS"
>+  elif test -n "$PKG_CONFIG"; then
>+     if test -n "$PKG_CONFIG" && \
>+-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libargon2 >= 0~20161029\""; } >&5
>+-  ($PKG_CONFIG --exists --print-errors "libargon2 >= 0~20161029") 2>&5
>++    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libargon2 >= 20161029\""; } >&5
>++  ($PKG_CONFIG --exists --print-errors "libargon2 >= 20161029") 2>&5
>+   ac_status=$?
>+   printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
>+   test $ac_status = 0; }; then
>+-  pkg_cv_ARGON2_CFLAGS=`$PKG_CONFIG --cflags "libargon2 >= 0~20161029" 2>/dev/null`
>++  pkg_cv_ARGON2_CFLAGS=`$PKG_CONFIG --cflags "libargon2 >= 20161029" 2>/dev/null`
>+ 		      test "x$?" != "x0" && pkg_failed=yes
>+ else
>+   pkg_failed=yes
>+@@ -8176,12 +8176,12 @@ if test -n "$ARGON2_LIBS"; then
>+     pkg_cv_ARGON2_LIBS="$ARGON2_LIBS"
>+  elif test -n "$PKG_CONFIG"; then
>+     if test -n "$PKG_CONFIG" && \
>+-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libargon2 >= 0~20161029\""; } >&5
>+-  ($PKG_CONFIG --exists --print-errors "libargon2 >= 0~20161029") 2>&5
>++    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libargon2 >= 20161029\""; } >&5
>++  ($PKG_CONFIG --exists --print-errors "libargon2 >= 20161029") 2>&5
>+   ac_status=$?
>+   printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
>+   test $ac_status = 0; }; then
>+-  pkg_cv_ARGON2_LIBS=`$PKG_CONFIG --libs "libargon2 >= 0~20161029" 2>/dev/null`
>++  pkg_cv_ARGON2_LIBS=`$PKG_CONFIG --libs "libargon2 >= 20161029" 2>/dev/null`
>+ 		      test "x$?" != "x0" && pkg_failed=yes
>+ else
>+   pkg_failed=yes
>+@@ -8202,9 +8202,9 @@ fi
>+         _pkg_short_errors_supported=no
>+ fi
>+         if test $_pkg_short_errors_supported = yes; then
>+-	        ARGON2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libargon2 >= 0~20161029" 2>&1`
>++	        ARGON2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libargon2 >= 20161029" 2>&1`
>+         else
>+-	        ARGON2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libargon2 >= 0~20161029" 2>&1`
>++	        ARGON2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libargon2 >= 20161029" 2>&1`
>+         fi
>+ 	# Put the nasty error message in config.log where it belongs
>+ 	echo "$ARGON2_PKG_ERRORS" >&5
>diff --git a/irc/unreal/files/patch-doc_conf_modules.default.conf b/irc/unreal/files/patch-doc_conf_modules.default.conf
>index 86cef49700f2..681a8daecede 100644
>--- a/irc/unreal/files/patch-doc_conf_modules.default.conf
>+++ b/irc/unreal/files/patch-doc_conf_modules.default.conf
>@@ -1,10 +1,9 @@
>---- doc/conf/modules.default.conf.orig	2023-09-21 00:26:43 UTC
>+--- doc/conf/modules.default.conf.orig	2024-05-15 00:19:01 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) */
>--
>+@@ -297,12 +297,4 @@ loadmodule "crule"; /* Rules in spamfilter::rule and d
>+ 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 {
>@@ -13,4 +12,4 @@
> -		ipv6-database "https://www.unrealircd.org/files/geo/classic/GeoIPv6.dat" { url-refresh 14d; }
> -	}
> -}
>--@endif
>+ @endif
>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..6dd2c1699369
>--- /dev/null
>+++ b/irc/unreal/files/patch-doc_conf_modules.sources.list
>@@ -0,0 +1,11 @@
>+--- doc/conf/modules.sources.list.orig	2024-06-10 14:48:54 UTC
>++++ doc/conf/modules.sources.list
>+@@ -14,7 +14,7 @@
>+ # 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
>++# 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/pkg-plist b/irc/unreal/pkg-plist
>index dc9cd2d50550..44a3a007894b 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
>@@ -51,6 +52,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 +103,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
>@@ -165,6 +169,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 +213,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
>-- 
>2.45.2
>

Actions: View | Diff

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