pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/chat/unrealircd



Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Feb  9 15:23:16 UTC 2019

Modified Files:
        pkgsrc/chat/unrealircd: Makefile PLIST distinfo options.mk
        pkgsrc/chat/unrealircd/files: unrealircd.sh
        pkgsrc/chat/unrealircd/files/smf: manifest.xml
        pkgsrc/chat/unrealircd/patches: patch-ac patch-ae
Added Files:
        pkgsrc/chat/unrealircd/patches: patch-Makefile.in
Removed Files:
        pkgsrc/chat/unrealircd/patches: patch-ab patch-af
            patch-src_modules_m__cycle.c patch-src_modules_m__rping.c
            patch-src_modules_m__svsjoin.c patch-src_modules_m__svspart.c
            patch-src_modules_m__svssilence.c patch-src_modules_m__svswatch.c
            patch-src_modules_m__vhost.c

Log Message:
chat/unrealircd: Update to 4.2.1.1

Many changes, coming from an unsupported version, but at least
fixes CVE-2016-7144.


To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 pkgsrc/chat/unrealircd/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/chat/unrealircd/PLIST
cvs rdiff -u -r1.19 -r1.20 pkgsrc/chat/unrealircd/distinfo
cvs rdiff -u -r1.16 -r1.17 pkgsrc/chat/unrealircd/options.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/chat/unrealircd/files/unrealircd.sh
cvs rdiff -u -r1.3 -r1.4 pkgsrc/chat/unrealircd/files/smf/manifest.xml
cvs rdiff -u -r0 -r1.1 pkgsrc/chat/unrealircd/patches/patch-Makefile.in
cvs rdiff -u -r1.2 -r0 pkgsrc/chat/unrealircd/patches/patch-ab \
    pkgsrc/chat/unrealircd/patches/patch-src_modules_m__cycle.c \
    pkgsrc/chat/unrealircd/patches/patch-src_modules_m__rping.c \
    pkgsrc/chat/unrealircd/patches/patch-src_modules_m__svsjoin.c \
    pkgsrc/chat/unrealircd/patches/patch-src_modules_m__svspart.c \
    pkgsrc/chat/unrealircd/patches/patch-src_modules_m__svssilence.c \
    pkgsrc/chat/unrealircd/patches/patch-src_modules_m__svswatch.c \
    pkgsrc/chat/unrealircd/patches/patch-src_modules_m__vhost.c
cvs rdiff -u -r1.3 -r1.4 pkgsrc/chat/unrealircd/patches/patch-ac \
    pkgsrc/chat/unrealircd/patches/patch-ae
cvs rdiff -u -r1.3 -r0 pkgsrc/chat/unrealircd/patches/patch-af

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/chat/unrealircd/Makefile
diff -u pkgsrc/chat/unrealircd/Makefile:1.55 pkgsrc/chat/unrealircd/Makefile:1.56
--- pkgsrc/chat/unrealircd/Makefile:1.55        Thu Dec 13 19:51:43 2018
+++ pkgsrc/chat/unrealircd/Makefile     Sat Feb  9 15:23:15 2019
@@ -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 @@ LICENSE=    gnu-gpl-v2
 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"
 
+# 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
+
+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-listen=${UIRCD_LISTEN:Q}
 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 @@ PTHREAD_OPTS+=      require
 # 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_GROUPS=         ${UIRCD_GROUP}
 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"

Index: pkgsrc/chat/unrealircd/PLIST
diff -u pkgsrc/chat/unrealircd/PLIST:1.11 pkgsrc/chat/unrealircd/PLIST:1.12
--- pkgsrc/chat/unrealircd/PLIST:1.11   Tue Mar 11 14:04:59 2014
+++ pkgsrc/chat/unrealircd/PLIST        Sat Feb  9 15:23:15 2019
@@ -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
+lib/unrealircd/modules/m_topic.so
+lib/unrealircd/modules/m_trace.so
+lib/unrealircd/modules/m_tsctl.so
+lib/unrealircd/modules/m_umode2.so
+lib/unrealircd/modules/m_undccdeny.so
+lib/unrealircd/modules/m_unsqline.so
+lib/unrealircd/modules/m_user.so
+lib/unrealircd/modules/m_userhost.so
+lib/unrealircd/modules/m_userip.so
+lib/unrealircd/modules/m_vhost.so
+lib/unrealircd/modules/m_wallops.so
+lib/unrealircd/modules/m_watch.so
+lib/unrealircd/modules/m_who.so
+lib/unrealircd/modules/m_whois.so
+lib/unrealircd/modules/m_whowas.so
+lib/unrealircd/modules/m_whox.so
+lib/unrealircd/modules/nocodes.so
+lib/unrealircd/modules/snomasks/dccreject.so
+lib/unrealircd/modules/ssl_antidos.so
+lib/unrealircd/modules/usermodes/bot.so
+lib/unrealircd/modules/usermodes/censor.so
+lib/unrealircd/modules/usermodes/noctcp.so
+lib/unrealircd/modules/usermodes/nokick.so
+lib/unrealircd/modules/usermodes/privacy.so
+lib/unrealircd/modules/usermodes/privdeaf.so
+lib/unrealircd/modules/usermodes/regonlymsg.so
+lib/unrealircd/modules/usermodes/secureonlymsg.so
+lib/unrealircd/modules/usermodes/servicebot.so
+lib/unrealircd/modules/usermodes/showwhois.so
+lib/unrealircd/modules/webirc.so
+lib/unrealircd/modules/websocket.so
 share/doc/unrealircd/Authors
