Attachment #251357 for bug #275987




PORTNAME=	unreal
DISTVERSION=	6.1.5
PORTREVISION=	1
CATEGORIES=	irc
MASTER_SITES=	https://www.unrealircd.org/downloads/
DISTNAME=	${PORTNAME}ircd-${PORTVERSION}

CACHEDIR=	/var/cache/ircd
_TMPDIR=	/tmp

EXTRACT_AFTER_ARGS=	--exclude extras/*.tar.gz

HAS_CONFIGURE=	yes
USE_RC_SUBR=	unrealircd



OPTIONS_DEFINE=	DOCS

PORTDOCS=	*
DOCS=		Donation Authors coding-guidelines \
		tao.of.irc translations.txt \
		technical/005.txt technical/base64.txt \

Lines 1-3 Link Here

(-)b/irc/unreal/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1473082474	1	TIMESTAMP = 1715731712
2	SHA256 (unrealircd-6.1.1.1.tar.gz) = 0c8e4164f499f0f6a72ed6032acb034bd7e9bd10308f556a0d919a00c2eeb334	2	SHA256 (unrealircd-6.1.5.tar.gz) = 38baea9335395b12fc63673226f8b19203d25b6284de8894c3993d5c9ecf6ee8
3	SIZE (unrealircd-6.1.1.1.tar.gz) = 10341432	3	SIZE (unrealircd-6.1.5.tar.gz) = 10400736




--- 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

Lines 1-10 Link Here

(-)b/irc/unreal/files/patch-doc_conf_modules.default.conf (-7 / +6 lines)
1	--- doc/conf/modules.default.conf.orig 2023-09-21 00:26:43 UTC	1	--- doc/conf/modules.default.conf.orig 2024-05-15 00:19:01 UTC
2	+++ doc/conf/modules.default.conf	2	+++ doc/conf/modules.default.conf
3	@@ -293,13 +293,3 @@ loadmodule "targetfloodprot"; /* set::anti-flood::targ	3	@@ -297,12 +297,4 @@ loadmodule "crule"; /* Rules in spamfilter::rule and d
4	loadmodule "watch-backend"; /* used by watch and other modules */	4	loadmodule "spamreport"; /* Spam reporting to a blacklist */
5	loadmodule "geoip_base"; /* needed for ALL geoip functions */	5	loadmodule "crule"; /* Rules in spamfilter::rule and deny link::rule */
6	loadmodule "websocket_common"; /* helper functions for websocket (internal) */	6
7	-
8	-loadmodule "geoip_classic";	7	-loadmodule "geoip_classic";
9	-@if module-loaded("geoip_classic")	8	-@if module-loaded("geoip_classic")
10	-set {	9	-set {
Lines 13-16 Link Here
13	- ipv6-database "https://www.unrealircd.org/files/geo/classic/GeoIPv6.dat" { url-refresh 14d; }	12	- ipv6-database "https://www.unrealircd.org/files/geo/classic/GeoIPv6.dat" { url-refresh 14d; }
14	- }	13	- }
15	-}	14	-}
16	-@endif	15	@endif

Added Link Here

(-)b/irc/unreal/files/patch-doc_conf_modules.sources.list (+11 lines)
1	--- doc/conf/modules.sources.list.orig 2024-06-10 14:48:54 UTC
2	+++ doc/conf/modules.sources.list
3	@@ -14,7 +14,7 @@
4	# as well, then read the rules and procedure at:
5	# https://www.unrealircd.org/docs/Rules_for_3rd_party_modules_in_unrealircd-contrib
6	#
7	-https://modules.unrealircd.org/modules.list
8	+# https://modules.unrealircd.org/modules.list
9
10	# You can add more repositories here. However, do note that all
11	# URLs MUST start with https://

Lines 16-21 Link Here

