pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/chat/unrealircd chat/unrealircd: Update to 4.2.1.1
details: https://anonhg.NetBSD.org/pkgsrc/rev/f07ba7be8608
branches: trunk
changeset: 329515:f07ba7be8608
user: nia <nia%pkgsrc.org@localhost>
date: Sat Feb 09 15:23:15 2019 +0000
description:
chat/unrealircd: Update to 4.2.1.1
Many changes, coming from an unsupported version, but at least
fixes CVE-2016-7144.
diffstat:
chat/unrealircd/Makefile | 108 +--
chat/unrealircd/PLIST | 337 +++++++------
chat/unrealircd/distinfo | 24 +-
chat/unrealircd/files/smf/manifest.xml | 2 +-
chat/unrealircd/files/unrealircd.sh | 8 +-
chat/unrealircd/options.mk | 78 +--
chat/unrealircd/patches/patch-Makefile.in | 130 +++++
chat/unrealircd/patches/patch-ab | 15 -
chat/unrealircd/patches/patch-ac | 14 +-
chat/unrealircd/patches/patch-ae | 8 +-
chat/unrealircd/patches/patch-af | 14 -
chat/unrealircd/patches/patch-src_modules_m__cycle.c | 16 -
chat/unrealircd/patches/patch-src_modules_m__rping.c | 16 -
chat/unrealircd/patches/patch-src_modules_m__svsjoin.c | 16 -
chat/unrealircd/patches/patch-src_modules_m__svspart.c | 16 -
chat/unrealircd/patches/patch-src_modules_m__svssilence.c | 16 -
chat/unrealircd/patches/patch-src_modules_m__svswatch.c | 16 -
chat/unrealircd/patches/patch-src_modules_m__vhost.c | 16 -
18 files changed, 395 insertions(+), 455 deletions(-)
diffs (truncated from 1030 to 300 lines):
diff -r fd5f6d8b5f38 -r f07ba7be8608 chat/unrealircd/Makefile
--- a/chat/unrealircd/Makefile Sat Feb 09 15:22:46 2019 +0000
+++ b/chat/unrealircd/Makefile Sat Feb 09 15:23:15 2019 +0000
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.55 2018/12/13 19:51:43 adam Exp $
+# $NetBSD: Makefile,v 1.56 2019/02/09 15:23:15 nia Exp $
-DISTNAME= Unreal3.2.10.5
-PKGNAME= ${DISTNAME:tl:S/l/lircd-/1}
-PKGREVISION= 10
+DISTNAME= unrealircd-4.2.1.1
CATEGORIES= chat
-MASTER_SITES= http://unrealircd.org/downloads/
+MASTER_SITES= https://www.unrealircd.org/unrealircd4/
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= https://www.unrealircd.org/
@@ -14,31 +12,49 @@
CONFLICTS+= ircu-[0-9]*
GNU_CONFIGURE= YES
+USE_TOOLS+= aclocal autoconf autoheader automake bash
USE_TOOLS+= gmake gunzip pkg-config
-CHECK_PORTABILITY_SKIP= update
+.include "options.mk"
-.include "options.mk"
+# Quoth ./configure,
+# "noone knows if disabling dynamic linking actually does anything or not".
+# Also needed to configure non-interactively.
+CONFIGURE_ARGS+= --enable-dynamic-linking
+
+# not building without SSL is apparently unsupported but this still
+# seems to be required or the build breaks...
+CONFIGURE_ARGS+= --enable-ssl
CONFIGURE_ARGS+= --with-system-cares
CONFIGURE_ARGS+= --with-system-tre
+CONFIGURE_ARGS+= --with-system-pcre2
-CONFIGURE_ARGS+= --with-dpath=${UIRCD_HOME}
-CONFIGURE_ARGS+= --with-spath=${PREFIX}/sbin/ircd
CONFIGURE_ARGS+= --with-permissions=0660
+CONFIGURE_ARGS+= --with-datadir=${PREFIX}/unrealircd/data
+CONFIGURE_ARGS+= --with-cachedir=${PREFIX}/unrealircd/cache
+CONFIGURE_ARGS+= --with-logdir=${PREFIX}/unrealircd/logs
+CONFIGURE_ARGS+= --with-tmpdir=${PREFIX}/unrealircd/tmp
+CONFIGURE_ARGS+= --with-pidfile=${PREFIX}/unrealircd/ircd.pid
+CONFIGURE_ARGS+= --with-scriptdir=${PREFIX}/unrealircd/scripts
+CONFIGURE_ARGS+= --with-bindir=${PREFIX}/bin
+CONFIGURE_ARGS+= --with-modulesdir=${PREFIX}/lib/unrealircd/modules
+CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/unrealircd
+CONFIGURE_ARGS+= --with-confdir=${PKG_SYSCONFDIR}/unrealircd
-CONFIGURE_ARGS+= --with-listen=${UIRCD_LISTEN:Q}
+OWN_DIRS_PERMS+= ${PREFIX}/unrealircd ${UIRCD_USER} ${UIRCD_GROUP} 0755
+OWN_DIRS_PERMS+= ${PREFIX}/unrealircd/data ${UIRCD_USER} ${UIRCD_GROUP} 0700
+OWN_DIRS_PERMS+= ${PREFIX}/unrealircd/cache ${UIRCD_USER} ${UIRCD_GROUP} 0700
+OWN_DIRS_PERMS+= ${PREFIX}/unrealircd/logs ${UIRCD_USER} ${UIRCD_GROUP} 0700
+OWN_DIRS_PERMS+= ${PREFIX}/unrealircd/tmp ${UIRCD_USER} ${UIRCD_GROUP} 0700
+
CONFIGURE_ARGS+= --with-sendq=${UIRCD_SENDQ:Q}
-CONFIGURE_ARGS+= --with-bufferpool=${UIRCD_BUFFER:Q}
CONFIGURE_ARGS+= --with-fd-setsize=${UIRCD_FDSIZE:Q}
CONFIGURE_ARGS+= --with-nick-history=${UIRCD_NICKHIST:Q}
-IRCD_DOCS= ${PREFIX}/share/doc/unrealircd
-IRCD_SHARE= ${PREFIX}/share/unrealircd
IRCD_EG= ${PREFIX}/share/examples/unrealircd
-BUILD_DEFS+= UIRCD_SENDQ UIRCD_LISTEN UIRCD_BUFFER UIRCD_HOST
-BUILD_DEFS+= UIRCD_HOME UIRCD_NICKHIST UIRCD_FDSIZE VARBASE
+BUILD_DEFS+= UIRCD_SENDQ UIRCD_NICKHIST UIRCD_FDSIZE VARBASE
PTHREAD_OPTS+= require
@@ -48,20 +64,10 @@
# script supplied with the UnrealIRCd package.
#
UIRCD_SENDQ?= 3000000
-UIRCD_LISTEN?= 5
-UIRCD_BUFFER?= 18
UIRCD_NICKHIST?= 2000
UIRCD_FDSIZE?= 1024
UIRCD_USER?= uircd
UIRCD_GROUP?= uircd
-UIRCD_HOST?= localhost
-UIRCD_HOME?= ${VARBASE}/unrealircd
-
-DOC_FILES= doc/Authors doc/coding-guidelines doc/tao.of.irc LICENSE
-
-CONF_FILES_PERMS= ${IRCD_EG}/example.conf \
- ${UIRCD_HOME}/unrealircd.conf \
- ${UIRCD_USER} ${UIRCD_GROUP} 0660
PKG_USERS_VARS+= UIRCD_USER
PKG_GROUPS_VARS+= UIRCD_GROUP
@@ -70,56 +76,28 @@
PKG_USERS= ${UIRCD_USER}:${UIRCD_GROUP}
PKG_GECOS.${UIRCD_USER}= UnrealIRCD user
-PKG_HOME.${UIRCD_USER}= ${UIRCD_HOME}
RCD_SCRIPTS= unrealircd
-FILES_SUBST+= UIRCD_HOME=${UIRCD_HOME}
FILES_SUBST+= UIRCD_USER=${UIRCD_USER}
FILES_SUBST+= UIRCD_GROUP=${UIRCD_GROUP}
-SUBST_CLASSES+= homedir
-SUBST_STAGE.homedir= pre-configure
-SUBST_FILES.homedir= doc/example.conf
-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.
-
-.if !empty(PKG_OPTIONS:Munrealircd-chroot)
-SUBST_CLASSES+= chroot
-SUBST_STAGE.chroot= pre-install
-SUBST_FILES.chroot= ${WRKDIR}/unrealircd
-SUBST_SED.chroot= -e "s|unrealircd_user=|\#unrealircd_user=|g"
-SUBST_SED.chroot+= -e "s|unrealircd_group=|\#unrealircd_group=|g"
-SUBST_MESSAGE.chroot= Fixing chroot installation.
-.endif
-
-OWN_DIRS_PERMS+= ${UIRCD_HOME} ${UIRCD_USER} ${UIRCD_GROUP} 0770
-OWN_DIRS_PERMS+= ${UIRCD_HOME}/tmp ${UIRCD_USER} ${UIRCD_GROUP} 0770
-INSTALLATION_DIRS= sbin ${IRCD_DOCS} ${IRCD_EG} ${IRCD_SHARE}/aliases \
- ${IRCD_SHARE}/modules
-
CFLAGS.Darwin+= -DUSE_LOCALE
CFLAGS.SunOS+= -DUSE_LOCALE
+INSTALLATION_DIRS+= unrealircd/scripts
+INSTALLATION_DIRS+= ${IRCD_EG}
+
+pre-configure:
+ cd ${WRKSRC} && ${BASH} ./autogen.sh
+
+post-install:
+ ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/unrealircd/* ${DESTDIR}${IRCD_EG}
+
.include "../../net/libcares/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../devel/tre/buildlink3.mk"
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/src/ircd ${DESTDIR}${PREFIX}/sbin
- ${INSTALL_DATA} ${WRKSRC}/aliases/*.conf \
- ${DESTDIR}${IRCD_SHARE}/aliases
- ${INSTALL_DATA} ${WRKSRC}/badwords*.conf ${DESTDIR}${IRCD_SHARE}
- ${INSTALL_DATA} ${WRKSRC}/help.* ${DESTDIR}${IRCD_SHARE}
- ${INSTALL_DATA} ${WRKSRC}/doc/help.* ${DESTDIR}${IRCD_SHARE}
- ${INSTALL_DATA} ${WRKSRC}/spamfilter.conf ${DESTDIR}${IRCD_SHARE}
- ${INSTALL_LIB} ${WRKSRC}/src/modules/*.so \
- ${DESTDIR}${IRCD_SHARE}/modules
- ${INSTALL_DATA} ${WRKSRC}/doc/unreal32docs.* ${DESTDIR}${IRCD_DOCS}
- ${INSTALL_DATA} ${WRKSRC}/doc/example.* ${DESTDIR}${IRCD_EG}
-.for f in ${DOC_FILES}
- ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${IRCD_DOCS}
-.endfor
-
+.include "../../devel/pcre2/buildlink3.mk"
+.include "../../security/argon2/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r fd5f6d8b5f38 -r f07ba7be8608 chat/unrealircd/PLIST
--- a/chat/unrealircd/PLIST Sat Feb 09 15:22:46 2019 +0000
+++ b/chat/unrealircd/PLIST Sat Feb 09 15:23:15 2019 +0000
@@ -1,149 +1,194 @@
-@comment $NetBSD: PLIST,v 1.11 2014/03/11 14:04:59 jperkin Exp $
-sbin/ircd
+@comment $NetBSD: PLIST,v 1.12 2019/02/09 15:23:15 nia Exp $
+bin/unrealircd
+lib/unrealircd/modules/antimixedutf8.so
+lib/unrealircd/modules/antirandom.so
+lib/unrealircd/modules/authprompt.so
+lib/unrealircd/modules/blacklist.so
+lib/unrealircd/modules/cap/link-security.so
+lib/unrealircd/modules/cap/plaintext-policy.so
+lib/unrealircd/modules/cap/sts.so
+lib/unrealircd/modules/certfp.so
+lib/unrealircd/modules/chanmodes/censor.so
+lib/unrealircd/modules/chanmodes/delayjoin.so
+lib/unrealircd/modules/chanmodes/floodprot.so
+lib/unrealircd/modules/chanmodes/issecure.so
+lib/unrealircd/modules/chanmodes/link.so
+lib/unrealircd/modules/chanmodes/nocolor.so
+lib/unrealircd/modules/chanmodes/noctcp.so
+lib/unrealircd/modules/chanmodes/noinvite.so
+lib/unrealircd/modules/chanmodes/nokick.so
+lib/unrealircd/modules/chanmodes/noknock.so
+lib/unrealircd/modules/chanmodes/nonickchange.so
+lib/unrealircd/modules/chanmodes/nonotice.so
+lib/unrealircd/modules/chanmodes/operonly.so
+lib/unrealircd/modules/chanmodes/permanent.so
+lib/unrealircd/modules/chanmodes/regonly.so
+lib/unrealircd/modules/chanmodes/regonlyspeak.so
+lib/unrealircd/modules/chanmodes/secureonly.so
+lib/unrealircd/modules/chanmodes/stripcolor.so
+lib/unrealircd/modules/charsys.so
+lib/unrealircd/modules/cloak.so
+lib/unrealircd/modules/extbans/account.so
+lib/unrealircd/modules/extbans/certfp.so
+lib/unrealircd/modules/extbans/inchannel.so
+lib/unrealircd/modules/extbans/join.so
+lib/unrealircd/modules/extbans/msgbypass.so
+lib/unrealircd/modules/extbans/nickchange.so
+lib/unrealircd/modules/extbans/operclass.so
+lib/unrealircd/modules/extbans/quiet.so
+lib/unrealircd/modules/extbans/realname.so
+lib/unrealircd/modules/extbans/regnick.so
+lib/unrealircd/modules/extbans/textban.so
+lib/unrealircd/modules/extbans/timedban.so
+lib/unrealircd/modules/hideserver.so
+lib/unrealircd/modules/jointhrottle.so
+lib/unrealircd/modules/jumpserver.so
+lib/unrealircd/modules/m_addmotd.so
+lib/unrealircd/modules/m_addomotd.so
+lib/unrealircd/modules/m_admin.so
+lib/unrealircd/modules/m_away.so
+lib/unrealircd/modules/m_botmotd.so
+lib/unrealircd/modules/m_cap.so
+lib/unrealircd/modules/m_chghost.so
+lib/unrealircd/modules/m_chgident.so
+lib/unrealircd/modules/m_chgname.so
+lib/unrealircd/modules/m_close.so
+lib/unrealircd/modules/m_connect.so
+lib/unrealircd/modules/m_cycle.so
+lib/unrealircd/modules/m_dccallow.so
+lib/unrealircd/modules/m_dccdeny.so
+lib/unrealircd/modules/m_eos.so
+lib/unrealircd/modules/m_globops.so
+lib/unrealircd/modules/m_help.so
+lib/unrealircd/modules/m_invite.so
+lib/unrealircd/modules/m_ircops.so
+lib/unrealircd/modules/m_ison.so
+lib/unrealircd/modules/m_join.so
+lib/unrealircd/modules/m_kick.so
+lib/unrealircd/modules/m_kill.so
+lib/unrealircd/modules/m_knock.so
+lib/unrealircd/modules/m_lag.so
+lib/unrealircd/modules/m_links.so
+lib/unrealircd/modules/m_list.so
+lib/unrealircd/modules/m_locops.so
+lib/unrealircd/modules/m_lusers.so
+lib/unrealircd/modules/m_map.so
+lib/unrealircd/modules/m_md.so
+lib/unrealircd/modules/m_message.so
+lib/unrealircd/modules/m_mkpasswd.so
+lib/unrealircd/modules/m_mode.so
+lib/unrealircd/modules/m_motd.so
+lib/unrealircd/modules/m_names.so
+lib/unrealircd/modules/m_netinfo.so
+lib/unrealircd/modules/m_nick.so
+lib/unrealircd/modules/m_nopost.so
+lib/unrealircd/modules/m_oper.so
+lib/unrealircd/modules/m_opermotd.so
+lib/unrealircd/modules/m_part.so
+lib/unrealircd/modules/m_pass.so
+lib/unrealircd/modules/m_pingpong.so
+lib/unrealircd/modules/m_protoctl.so
+lib/unrealircd/modules/m_quit.so
+lib/unrealircd/modules/m_rules.so
+lib/unrealircd/modules/m_sajoin.so
+lib/unrealircd/modules/m_samode.so
+lib/unrealircd/modules/m_sapart.so
+lib/unrealircd/modules/m_sasl.so
+lib/unrealircd/modules/m_sdesc.so
+lib/unrealircd/modules/m_sendsno.so
+lib/unrealircd/modules/m_sendumode.so
+lib/unrealircd/modules/m_server.so
+lib/unrealircd/modules/m_sethost.so
+lib/unrealircd/modules/m_setident.so
+lib/unrealircd/modules/m_setname.so
+lib/unrealircd/modules/m_silence.so
+lib/unrealircd/modules/m_sjoin.so
+lib/unrealircd/modules/m_sqline.so
+lib/unrealircd/modules/m_squit.so
+lib/unrealircd/modules/m_staff.so
+lib/unrealircd/modules/m_starttls.so
+lib/unrealircd/modules/m_stats.so
+lib/unrealircd/modules/m_svsfline.so
+lib/unrealircd/modules/m_svsjoin.so
+lib/unrealircd/modules/m_svskill.so
+lib/unrealircd/modules/m_svslusers.so
+lib/unrealircd/modules/m_svsmode.so
+lib/unrealircd/modules/m_svsmotd.so
+lib/unrealircd/modules/m_svsnick.so
+lib/unrealircd/modules/m_svsnline.so
+lib/unrealircd/modules/m_svsnolag.so
+lib/unrealircd/modules/m_svsnoop.so
+lib/unrealircd/modules/m_svspart.so
+lib/unrealircd/modules/m_svssilence.so
+lib/unrealircd/modules/m_svssno.so
+lib/unrealircd/modules/m_svswatch.so
+lib/unrealircd/modules/m_swhois.so
+lib/unrealircd/modules/m_time.so
+lib/unrealircd/modules/m_tkl.so
Home |
Main Index |
Thread Index |
Old Index