-share/doc/unrealircd/LICENSE
 share/doc/unrealircd/coding-guidelines
 share/doc/unrealircd/tao.of.irc
-share/doc/unrealircd/unreal32docs.de.html
-share/doc/unrealircd/unreal32docs.es.html
-share/doc/unrealircd/unreal32docs.fr.html
-share/doc/unrealircd/unreal32docs.html
-share/doc/unrealircd/unreal32docs.hu.html
-share/doc/unrealircd/unreal32docs.ru.html
-share/doc/unrealircd/unreal32docs.tr.html
-share/examples/unrealircd/example.conf
-share/examples/unrealircd/example.de.conf
-share/examples/unrealircd/example.es.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/examples/unrealircd/example.tr.conf
-share/unrealircd/aliases/aliases.conf
-share/unrealircd/aliases/anope.conf
-share/unrealircd/aliases/atheme.conf
-share/unrealircd/aliases/auspice.conf
-share/unrealircd/aliases/cygnus.conf
-share/unrealircd/aliases/epona.conf
-share/unrealircd/aliases/generic.conf
-share/unrealircd/aliases/genericstats.conf
-share/unrealircd/aliases/ircservices.conf
-share/unrealircd/aliases/operstats.conf
-share/unrealircd/badwords.channel.conf
-share/unrealircd/badwords.message.conf
-share/unrealircd/badwords.quit.conf
-share/unrealircd/help.conf
-share/unrealircd/help.de.conf
-share/unrealircd/help.fr.conf
-share/unrealircd/help.ru.conf
-share/unrealircd/help.tr.conf
-share/unrealircd/modules/cloak.so
-share/unrealircd/modules/commands.so
-share/unrealircd/modules/m_addline.so
-share/unrealircd/modules/m_addmotd.so
-share/unrealircd/modules/m_addomotd.so
-share/unrealircd/modules/m_admin.so
-share/unrealircd/modules/m_adminchat.so
-share/unrealircd/modules/m_akill.so
-share/unrealircd/modules/m_away.so
-share/unrealircd/modules/m_botmotd.so
-share/unrealircd/modules/m_cap.so
-share/unrealircd/modules/m_chatops.so
-share/unrealircd/modules/m_chghost.so
-share/unrealircd/modules/m_chgident.so
-share/unrealircd/modules/m_chgname.so
-share/unrealircd/modules/m_close.so
-share/unrealircd/modules/m_connect.so
-share/unrealircd/modules/m_cycle.so
-share/unrealircd/modules/m_dccallow.so
-share/unrealircd/modules/m_dccdeny.so
-share/unrealircd/modules/m_eos.so
-share/unrealircd/modules/m_globops.so
-share/unrealircd/modules/m_guest.so
-share/unrealircd/modules/m_help.so
-share/unrealircd/modules/m_htm.so
-share/unrealircd/modules/m_invite.so
-share/unrealircd/modules/m_ison.so
-share/unrealircd/modules/m_issecure.so
-share/unrealircd/modules/m_join.so
-share/unrealircd/modules/m_kick.so
-share/unrealircd/modules/m_kill.so
-share/unrealircd/modules/m_knock.so
-share/unrealircd/modules/m_lag.so
-share/unrealircd/modules/m_links.so
-share/unrealircd/modules/m_list.so
-share/unrealircd/modules/m_locops.so
-share/unrealircd/modules/m_lusers.so
-share/unrealircd/modules/m_map.so
-share/unrealircd/modules/m_message.so
-share/unrealircd/modules/m_mkpasswd.so
-share/unrealircd/modules/m_mode.so
-share/unrealircd/modules/m_motd.so
-share/unrealircd/modules/m_nachat.so
-share/unrealircd/modules/m_names.so
-share/unrealircd/modules/m_netinfo.so
-share/unrealircd/modules/m_nick.so
-share/unrealircd/modules/m_nopost.so
-share/unrealircd/modules/m_oper.so
-share/unrealircd/modules/m_opermotd.so
-share/unrealircd/modules/m_part.so
-share/unrealircd/modules/m_pass.so
-share/unrealircd/modules/m_pingpong.so
-share/unrealircd/modules/m_protoctl.so
-share/unrealircd/modules/m_quit.so
-share/unrealircd/modules/m_rakill.so
-share/unrealircd/modules/m_rping.so
-share/unrealircd/modules/m_rules.so
-share/unrealircd/modules/m_sajoin.so
-share/unrealircd/modules/m_samode.so
-share/unrealircd/modules/m_sapart.so
-share/unrealircd/modules/m_sasl.so
-share/unrealircd/modules/m_sdesc.so
-share/unrealircd/modules/m_sendsno.so
-share/unrealircd/modules/m_sendumode.so
-share/unrealircd/modules/m_server.so
-share/unrealircd/modules/m_sethost.so
-share/unrealircd/modules/m_setident.so
-share/unrealircd/modules/m_setname.so
-share/unrealircd/modules/m_silence.so
-share/unrealircd/modules/m_sjoin.so
-share/unrealircd/modules/m_sqline.so
-share/unrealircd/modules/m_squit.so
-share/unrealircd/modules/m_starttls.so
-share/unrealircd/modules/m_stats.so
-share/unrealircd/modules/m_svsfline.so
-share/unrealircd/modules/m_svsjoin.so
-share/unrealircd/modules/m_svskill.so
-share/unrealircd/modules/m_svslusers.so
-share/unrealircd/modules/m_svsmode.so
-share/unrealircd/modules/m_svsmotd.so
-share/unrealircd/modules/m_svsnick.so
-share/unrealircd/modules/m_svsnline.so
-share/unrealircd/modules/m_svsnolag.so
-share/unrealircd/modules/m_svsnoop.so
-share/unrealircd/modules/m_svso.so
-share/unrealircd/modules/m_svspart.so
-share/unrealircd/modules/m_svssilence.so
-share/unrealircd/modules/m_svssno.so
-share/unrealircd/modules/m_svswatch.so
-share/unrealircd/modules/m_swhois.so
-share/unrealircd/modules/m_time.so
-share/unrealircd/modules/m_tkl.so
-share/unrealircd/modules/m_topic.so
-share/unrealircd/modules/m_trace.so
-share/unrealircd/modules/m_tsctl.so
-share/unrealircd/modules/m_umode2.so
-share/unrealircd/modules/m_undccdeny.so
-share/unrealircd/modules/m_unkline.so
-share/unrealircd/modules/m_unsqline.so
-share/unrealircd/modules/m_unzline.so
-share/unrealircd/modules/m_user.so
-share/unrealircd/modules/m_userhost.so
-share/unrealircd/modules/m_userip.so
-share/unrealircd/modules/m_vhost.so
-share/unrealircd/modules/m_wallops.so
-share/unrealircd/modules/m_watch.so
-share/unrealircd/modules/m_who.so
-share/unrealircd/modules/m_whois.so
-share/unrealircd/modules/m_whowas.so
-share/unrealircd/spamfilter.conf
+share/examples/unrealircd/aliases/aliases.conf
+share/examples/unrealircd/aliases/anope.conf
+share/examples/unrealircd/aliases/atheme.conf
+share/examples/unrealircd/aliases/auspice.conf
+share/examples/unrealircd/aliases/cygnus.conf
+share/examples/unrealircd/aliases/epona.conf
+share/examples/unrealircd/aliases/generic.conf
+share/examples/unrealircd/aliases/genericstats.conf
+share/examples/unrealircd/aliases/ircservices.conf
+share/examples/unrealircd/aliases/operstats.conf
+share/examples/unrealircd/badwords.conf
+share/examples/unrealircd/dccallow.conf
+share/examples/unrealircd/examples/example.conf
+share/examples/unrealircd/examples/example.fr.conf
+share/examples/unrealircd/examples/example.tr.conf
+share/examples/unrealircd/help/help.conf
+share/examples/unrealircd/help/help.de.conf
+share/examples/unrealircd/help/help.fr.conf
+share/examples/unrealircd/help/help.it.conf
+share/examples/unrealircd/help/help.ru.conf
+share/examples/unrealircd/help/help.tr.conf
+share/examples/unrealircd/modules.default.conf
+share/examples/unrealircd/modules.optional.conf
+share/examples/unrealircd/operclass.default.conf
+share/examples/unrealircd/spamfilter.conf
+share/examples/unrealircd/ssl/curl-ca-bundle.crt
+unrealircd/scripts/unrealircd
+@pkgdir unrealircd/tmp
+@pkgdir unrealircd/logs
+@pkgdir unrealircd/data
+@pkgdir unrealircd/cache
+@pkgdir lib/unrealircd/modules/third
+@pkgdir etc/unrealircd

