From 4f308dc8f52259c18c2552a9f6d9ab556d41c49b Mon Sep 17 00:00:00 2001 From: adrianp Date: Tue, 18 Jul 2006 22:43:36 +0000 Subject: Update to 3.2.5 ==[ MAJOR BUGS FIXED ]== - Spamfilter was not always working properly - MS Visual studio 2005 (8.x) was unable to compile Unreal and/or caused crashes - Certain IPv6 listen blocks could crash the ircd on-boot/on-rehash ==[ MINOR BUGS FIXED ]== - "Looking up your hostname" message was missing if set::options::show-connect-notice was enabled (other messages, like "looking up ident" were shown, however) - It was sometimes impossible to update a link { } block: all old settings would still be used, this happened if connfreq was low. This might also have caused crashes. - Netsynch problem, which could cause the wrong modes to be applied to a channel in some rare cases. - Setting set::maxdccallow to 0 (or lower) still allowed one entry to be added - Spamfilter oversized-checking is no longer done when removing a spamfilter - Operator count bug (there might still be others...) - Some chinese-* charsets could not be selected individually - No longer requiring a C++ compiler (was caused by resolver in 3.2.4) - Added workaround for "make: Permission denied" bug in some FreeBSD's --- chat/unrealircd/Makefile | 27 +++++++++++++-------------- chat/unrealircd/PLIST | 5 ++++- chat/unrealircd/distinfo | 10 +++++----- chat/unrealircd/options.mk | 5 +++-- chat/unrealircd/patches/patch-aa | 23 +++++++++-------------- 5 files changed, 34 insertions(+), 36 deletions(-) diff --git a/chat/unrealircd/Makefile b/chat/unrealircd/Makefile index c8602a7150f..30e9be577da 100644 --- a/chat/unrealircd/Makefile +++ b/chat/unrealircd/Makefile @@ -1,12 +1,11 @@ -# $NetBSD: Makefile,v 1.13 2006/04/23 00:12:36 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2006/07/18 22:43:36 adrianp Exp $ -DISTNAME= Unreal3.2.4 -PKGNAME= unrealircd-3.2.4 -PKGREVISION= 3 +DISTNAME= Unreal3.2.5 +PKGNAME= unrealircd-3.2.5 CATEGORIES= chat -MASTER_SITES= http://unreal.fire-com.net/ \ - http://www.ilmarinen.us/unreal/ \ - http://www1.dnwt.net/unreal/ +MASTER_SITES= http://www1.dnwt.net/unreal/ \ + http://unrealircd.icedslash.com/ \ + http://www.blurryfox.com/unreal/ MAINTAINER= adrianp@NetBSD.org HOMEPAGE= http://www.unrealircd.com/ @@ -14,7 +13,6 @@ COMMENT= Advanced IRC server with IPv6 and SSL support CONFLICTS+= ircu-[0-9]* -DIST_SUBDIR= ${PKGNAME} GNU_CONFIGURE= YES USE_TOOLS+= pkg-config gmake WRKSRC= ${WRKDIR}/Unreal3.2 @@ -22,7 +20,7 @@ TRE_NEEDED= 0.7.2 CARES_NEEDED= 1.3.0 BUILDLINK_API_DEPENDS.tre+= tre-${TRE_NEEDED} -BUILDLINK_API_DEPENDS.libcares+= libcares-${CARES_NEEDED} +BUILDLINK_API_DEPENDS.libcares+= libcares-${CARES_NEEDED}nb1 .include "../../mk/bsd.prefs.mk" @@ -30,7 +28,8 @@ CONFIGURE_ENV+= tre_version=${TRE_NEEDED:Q} CONFIGURE_ENV+= TRELIBS='-L${PREFIX:Q}/lib -ltre' CONFIGURE_ENV+= cares_version=${CARES_NEEDED:Q} CONFIGURE_ENV+= CARESINCDIR='${PREFIX:Q}/include' -CONFIGURE_ENV+= CARESLIBS='-L${PREFIX:Q}/lib -lcares' +CONFIGURE_ENV+= CARESLIBDIR='-L${PREFIX:Q}/lib' +CONFIGURE_ENV+= CARESLIBS='-lcares' CONFIGURE_ARGS+= --with-dpath=${UIRCD_HOME:Q} CONFIGURE_ARGS+= --with-spath=${PREFIX:Q}/sbin/ircd @@ -92,8 +91,8 @@ FILES_SUBST+= UIRCD_GROUP=${UIRCD_GROUP:Q} SUBST_CLASSES+= homedir SUBST_STAGE.homedir= post-patch SUBST_FILES.homedir= doc/example.conf -SUBST_SED.homedir= -e "s|src/modules|${IRCD_SHARE}/modules|g" \ - -e "s|include \"|include \"${IRCD_SHARE}/|g" +SUBST_SED.homedir= -e "s|src/modules|${IRCD_SHARE}/modules|g" +SUBST_SED.homedir+= -e "s|include \"|include \"${IRCD_SHARE}/|g" SUBST_MESSAGE.homedir= Fixing home directory of the IRC server. OWN_DIRS_PERMS+= ${UIRCD_HOME:Q} ${UIRCD_USER:Q} ${UIRCD_GROUP:Q} 0770 @@ -109,9 +108,9 @@ INSTALL_UNSTRIPPED=YES .include "../../devel/tre/buildlink3.mk" post-build: - @${CP} ${PKGDIR:Q}/MESSAGE ${WRKDIR:Q}/.MESSAGE_SRC + ${CP} ${PKGDIR:Q}/MESSAGE ${WRKDIR:Q}/.MESSAGE_SRC .if !empty(PKG_OPTIONS:Minet6) - @${CP} ${PKGDIR:Q}/MESSAGE.inet6 ${WRKDIR:Q}/.MESSAGE_SRC.inet6 + ${CP} ${PKGDIR:Q}/MESSAGE.inet6 ${WRKDIR:Q}/.MESSAGE_SRC.inet6 .endif do-install: diff --git a/chat/unrealircd/PLIST b/chat/unrealircd/PLIST index dfd216ef4a0..bf674da6884 100644 --- a/chat/unrealircd/PLIST +++ b/chat/unrealircd/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2006/03/07 17:23:51 adrianp Exp $ +@comment $NetBSD: PLIST,v 1.4 2006/07/18 22:43:36 adrianp Exp $ sbin/ircd share/doc/unrealircd/Authors share/doc/unrealircd/LICENSE @@ -12,12 +12,15 @@ share/doc/unrealircd/unreal32docs.html share/doc/unrealircd/unreal32docs.hu.html share/doc/unrealircd/unreal32docs.nl.html share/doc/unrealircd/unreal32docs.ru.html +share/doc/unrealircd/unreal32docs.tk.html share/examples/rc.d/unrealircd share/examples/unrealircd/example.bg.conf share/examples/unrealircd/example.conf share/examples/unrealircd/example.de.conf share/examples/unrealircd/example.fr.conf share/examples/unrealircd/example.hu.conf +share/examples/unrealircd/example.nl.conf +share/examples/unrealircd/example.ru.conf share/unrealircd/aliases/aliases.conf share/unrealircd/aliases/anope.conf share/unrealircd/aliases/auspice.conf diff --git a/chat/unrealircd/distinfo b/chat/unrealircd/distinfo index 0c2d7357326..0963271dbdd 100644 --- a/chat/unrealircd/distinfo +++ b/chat/unrealircd/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.6 2006/03/07 17:23:51 adrianp Exp $ +$NetBSD: distinfo,v 1.7 2006/07/18 22:43:36 adrianp Exp $ -SHA1 (unrealircd-3.2.4nb3/Unreal3.2.4.tar.gz) = 79232726ec3e6e56445ede399c343263cc0858f8 -RMD160 (unrealircd-3.2.4nb3/Unreal3.2.4.tar.gz) = 4663fdf389caf5f461399b6ff4281ad022fa0aee -Size (unrealircd-3.2.4nb3/Unreal3.2.4.tar.gz) = 2503560 bytes -SHA1 (patch-aa) = 762764ac4b520f3e4497f1ded834dc08bb2868e2 +SHA1 (Unreal3.2.5.tar.gz) = 4f7d37c134b3148796313e38ef1ee1eb11c3cb8d +RMD160 (Unreal3.2.5.tar.gz) = ecf8e98267214151f26ea5fb5aec61e8c14d34de +Size (Unreal3.2.5.tar.gz) = 2546977 bytes +SHA1 (patch-aa) = a8c7a1899b264ddc19a0a709acdcd8fca9bb234c SHA1 (patch-ab) = b66ae1990e25479abe9087a9308a2185692fcba2 SHA1 (patch-ac) = 4c3e7219d03e93c2a3e8f735c350d919efdf8fbb SHA1 (patch-ad) = 3bef7c197efb59def9e77114ad9356ef2f23fa26 diff --git a/chat/unrealircd/options.mk b/chat/unrealircd/options.mk index c10a6763461..be47622a096 100644 --- a/chat/unrealircd/options.mk +++ b/chat/unrealircd/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.8 2006/03/07 17:23:51 adrianp Exp $ +# $NetBSD: options.mk,v 1.9 2006/07/18 22:43:36 adrianp Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.unrealircd @@ -11,7 +11,8 @@ PKG_SUPPORTED_OPTIONS+= unrealircd-chroot unrealircd-prefixaq PKG_SUPPORTED_OPTIONS+= unrealircd-showlistmodes unrealircd-topicisnuhost PKG_SUPPORTED_OPTIONS+= unrealircd-shunnotices unrealircd-operoverride-verify PKG_SUPPORTED_OPTIONS+= unrealircd-no-operoverride unrealircd-disableusermod -PKG_SUGGESTED_OPTIONS= unrealircd-showlistmodes unrealircd-hub +PKG_SUGGESTED_OPTIONS= unrealircd-showlistmodes unrealircd-hub \ + unrealircd-prefixaq .include "../../mk/bsd.options.mk" diff --git a/chat/unrealircd/patches/patch-aa b/chat/unrealircd/patches/patch-aa index 3a6759f7829..d46b754dccb 100644 --- a/chat/unrealircd/patches/patch-aa +++ b/chat/unrealircd/patches/patch-aa @@ -1,17 +1,8 @@ -$NetBSD: patch-aa,v 1.3 2006/02/04 21:13:54 adrianp Exp $ +$NetBSD: patch-aa,v 1.4 2006/07/18 22:43:36 adrianp Exp $ ---- configure.orig 2006-02-03 13:57:17.000000000 +0000 +--- configure.orig 2006-06-16 19:29:12.000000000 +0100 +++ configure -@@ -10247,7 +10247,7 @@ if test "${enable_libcurl+set}" = set; t - CURLLIBS=`$enableval/bin/curl-config --libs` - - if test "x`echo $CURLLIBS |grep .*ares.*`" = x ; then -- CURLLIBS="$CURLLIBS -lares" -+ CURLLIBS="$CURLLIBS -lcares" - fi - IRCDLIBS="$IRCDLIBS $CURLLIBS" - URL="url.o" -@@ -10692,72 +10692,6 @@ IRCDLIBS="$IRCDLIBS -lresolv " +@@ -12666,75 +12666,7 @@ IRCDLIBS="$IRCDLIBS -lresolv " ;; esac @@ -76,11 +67,15 @@ $NetBSD: patch-aa,v 1.3 2006/02/04 21:13:54 adrianp Exp $ -$ac_cv_prog_MAKER install || exit 1 -CARESINCDIR="$cur_dir/extras/c-ares/include" - --CARESLIBS="-L../extras/c-ares/lib -lcares" +-CARESLIBDIR="-L../extras/c-ares/lib" +- +-CARESLIBS="-lcares" - -cd $cur_dir - - - ac_config_files="$ac_config_files Makefile src/modules/Makefile unreal ircdcron/ircdchk" +- ac_config_files="$ac_config_files Makefile src/modules/Makefile unreal ircdcron/ircdchk" ++ac_config_files="$ac_config_files Makefile src/modules/Makefile unreal ircdcron/ircdchk" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure + # tests run on this system so they can be shared between configure -- cgit v1.2.3