(-)b/irc/unreal/pkg-plist (-1 / +6 lines)
16	%%ETCDIR%%/examples/example.conf	16	%%ETCDIR%%/examples/example.conf
17	%%ETCDIR%%/examples/example.es.conf	17	%%ETCDIR%%/examples/example.es.conf
18	%%ETCDIR%%/examples/example.fr.conf	18	%%ETCDIR%%/examples/example.fr.conf
		19	%%ETCDIR%%/examples/example.pt.conf
19	%%ETCDIR%%/examples/example.tr.conf	20	%%ETCDIR%%/examples/example.tr.conf
20	%%ETCDIR%%/help/help.conf	21	%%ETCDIR%%/help/help.conf
21	%%ETCDIR%%/help/help.de.conf	22	%%ETCDIR%%/help/help.de.conf
Lines 51-56 lib/unreal/bot-tag.so Link Here
51	lib/unreal/botmotd.so	52	lib/unreal/botmotd.so
52	lib/unreal/cap.so	53	lib/unreal/cap.so
53	lib/unreal/certfp.so	54	lib/unreal/certfp.so
		55	lib/unreal/central-api.so
		56	lib/unreal/central-blocklist.so
54	lib/unreal/chanmodes/censor.so	57	lib/unreal/chanmodes/censor.so
55	lib/unreal/chanmodes/chanadmin.so	58	lib/unreal/chanmodes/chanadmin.so
56	lib/unreal/chanmodes/chanop.so	59	lib/unreal/chanmodes/chanop.so
Lines 100-105 lib/unreal/connect-flood.so Link Here
100	lib/unreal/connect.so	103	lib/unreal/connect.so
101	lib/unreal/connthrottle.so	104	lib/unreal/connthrottle.so
102	lib/unreal/creationtime.so	105	lib/unreal/creationtime.so
		106	lib/unreal/crule.so
103	lib/unreal/cycle.so	107	lib/unreal/cycle.so
104	lib/unreal/dccallow.so	108	lib/unreal/dccallow.so
105	lib/unreal/dccdeny.so	109	lib/unreal/dccdeny.so
Lines 165-170 lib/unreal/names.so Link Here
165	lib/unreal/netinfo.so	169	lib/unreal/netinfo.so
166	lib/unreal/nick.so	170	lib/unreal/nick.so
167	lib/unreal/nocodes.so	171	lib/unreal/nocodes.so
		172	lib/unreal/no-implicit-names.so
168	lib/unreal/oper.so	173	lib/unreal/oper.so
169	lib/unreal/operinfo.so	174	lib/unreal/operinfo.so
170	lib/unreal/opermotd.so	175	lib/unreal/opermotd.so
Lines 208-213 lib/unreal/silence.so Link Here
208	lib/unreal/sinfo.so	213	lib/unreal/sinfo.so
209	lib/unreal/sjoin.so	214	lib/unreal/sjoin.so
210	lib/unreal/slog.so	215	lib/unreal/slog.so
		216	lib/unreal/spamreport.so
211	lib/unreal/sqline.so	217	lib/unreal/sqline.so
212	lib/unreal/squit.so	218	lib/unreal/squit.so
213	lib/unreal/sreply.so	219	lib/unreal/sreply.so
214	-

Return to bug 275987

Lines 1-6 Link Here