Index: pkgsrc/chat/unrealircd/distinfo
diff -u pkgsrc/chat/unrealircd/distinfo:1.19 pkgsrc/chat/unrealircd/distinfo:1.20
--- pkgsrc/chat/unrealircd/distinfo:1.19        Thu Nov 26 16:36:00 2015
+++ pkgsrc/chat/unrealircd/distinfo     Sat Feb  9 15:23:15 2019
@@ -1,17 +1,9 @@
-$NetBSD: distinfo,v 1.19 2015/11/26 16:36:00 jperkin Exp $
+$NetBSD: distinfo,v 1.20 2019/02/09 15:23:15 nia Exp $
 
-SHA1 (Unreal3.2.10.5.tar.gz) = 3a8823e79c8c89ac8339e105c6c0b6a2a76f6097
-RMD160 (Unreal3.2.10.5.tar.gz) = 4acf7edbadeca5679a22a09d16e08873f1e61e8b
-SHA512 (Unreal3.2.10.5.tar.gz) = 98c71a958f3b620ff4c9d83279c508e13bdd76cc9d191ac021c4ef57eaf6a549345c0b2c1f8c550f29c2d79f8f257a176ae73e73dcbab839715462aa4b80565e
-Size (Unreal3.2.10.5.tar.gz) = 3538121 bytes
-SHA1 (patch-ab) = 3c36478f05d9acffa0c0b51ca0c4a4d313252687
-SHA1 (patch-ac) = f0d882e6caae52527f6ad9cc2bb5657d0288d852
-SHA1 (patch-ae) = 0a3a072871295f5108d439770609e8e4c4036d7b
-SHA1 (patch-af) = a00efce16f294aa1675cc8cc4fb5b5ada3c7146e
-SHA1 (patch-src_modules_m__cycle.c) = 05944483d7b7584e03f883bd3dcd30fdaec0526f
-SHA1 (patch-src_modules_m__rping.c) = 799e8d26b4916fdf7a251bae49da594fc19f8612
-SHA1 (patch-src_modules_m__svsjoin.c) = 6af54f4e141674d8a207213a0de28289cbbe8ba1
-SHA1 (patch-src_modules_m__svspart.c) = 898ef5c57238071aa796fef4226e70156b0d29ff
-SHA1 (patch-src_modules_m__svssilence.c) = 5e3bb9eae6557196069fba081828d90e107226e2
-SHA1 (patch-src_modules_m__svswatch.c) = 2be4f2218edd263ccdef4f8fd8c6f5c06d78166f
-SHA1 (patch-src_modules_m__vhost.c) = 080b1c827e575d7fbdab760b05bfdd10b9413b88
+SHA1 (unrealircd-4.2.1.1.tar.gz) = be65901ab7e7823060cc54a9d1dce7ae47817608
+RMD160 (unrealircd-4.2.1.1.tar.gz) = 407ce52a28799dc44c68e1061a35353eb57a9ebb
+SHA512 (unrealircd-4.2.1.1.tar.gz) = e1c4a071fe47893d6cbe924cf6eece1939ca0c9531c6f2fd0b421d9a9b8850ca8fa407033409aa1f08e8257a8a4d73e8632db54dbe9f0365544b48d92db728fe
+Size (unrealircd-4.2.1.1.tar.gz) = 6039863 bytes
+SHA1 (patch-Makefile.in) = f42dbe01865c99f16db227bec251a0d78bdddd2c
+SHA1 (patch-ac) = 644990fd93c6754778d4c0a8b3a2aab34a1bcbb3
+SHA1 (patch-ae) = 14499974009921e55fbf2c1719f7588b17f1315c

