diff options
author | Chris Rees <crees@FreeBSD.org> | 2013-01-02 12:23:17 +0000 |
---|---|---|
committer | Chris Rees <crees@FreeBSD.org> | 2013-01-02 12:23:17 +0000 |
commit | 31a6e1f9c3955ffa5d8ef7a40be9bd335a94049c (patch) | |
tree | 378477f8eec430a59f1beb7f2d4304c1a409a9b8 /irc | |
parent | Fix build with clang. (diff) |
Update to 3.4.2
This contains a security fix, all admins are advised to upgrade.
Security: http://www.ratbox.org/ASA-2012-12-31.txt
Notes
Notes:
svn path=/head/; revision=309812
Diffstat (limited to 'irc')
-rw-r--r-- | irc/charybdis/Makefile | 12 | ||||
-rw-r--r-- | irc/charybdis/distinfo | 4 | ||||
-rw-r--r-- | irc/charybdis/files/charybdis.in | 16 | ||||
-rw-r--r-- | irc/charybdis/files/patch-tools-Makefile-in | 6 | ||||
-rw-r--r-- | irc/charybdis/pkg-plist | 15 |
5 files changed, 25 insertions, 28 deletions
diff --git a/irc/charybdis/Makefile b/irc/charybdis/Makefile index 7054ba385ff0..a1fe74aed1b5 100644 --- a/irc/charybdis/Makefile +++ b/irc/charybdis/Makefile @@ -1,13 +1,7 @@ -# New ports collection Makefile for: charybdis -# Date created: 6th March 2011 -# Whom: Chris Rees <utisoft@gmail.com> -# # $FreeBSD$ -# PORTNAME= charybdis -PORTVERSION= 3.3.0 -PORTREVISION= 1 +PORTVERSION= 3.4.2 CATEGORIES= irc net MASTER_SITES= http://www.stack.nl/~jilles/irc/ \ http://www.bayofrum.net/dist/${PORTNAME}/ @@ -61,5 +55,9 @@ pre-su-install: @${MKDIR} ${DOCSDIR} @${INSTALL_DATA} ${DISTDIR}/charybdis-oper-guide.pdf ${DOCSDIR} .endif + @${MKDIR} ${ETCDIR} + @${INSTALL_DATA} ${WRKSRC}/doc/ircd.motd ${ETCDIR}/ircd.motd.sample + @[ -f ${ETCDIR}/ircd.motd ] || ${CP} -p ${ETCDIR}/ircd.motd.sample \ + ${ETCDIR}/ircd.motd .include <bsd.port.mk> diff --git a/irc/charybdis/distinfo b/irc/charybdis/distinfo index 0ba488d02a10..e5cad524a72c 100644 --- a/irc/charybdis/distinfo +++ b/irc/charybdis/distinfo @@ -1,4 +1,4 @@ -SHA256 (charybdis-3.3.0.tbz2) = b5feae88c031dee799144fbfde9d64f3ace4c979c337a1047677a17600dddab1 -SIZE (charybdis-3.3.0.tbz2) = 1478877 +SHA256 (charybdis-3.4.2.tbz2) = 8a38e67072d90147c40202918c82237765e339cbc849456da54994ce6e31b754 +SIZE (charybdis-3.4.2.tbz2) = 1526229 SHA256 (charybdis-oper-guide.pdf) = 13a0fe5642ed62810e76aed4c95dcd2fcd63f3565af9035fdd7b3874b5951e07 SIZE (charybdis-oper-guide.pdf) = 553379 diff --git a/irc/charybdis/files/charybdis.in b/irc/charybdis/files/charybdis.in index aa32cffeede1..4876c4d6467a 100644 --- a/irc/charybdis/files/charybdis.in +++ b/irc/charybdis/files/charybdis.in @@ -13,20 +13,20 @@ . /etc/rc.subr -name="charybdis" +name=charybdis rcvar=charybdis_enable load_rc_config $name -: ${charybdis_enable="NO"} -: ${charybdis_user="ircd"} -: ${charybdis_group="ircd"} +: ${charybdis_enable:=NO} +: ${charybdis_user=ircd} +: ${charybdis_group=ircd} -command="%%PREFIX%%/bin/ircd" -pidfile="/var/run/${name}/${name}.pid" +command=%%PREFIX%%/bin/ircd +pidfile=/var/run/${name}/${name}.pid command_args="-configfile %%ETCDIR%%/ircd.conf -pidfile ${pidfile}" -start_precmd="${name}_prestart" +start_precmd=${name}_prestart charybdis_prestart() { @@ -34,4 +34,4 @@ charybdis_prestart() chown -R ircd %%ETCDIR%% } -run_rc_command "$1" +run_rc_command $1 diff --git a/irc/charybdis/files/patch-tools-Makefile-in b/irc/charybdis/files/patch-tools-Makefile-in index 0f05ae78bfe0..0c7903280013 100644 --- a/irc/charybdis/files/patch-tools-Makefile-in +++ b/irc/charybdis/files/patch-tools-Makefile-in @@ -22,9 +22,7 @@ @@ -100,6 +101,7 @@ fi; \ - $(INSTALL_BIN) $$i $(DESTDIR)$(bindir); \ + $(INSTALL_BIN) $$i $(DESTDIR)$(bindir)/$(PROGRAM_PREFIX)$$i; \ done; \ + $(INSTALL_SCRIPT) genssl.sh $(DESTDIR)$(bindir); \ - $(RM) -f $(DESTDIR)$(bindir)/vimotd $(DESTDIR)$(bindir)/viklines - $(LN) $(DESTDIR)$(bindir)/viconf $(DESTDIR)$(bindir)/vimotd - $(LN) $(DESTDIR)$(bindir)/viconf $(DESTDIR)$(bindir)/viklines + $(RM) -f $(DESTDIR)$(bindir)/$(PROGRAM_PREFIX)vimotd diff --git a/irc/charybdis/pkg-plist b/irc/charybdis/pkg-plist index 5119e7390266..49f9fa1bbceb 100644 --- a/irc/charybdis/pkg-plist +++ b/irc/charybdis/pkg-plist @@ -7,15 +7,12 @@ bin/ircd bin/mkpasswd bin/ssld bin/viconf -bin/viklines bin/vimotd -etc/charybdis/dline.conf etc/charybdis/example.conf -etc/charybdis/ircd.motd -etc/charybdis/kline.conf +@unexec cmp -s %D/etc/charybdis/ircd.motd.sample %D/etc/charybdis/ircd.motd && rm -f %D/etc/charybdis/ircd.motd || true +etc/charybdis/ircd.motd.sample +@exec [ -f %D/ircd.motd ] || cp -p %D/%F %B/ircd.motd etc/charybdis/reference.conf -etc/charybdis/resv.conf -etc/charybdis/xline.conf lib/libratbox.la lib/libratbox.so %%DATADIR%%/help/opers/accept @@ -199,6 +196,7 @@ lib/libratbox.so %%DATADIR%%/modules/autoload/m_tb.so %%DATADIR%%/modules/autoload/m_testline.so %%DATADIR%%/modules/autoload/m_testmask.so +%%DATADIR%%/modules/autoload/m_tginfo.so %%DATADIR%%/modules/autoload/m_time.so %%DATADIR%%/modules/autoload/m_topic.so %%DATADIR%%/modules/autoload/m_trace.so @@ -230,6 +228,7 @@ lib/libratbox.so %%DATADIR%%/modules/extensions/extb_realname.so %%DATADIR%%/modules/extensions/extb_server.so %%DATADIR%%/modules/extensions/extb_ssl.so +%%DATADIR%%/modules/extensions/extb_usermode.so %%DATADIR%%/modules/extensions/force_user_invis.so %%DATADIR%%/modules/extensions/hurt.so %%DATADIR%%/modules/extensions/ip_cloaking.so @@ -246,10 +245,13 @@ lib/libratbox.so %%DATADIR%%/modules/extensions/m_olist.so %%DATADIR%%/modules/extensions/m_omode.so %%DATADIR%%/modules/extensions/m_opme.so +%%DATADIR%%/modules/extensions/m_remove.so +%%DATADIR%%/modules/extensions/m_roleplay.so %%DATADIR%%/modules/extensions/m_sendbans.so %%DATADIR%%/modules/extensions/m_webirc.so %%DATADIR%%/modules/extensions/no_locops.so %%DATADIR%%/modules/extensions/no_oper_invis.so +%%DATADIR%%/modules/extensions/override.so %%DATADIR%%/modules/extensions/sno_farconnect.so %%DATADIR%%/modules/extensions/sno_globalkline.so %%DATADIR%%/modules/extensions/sno_globaloper.so @@ -280,7 +282,6 @@ lib/libratbox.so @dirrm %%DATADIR%%/modules @dirrm %%DATADIR%%/help/users @dirrm %%DATADIR%%/help/opers -@dirrm %%DATADIR%%/help-old @dirrm %%DATADIR%%/help @dirrm %%DATADIR%% @dirrm etc/charybdis |