(-)b/irc/unreal/Makefile (-5 / +2 lines)
1	PORTNAME= unreal	1	PORTNAME= unreal
2	DISTVERSION= 6.1.1.1	2	DISTVERSION= 6.1.5
3	PORTREVISION= 1
4	CATEGORIES= irc	3	CATEGORIES= irc
5	MASTER_SITES= https://www.unrealircd.org/downloads/	4	MASTER_SITES= https://www.unrealircd.org/downloads/
6	DISTNAME= ${PORTNAME}ircd-${PORTVERSION}	5	DISTNAME= ${PORTNAME}ircd-${PORTVERSION}
Lines 29-36 LOGDIR= /var/log/ircd Link Here
29	CACHEDIR= /var/cache/ircd	28	CACHEDIR= /var/cache/ircd
30	_TMPDIR= /tmp	29	_TMPDIR= /tmp
31		30
32	EXTRACT_AFTER_ARGS= --exclude extras/*.tar.gz
33
34	HAS_CONFIGURE= yes	31	HAS_CONFIGURE= yes
35	USE_RC_SUBR= unrealircd	32	USE_RC_SUBR= unrealircd
36		33
Lines 64-70 CONFIGURE_ARGS= --with-nick-history=2000 \ Link Here
64		61
65	OPTIONS_DEFINE= DOCS	62	OPTIONS_DEFINE= DOCS
66		63
67	PORTDOCS= ${DOCS:T}	64	PORTDOCS= *
68	DOCS= Donation Authors coding-guidelines \	65	DOCS= Donation Authors coding-guidelines \
69	tao.of.irc translations.txt \	66	tao.of.irc translations.txt \
70	technical/005.txt technical/base64.txt \	67	technical/005.txt technical/base64.txt \

Added Link Here

(-)b/irc/unreal/files/patch-configure (+46 lines)
1	--- configure.orig 2024-05-15 00:26:08 UTC
2	+++ configure
3	@@ -8159,12 +8159,12 @@ if test -n "$ARGON2_CFLAGS"; then
4	pkg_cv_ARGON2_CFLAGS="$ARGON2_CFLAGS"
5	elif test -n "$PKG_CONFIG"; then
6	if test -n "$PKG_CONFIG" && \
7	- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libargon2 >= 0~20161029\""; } >&5
8	- ($PKG_CONFIG --exists --print-errors "libargon2 >= 0~20161029") 2>&5
9	+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libargon2 >= 20161029\""; } >&5
10	+ ($PKG_CONFIG --exists --print-errors "libargon2 >= 20161029") 2>&5
11	ac_status=$?
12	printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
13	test $ac_status = 0; }; then
14	- pkg_cv_ARGON2_CFLAGS=`$PKG_CONFIG --cflags "libargon2 >= 0~20161029" 2>/dev/null`
15	+ pkg_cv_ARGON2_CFLAGS=`$PKG_CONFIG --cflags "libargon2 >= 20161029" 2>/dev/null`
16	test "x$?" != "x0" && pkg_failed=yes
17	else
18	pkg_failed=yes
19	@@ -8176,12 +8176,12 @@ if test -n "$ARGON2_LIBS"; then
20	pkg_cv_ARGON2_LIBS="$ARGON2_LIBS"
21	elif test -n "$PKG_CONFIG"; then
22	if test -n "$PKG_CONFIG" && \
23	- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libargon2 >= 0~20161029\""; } >&5
24	- ($PKG_CONFIG --exists --print-errors "libargon2 >= 0~20161029") 2>&5
25	+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libargon2 >= 20161029\""; } >&5
26	+ ($PKG_CONFIG --exists --print-errors "libargon2 >= 20161029") 2>&5
27	ac_status=$?
28	printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
29	test $ac_status = 0; }; then
30	- pkg_cv_ARGON2_LIBS=`$PKG_CONFIG --libs "libargon2 >= 0~20161029" 2>/dev/null`
31	+ pkg_cv_ARGON2_LIBS=`$PKG_CONFIG --libs "libargon2 >= 20161029" 2>/dev/null`
32	test "x$?" != "x0" && pkg_failed=yes
33	else
34	pkg_failed=yes
35	@@ -8202,9 +8202,9 @@ fi
36	_pkg_short_errors_supported=no
37	fi
38	if test $_pkg_short_errors_supported = yes; then
39	- ARGON2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libargon2 >= 0~20161029" 2>&1`
40	+ ARGON2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libargon2 >= 20161029" 2>&1`
41	else
42	- ARGON2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libargon2 >= 0~20161029" 2>&1`
43	+ ARGON2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libargon2 >= 20161029" 2>&1`
44	fi
45	# Put the nasty error message in config.log where it belongs
46	echo "$ARGON2_PKG_ERRORS" >&5