Index: pkgsrc/chat/unrealircd/options.mk
diff -u pkgsrc/chat/unrealircd/options.mk:1.16 pkgsrc/chat/unrealircd/options.mk:1.17
--- pkgsrc/chat/unrealircd/options.mk:1.16      Thu Nov 26 16:36:00 2015
+++ pkgsrc/chat/unrealircd/options.mk   Sat Feb  9 15:23:15 2019
@@ -1,86 +1,22 @@
-# $NetBSD: options.mk,v 1.16 2015/11/26 16:36:00 jperkin Exp $
+# $NetBSD: options.mk,v 1.17 2019/02/09 15:23:15 nia Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.unrealircd
 
-PKG_SUPPORTED_OPTIONS= inet6 unrealircd-nospoof unrealircd-ziplinks
-PKG_SUPPORTED_OPTIONS+= unrealircd-remoteinc ssl unrealircd-chroot
-PKG_SUPPORTED_OPTIONS+=        unrealircd-prefixaq unrealircd-showlistmodes
-PKG_SUPPORTED_OPTIONS+= unrealircd-topicisnuhost unrealircd-shunnotices
-PKG_SUPPORTED_OPTIONS+= unrealircd-operoverride-verify
+PKG_SUPPORTED_OPTIONS+=        unrealircd-remoteinc
+PKG_SUPPORTED_OPTIONS+=        unrealircd-showlistmodes
+PKG_SUPPORTED_OPTIONS+=        unrealircd-topicisnuhost unrealircd-shunnotices
+PKG_SUPPORTED_OPTIONS+=        unrealircd-operoverride-verify
 PKG_SUPPORTED_OPTIONS+=        unrealircd-no-operoverride unrealircd-disableusermod
-PKG_SUGGESTED_OPTIONS= unrealircd-showlistmodes unrealircd-prefixaq
+PKG_SUGGESTED_OPTIONS= unrealircd-showlistmodes
 
 .include "../../mk/bsd.options.mk"
 
 ###
