Attachment #247323 for bug #275987




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

		libsodium.so:security/libsodium \
		libjansson.so:devel/jansson \
		libmaxminddb.so:net/libmaxminddb
RUN_DEPENDS=	${LOCALBASE}/bin/geoipupdate:net/geoipupdate

RUN_DEPENDS=          ${LOCALBASE}/bin/geoipupdate:net/geoipupdate
USES=		pkgconfig cpe gmake localbase ssl
MODULESDIR=	${PREFIX}/lib/${PORTNAME}
MODULESSUBDIR=	chanmodes extbans rpc usermodes

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 = 1703789490
2	SHA256 (unrealircd-6.1.1.1.tar.gz) = 0c8e4164f499f0f6a72ed6032acb034bd7e9bd10308f556a0d919a00c2eeb334	2	SHA256 (unrealircd-6.1.4.tar.gz) = 628892362345bfe27fc40e4c0c775d879c2200f134b8f401b4ca633005928809
3	SIZE (unrealircd-6.1.1.1.tar.gz) = 10341432	3	SIZE (unrealircd-6.1.4.tar.gz) = 10391535




--- configure.orig	2023-12-16 10:02:43 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 @@ else
         _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




--- doc/conf/modules.default.conf.orig	2023-12-16 10:02:43 UTC
+++ doc/conf/modules.default.conf
@@ -295,13 +295,3 @@ loadmodule "geoip_base"; /* needed for ALL geoip funct
 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) */
 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")
- 

Return to bug 275987

Lines 1-5 Link Here

(-)b/irc/unreal/Makefile (-5 / +3 lines)
1	PORTNAME= unreal	1	PORTNAME= unreal
2	DISTVERSION= 6.1.1.1	2	DISTVERSION= 6.1.4
3	CATEGORIES= irc	3	CATEGORIES= irc
4	MASTER_SITES= https://www.unrealircd.org/downloads/	4	MASTER_SITES= https://www.unrealircd.org/downloads/
5	DISTNAME= ${PORTNAME}ircd-${PORTVERSION}	5	DISTNAME= ${PORTNAME}ircd-${PORTVERSION}
Lines 17-24 LIB_DEPENDS= libcares.so:dns/c-ares \ Link Here
17	libsodium.so:security/libsodium \	17	libsodium.so:security/libsodium \
18	libjansson.so:devel/jansson \	18	libjansson.so:devel/jansson \
19	libmaxminddb.so:net/libmaxminddb	19	libmaxminddb.so:net/libmaxminddb
20	RUN_DEPENDS= ${LOCALBASE}/bin/geoipupdate:net/geoipupdate
21		20
		21	RUN_DEPENDS= ${LOCALBASE}/bin/geoipupdate:net/geoipupdate
22	USES= pkgconfig cpe gmake localbase ssl	22	USES= pkgconfig cpe gmake localbase ssl
23	MODULESDIR= ${PREFIX}/lib/${PORTNAME}	23	MODULESDIR= ${PREFIX}/lib/${PORTNAME}
24	MODULESSUBDIR= chanmodes extbans rpc usermodes	24	MODULESSUBDIR= chanmodes extbans rpc usermodes
Lines 28-35 LOGDIR= /var/log/ircd Link Here
28	CACHEDIR= /var/cache/ircd	28	CACHEDIR= /var/cache/ircd
29	_TMPDIR= /tmp	29	_TMPDIR= /tmp
30		30
31	EXTRACT_AFTER_ARGS= --exclude extras/*.tar.gz
32
33	HAS_CONFIGURE= yes	31	HAS_CONFIGURE= yes
34	USE_RC_SUBR= unrealircd	32	USE_RC_SUBR= unrealircd
35		33
Lines 63-69 CONFIGURE_ARGS= --with-nick-history=2000 \ Link Here
63		61
64	OPTIONS_DEFINE= DOCS	62	OPTIONS_DEFINE= DOCS
65		63
66	PORTDOCS= ${DOCS:T}	64	PORTDOCS= *
67	DOCS= Donation Authors coding-guidelines \	65	DOCS= Donation Authors coding-guidelines \
68	tao.of.irc translations.txt \	66	tao.of.irc translations.txt \
69	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 2023-12-16 10:02:43 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 @@ else
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

Lines 1-9 Link Here

(-)b/irc/unreal/files/patch-doc_conf_modules.default.conf (-5 / +4 lines)
1	--- doc/conf/modules.default.conf.orig 2023-09-21 00:26:43 UTC	1	--- doc/conf/modules.default.conf.orig 2023-12-16 10:02:43 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	@@ -295,13 +295,3 @@ loadmodule "geoip_base"; /* needed for ALL geoip funct
4	loadmodule "watch-backend"; /* used by watch and other modules */
5	loadmodule "geoip_base"; /* needed for ALL geoip functions */
6	loadmodule "websocket_common"; /* helper functions for websocket (internal) */	4	loadmodule "websocket_common"; /* helper functions for websocket (internal) */
		5	loadmodule "spamreport"; /* Spam reporting to a blacklist */
		6	loadmodule "crule"; /* Rules in spamfilter::rule and deny link::rule */
7	-	7	-
8	-loadmodule "geoip_classic";	8	-loadmodule "geoip_classic";
9	-@if module-loaded("geoip_classic")	9	-@if module-loaded("geoip_classic")
10	-