-### Enable IPv6 support
-###
-.if !empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ARGS+=       --enable-inet6
-.else
-CONFIGURE_ARGS+=       --disable-inet6
-CONFIGURE_ENV+=                ac_cv_ip6=no
-.endif
-
-###
-### Enable SSL support
-###
-.if !empty(PKG_OPTIONS:Mssl)
-.      include "../../security/openssl/buildlink3.mk"
-CONFIGURE_ARGS+=       --enable-ssl=${SSLBASE}
-.endif
-
-###
-### Enable Anti-Spoofing protection for older OS's with an insecure IPv4 stack
-###
-.if !empty(PKG_OPTIONS:Munrealircd-nospoof)
-CONFIGURE_ARGS+=       --enable-nospoof
-.endif
-
-###
-### Compile in support for ziplinks.  This compresses data sent from
-### server <-> server with zlib.
-###
-.if !empty(PKG_OPTIONS:Munrealircd-ziplinks)
-CONFIGURE_ARGS+=               --enable-ziplinks=${BUILDLINK_PREFIX.zlib}
-.      include "../../devel/zlib/buildlink3.mk"
-.endif
-
-###
 ### Compile in support for remote include files.
 ###
 .if !empty(PKG_OPTIONS:Munrealircd-remoteinc)
 CONFIGURE_ARGS+=               --enable-libcurl=${PREFIX}
-.      include "../../www/curl/buildlink3.mk"
-.      include "../../net/libcares/buildlink3.mk"
-.endif
-
-###
-### Compile in CHROOTDIR support.
-### As far as pkgsrc goes this is just an expirement.  You should read the
-### unrealircd docs/source for further information on this.  By default
-### CHROOTDIR is defined as ${IRCD_HOME}.
-###
-.if !empty(PKG_OPTIONS:Munrealircd-chroot)
-CFLAGS+=               -DCHROOTDIR
-CFLAGS+=               -DIRC_USER=\"${UIRCD_USER}\"
-CFLAGS+=               -DIRC_GROUP=\"${UIRCD_GROUP}\"
-CONFIGURE_ARGS+=       --disable-dynamic-linking
-.else
-CONFIGURE_ARGS+=       --enable-dynamic-linking
-.endif
-
-###
-### Enable prefixes for chanadmin and chanowner.
-### This will give +a the & prefix and ~ for +q (just like +o is @)
-### Supported by the major clients:
-###    mIRC, xchat, epic, eggdrop, Klient, PJIRC, etc.
-### with the notable exceptions of:
-###    irssi, KVIrc and CGI:IRC.
-### This feature should be enabled/disabled network-wide.
-###
-.if !empty(PKG_OPTIONS:Munrealircd-prefixaq)
-CONFIGURE_ARGS+=               --enable-prefixaq
+.  include "../../www/curl/buildlink3.mk"
 .endif
 
 ###

Index: pkgsrc/chat/unrealircd/files/unrealircd.sh
diff -u pkgsrc/chat/unrealircd/files/unrealircd.sh:1.2 pkgsrc/chat/unrealircd/files/unrealircd.sh:1.3
--- pkgsrc/chat/unrealircd/files/unrealircd.sh:1.2      Tue Mar  7 17:23:51 2006
+++ pkgsrc/chat/unrealircd/files/unrealircd.sh  Sat Feb  9 15:23:15 2019
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: unrealircd.sh,v 1.2 2006/03/07 17:23:51 adrianp Exp $
+# $NetBSD: unrealircd.sh,v 1.3 2019/02/09 15:23:15 nia Exp $
 #
 # PROVIDE: unrealircd
 # REQUIRE: DAEMON
@@ -14,9 +14,9 @@ fi
 
 name="unrealircd"
 rcvar=${name}
-command="@PREFIX@/sbin/ircd"
-required_files="@UIRCD_HOME@/unrealircd.conf"
-pidfile="@UIRCD_HOME@/ircd.pid"
+command="@PREFIX@/bin/unrealircd"
+required_files="@PKG_SYSCONFDIR@/unrealircd/unrealircd.conf"
+pidfile="@PREFIX@/unrealircd/ircd.pid"
 unrealircd_user="@UIRCD_USER@"
 unrealircd_group="@UIRCD_GROUP@"
 extra_commands="rehash"

Index: pkgsrc/chat/unrealircd/files/smf/manifest.xml
diff -u pkgsrc/chat/unrealircd/files/smf/manifest.xml:1.3 pkgsrc/chat/unrealircd/files/smf/manifest.xml:1.4
--- pkgsrc/chat/unrealircd/files/smf/manifest.xml:1.3   Wed Jun  8 10:16:50 2016
+++ pkgsrc/chat/unrealircd/files/smf/manifest.xml       Sat Feb  9 15:23:16 2019
@@ -21,7 +21,7 @@
       <propval name="ignore_error" type="astring" value="core,signal" />
     </property_group>
     <property_group name="application" type="application">
-      <propval name="config_file" type="astring" value="@UIRCD_HOME@/unrealircd.conf" />
+      <propval name="config_file" type="astring" value="@PKG_SYSCONFDIR@/unrealircd/unrealircd.conf" />
     </property_group>
     <template>
       <common_name>

Index: pkgsrc/chat/unrealircd/patches/patch-ac
diff -u pkgsrc/chat/unrealircd/patches/patch-ac:1.3 pkgsrc/chat/unrealircd/patches/patch-ac:1.4
--- pkgsrc/chat/unrealircd/patches/patch-ac:1.3 Thu Nov 26 16:36:00 2015
+++ pkgsrc/chat/unrealircd/patches/patch-ac     Sat Feb  9 15:23:16 2019
@@ -1,15 +1,15 @@
-$NetBSD: patch-ac,v 1.3 2015/11/26 16:36:00 jperkin Exp $
+$NetBSD: patch-ac,v 1.4 2019/02/09 15:23:16 nia Exp $
 
 Don't declare own errno.
 
---- include/h.h.orig   2015-11-09 16:16:59.000000000 +0000
+--- include/h.h.orig   2019-01-03 08:00:11.000000000 +0000
 +++ include/h.h
-@@ -237,7 +237,7 @@ extern int vsnprintf (char *str, size_t 
+@@ -218,7 +218,7 @@ extern int vsnprintf (char *str, size_t 
  #ifdef _WIN32
- extern MODVAR int dbufalloc, dbufblocks, debuglevel;
+ extern MODVAR int debuglevel;
  #else
--extern int dbufalloc, dbufblocks, debuglevel, errno, h_errno;
-+extern int dbufalloc, dbufblocks, debuglevel, h_errno;
+-extern int debuglevel, errno, h_errno;
++extern int debuglevel, h_errno;
  #endif
- extern MODVAR short LastSlot; /* last used index in local client array */
  extern MODVAR int OpenFiles;  /* number of files currently open */
+ extern MODVAR int debuglevel, portnum, debugtty, maxusersperchannel;
Index: pkgsrc/chat/unrealircd/patches/patch-ae
diff -u pkgsrc/chat/unrealircd/patches/patch-ae:1.3 pkgsrc/chat/unrealircd/patches/patch-ae:1.4
--- pkgsrc/chat/unrealircd/patches/patch-ae:1.3 Thu Nov 26 16:36:00 2015
+++ pkgsrc/chat/unrealircd/patches/patch-ae     Sat Feb  9 15:23:16 2019
@@ -1,12 +1,12 @@
-$NetBSD: patch-ae,v 1.3 2015/11/26 16:36:00 jperkin Exp $
+$NetBSD: patch-ae,v 1.4 2019/02/09 15:23:16 nia Exp $
 
 Don't declare own errno.
 
---- src/socket.c.orig  2015-11-09 16:16:59.000000000 +0000
+--- src/socket.c.orig  2019-01-03 08:00:11.000000000 +0000
 +++ src/socket.c
-@@ -24,9 +24,6 @@
- #include "h.h"
+@@ -25,9 +25,6 @@
  #include <signal.h>
+ #include <string.h>
  #include "inet.h"
 -#ifndef _WIN32
 -extern int errno;             /* ...seems that errno.h doesn't define this everywhere */

Added files:

Index: pkgsrc/chat/unrealircd/patches/patch-Makefile.in
diff -u /dev/null pkgsrc/chat/unrealircd/patches/patch-Makefile.in:1.1
--- /dev/null   Sat Feb  9 15:23:16 2019
+++ pkgsrc/chat/unrealircd/patches/patch-Makefile.in    Sat Feb  9 15:23:16 2019
@@ -0,0 +1,130 @@
+$NetBSD: patch-Makefile.in,v 1.1 2019/02/09 15:23:16 nia Exp $
+
+DESTDIR support. Also use correct permissions.
+
+--- Makefile.in.orig   2019-01-03 08:00:11.000000000 +0000
++++ Makefile.in
+@@ -177,65 +177,65 @@ depend:
+       done
+ 
+ install: all
+-      $(INSTALL) -m 0700 -d @BINDIR@
+-      $(INSTALL) -m 0700 src/ircd @BINDIR@/unrealircd
+-      $(INSTALL) -m 0700 -d @DOCDIR@
+-      $(INSTALL) -m 0600 doc/Authors doc/coding-guidelines doc/tao.of.irc @DOCDIR@
+-      $(INSTALL) -m 0700 -d @CONFDIR@
+-      $(INSTALL) -m 0600 doc/conf/*.default.conf @CONFDIR@
+-      $(INSTALL) -m 0600 doc/conf/*.optional.conf @CONFDIR@
+-      -@if [ ! -f "@CONFDIR@/spamfilter.conf" ] ; then \
+-              $(INSTALL) -m 0600 doc/conf/spamfilter.conf @CONFDIR@ ; \
+-      fi
+-      -@if [ ! -f "@CONFDIR@/badwords.conf" ] ; then \
+-              $(INSTALL) -m 0600 doc/conf/badwords.conf @CONFDIR@ ; \
+-      fi
+-      -@if [ ! -f "@CONFDIR@/dccallow.conf" ] ; then \
+-              $(INSTALL) -m 0600 doc/conf/dccallow.conf @CONFDIR@ ; \
+-      fi
+-      $(INSTALL) -m 0700 -d @CONFDIR@/aliases
+-      $(INSTALL) -m 0600 doc/conf/aliases/*.conf @CONFDIR@/aliases
+-      $(INSTALL) -m 0700 -d @CONFDIR@/help
+-      $(INSTALL) -m 0600 doc/conf/help/*.conf @CONFDIR@/help
+-      $(INSTALL) -m 0700 -d @CONFDIR@/examples
+-      $(INSTALL) -m 0600 doc/conf/examples/*.conf @CONFDIR@/examples
+-      $(INSTALL) -m 0700 -d @CONFDIR@/ssl
+-      $(INSTALL) -m 0600 doc/conf/ssl/curl-ca-bundle.crt @CONFDIR@/ssl
+-      $(INSTALL) -m 0700 unrealircd @SCRIPTDIR@
+-      $(INSTALL) -m 0700 -d @MODULESDIR@
+-      $(INSTALL) -m 0700 src/modules/*.so @MODULESDIR@
+-      $(INSTALL) -m 0700 -d @MODULESDIR@/usermodes
+-      $(INSTALL) -m 0700 src/modules/usermodes/*.so @MODULESDIR@/usermodes
+-      $(INSTALL) -m 0700 -d @MODULESDIR@/chanmodes
+-      $(INSTALL) -m 0700 src/modules/chanmodes/*.so @MODULESDIR@/chanmodes
+-      $(INSTALL) -m 0700 -d @MODULESDIR@/snomasks
+-      $(INSTALL) -m 0700 src/modules/snomasks/*.so @MODULESDIR@/snomasks
+-      $(INSTALL) -m 0700 -d @MODULESDIR@/extbans
+-      $(INSTALL) -m 0700 src/modules/extbans/*.so @MODULESDIR@/extbans
+-      $(INSTALL) -m 0700 -d @MODULESDIR@/cap
+-      $(INSTALL) -m 0700 src/modules/cap/*.so @MODULESDIR@/cap
+-      $(INSTALL) -m 0700 -d @MODULESDIR@/third
++      $(INSTALL) -m 0755 -d ${DESTDIR}@BINDIR@
++      $(INSTALL) -m 0755 src/ircd ${DESTDIR}@BINDIR@/unrealircd
++      $(INSTALL) -m 0755 -d ${DESTDIR}@DOCDIR@
++      $(INSTALL) -m 0644 doc/Authors doc/coding-guidelines doc/tao.of.irc ${DESTDIR}@DOCDIR@
++      $(INSTALL) -m 0755 -d ${DESTDIR}@CONFDIR@
++      $(INSTALL) -m 0644 doc/conf/*.default.conf ${DESTDIR}@CONFDIR@
++      $(INSTALL) -m 0644 doc/conf/*.optional.conf ${DESTDIR}@CONFDIR@
++      -@if [ ! -f "${DESTDIR}@CONFDIR@/spamfilter.conf" ] ; then \
++              $(INSTALL) -m 0644 doc/conf/spamfilter.conf ${DESTDIR}@CONFDIR@ ; \
++      fi
++      -@if [ ! -f "${DESTDIR}@CONFDIR@/badwords.conf" ] ; then \
++              $(INSTALL) -m 0644 doc/conf/badwords.conf ${DESTDIR}@CONFDIR@ ; \
++      fi
++      -@if [ ! -f "${DESTDIR}@CONFDIR@/dccallow.conf" ] ; then \
++              $(INSTALL) -m 0644 doc/conf/dccallow.conf ${DESTDIR}@CONFDIR@ ; \
++      fi
++      $(INSTALL) -m 0755 -d ${DESTDIR}@CONFDIR@/aliases
++      $(INSTALL) -m 0644 doc/conf/aliases/*.conf ${DESTDIR}@CONFDIR@/aliases
++      $(INSTALL) -m 0755 -d ${DESTDIR}@CONFDIR@/help
++      $(INSTALL) -m 0644 doc/conf/help/*.conf ${DESTDIR}@CONFDIR@/help
++      $(INSTALL) -m 0755 -d ${DESTDIR}@CONFDIR@/examples
++      $(INSTALL) -m 0644 doc/conf/examples/*.conf ${DESTDIR}@CONFDIR@/examples
++      $(INSTALL) -m 0755 -d ${DESTDIR}@CONFDIR@/ssl
++      $(INSTALL) -m 0644 doc/conf/ssl/curl-ca-bundle.crt ${DESTDIR}@CONFDIR@/ssl
++      $(INSTALL) -m 0755 unrealircd ${DESTDIR}@SCRIPTDIR@
++      $(INSTALL) -m 0755 -d ${DESTDIR}@MODULESDIR@
++      $(INSTALL) -m 0755 src/modules/*.so ${DESTDIR}@MODULESDIR@
++      $(INSTALL) -m 0755 -d ${DESTDIR}@MODULESDIR@/usermodes
++      $(INSTALL) -m 0755 src/modules/usermodes/*.so ${DESTDIR}@MODULESDIR@/usermodes
++      $(INSTALL) -m 0755 -d ${DESTDIR}@MODULESDIR@/chanmodes
++      $(INSTALL) -m 0755 src/modules/chanmodes/*.so ${DESTDIR}@MODULESDIR@/chanmodes
++      $(INSTALL) -m 0755 -d ${DESTDIR}@MODULESDIR@/snomasks
++      $(INSTALL) -m 0755 src/modules/snomasks/*.so ${DESTDIR}@MODULESDIR@/snomasks
++      $(INSTALL) -m 0755 -d ${DESTDIR}@MODULESDIR@/extbans
++      $(INSTALL) -m 0755 src/modules/extbans/*.so ${DESTDIR}@MODULESDIR@/extbans
++      $(INSTALL) -m 0755 -d ${DESTDIR}@MODULESDIR@/cap
++      $(INSTALL) -m 0755 src/modules/cap/*.so ${DESTDIR}@MODULESDIR@/cap
++      $(INSTALL) -m 0755 -d ${DESTDIR}@MODULESDIR@/third
+       @#Ugly stuff to detect 0 files in this directory:
+       @+for f in src/modules/third/*.so; do \
+-              [ -e $f ] && $(INSTALL) -m 0700 src/modules/third/*.so @MODULESDIR@/third || echo; \
++              [ -e $f ] && $(INSTALL) -m 0755 src/modules/third/*.so ${DESTDIR}@MODULESDIR@/third || echo; \
+       done
+-      $(INSTALL) -m 0700 -d @TMPDIR@
+-      $(INSTALL) -m 0700 -d @CACHEDIR@
+-      $(INSTALL) -m 0700 -d @PERMDATADIR@
+-      $(INSTALL) -m 0700 -d @LOGDIR@
+-      -@if [ ! -f "@CONFDIR@/ssl/server.cert.pem" ] ; then \
+-              $(INSTALL) -m 0600 server.req.pem @CONFDIR@/ssl ; \
+-              $(INSTALL) -m 0600 server.key.pem @CONFDIR@/ssl ; \
+-              $(INSTALL) -m 0600 server.cert.pem @CONFDIR@/ssl ; \
++      $(INSTALL) -m 0755 -d ${DESTDIR}@TMPDIR@
++      $(INSTALL) -m 0755 -d ${DESTDIR}@CACHEDIR@
++      $(INSTALL) -m 0755 -d ${DESTDIR}@PERMDATADIR@
++      $(INSTALL) -m 0755 -d ${DESTDIR}@LOGDIR@
++      -@if [ ! -f "${DESTDIR}@CONFDIR@/ssl/server.cert.pem" ] ; then \
++              $(INSTALL) -m 0644 server.req.pem ${DESTDIR}@CONFDIR@/ssl ; \
++              $(INSTALL) -m 0644 server.key.pem ${DESTDIR}@CONFDIR@/ssl ; \
++              $(INSTALL) -m 0644 server.cert.pem ${DESTDIR}@CONFDIR@/ssl ; \
+       fi
+       @echo ''
+       @echo '* UnrealIRCd is now installed.'
+       
+-      -@if [ "@SCRIPTDIR@/bin" = "@BINDIR@" ] ; then \
++      -@if [ "${DESTDIR}@SCRIPTDIR@/bin" = "${DESTDIR}@BINDIR@" ] ; then \
+               echo '* Leave this directory and run "cd @SCRIPTDIR@" now' ; \
+       fi
+       @echo '* Directory layout:'
+-      -@if [ "@SCRIPTDIR@/bin" = "@BINDIR@" ] ; then \
++      -@if [ "${DESTDIR}@SCRIPTDIR@/bin" = "${DESTDIR}@BINDIR@" ] ; then \
+               echo ' * Base directory: @SCRIPTDIR@' ; \
+       fi
+       @echo '  * Configuration files: @CONFDIR@'
+@@ -249,7 +249,7 @@ install: all
+       @echo '* You may also wish to install a cron job to ensure UnrealIRCd is always running:'
+       @echo '  * https://www.unrealircd.org/docs/Cron_job'
+       @echo ''
+-      -@if [ "@SCRIPTDIR@/bin" = "@BINDIR@" ] ; then \
++      -@if [ "${DESTDIR}@SCRIPTDIR@/bin" = "${DESTDIR}@BINDIR@" ] ; then \
+               echo 'Again, be sure to change to the @SCRIPTDIR@ directory!' ; \
+       fi
+ 



Home | Main Index | Thread Index | Old Index