- Update to 7.2.1

PR:		ports/106485
Submitted by:	Evgueni V. Gavrilov <aquatique-ports@rambler.ru> (maintainer)

26 files changed, 518 insertions, 724 deletions

diff --git a/russian/ircd-hybrid-ru/Makefile b/russian/ircd-hybrid-ru/Makefile
index 0f526448e76d..e80237e1754f 100644
--- a/russian/ircd-hybrid-ru/Makefile
+++ b/russian/ircd-hybrid-ru/Makefile
@@ -6,37 +6,36 @@
 #
 
 PORTNAME=	ircd
-PORTVERSION=	7.1
-PORTREVISION=	5
+PORTVERSION=	7.2.1
 CATEGORIES=	irc russian
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://rusunix.org/pub/FreeBSD/distfiles/
 MASTER_SITE_SUBDIR=	ircd-hybrid-ru
 PKGNAMESUFFIX=	-hybrid-ru
-DISTNAME=	ircd-hybrid-ru-7.0rc12
+DISTNAME=	ircd-hybrid-ru-7.2.1
 
 MAINTAINER=	aquatique-ports@rambler.ru
 COMMENT=	Russian version of well known hybrid IRC server
 
-CONFLICTS=	ircd-hybrid-7* ircd-ru[0-9]*
+CONFLICTS=	ircd-[0-9]*
 
 WRKSRC=		${WRKDIR}/${PORTNAME}${PKGNAMESUFFIX}
 USE_OPENSSL=	yes
 USE_BISON=	yes
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/ircd-hybrid-ru --enable-kqueue
+CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/ircd-hybrid-ru
 
-MANCOMPRESSED=	no
 MAN8=		ircd.8
 
-.if defined(WITHOUT_NLS)
-BROKEN=		"Incorrect pkg-plist"
-.endif
-
 .if defined(WITH_SMALL_NET)
 CONFIGURE_ARGS+=-enable-small-net
 .endif
 
+.if defined(WITH_SYSLOG)
+CONFIGURE_ARGS+=--enable-syslog=\"kill squit connect users oper\"
+.endif
+
 .if defined(NICKLENGTH)
 CONFIGURE_ARGS+=--with-nicklen=${NICKLENGTH}
 .endif
@@ -45,30 +44,31 @@ CONFIGURE_ARGS+=--with-nicklen=${NICKLENGTH}
 CONFIGURE_ARGS+=--with-topiclen=${TOPICLENGTH}
 .endif
 
-.if defined(MAXCLIENTS)
-CONFIGURE_ARGS+=--with-maxclients=${MAXCLIENTS}
+.if defined(MAXCONN)
+CONFIGURE_ARGS+=--with-maxconn=${MAXCONN}
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e 's,"-g,",; s,-O2 -g,-O,' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's,/modules/,/lib/ircd-hybrid-ru-modules/,' ${WRKSRC}/include/config.h
-	@${REINPLACE_CMD} -e 's,/etc,/etc/ircd-hybrid-ru,' ${WRKSRC}/include/config.h
-	@${REINPLACE_CMD} -e 's,IRCD_PREFIX "/logs","/var/log/ircd-hybrid-ru",' ${WRKSRC}/include/config.h
-	@${FIND} ${WRKSRC} -type f -name Makefile.in -print0 | ${XARGS} -0 ${REINPLACE_CMD} \
-		-e "s,/modules,/lib/ircd-hybrid-ru-modules,"
-
 pre-extract:
 	@${ECHO_MSG} "* * * Build options for ircd-hybrid-ru * * *"
 	@${ECHO_MSG} "Issue make WITH_SMALL_NET=yes to build server optimized for small network"
+	@${ECHO_MSG} "Issue make WITH_SYSLOG=yes to enable logging via syslogd"
 	@${ECHO_MSG} "You can define maximum nick length. For example make NICKLENGTH=46 (default is 30)"
 	@${ECHO_MSG} "You can define maximum topic length. For example make TOPICLENGTH=254 (default is 120; maximum is 390)"
-	@${ECHO_MSG} "You can define maximum number of connections for ircd. For example make MAXCLIENTS=512"
+	@${ECHO_MSG} "You can define maximum number of connections for ircd. For example make MAXCONN=512"
+
+post-extract:
+	@${CP} ${WRKSRC}/contrib/m_ojoin.c ${WRKSRC}/modules/
+	@${CP} ${WRKSRC}/contrib/m_force.c ${WRKSRC}/modules/
+
+post-patch:
+	@${REINPLACE_CMD} -e 's,-g -O2,-O2,' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's,"-g","",' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's,ac_cv_prog_cc_g=yes,ac_cv_prog_cc_g=no,' ${WRKSRC}/configure
 
 pre-install:
 	@${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-	@${REINPLACE_CMD} -e 's,ircd/etc/codepage,etc/ircd-hybrid-ru/codepage,' ${WRKSRC}/doc/example.conf
-	@${REINPLACE_CMD} -e 's,/ircd/modules,/lib/ircd-hybrid-ru-modules,' ${WRKSRC}/doc/example.conf
-	@${REINPLACE_CMD} -e 's,logs/,/var/log/ircd-hybrid-ru/,' ${WRKSRC}/doc/example.conf
+	@${REINPLACE_CMD} -e 's,ircd/etc/codepage,etc/ircd-hybrid-ru/codepage,' ${WRKSRC}/etc/example.conf
+	@${REINPLACE_CMD} -e 's,/ircd/modules,/lib/ircd-hybrid-ru-modules,' ${WRKSRC}/etc/example.conf
 
 post-install:
 	@${INSTALL_SCRIPT} -m 555 ${FILESDIR}/ircd-hybrid-ru.sh.sample ${PREFIX}/etc/rc.d
diff --git a/russian/ircd-hybrid-ru/distinfo b/russian/ircd-hybrid-ru/distinfo
index c428c90b8dc1..3d76c7efb177 100644
--- a/russian/ircd-hybrid-ru/distinfo
+++ b/russian/ircd-hybrid-ru/distinfo
@@ -1,3 +1,3 @@
-MD5 (ircd-hybrid-ru-7.0rc12.tar.gz) = ee5c58d107b1d96b6b2f10397c07a43d
-SHA256 (ircd-hybrid-ru-7.0rc12.tar.gz) = f567b0e11069d313c563f121ead8b84920f764368877fe3303d656ff26608584
-SIZE (ircd-hybrid-ru-7.0rc12.tar.gz) = 1149919
+MD5 (ircd-hybrid-ru-7.2.1.tar.gz) = e9cbadd258ebfa44a425664d919768cd
+SHA256 (ircd-hybrid-ru-7.2.1.tar.gz) = 652d2e38dcadb3893c5c75dbce54113471a6c54ef0a155566ffd9c9861051fe9
+SIZE (ircd-hybrid-ru-7.2.1.tar.gz) = 1025064
diff --git a/russian/ircd-hybrid-ru/files/ircd-hybrid-ru.sh.sample b/russian/ircd-hybrid-ru/files/ircd-hybrid-ru.sh.sample
index fae85a3c8289..f62cb23e9862 100644
--- a/russian/ircd-hybrid-ru/files/ircd-hybrid-ru.sh.sample
+++ b/russian/ircd-hybrid-ru/files/ircd-hybrid-ru.sh.sample
@@ -13,7 +13,7 @@ start)
 	;;
 stop)
 	kill `cat ${PREFIX}/etc/ircd-hybrid-ru/ircd.pid` >/dev/null 2>&1
-	echo -n ' ircd-hybrid-ru'
+	echo -n ' ircd'
 	;;
 *)
 	echo "Usage: `basename $0` {start|stop}" >&2
diff --git a/russian/ircd-hybrid-ru/files/patch-defaults.h b/russian/ircd-hybrid-ru/files/patch-defaults.h
new file mode 100644
index 000000000000..f62e226d2dce
--- /dev/null
+++ b/russian/ircd-hybrid-ru/files/patch-defaults.h
@@ -0,0 +1,18 @@
+--- include/defaults.h.ORIG	Mon Oct 16 13:32:18 2006
++++ include/defaults.h	Mon Oct 16 13:34:28 2006
+@@ -51,11 +51,11 @@
+ #define DPATH       IRCD_PREFIX                                                     
+ #define BINPATH     IRCD_PREFIX "/bin/"
+ #define MSGPATH     IRCD_PREFIX "/messages/"
+-#define ETCPATH     IRCD_PREFIX "/etc"
++#define ETCPATH     IRCD_PREFIX "/etc/ircd-hybrid-ru/"
+ #define CPPATH      ETCPATH     "/codepages/"
+-#define LOGPATH     IRCD_PREFIX "/logs"
+-#define MODPATH     IRCD_PREFIX "/modules/"
+-#define AUTOMODPATH IRCD_PREFIX "/modules/autoload/"
++#define LOGPATH     		"/var/log/ircd-hybrid-ru/"
++#define MODPATH     IRCD_PREFIX "/lib/ircd-hybrid-ru-modules/"
++#define AUTOMODPATH IRCD_PREFIX "/lib/ircd-hybrid-ru-modules/autoload/"
+ 
+ /* files */
+ #define SPATH   BINPATH "/ircd"                 /* ircd executable */
diff --git a/russian/ircd-hybrid-ru/files/patch-doc-Makefile.in b/russian/ircd-hybrid-ru/files/patch-doc-Makefile.in
deleted file mode 100644
index 10b829b4b40a..000000000000
--- a/russian/ircd-hybrid-ru/files/patch-doc-Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- doc/Makefile.in.orig	Sat Nov 13 23:58:49 2004
-+++ doc/Makefile.in	Mon Nov 15 17:34:02 2004
-@@ -26,7 +26,7 @@
- automoduledir	= @prefix@/modules/autoload
- 
- # Local to the etc Makefile
--mandir          = @prefix@/man8
-+mandir          = @prefix@/man/man8
- MANPAGES        = ircd.8
- 
- CONFS		= example.conf example.dalnetru.conf
-@@ -81,6 +81,8 @@
- 			touch $(sysconfdir)/$${i}line.conf; \
- 		fi; \
- 	done
-+	mkdir -p $(sysconfdir)/codepage; \
-+	$(INSTALL_DATA) codepage/* $(sysconfdir)/codepage/
- 
- 	@for i in n c; do \
- 		if test ! -f "$(sysconfdir)/$${i}resv.conf"; then \
diff --git a/russian/ircd-hybrid-ru/files/patch-etc-Makefile.in b/russian/ircd-hybrid-ru/files/patch-etc-Makefile.in
new file mode 100644
index 000000000000..f491eaf0f143
--- /dev/null
+++ b/russian/ircd-hybrid-ru/files/patch-etc-Makefile.in
@@ -0,0 +1,11 @@
+--- etc/Makefile.in.orig	Thu May  5 16:21:59 2005
++++ etc/Makefile.in	Thu May  5 16:20:08 2005
+@@ -27,6 +27,8 @@
+ 		echo $(INSTALL_DATA) $$i $(sysconfdir); \
+ 		$(INSTALL_DATA) $$i $(sysconfdir); \
+ 	done
++	mkdir -p $(sysconfdir)/codepages
++	$(INSTALL_DATA) codepages/*.tab $(sysconfdir)/codepages
+ 
+ 	@echo "Note: more example configuration files can be found in this directory (etc/)."
+ 	
diff --git a/russian/ircd-hybrid-ru/files/patch-include-Makefile.in b/russian/ircd-hybrid-ru/files/patch-include-Makefile.in
deleted file mode 100644
index 3f7c0db6e4c3..000000000000
--- a/russian/ircd-hybrid-ru/files/patch-include-Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
---- include/Makefile.in.orig	Mon Nov 15 15:32:30 2004
-+++ include/Makefile.in	Mon Nov 15 15:33:04 2004
-@@ -21,9 +21,9 @@
- 	@echo installing header files...
- 	-@if test ! -d $(prefix)/include; then \
- 		echo "mkdir $(prefix)/include"; \
--		mkdir $(prefix)/include; \
--		mkdir $(prefix)/include/ircd-hybrid-7; \
-+		mkdir $(prefix)/include; \
- 	fi
-+	mkdir $(prefix)/include/ircd-hybrid-7
- 	@for header in *.h; do \
- 		${INSTALL_DATA} $$header $(prefix)/include/ircd-hybrid-7; \
- 	done
diff --git a/russian/ircd-hybrid-ru/files/patch-modules-Makefile.in b/russian/ircd-hybrid-ru/files/patch-modules-Makefile.in
new file mode 100644
index 000000000000..628d5e0061f0
--- /dev/null
+++ b/russian/ircd-hybrid-ru/files/patch-modules-Makefile.in
@@ -0,0 +1,22 @@
+--- modules/Makefile.in.orig	Tue Jun 20 16:59:06 2006
++++ modules/Makefile.in	Tue Oct 17 08:35:33 2006
+@@ -23,7 +23,7 @@
+ 
+ prefix          = $(DESTDIR)@prefix@
+ # Change this later! -- adrian
+-moduledir       = ${prefix}/modules
++moduledir       = ${prefix}/lib/ircd-hybrid-ru-modules
+ automoduledir   = ${moduledir}/autoload
+ 
+ INCLUDES	= -I../include -I../lib/pcre $(SSL_INCLUDES)
+@@ -111,7 +111,9 @@
+   m_who.c \
+   m_whois.c \
+   m_whowas.c \
+-  m_xline.c
++  m_xline.c \
++  m_force.c \
++  m_ojoin.c
+ 
+ ALL_SRCS = $(CORE_SRCS) $(SRCS) @SSL_SRCS_ENABLE@
+ 
diff --git a/russian/ircd-hybrid-ru/files/patch-src-Makefile.in b/russian/ircd-hybrid-ru/files/patch-src-Makefile.in
index 300e5d791c3b..a0aded922d6d 100644
--- a/russian/ircd-hybrid-ru/files/patch-src-Makefile.in
+++ b/russian/ircd-hybrid-ru/files/patch-src-Makefile.in
@@ -1,15 +1,11 @@
---- src/Makefile.in.orig	Mon Nov 15 14:39:25 2004
-+++ src/Makefile.in	Mon Nov 15 14:39:59 2004
-@@ -141,9 +141,9 @@
- 		echo "mkdir $(sysconfdir)"; \
- 		mkdir $(sysconfdir); \
- 	fi
--	-@if test ! -d $(localstatedir)/logs; then \
--		echo "mkdir $(localstatedir)/logs"; \
--		mkdir $(localstatedir)/logs; \
-+	-@if test ! -d /var/log/ircd-hybrid-ru; then \
-+		echo "/var/log/ircd-hybrid-ru"; \
-+		mkdir /var/log/ircd-hybrid-ru; \
- 	fi
+--- src/Makefile.in.ORIG	Mon Oct 16 13:38:09 2006
++++ src/Makefile.in	Mon Oct 16 13:38:24 2006
+@@ -121,7 +121,7 @@
+ 
+ install-mkdirs:
+ 	mkdir -p $(DESTDIR)$(prefix) $(exec_prefix) $(bindir) $(sysconfdir) \
+-		$(localstatedir)/logs
++		/var/log/ircd-hybrid-ru
  
  install: install-mkdirs build
+ 	@for i in $(PROGS); do \
diff --git a/russian/ircd-hybrid-ru/files/patch-src-packet.c b/russian/ircd-hybrid-ru/files/patch-src-packet.c
deleted file mode 100644
index b3f4a4796b87..000000000000
--- a/russian/ircd-hybrid-ru/files/patch-src-packet.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/packet.c.orig	Tue Nov 16 22:29:48 2004
-+++ src/packet.c	Sun Feb 13 12:33:49 2005
-@@ -532,7 +532,7 @@
- 
-   /* Check to make sure we're not flooding */
- 
--  if (IsPerson(client_p) &&
-+  if (!(IsServer(client_p) || IsHandshake(client_p) || IsConnecting(client_p)) &&
-       (linebuf_alloclen(&client_p->localClient->buf_recvq) >
-        ConfigFileEntry.client_flood))
-   {
diff --git a/russian/ircd-hybrid-ru/files/patch-tools-Makefile.in b/russian/ircd-hybrid-ru/files/patch-tools-Makefile.in
deleted file mode 100644
index c807f0577a4c..000000000000
--- a/russian/ircd-hybrid-ru/files/patch-tools-Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- tools/Makefile.in.orig	Fri Jul 12 06:40:27 2002
-+++ tools/Makefile.in	Mon Nov 15 16:51:10 2004
-@@ -121,17 +121,9 @@
- 		echo "mkdir $(moduledir)"; \
- 		mkdir $(moduledir); \
- 	fi
--	-@if test ! -d $(automoduledir); then \
--		echo "mkdir $(automoduledir)"; \
--		mkdir $(automoduledir); \
--	fi
- 	-@if test ! -d $(sysconfdir); then \
- 		echo "mkdir $(sysconfdir)"; \
- 		mkdir $(sysconfdir); \
--	fi
--	-@if test ! -d $(localstatedir)/logs; then \
--		echo "mkdir $(localstatedir)/logs"; \
--		mkdir $(localstatedir)/logs; \
- 	fi
- 
- install: install-mkdirs build
diff --git a/russian/ircd-hybrid-ru/pkg-message b/russian/ircd-hybrid-ru/pkg-message
index 8cafa9cf22fa..83c0ab174a7c 100644
--- a/russian/ircd-hybrid-ru/pkg-message
+++ b/russian/ircd-hybrid-ru/pkg-message
@@ -1,11 +1,6 @@
 
 ----------------------------------------------------
 
-If you updated this port to version 7.1_2, please
-don't forget to remove the old UID/GID - 6667
-
-This port uses now UID/GID - 555
-
 ircd-hybrid-ru has been installed.
 
 This port create user ircdru and group ircdru
diff --git a/russian/ircd-hybrid-ru/pkg-plist b/russian/ircd-hybrid-ru/pkg-plist
index 8bbb6100cc1f..3a82141553ff 100644
--- a/russian/ircd-hybrid-ru/pkg-plist
+++ b/russian/ircd-hybrid-ru/pkg-plist
@@ -1,242 +1,42 @@
+bin/encspeed
 bin/ircd
-bin/viconf
 bin/mkpasswd
-bin/convertconf
-bin/convertilines
-bin/convertklines
-bin/encspeed
-bin/vimotd
-bin/viklines
 bin/servlink
-etc/rc.d/ircd-hybrid-ru.sh.sample
-etc/ircd-hybrid-ru/auto.am.conf
-etc/ircd-hybrid-ru/auto.az.conf
-etc/ircd-hybrid-ru/auto.by.conf
-etc/ircd-hybrid-ru/auto.ee.conf
-etc/ircd-hybrid-ru/auto.ge.conf
-etc/ircd-hybrid-ru/auto.kg.conf
-etc/ircd-hybrid-ru/auto.kz.conf
-etc/ircd-hybrid-ru/auto.lt.conf
-etc/ircd-hybrid-ru/auto.lv.conf
-etc/ircd-hybrid-ru/auto.md.conf
-etc/ircd-hybrid-ru/auto.ru.conf
-etc/ircd-hybrid-ru/auto.tj.conf
-etc/ircd-hybrid-ru/auto.tm.conf
-etc/ircd-hybrid-ru/auto.ua.conf
-etc/ircd-hybrid-ru/auto.uz.conf
+etc/ircd-hybrid-ru/codepages/cp866.tab
+etc/ircd-hybrid-ru/codepages/iso8859-5.tab
+etc/ircd-hybrid-ru/codepages/koi8r.tab
+etc/ircd-hybrid-ru/codepages/macintosh.tab
+etc/ircd-hybrid-ru/codepages/translit.tab
+etc/ircd-hybrid-ru/cresv.conf
+etc/ircd-hybrid-ru/dline.conf
 etc/ircd-hybrid-ru/example.conf
-etc/ircd-hybrid-ru/example.dalnetru.conf
+etc/ircd-hybrid-ru/ircd.motd
 etc/ircd-hybrid-ru/kline.conf
-etc/ircd-hybrid-ru/dline.conf
-etc/ircd-hybrid-ru/xline.conf
 etc/ircd-hybrid-ru/nresv.conf
-etc/ircd-hybrid-ru/cresv.conf
-etc/ircd-hybrid-ru/codepage/cp866.tab
-etc/ircd-hybrid-ru/codepage/iso8859-5.tab
-etc/ircd-hybrid-ru/codepage/koi8.tab
-etc/ircd-hybrid-ru/codepage/macintosh.tab
-etc/ircd-hybrid-ru/codepage/translit.tab
-include/ircd-hybrid-7/balloc.h
-include/ircd-hybrid-7/channel.h
-include/ircd-hybrid-7/channel_mode.h
-include/ircd-hybrid-7/class.h
-include/ircd-hybrid-7/client.h
-include/ircd-hybrid-7/common.h
-include/ircd-hybrid-7/config.h
-include/ircd-hybrid-7/defaults.h
-include/ircd-hybrid-7/event.h
-include/ircd-hybrid-7/fdlist.h
-include/ircd-hybrid-7/fileio.h
-include/ircd-hybrid-7/handlers.h
-include/ircd-hybrid-7/hash.h
-include/ircd-hybrid-7/hook.h
-include/ircd-hybrid-7/hostmask.h
-include/ircd-hybrid-7/irc_string.h
-include/ircd-hybrid-7/ircd.h
-include/ircd-hybrid-7/ircd_defs.h
-include/ircd-hybrid-7/ircd_getopt.h
-include/ircd-hybrid-7/ircd_handler.h
-include/ircd-hybrid-7/ircd_signal.h
-include/ircd-hybrid-7/ircdauth.h
-include/ircd-hybrid-7/linebuf.h
-include/ircd-hybrid-7/list.h
-include/ircd-hybrid-7/listener.h
-include/ircd-hybrid-7/m_info.h
-include/ircd-hybrid-7/m_kline.h
-include/ircd-hybrid-7/md5.h
-include/ircd-hybrid-7/memory.h
-include/ircd-hybrid-7/modules.h
-include/ircd-hybrid-7/motd.h
-include/ircd-hybrid-7/msg.h
-include/ircd-hybrid-7/numeric.h
-include/ircd-hybrid-7/packet.h
-include/ircd-hybrid-7/parse.h
-include/ircd-hybrid-7/patchlevel.h
-include/ircd-hybrid-7/res.h
-include/ircd-hybrid-7/restart.h
-include/ircd-hybrid-7/resv.h
-include/ircd-hybrid-7/rsa.h
-include/ircd-hybrid-7/s_auth.h
-include/ircd-hybrid-7/s_bsd.h
-include/ircd-hybrid-7/s_conf.h
-include/ircd-hybrid-7/s_debug.h
-include/ircd-hybrid-7/s_gline.h
-include/ircd-hybrid-7/s_log.h
-include/ircd-hybrid-7/s_misc.h
-include/ircd-hybrid-7/s_serv.h
-include/ircd-hybrid-7/s_stats.h
-include/ircd-hybrid-7/s_user.h
-include/ircd-hybrid-7/s_zip.h
-include/ircd-hybrid-7/scache.h
-include/ircd-hybrid-7/send.h
-include/ircd-hybrid-7/serno.h
-include/ircd-hybrid-7/setup.h
-include/ircd-hybrid-7/sprintf_irc.h
-include/ircd-hybrid-7/stdinc.h
-include/ircd-hybrid-7/supported.h
-include/ircd-hybrid-7/tools.h
-include/ircd-hybrid-7/translate.h
-include/ircd-hybrid-7/vchannel.h
-include/ircd-hybrid-7/whowas.h
-lib/ircd-hybrid-ru-modules/autoload/m_accept.so
-lib/ircd-hybrid-ru-modules/autoload/m_admin.so
-lib/ircd-hybrid-ru-modules/autoload/m_alias.so
-lib/ircd-hybrid-ru-modules/autoload/m_away.so
-lib/ircd-hybrid-ru-modules/autoload/m_capab.so
-lib/ircd-hybrid-ru-modules/autoload/m_cburst.so
-lib/ircd-hybrid-ru-modules/autoload/m_challenge.so
-lib/ircd-hybrid-ru-modules/autoload/m_cjoin.so
-lib/ircd-hybrid-ru-modules/autoload/m_clearchan.so
-lib/ircd-hybrid-ru-modules/autoload/m_close.so
-lib/ircd-hybrid-ru-modules/autoload/m_connect.so
-lib/ircd-hybrid-ru-modules/autoload/m_cryptlink.so
-lib/ircd-hybrid-ru-modules/autoload/m_dmem.so
-lib/ircd-hybrid-ru-modules/autoload/m_drop.so
-lib/ircd-hybrid-ru-modules/autoload/m_encap.so
-lib/ircd-hybrid-ru-modules/autoload/m_eob.so
-lib/ircd-hybrid-ru-modules/autoload/m_force.so
-lib/ircd-hybrid-ru-modules/autoload/m_forcenick.so
-lib/ircd-hybrid-ru-modules/autoload/m_gline.so
-lib/ircd-hybrid-ru-modules/autoload/m_help.so
-lib/ircd-hybrid-ru-modules/autoload/m_info.so
-lib/ircd-hybrid-ru-modules/autoload/m_invite.so
-lib/ircd-hybrid-ru-modules/autoload/m_ison.so
-lib/ircd-hybrid-ru-modules/autoload/m_join.so
-lib/ircd-hybrid-ru-modules/autoload/m_kline.so
-lib/ircd-hybrid-ru-modules/autoload/m_knock.so
-lib/ircd-hybrid-ru-modules/autoload/m_links.so
-lib/ircd-hybrid-ru-modules/autoload/m_list.so
-lib/ircd-hybrid-ru-modules/autoload/m_lljoin.so
-lib/ircd-hybrid-ru-modules/autoload/m_llnick.so
-lib/ircd-hybrid-ru-modules/autoload/m_locops.so
-lib/ircd-hybrid-ru-modules/autoload/m_lusers.so
-lib/ircd-hybrid-ru-modules/autoload/m_map.so
-lib/ircd-hybrid-ru-modules/autoload/m_motd.so
-lib/ircd-hybrid-ru-modules/autoload/m_names.so
-lib/ircd-hybrid-ru-modules/autoload/m_nburst.so
-lib/ircd-hybrid-ru-modules/autoload/m_oper.so
-lib/ircd-hybrid-ru-modules/autoload/m_operwall.so
-lib/ircd-hybrid-ru-modules/autoload/m_ojoin.so
-lib/ircd-hybrid-ru-modules/autoload/m_pass.so
-lib/ircd-hybrid-ru-modules/autoload/m_ping.so
-lib/ircd-hybrid-ru-modules/autoload/m_pong.so
-lib/ircd-hybrid-ru-modules/autoload/m_post.so
-lib/ircd-hybrid-ru-modules/autoload/m_rehash.so
-lib/ircd-hybrid-ru-modules/autoload/m_restart.so
-lib/ircd-hybrid-ru-modules/autoload/m_resv.so
-lib/ircd-hybrid-ru-modules/autoload/m_set.so
-lib/ircd-hybrid-ru-modules/autoload/m_svs.so
-lib/ircd-hybrid-ru-modules/autoload/m_stats.so
-lib/ircd-hybrid-ru-modules/autoload/m_svinfo.so
-lib/ircd-hybrid-ru-modules/autoload/m_tburst.so
-lib/ircd-hybrid-ru-modules/autoload/m_testline.so
-lib/ircd-hybrid-ru-modules/autoload/m_time.so
-lib/ircd-hybrid-ru-modules/autoload/m_topic.so
-lib/ircd-hybrid-ru-modules/autoload/m_trace.so
-lib/ircd-hybrid-ru-modules/autoload/m_unkline.so
-lib/ircd-hybrid-ru-modules/autoload/m_user.so
-lib/ircd-hybrid-ru-modules/autoload/m_userhost.so
-lib/ircd-hybrid-ru-modules/autoload/m_users.so
-lib/ircd-hybrid-ru-modules/autoload/m_version.so
-lib/ircd-hybrid-ru-modules/autoload/m_wallops.so
-lib/ircd-hybrid-ru-modules/autoload/m_who.so
-lib/ircd-hybrid-ru-modules/autoload/m_whois.so
-lib/ircd-hybrid-ru-modules/autoload/m_whowas.so
-lib/ircd-hybrid-ru-modules/autoload/m_xline.so
-lib/ircd-hybrid-ru-modules/m_die.so
-lib/ircd-hybrid-ru-modules/m_kick.so
-lib/ircd-hybrid-ru-modules/m_kill.so
-lib/ircd-hybrid-ru-modules/m_message.so
-lib/ircd-hybrid-ru-modules/m_mode.so
-lib/ircd-hybrid-ru-modules/m_nick.so
-lib/ircd-hybrid-ru-modules/m_part.so
-lib/ircd-hybrid-ru-modules/m_quit.so
-lib/ircd-hybrid-ru-modules/m_server.so
-lib/ircd-hybrid-ru-modules/m_sjoin.so
-lib/ircd-hybrid-ru-modules/m_squit.so
-messages/ayb/LC_MESSAGES/ircd-hybrid.mo
-messages/custom/LC_MESSAGES/ircd-hybrid.mo
-help/users/accept
-help/users/admin
-help/users/away
-help/users/challenge
-help/users/cjoin
-help/users/cmode
-help/users/credits
-help/users/error
-help/users/help
-help/users/index
-help/users/info
-help/users/invite
-help/users/ison
-help/users/join
-help/users/kick
-help/users/knock
-help/users/links
-help/users/list
-help/users/lusers
-help/users/motd
-help/users/names
-help/users/nick
-help/users/notice
-help/users/oper
-help/users/part
-help/users/pass
-help/users/ping
-help/users/pong
-help/users/privmsg
-help/users/quit
-help/users/stats
-help/users/time
-help/users/topic
-help/users/umode
-help/users/user
-help/users/userhost
-help/users/users
-help/users/version
-help/users/who
-help/users/whois
-help/users/whowas
+etc/ircd-hybrid-ru/rkline.conf
+etc/ircd-hybrid-ru/rxline.conf
+etc/ircd-hybrid-ru/xline.conf
+etc/rc.d/ircd-hybrid-ru.sh.sample
 help/opers/accept
 help/opers/admin
 help/opers/away
 help/opers/capab
 help/opers/cburst
 help/opers/challenge
-help/opers/cjoin
 help/opers/client
 help/opers/close
 help/opers/cmode
+help/opers/codepage
 help/opers/connect
-help/opers/credits
 help/opers/cryptlink
 help/opers/die
 help/opers/dline
-help/opers/dmem
 help/opers/drop
 help/opers/eob
 help/opers/error
+help/opers/etrace
 help/opers/gline
+help/opers/hash
 help/opers/help
 help/opers/index
 help/opers/info
@@ -254,6 +54,7 @@ help/opers/lljoin
 help/opers/llnick
 help/opers/locops
 help/opers/lusers
+help/opers/map
 help/opers/modlist
 help/opers/modload
 help/opers/modrestart
@@ -263,6 +64,7 @@ help/opers/names
 help/opers/nburst
 help/opers/nick
 help/opers/notice
+help/opers/omotd
 help/opers/oper
 help/opers/operwall
 help/opers/part
@@ -275,13 +77,17 @@ help/opers/quit
 help/opers/rehash
 help/opers/restart
 help/opers/resv
+help/opers/rkline
+help/opers/rxline
 help/opers/server
 help/opers/set
 help/opers/sjoin
 help/opers/squit
 help/opers/stats
 help/opers/svinfo
+help/opers/testgecos
 help/opers/testline
+help/opers/testmask
 help/opers/time
 help/opers/topic
 help/opers/trace
@@ -291,6 +97,7 @@ help/opers/undline
 help/opers/ungline
 help/opers/unkline
 help/opers/unresv
+help/opers/unxline
 help/opers/user
 help/opers/userhost
 help/opers/users
@@ -299,38 +106,151 @@ help/opers/wallops
 help/opers/who
 help/opers/whois
 help/opers/whowas
-%%PORTDOCS%%%%DOCSDIR%%/RELNOTES
-%%PORTDOCS%%%%DOCSDIR%%/RELNOTES.hybrid-ru
-%%PORTDOCS%%%%DOCSDIR%%/CIDR.txt
-%%PORTDOCS%%%%DOCSDIR%%/LazyLinks.txt
-%%PORTDOCS%%%%DOCSDIR%%/challenge.txt
-%%PORTDOCS%%%%DOCSDIR%%/guidelines.txt
-%%PORTDOCS%%%%DOCSDIR%%/index.txt
-%%PORTDOCS%%%%DOCSDIR%%/kline.txt
-%%PORTDOCS%%%%DOCSDIR%%/messages.txt
-%%PORTDOCS%%%%DOCSDIR%%/modeg.txt
-%%PORTDOCS%%%%DOCSDIR%%/modes.txt
-%%PORTDOCS%%%%DOCSDIR%%/operguide.txt
-%%PORTDOCS%%%%DOCSDIR%%/opermyth.txt
-%%PORTDOCS%%%%DOCSDIR%%/resv.txt
-%%PORTDOCS%%%%DOCSDIR%%/serverhide.txt
-%%PORTDOCS%%%%DOCSDIR%%/vchans.txt
-%%PORTDOCS%%%%DOCSDIR%%/whats-new.txt
-%%PORTDOCS%%%%DOCSDIR%%/server-version-info
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm include/ircd-hybrid-7
-@dirrm lib/ircd-hybrid-ru-modules/autoload
-@dirrm lib/ircd-hybrid-ru-modules
-@dirrm help/users
-@dirrm help/opers
-@dirrm help
-@dirrm messages/ayb/LC_MESSAGES
-@dirrm messages/custom/LC_MESSAGES
-@dirrm messages/ayb
-@dirrm messages/custom
-@dirrm messages
-@exec mkdir -m 755 /var/log/ircd-hybrid-ru
-@exec chown ircdru:ircdru /var/log/ircd-hybrid-ru
-@unexec rmdir /var/log/ircd-hybrid-ru 2>/dev/null || true
-@dirrmtry etc/ircd-hybrid-ru/codepage
-@dirrmtry etc/ircd-hybrid-ru
+help/opers/xline
+help/users/accept
+help/users/admin
+help/users/away
+help/users/challenge
+help/users/cmode
+help/users/error
+help/users/help
+help/users/index
+help/users/info
+help/users/invite
+help/users/ison
+help/users/join
+help/users/kick
+help/users/knock
+help/users/links
+help/users/list
+help/users/lusers
+help/users/map
+help/users/motd
+help/users/names
+help/users/nick
+help/users/notice
+help/users/oper
+help/users/part
+help/users/pass
+help/users/ping
+help/users/pong
+help/users/privmsg
+help/users/quit
+help/users/stats
+help/users/time
+help/users/topic
+help/users/umode
+help/users/user
+help/users/userhost
+help/users/users
+help/users/version
+help/users/who
+help/users/whois
+help/users/whowas
+lib/ircd-hybrid-ru-modules/autoload/m_accept.so
+lib/ircd-hybrid-ru-modules/autoload/m_admin.so
+lib/ircd-hybrid-ru-modules/autoload/m_alias.so
+lib/ircd-hybrid-ru-modules/autoload/m_away.so
+lib/ircd-hybrid-ru-modules/autoload/m_cap.so
+lib/ircd-hybrid-ru-modules/autoload/m_capab.so
+lib/ircd-hybrid-ru-modules/autoload/m_cburst.so
+lib/ircd-hybrid-ru-modules/autoload/m_challenge.so
+lib/ircd-hybrid-ru-modules/autoload/m_close.so
+lib/ircd-hybrid-ru-modules/autoload/m_codepage.so
+lib/ircd-hybrid-ru-modules/autoload/m_connect.so
+lib/ircd-hybrid-ru-modules/autoload/m_cryptlink.so
+lib/ircd-hybrid-ru-modules/autoload/m_drop.so
+lib/ircd-hybrid-ru-modules/autoload/m_encap.so
+lib/ircd-hybrid-ru-modules/autoload/m_eob.so
+lib/ircd-hybrid-ru-modules/autoload/m_etrace.so
+lib/ircd-hybrid-ru-modules/autoload/m_force.so
+lib/ircd-hybrid-ru-modules/autoload/m_gline.so
+lib/ircd-hybrid-ru-modules/autoload/m_hash.so
+lib/ircd-hybrid-ru-modules/autoload/m_help.so
+lib/ircd-hybrid-ru-modules/autoload/m_info.so
+lib/ircd-hybrid-ru-modules/autoload/m_invite.so
+lib/ircd-hybrid-ru-modules/autoload/m_ison.so
+lib/ircd-hybrid-ru-modules/autoload/m_kline.so
+lib/ircd-hybrid-ru-modules/autoload/m_knock.so
+lib/ircd-hybrid-ru-modules/autoload/m_links.so
+lib/ircd-hybrid-ru-modules/autoload/m_list.so
+lib/ircd-hybrid-ru-modules/autoload/m_lljoin.so
+lib/ircd-hybrid-ru-modules/autoload/m_llnick.so
+lib/ircd-hybrid-ru-modules/autoload/m_locops.so
+lib/ircd-hybrid-ru-modules/autoload/m_lusers.so
+lib/ircd-hybrid-ru-modules/autoload/m_map.so
+lib/ircd-hybrid-ru-modules/autoload/m_motd.so
+lib/ircd-hybrid-ru-modules/autoload/m_names.so
+lib/ircd-hybrid-ru-modules/autoload/m_nburst.so
+lib/ircd-hybrid-ru-modules/autoload/m_ojoin.so
+lib/ircd-hybrid-ru-modules/autoload/m_omotd.so
+lib/ircd-hybrid-ru-modules/autoload/m_oper.so
+lib/ircd-hybrid-ru-modules/autoload/m_operwall.so
+lib/ircd-hybrid-ru-modules/autoload/m_pass.so
+lib/ircd-hybrid-ru-modules/autoload/m_ping.so
+lib/ircd-hybrid-ru-modules/autoload/m_pong.so
+lib/ircd-hybrid-ru-modules/autoload/m_post.so
+lib/ircd-hybrid-ru-modules/autoload/m_rehash.so
+lib/ircd-hybrid-ru-modules/autoload/m_restart.so
+lib/ircd-hybrid-ru-modules/autoload/m_resv.so
+lib/ircd-hybrid-ru-modules/autoload/m_rkline.so
+lib/ircd-hybrid-ru-modules/autoload/m_rxline.so
+lib/ircd-hybrid-ru-modules/autoload/m_set.so
+lib/ircd-hybrid-ru-modules/autoload/m_stats.so
+lib/ircd-hybrid-ru-modules/autoload/m_svinfo.so
+lib/ircd-hybrid-ru-modules/autoload/m_svs.so
+lib/ircd-hybrid-ru-modules/autoload/m_tburst.so
+lib/ircd-hybrid-ru-modules/autoload/m_testline.so
+lib/ircd-hybrid-ru-modules/autoload/m_testmask.so
+lib/ircd-hybrid-ru-modules/autoload/m_time.so
+lib/ircd-hybrid-ru-modules/autoload/m_topic.so
+lib/ircd-hybrid-ru-modules/autoload/m_trace.so
+lib/ircd-hybrid-ru-modules/autoload/m_user.so
+lib/ircd-hybrid-ru-modules/autoload/m_userhost.so
+lib/ircd-hybrid-ru-modules/autoload/m_users.so
+lib/ircd-hybrid-ru-modules/autoload/m_version.so
+lib/ircd-hybrid-ru-modules/autoload/m_wallops.so
+lib/ircd-hybrid-ru-modules/autoload/m_who.so
+lib/ircd-hybrid-ru-modules/autoload/m_whois.so
+lib/ircd-hybrid-ru-modules/autoload/m_whowas.so
+lib/ircd-hybrid-ru-modules/autoload/m_xline.so
+lib/ircd-hybrid-ru-modules/m_die.so
+lib/ircd-hybrid-ru-modules/m_join.so
+lib/ircd-hybrid-ru-modules/m_kick.so
+lib/ircd-hybrid-ru-modules/m_kill.so
+lib/ircd-hybrid-ru-modules/m_message.so
+lib/ircd-hybrid-ru-modules/m_mode.so
+lib/ircd-hybrid-ru-modules/m_nick.so
+lib/ircd-hybrid-ru-modules/m_part.so
+lib/ircd-hybrid-ru-modules/m_quit.so
+lib/ircd-hybrid-ru-modules/m_server.so
+lib/ircd-hybrid-ru-modules/m_sjoin.so
+lib/ircd-hybrid-ru-modules/m_squit.so
+%%DOCSDIR%%/CIDR.txt
+%%DOCSDIR%%/LazyLinks.txt
+%%DOCSDIR%%/RELNOTES
+%%DOCSDIR%%/RELNOTES.RU
+%%DOCSDIR%%/challenge.txt
+%%DOCSDIR%%/guidelines.txt
+%%DOCSDIR%%/index.txt
+%%DOCSDIR%%/kline.txt
+%%DOCSDIR%%/messages.txt
+%%DOCSDIR%%/modeg.txt
+%%DOCSDIR%%/modes.txt
+%%DOCSDIR%%/resv.txt
+%%DOCSDIR%%/server-version-info
+%%DOCSDIR%%/serverhide.txt
+%%DOCSDIR%%/whats-new.txt
+@dirrm share/doc/ircd
+@dirrm etc/ircd-hybrid-ru/codepages
+@dirrm etc/ircd-hybrid-ru
+@dirrm lib/ircd-hybrid-ru-modules/autoload                                                                                                   
+@dirrm lib/ircd-hybrid-ru-modules                                                                                                            
+@dirrm help/users                                                                                                                            
+@dirrm help/opers                                                                                                                            
+@dirrm help                                                                                                                                  
+@exec mkdir -m 755 /var/log/ircd-hybrid-ru                                                                                                   
+@exec chown ircdru:ircdru /var/log/ircd-hybrid-ru                                                                                            
+@unexec rmdir /var/log/ircd-hybrid-ru 2>/dev/null || true                                                                                    
+@unexec rmdir %D/etc/ircd-hybrid-ru/codepages 2>/dev/null || true                                                                            
+@unexec rmdir %D/etc/ircd-hybrid-ru 2>/dev/null || true
diff --git a/russian/ircd-hybrid/Makefile b/russian/ircd-hybrid/Makefile
index 0f526448e76d..e80237e1754f 100644
--- a/russian/ircd-hybrid/Makefile
+++ b/russian/ircd-hybrid/Makefile
@@ -6,37 +6,36 @@
 #
 
 PORTNAME=	ircd
-PORTVERSION=	7.1
-PORTREVISION=	5
+PORTVERSION=	7.2.1
 CATEGORIES=	irc russian
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://rusunix.org/pub/FreeBSD/distfiles/
 MASTER_SITE_SUBDIR=	ircd-hybrid-ru
 PKGNAMESUFFIX=	-hybrid-ru
-DISTNAME=	ircd-hybrid-ru-7.0rc12
+DISTNAME=	ircd-hybrid-ru-7.2.1
 
 MAINTAINER=	aquatique-ports@rambler.ru
 COMMENT=	Russian version of well known hybrid IRC server
 
-CONFLICTS=	ircd-hybrid-7* ircd-ru[0-9]*
+CONFLICTS=	ircd-[0-9]*
 
 WRKSRC=		${WRKDIR}/${PORTNAME}${PKGNAMESUFFIX}
 USE_OPENSSL=	yes
 USE_BISON=	yes
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/ircd-hybrid-ru --enable-kqueue
+CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/ircd-hybrid-ru
 
-MANCOMPRESSED=	no
 MAN8=		ircd.8
 
-.if defined(WITHOUT_NLS)
-BROKEN=		"Incorrect pkg-plist"
-.endif
-
 .if defined(WITH_SMALL_NET)
 CONFIGURE_ARGS+=-enable-small-net
 .endif
 
+.if defined(WITH_SYSLOG)
+CONFIGURE_ARGS+=--enable-syslog=\"kill squit connect users oper\"
+.endif
+
 .if defined(NICKLENGTH)
 CONFIGURE_ARGS+=--with-nicklen=${NICKLENGTH}
 .endif
@@ -45,30 +44,31 @@ CONFIGURE_ARGS+=--with-nicklen=${NICKLENGTH}
 CONFIGURE_ARGS+=--with-topiclen=${TOPICLENGTH}
 .endif
 
-.if defined(MAXCLIENTS)
-CONFIGURE_ARGS+=--with-maxclients=${MAXCLIENTS}
+.if defined(MAXCONN)
+CONFIGURE_ARGS+=--with-maxconn=${MAXCONN}
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e 's,"-g,",; s,-O2 -g,-O,' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's,/modules/,/lib/ircd-hybrid-ru-modules/,' ${WRKSRC}/include/config.h
-	@${REINPLACE_CMD} -e 's,/etc,/etc/ircd-hybrid-ru,' ${WRKSRC}/include/config.h
-	@${REINPLACE_CMD} -e 's,IRCD_PREFIX "/logs","/var/log/ircd-hybrid-ru",' ${WRKSRC}/include/config.h
-	@${FIND} ${WRKSRC} -type f -name Makefile.in -print0 | ${XARGS} -0 ${REINPLACE_CMD} \
-		-e "s,/modules,/lib/ircd-hybrid-ru-modules,"
-
 pre-extract:
 	@${ECHO_MSG} "* * * Build options for ircd-hybrid-ru * * *"
 	@${ECHO_MSG} "Issue make WITH_SMALL_NET=yes to build server optimized for small network"
+	@${ECHO_MSG} "Issue make WITH_SYSLOG=yes to enable logging via syslogd"
 	@${ECHO_MSG} "You can define maximum nick length. For example make NICKLENGTH=46 (default is 30)"
 	@${ECHO_MSG} "You can define maximum topic length. For example make TOPICLENGTH=254 (default is 120; maximum is 390)"
-	@${ECHO_MSG} "You can define maximum number of connections for ircd. For example make MAXCLIENTS=512"
+	@${ECHO_MSG} "You can define maximum number of connections for ircd. For example make MAXCONN=512"
+
+post-extract:
+	@${CP} ${WRKSRC}/contrib/m_ojoin.c ${WRKSRC}/modules/
+	@${CP} ${WRKSRC}/contrib/m_force.c ${WRKSRC}/modules/
+
+post-patch:
+	@${REINPLACE_CMD} -e 's,-g -O2,-O2,' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's,"-g","",' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's,ac_cv_prog_cc_g=yes,ac_cv_prog_cc_g=no,' ${WRKSRC}/configure
 
 pre-install:
 	@${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-	@${REINPLACE_CMD} -e 's,ircd/etc/codepage,etc/ircd-hybrid-ru/codepage,' ${WRKSRC}/doc/example.conf
-	@${REINPLACE_CMD} -e 's,/ircd/modules,/lib/ircd-hybrid-ru-modules,' ${WRKSRC}/doc/example.conf
-	@${REINPLACE_CMD} -e 's,logs/,/var/log/ircd-hybrid-ru/,' ${WRKSRC}/doc/example.conf
+	@${REINPLACE_CMD} -e 's,ircd/etc/codepage,etc/ircd-hybrid-ru/codepage,' ${WRKSRC}/etc/example.conf
+	@${REINPLACE_CMD} -e 's,/ircd/modules,/lib/ircd-hybrid-ru-modules,' ${WRKSRC}/etc/example.conf
 
 post-install:
 	@${INSTALL_SCRIPT} -m 555 ${FILESDIR}/ircd-hybrid-ru.sh.sample ${PREFIX}/etc/rc.d
diff --git a/russian/ircd-hybrid/distinfo b/russian/ircd-hybrid/distinfo
index c428c90b8dc1..3d76c7efb177 100644
--- a/russian/ircd-hybrid/distinfo
+++ b/russian/ircd-hybrid/distinfo
@@ -1,3 +1,3 @@
-MD5 (ircd-hybrid-ru-7.0rc12.tar.gz) = ee5c58d107b1d96b6b2f10397c07a43d
-SHA256 (ircd-hybrid-ru-7.0rc12.tar.gz) = f567b0e11069d313c563f121ead8b84920f764368877fe3303d656ff26608584
-SIZE (ircd-hybrid-ru-7.0rc12.tar.gz) = 1149919
+MD5 (ircd-hybrid-ru-7.2.1.tar.gz) = e9cbadd258ebfa44a425664d919768cd
+SHA256 (ircd-hybrid-ru-7.2.1.tar.gz) = 652d2e38dcadb3893c5c75dbce54113471a6c54ef0a155566ffd9c9861051fe9
+SIZE (ircd-hybrid-ru-7.2.1.tar.gz) = 1025064
diff --git a/russian/ircd-hybrid/files/ircd-hybrid-ru.sh.sample b/russian/ircd-hybrid/files/ircd-hybrid-ru.sh.sample
index fae85a3c8289..f62cb23e9862 100644
--- a/russian/ircd-hybrid/files/ircd-hybrid-ru.sh.sample
+++ b/russian/ircd-hybrid/files/ircd-hybrid-ru.sh.sample
@@ -13,7 +13,7 @@ start)
 	;;
 stop)
 	kill `cat ${PREFIX}/etc/ircd-hybrid-ru/ircd.pid` >/dev/null 2>&1
-	echo -n ' ircd-hybrid-ru'
+	echo -n ' ircd'
 	;;
 *)
 	echo "Usage: `basename $0` {start|stop}" >&2
diff --git a/russian/ircd-hybrid/files/patch-defaults.h b/russian/ircd-hybrid/files/patch-defaults.h
new file mode 100644
index 000000000000..f62e226d2dce
--- /dev/null
+++ b/russian/ircd-hybrid/files/patch-defaults.h
@@ -0,0 +1,18 @@
+--- include/defaults.h.ORIG	Mon Oct 16 13:32:18 2006
++++ include/defaults.h	Mon Oct 16 13:34:28 2006
+@@ -51,11 +51,11 @@
+ #define DPATH       IRCD_PREFIX                                                     
+ #define BINPATH     IRCD_PREFIX "/bin/"
+ #define MSGPATH     IRCD_PREFIX "/messages/"
+-#define ETCPATH     IRCD_PREFIX "/etc"
++#define ETCPATH     IRCD_PREFIX "/etc/ircd-hybrid-ru/"
+ #define CPPATH      ETCPATH     "/codepages/"
+-#define LOGPATH     IRCD_PREFIX "/logs"
+-#define MODPATH     IRCD_PREFIX "/modules/"
+-#define AUTOMODPATH IRCD_PREFIX "/modules/autoload/"
++#define LOGPATH     		"/var/log/ircd-hybrid-ru/"
++#define MODPATH     IRCD_PREFIX "/lib/ircd-hybrid-ru-modules/"
++#define AUTOMODPATH IRCD_PREFIX "/lib/ircd-hybrid-ru-modules/autoload/"
+ 
+ /* files */
+ #define SPATH   BINPATH "/ircd"                 /* ircd executable */
diff --git a/russian/ircd-hybrid/files/patch-doc-Makefile.in b/russian/ircd-hybrid/files/patch-doc-Makefile.in
deleted file mode 100644
index 10b829b4b40a..000000000000
--- a/russian/ircd-hybrid/files/patch-doc-Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- doc/Makefile.in.orig	Sat Nov 13 23:58:49 2004
-+++ doc/Makefile.in	Mon Nov 15 17:34:02 2004
-@@ -26,7 +26,7 @@
- automoduledir	= @prefix@/modules/autoload
- 
- # Local to the etc Makefile
--mandir          = @prefix@/man8
-+mandir          = @prefix@/man/man8
- MANPAGES        = ircd.8
- 
- CONFS		= example.conf example.dalnetru.conf
-@@ -81,6 +81,8 @@
- 			touch $(sysconfdir)/$${i}line.conf; \
- 		fi; \
- 	done
-+	mkdir -p $(sysconfdir)/codepage; \
-+	$(INSTALL_DATA) codepage/* $(sysconfdir)/codepage/
- 
- 	@for i in n c; do \
- 		if test ! -f "$(sysconfdir)/$${i}resv.conf"; then \
diff --git a/russian/ircd-hybrid/files/patch-etc-Makefile.in b/russian/ircd-hybrid/files/patch-etc-Makefile.in
new file mode 100644
index 000000000000..f491eaf0f143
--- /dev/null
+++ b/russian/ircd-hybrid/files/patch-etc-Makefile.in
@@ -0,0 +1,11 @@
+--- etc/Makefile.in.orig	Thu May  5 16:21:59 2005
++++ etc/Makefile.in	Thu May  5 16:20:08 2005
+@@ -27,6 +27,8 @@
+ 		echo $(INSTALL_DATA) $$i $(sysconfdir); \
+ 		$(INSTALL_DATA) $$i $(sysconfdir); \
+ 	done
++	mkdir -p $(sysconfdir)/codepages
++	$(INSTALL_DATA) codepages/*.tab $(sysconfdir)/codepages
+ 
+ 	@echo "Note: more example configuration files can be found in this directory (etc/)."
+ 	
diff --git a/russian/ircd-hybrid/files/patch-include-Makefile.in b/russian/ircd-hybrid/files/patch-include-Makefile.in
deleted file mode 100644
index 3f7c0db6e4c3..000000000000
--- a/russian/ircd-hybrid/files/patch-include-Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
---- include/Makefile.in.orig	Mon Nov 15 15:32:30 2004
-+++ include/Makefile.in	Mon Nov 15 15:33:04 2004
-@@ -21,9 +21,9 @@
- 	@echo installing header files...
- 	-@if test ! -d $(prefix)/include; then \
- 		echo "mkdir $(prefix)/include"; \
--		mkdir $(prefix)/include; \
--		mkdir $(prefix)/include/ircd-hybrid-7; \
-+		mkdir $(prefix)/include; \
- 	fi
-+	mkdir $(prefix)/include/ircd-hybrid-7
- 	@for header in *.h; do \
- 		${INSTALL_DATA} $$header $(prefix)/include/ircd-hybrid-7; \
- 	done
diff --git a/russian/ircd-hybrid/files/patch-modules-Makefile.in b/russian/ircd-hybrid/files/patch-modules-Makefile.in
new file mode 100644
index 000000000000..628d5e0061f0
--- /dev/null
+++ b/russian/ircd-hybrid/files/patch-modules-Makefile.in
@@ -0,0 +1,22 @@
+--- modules/Makefile.in.orig	Tue Jun 20 16:59:06 2006
++++ modules/Makefile.in	Tue Oct 17 08:35:33 2006
+@@ -23,7 +23,7 @@
+ 
+ prefix          = $(DESTDIR)@prefix@
+ # Change this later! -- adrian
+-moduledir       = ${prefix}/modules
++moduledir       = ${prefix}/lib/ircd-hybrid-ru-modules
+ automoduledir   = ${moduledir}/autoload
+ 
+ INCLUDES	= -I../include -I../lib/pcre $(SSL_INCLUDES)
+@@ -111,7 +111,9 @@
+   m_who.c \
+   m_whois.c \
+   m_whowas.c \
+-  m_xline.c
++  m_xline.c \
++  m_force.c \
++  m_ojoin.c
+ 
+ ALL_SRCS = $(CORE_SRCS) $(SRCS) @SSL_SRCS_ENABLE@
+ 
diff --git a/russian/ircd-hybrid/files/patch-src-Makefile.in b/russian/ircd-hybrid/files/patch-src-Makefile.in
index 300e5d791c3b..a0aded922d6d 100644
--- a/russian/ircd-hybrid/files/patch-src-Makefile.in
+++ b/russian/ircd-hybrid/files/patch-src-Makefile.in
@@ -1,15 +1,11 @@
---- src/Makefile.in.orig	Mon Nov 15 14:39:25 2004
-+++ src/Makefile.in	Mon Nov 15 14:39:59 2004
-@@ -141,9 +141,9 @@
- 		echo "mkdir $(sysconfdir)"; \
- 		mkdir $(sysconfdir); \
- 	fi
--	-@if test ! -d $(localstatedir)/logs; then \
--		echo "mkdir $(localstatedir)/logs"; \
--		mkdir $(localstatedir)/logs; \
-+	-@if test ! -d /var/log/ircd-hybrid-ru; then \
-+		echo "/var/log/ircd-hybrid-ru"; \
-+		mkdir /var/log/ircd-hybrid-ru; \
- 	fi
+--- src/Makefile.in.ORIG	Mon Oct 16 13:38:09 2006
++++ src/Makefile.in	Mon Oct 16 13:38:24 2006
+@@ -121,7 +121,7 @@
+ 
+ install-mkdirs:
+ 	mkdir -p $(DESTDIR)$(prefix) $(exec_prefix) $(bindir) $(sysconfdir) \
+-		$(localstatedir)/logs
++		/var/log/ircd-hybrid-ru
  
  install: install-mkdirs build
+ 	@for i in $(PROGS); do \
diff --git a/russian/ircd-hybrid/files/patch-src-packet.c b/russian/ircd-hybrid/files/patch-src-packet.c
deleted file mode 100644
index b3f4a4796b87..000000000000
--- a/russian/ircd-hybrid/files/patch-src-packet.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/packet.c.orig	Tue Nov 16 22:29:48 2004
-+++ src/packet.c	Sun Feb 13 12:33:49 2005
-@@ -532,7 +532,7 @@
- 
-   /* Check to make sure we're not flooding */
- 
--  if (IsPerson(client_p) &&
-+  if (!(IsServer(client_p) || IsHandshake(client_p) || IsConnecting(client_p)) &&
-       (linebuf_alloclen(&client_p->localClient->buf_recvq) >
-        ConfigFileEntry.client_flood))
-   {
diff --git a/russian/ircd-hybrid/files/patch-tools-Makefile.in b/russian/ircd-hybrid/files/patch-tools-Makefile.in
deleted file mode 100644
index c807f0577a4c..000000000000
--- a/russian/ircd-hybrid/files/patch-tools-Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- tools/Makefile.in.orig	Fri Jul 12 06:40:27 2002
-+++ tools/Makefile.in	Mon Nov 15 16:51:10 2004
-@@ -121,17 +121,9 @@
- 		echo "mkdir $(moduledir)"; \
- 		mkdir $(moduledir); \
- 	fi
--	-@if test ! -d $(automoduledir); then \
--		echo "mkdir $(automoduledir)"; \
--		mkdir $(automoduledir); \
--	fi
- 	-@if test ! -d $(sysconfdir); then \
- 		echo "mkdir $(sysconfdir)"; \
- 		mkdir $(sysconfdir); \
--	fi
--	-@if test ! -d $(localstatedir)/logs; then \
--		echo "mkdir $(localstatedir)/logs"; \
--		mkdir $(localstatedir)/logs; \
- 	fi
- 
- install: install-mkdirs build
diff --git a/russian/ircd-hybrid/pkg-message b/russian/ircd-hybrid/pkg-message
index 8cafa9cf22fa..83c0ab174a7c 100644
--- a/russian/ircd-hybrid/pkg-message
+++ b/russian/ircd-hybrid/pkg-message
@@ -1,11 +1,6 @@
 
 ----------------------------------------------------
 
-If you updated this port to version 7.1_2, please
-don't forget to remove the old UID/GID - 6667
-
-This port uses now UID/GID - 555
-
 ircd-hybrid-ru has been installed.
 
 This port create user ircdru and group ircdru
diff --git a/russian/ircd-hybrid/pkg-plist b/russian/ircd-hybrid/pkg-plist
index 8bbb6100cc1f..3a82141553ff 100644
--- a/russian/ircd-hybrid/pkg-plist
+++ b/russian/ircd-hybrid/pkg-plist
@@ -1,242 +1,42 @@
+bin/encspeed
 bin/ircd
-bin/viconf
 bin/mkpasswd
-bin/convertconf
-bin/convertilines
-bin/convertklines
-bin/encspeed
-bin/vimotd
-bin/viklines
 bin/servlink
-etc/rc.d/ircd-hybrid-ru.sh.sample
-etc/ircd-hybrid-ru/auto.am.conf
-etc/ircd-hybrid-ru/auto.az.conf
-etc/ircd-hybrid-ru/auto.by.conf
-etc/ircd-hybrid-ru/auto.ee.conf
-etc/ircd-hybrid-ru/auto.ge.conf
-etc/ircd-hybrid-ru/auto.kg.conf
-etc/ircd-hybrid-ru/auto.kz.conf
-etc/ircd-hybrid-ru/auto.lt.conf
-etc/ircd-hybrid-ru/auto.lv.conf
-etc/ircd-hybrid-ru/auto.md.conf
-etc/ircd-hybrid-ru/auto.ru.conf
-etc/ircd-hybrid-ru/auto.tj.conf
-etc/ircd-hybrid-ru/auto.tm.conf
-etc/ircd-hybrid-ru/auto.ua.conf
-etc/ircd-hybrid-ru/auto.uz.conf
+etc/ircd-hybrid-ru/codepages/cp866.tab
+etc/ircd-hybrid-ru/codepages/iso8859-5.tab
+etc/ircd-hybrid-ru/codepages/koi8r.tab
+etc/ircd-hybrid-ru/codepages/macintosh.tab
+etc/ircd-hybrid-ru/codepages/translit.tab
+etc/ircd-hybrid-ru/cresv.conf
+etc/ircd-hybrid-ru/dline.conf
 etc/ircd-hybrid-ru/example.conf
-etc/ircd-hybrid-ru/example.dalnetru.conf
+etc/ircd-hybrid-ru/ircd.motd
 etc/ircd-hybrid-ru/kline.conf
-etc/ircd-hybrid-ru/dline.conf
-etc/ircd-hybrid-ru/xline.conf
 etc/ircd-hybrid-ru/nresv.conf
-etc/ircd-hybrid-ru/cresv.conf
-etc/ircd-hybrid-ru/codepage/cp866.tab
-etc/ircd-hybrid-ru/codepage/iso8859-5.tab
-etc/ircd-hybrid-ru/codepage/koi8.tab
-etc/ircd-hybrid-ru/codepage/macintosh.tab
-etc/ircd-hybrid-ru/codepage/translit.tab
-include/ircd-hybrid-7/balloc.h
-include/ircd-hybrid-7/channel.h
-include/ircd-hybrid-7/channel_mode.h
-include/ircd-hybrid-7/class.h
-include/ircd-hybrid-7/client.h
-include/ircd-hybrid-7/common.h
-include/ircd-hybrid-7/config.h
-include/ircd-hybrid-7/defaults.h
-include/ircd-hybrid-7/event.h
-include/ircd-hybrid-7/fdlist.h
-include/ircd-hybrid-7/fileio.h
-include/ircd-hybrid-7/handlers.h
-include/ircd-hybrid-7/hash.h
-include/ircd-hybrid-7/hook.h
-include/ircd-hybrid-7/hostmask.h
-include/ircd-hybrid-7/irc_string.h
-include/ircd-hybrid-7/ircd.h
-include/ircd-hybrid-7/ircd_defs.h
-include/ircd-hybrid-7/ircd_getopt.h
-include/ircd-hybrid-7/ircd_handler.h
-include/ircd-hybrid-7/ircd_signal.h
-include/ircd-hybrid-7/ircdauth.h
-include/ircd-hybrid-7/linebuf.h
-include/ircd-hybrid-7/list.h
-include/ircd-hybrid-7/listener.h
-include/ircd-hybrid-7/m_info.h
-include/ircd-hybrid-7/m_kline.h
-include/ircd-hybrid-7/md5.h
-include/ircd-hybrid-7/memory.h
-include/ircd-hybrid-7/modules.h
-include/ircd-hybrid-7/motd.h
-include/ircd-hybrid-7/msg.h
-include/ircd-hybrid-7/numeric.h
-include/ircd-hybrid-7/packet.h
-include/ircd-hybrid-7/parse.h
-include/ircd-hybrid-7/patchlevel.h
-include/ircd-hybrid-7/res.h
-include/ircd-hybrid-7/restart.h
-include/ircd-hybrid-7/resv.h
-include/ircd-hybrid-7/rsa.h
-include/ircd-hybrid-7/s_auth.h
-include/ircd-hybrid-7/s_bsd.h
-include/ircd-hybrid-7/s_conf.h
-include/ircd-hybrid-7/s_debug.h
-include/ircd-hybrid-7/s_gline.h
-include/ircd-hybrid-7/s_log.h
-include/ircd-hybrid-7/s_misc.h
-include/ircd-hybrid-7/s_serv.h
-include/ircd-hybrid-7/s_stats.h
-include/ircd-hybrid-7/s_user.h
-include/ircd-hybrid-7/s_zip.h
-include/ircd-hybrid-7/scache.h
-include/ircd-hybrid-7/send.h
-include/ircd-hybrid-7/serno.h
-include/ircd-hybrid-7/setup.h
-include/ircd-hybrid-7/sprintf_irc.h
-include/ircd-hybrid-7/stdinc.h
-include/ircd-hybrid-7/supported.h
-include/ircd-hybrid-7/tools.h
-include/ircd-hybrid-7/translate.h
-include/ircd-hybrid-7/vchannel.h
-include/ircd-hybrid-7/whowas.h
-lib/ircd-hybrid-ru-modules/autoload/m_accept.so
-lib/ircd-hybrid-ru-modules/autoload/m_admin.so
-lib/ircd-hybrid-ru-modules/autoload/m_alias.so
-lib/ircd-hybrid-ru-modules/autoload/m_away.so
-lib/ircd-hybrid-ru-modules/autoload/m_capab.so
-lib/ircd-hybrid-ru-modules/autoload/m_cburst.so
-lib/ircd-hybrid-ru-modules/autoload/m_challenge.so
-lib/ircd-hybrid-ru-modules/autoload/m_cjoin.so
-lib/ircd-hybrid-ru-modules/autoload/m_clearchan.so
-lib/ircd-hybrid-ru-modules/autoload/m_close.so
-lib/ircd-hybrid-ru-modules/autoload/m_connect.so
-lib/ircd-hybrid-ru-modules/autoload/m_cryptlink.so
-lib/ircd-hybrid-ru-modules/autoload/m_dmem.so
-lib/ircd-hybrid-ru-modules/autoload/m_drop.so
-lib/ircd-hybrid-ru-modules/autoload/m_encap.so
-lib/ircd-hybrid-ru-modules/autoload/m_eob.so
-lib/ircd-hybrid-ru-modules/autoload/m_force.so
-lib/ircd-hybrid-ru-modules/autoload/m_forcenick.so
-lib/ircd-hybrid-ru-modules/autoload/m_gline.so
-lib/ircd-hybrid-ru-modules/autoload/m_help.so
-lib/ircd-hybrid-ru-modules/autoload/m_info.so
-lib/ircd-hybrid-ru-modules/autoload/m_invite.so
-lib/ircd-hybrid-ru-modules/autoload/m_ison.so
-lib/ircd-hybrid-ru-modules/autoload/m_join.so
-lib/ircd-hybrid-ru-modules/autoload/m_kline.so
-lib/ircd-hybrid-ru-modules/autoload/m_knock.so
-lib/ircd-hybrid-ru-modules/autoload/m_links.so
-lib/ircd-hybrid-ru-modules/autoload/m_list.so
-lib/ircd-hybrid-ru-modules/autoload/m_lljoin.so
-lib/ircd-hybrid-ru-modules/autoload/m_llnick.so
-lib/ircd-hybrid-ru-modules/autoload/m_locops.so
-lib/ircd-hybrid-ru-modules/autoload/m_lusers.so
-lib/ircd-hybrid-ru-modules/autoload/m_map.so
-lib/ircd-hybrid-ru-modules/autoload/m_motd.so
-lib/ircd-hybrid-ru-modules/autoload/m_names.so
-lib/ircd-hybrid-ru-modules/autoload/m_nburst.so
-lib/ircd-hybrid-ru-modules/autoload/m_oper.so
-lib/ircd-hybrid-ru-modules/autoload/m_operwall.so
-lib/ircd-hybrid-ru-modules/autoload/m_ojoin.so
-lib/ircd-hybrid-ru-modules/autoload/m_pass.so
-lib/ircd-hybrid-ru-modules/autoload/m_ping.so
-lib/ircd-hybrid-ru-modules/autoload/m_pong.so
-lib/ircd-hybrid-ru-modules/autoload/m_post.so
-lib/ircd-hybrid-ru-modules/autoload/m_rehash.so
-lib/ircd-hybrid-ru-modules/autoload/m_restart.so
-lib/ircd-hybrid-ru-modules/autoload/m_resv.so
-lib/ircd-hybrid-ru-modules/autoload/m_set.so
-lib/ircd-hybrid-ru-modules/autoload/m_svs.so
-lib/ircd-hybrid-ru-modules/autoload/m_stats.so
-lib/ircd-hybrid-ru-modules/autoload/m_svinfo.so
-lib/ircd-hybrid-ru-modules/autoload/m_tburst.so
-lib/ircd-hybrid-ru-modules/autoload/m_testline.so
-lib/ircd-hybrid-ru-modules/autoload/m_time.so
-lib/ircd-hybrid-ru-modules/autoload/m_topic.so
-lib/ircd-hybrid-ru-modules/autoload/m_trace.so
-lib/ircd-hybrid-ru-modules/autoload/m_unkline.so
-lib/ircd-hybrid-ru-modules/autoload/m_user.so
-lib/ircd-hybrid-ru-modules/autoload/m_userhost.so
-lib/ircd-hybrid-ru-modules/autoload/m_users.so
-lib/ircd-hybrid-ru-modules/autoload/m_version.so
-lib/ircd-hybrid-ru-modules/autoload/m_wallops.so
-lib/ircd-hybrid-ru-modules/autoload/m_who.so
-lib/ircd-hybrid-ru-modules/autoload/m_whois.so
-lib/ircd-hybrid-ru-modules/autoload/m_whowas.so
-lib/ircd-hybrid-ru-modules/autoload/m_xline.so
-lib/ircd-hybrid-ru-modules/m_die.so
-lib/ircd-hybrid-ru-modules/m_kick.so
-lib/ircd-hybrid-ru-modules/m_kill.so
-lib/ircd-hybrid-ru-modules/m_message.so
-lib/ircd-hybrid-ru-modules/m_mode.so
-lib/ircd-hybrid-ru-modules/m_nick.so
-lib/ircd-hybrid-ru-modules/m_part.so
-lib/ircd-hybrid-ru-modules/m_quit.so
-lib/ircd-hybrid-ru-modules/m_server.so
-lib/ircd-hybrid-ru-modules/m_sjoin.so
-lib/ircd-hybrid-ru-modules/m_squit.so
-messages/ayb/LC_MESSAGES/ircd-hybrid.mo
-messages/custom/LC_MESSAGES/ircd-hybrid.mo
-help/users/accept
-help/users/admin
-help/users/away
-help/users/challenge
-help/users/cjoin
-help/users/cmode
-help/users/credits
-help/users/error
-help/users/help
-help/users/index
-help/users/info
-help/users/invite
-help/users/ison
-help/users/join
-help/users/kick
-help/users/knock
-help/users/links
-help/users/list
-help/users/lusers
-help/users/motd
-help/users/names
-help/users/nick
-help/users/notice
-help/users/oper
-help/users/part
-help/users/pass
-help/users/ping
-help/users/pong
-help/users/privmsg
-help/users/quit
-help/users/stats
-help/users/time
-help/users/topic
-help/users/umode
-help/users/user
-help/users/userhost
-help/users/users
-help/users/version
-help/users/who
-help/users/whois
-help/users/whowas
+etc/ircd-hybrid-ru/rkline.conf
+etc/ircd-hybrid-ru/rxline.conf
+etc/ircd-hybrid-ru/xline.conf
+etc/rc.d/ircd-hybrid-ru.sh.sample
 help/opers/accept
 help/opers/admin
 help/opers/away
 help/opers/capab
 help/opers/cburst
 help/opers/challenge
-help/opers/cjoin
 help/opers/client
 help/opers/close
 help/opers/cmode
+help/opers/codepage
 help/opers/connect
-help/opers/credits
 help/opers/cryptlink
 help/opers/die
 help/opers/dline
-help/opers/dmem
 help/opers/drop
 help/opers/eob
 help/opers/error
+help/opers/etrace
 help/opers/gline
+help/opers/hash
 help/opers/help
 help/opers/index
 help/opers/info
@@ -254,6 +54,7 @@ help/opers/lljoin
 help/opers/llnick
 help/opers/locops
 help/opers/lusers
+help/opers/map
 help/opers/modlist
 help/opers/modload
 help/opers/modrestart
@@ -263,6 +64,7 @@ help/opers/names
 help/opers/nburst
 help/opers/nick
 help/opers/notice
+help/opers/omotd
 help/opers/oper
 help/opers/operwall
 help/opers/part
@@ -275,13 +77,17 @@ help/opers/quit
 help/opers/rehash
 help/opers/restart
 help/opers/resv
+help/opers/rkline
+help/opers/rxline
 help/opers/server
 help/opers/set
 help/opers/sjoin
 help/opers/squit
 help/opers/stats
 help/opers/svinfo
+help/opers/testgecos
 help/opers/testline
+help/opers/testmask
 help/opers/time
 help/opers/topic
 help/opers/trace
@@ -291,6 +97,7 @@ help/opers/undline
 help/opers/ungline
 help/opers/unkline
 help/opers/unresv
+help/opers/unxline
 help/opers/user
 help/opers/userhost
 help/opers/users
@@ -299,38 +106,151 @@ help/opers/wallops
 help/opers/who
 help/opers/whois
 help/opers/whowas
-%%PORTDOCS%%%%DOCSDIR%%/RELNOTES
-%%PORTDOCS%%%%DOCSDIR%%/RELNOTES.hybrid-ru
-%%PORTDOCS%%%%DOCSDIR%%/CIDR.txt
-%%PORTDOCS%%%%DOCSDIR%%/LazyLinks.txt
-%%PORTDOCS%%%%DOCSDIR%%/challenge.txt
-%%PORTDOCS%%%%DOCSDIR%%/guidelines.txt
-%%PORTDOCS%%%%DOCSDIR%%/index.txt
-%%PORTDOCS%%%%DOCSDIR%%/kline.txt
-%%PORTDOCS%%%%DOCSDIR%%/messages.txt
-%%PORTDOCS%%%%DOCSDIR%%/modeg.txt
-%%PORTDOCS%%%%DOCSDIR%%/modes.txt
-%%PORTDOCS%%%%DOCSDIR%%/operguide.txt
-%%PORTDOCS%%%%DOCSDIR%%/opermyth.txt
-%%PORTDOCS%%%%DOCSDIR%%/resv.txt
-%%PORTDOCS%%%%DOCSDIR%%/serverhide.txt
-%%PORTDOCS%%%%DOCSDIR%%/vchans.txt
-%%PORTDOCS%%%%DOCSDIR%%/whats-new.txt
-%%PORTDOCS%%%%DOCSDIR%%/server-version-info
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm include/ircd-hybrid-7
-@dirrm lib/ircd-hybrid-ru-modules/autoload
-@dirrm lib/ircd-hybrid-ru-modules
-@dirrm help/users
-@dirrm help/opers
-@dirrm help
-@dirrm messages/ayb/LC_MESSAGES
-@dirrm messages/custom/LC_MESSAGES
-@dirrm messages/ayb
-@dirrm messages/custom
-@dirrm messages
-@exec mkdir -m 755 /var/log/ircd-hybrid-ru
-@exec chown ircdru:ircdru /var/log/ircd-hybrid-ru
-@unexec rmdir /var/log/ircd-hybrid-ru 2>/dev/null || true
-@dirrmtry etc/ircd-hybrid-ru/codepage
-@dirrmtry etc/ircd-hybrid-ru
+help/opers/xline
+help/users/accept
+help/users/admin
+help/users/away
+help/users/challenge
+help/users/cmode
+help/users/error
+help/users/help
+help/users/index
+help/users/info
+help/users/invite
+help/users/ison
+help/users/join
+help/users/kick
+help/users/knock
+help/users/links
+help/users/list
+help/users/lusers
+help/users/map
+help/users/motd
+help/users/names
+help/users/nick
+help/users/notice
+help/users/oper
+help/users/part
+help/users/pass
+help/users/ping
+help/users/pong
+help/users/privmsg
+help/users/quit
+help/users/stats
+help/users/time
+help/users/topic
+help/users/umode
+help/users/user
+help/users/userhost
+help/users/users
+help/users/version
+help/users/who
+help/users/whois
+help/users/whowas
+lib/ircd-hybrid-ru-modules/autoload/m_accept.so
+lib/ircd-hybrid-ru-modules/autoload/m_admin.so
+lib/ircd-hybrid-ru-modules/autoload/m_alias.so
+lib/ircd-hybrid-ru-modules/autoload/m_away.so
+lib/ircd-hybrid-ru-modules/autoload/m_cap.so
+lib/ircd-hybrid-ru-modules/autoload/m_capab.so
+lib/ircd-hybrid-ru-modules/autoload/m_cburst.so
+lib/ircd-hybrid-ru-modules/autoload/m_challenge.so
+lib/ircd-hybrid-ru-modules/autoload/m_close.so
+lib/ircd-hybrid-ru-modules/autoload/m_codepage.so
+lib/ircd-hybrid-ru-modules/autoload/m_connect.so
+lib/ircd-hybrid-ru-modules/autoload/m_cryptlink.so
+lib/ircd-hybrid-ru-modules/autoload/m_drop.so
+lib/ircd-hybrid-ru-modules/autoload/m_encap.so
+lib/ircd-hybrid-ru-modules/autoload/m_eob.so
+lib/ircd-hybrid-ru-modules/autoload/m_etrace.so
+lib/ircd-hybrid-ru-modules/autoload/m_force.so
+lib/ircd-hybrid-ru-modules/autoload/m_gline.so
+lib/ircd-hybrid-ru-modules/autoload/m_hash.so
+lib/ircd-hybrid-ru-modules/autoload/m_help.so
+lib/ircd-hybrid-ru-modules/autoload/m_info.so
+lib/ircd-hybrid-ru-modules/autoload/m_invite.so
+lib/ircd-hybrid-ru-modules/autoload/m_ison.so
+lib/ircd-hybrid-ru-modules/autoload/m_kline.so
+lib/ircd-hybrid-ru-modules/autoload/m_knock.so
+lib/ircd-hybrid-ru-modules/autoload/m_links.so
+lib/ircd-hybrid-ru-modules/autoload/m_list.so
+lib/ircd-hybrid-ru-modules/autoload/m_lljoin.so
+lib/ircd-hybrid-ru-modules/autoload/m_llnick.so
+lib/ircd-hybrid-ru-modules/autoload/m_locops.so
+lib/ircd-hybrid-ru-modules/autoload/m_lusers.so
+lib/ircd-hybrid-ru-modules/autoload/m_map.so
+lib/ircd-hybrid-ru-modules/autoload/m_motd.so
+lib/ircd-hybrid-ru-modules/autoload/m_names.so
+lib/ircd-hybrid-ru-modules/autoload/m_nburst.so
+lib/ircd-hybrid-ru-modules/autoload/m_ojoin.so
+lib/ircd-hybrid-ru-modules/autoload/m_omotd.so
+lib/ircd-hybrid-ru-modules/autoload/m_oper.so
+lib/ircd-hybrid-ru-modules/autoload/m_operwall.so
+lib/ircd-hybrid-ru-modules/autoload/m_pass.so
+lib/ircd-hybrid-ru-modules/autoload/m_ping.so
+lib/ircd-hybrid-ru-modules/autoload/m_pong.so
+lib/ircd-hybrid-ru-modules/autoload/m_post.so
+lib/ircd-hybrid-ru-modules/autoload/m_rehash.so
+lib/ircd-hybrid-ru-modules/autoload/m_restart.so
+lib/ircd-hybrid-ru-modules/autoload/m_resv.so
+lib/ircd-hybrid-ru-modules/autoload/m_rkline.so
+lib/ircd-hybrid-ru-modules/autoload/m_rxline.so
+lib/ircd-hybrid-ru-modules/autoload/m_set.so
+lib/ircd-hybrid-ru-modules/autoload/m_stats.so
+lib/ircd-hybrid-ru-modules/autoload/m_svinfo.so
+lib/ircd-hybrid-ru-modules/autoload/m_svs.so
+lib/ircd-hybrid-ru-modules/autoload/m_tburst.so
+lib/ircd-hybrid-ru-modules/autoload/m_testline.so
+lib/ircd-hybrid-ru-modules/autoload/m_testmask.so
+lib/ircd-hybrid-ru-modules/autoload/m_time.so
+lib/ircd-hybrid-ru-modules/autoload/m_topic.so
+lib/ircd-hybrid-ru-modules/autoload/m_trace.so
+lib/ircd-hybrid-ru-modules/autoload/m_user.so
+lib/ircd-hybrid-ru-modules/autoload/m_userhost.so
+lib/ircd-hybrid-ru-modules/autoload/m_users.so
+lib/ircd-hybrid-ru-modules/autoload/m_version.so
+lib/ircd-hybrid-ru-modules/autoload/m_wallops.so
+lib/ircd-hybrid-ru-modules/autoload/m_who.so
+lib/ircd-hybrid-ru-modules/autoload/m_whois.so
+lib/ircd-hybrid-ru-modules/autoload/m_whowas.so
+lib/ircd-hybrid-ru-modules/autoload/m_xline.so
+lib/ircd-hybrid-ru-modules/m_die.so
+lib/ircd-hybrid-ru-modules/m_join.so
+lib/ircd-hybrid-ru-modules/m_kick.so
+lib/ircd-hybrid-ru-modules/m_kill.so
+lib/ircd-hybrid-ru-modules/m_message.so
+lib/ircd-hybrid-ru-modules/m_mode.so
+lib/ircd-hybrid-ru-modules/m_nick.so
+lib/ircd-hybrid-ru-modules/m_part.so
+lib/ircd-hybrid-ru-modules/m_quit.so
+lib/ircd-hybrid-ru-modules/m_server.so
+lib/ircd-hybrid-ru-modules/m_sjoin.so
+lib/ircd-hybrid-ru-modules/m_squit.so
+%%DOCSDIR%%/CIDR.txt
+%%DOCSDIR%%/LazyLinks.txt
+%%DOCSDIR%%/RELNOTES
+%%DOCSDIR%%/RELNOTES.RU
+%%DOCSDIR%%/challenge.txt
+%%DOCSDIR%%/guidelines.txt
+%%DOCSDIR%%/index.txt
+%%DOCSDIR%%/kline.txt
+%%DOCSDIR%%/messages.txt
+%%DOCSDIR%%/modeg.txt
+%%DOCSDIR%%/modes.txt
+%%DOCSDIR%%/resv.txt
+%%DOCSDIR%%/server-version-info
+%%DOCSDIR%%/serverhide.txt
+%%DOCSDIR%%/whats-new.txt
+@dirrm share/doc/ircd
+@dirrm etc/ircd-hybrid-ru/codepages
+@dirrm etc/ircd-hybrid-ru
+@dirrm lib/ircd-hybrid-ru-modules/autoload                                                                                                   
+@dirrm lib/ircd-hybrid-ru-modules                                                                                                            
+@dirrm help/users                                                                                                                            
+@dirrm help/opers                                                                                                                            
+@dirrm help                                                                                                                                  
+@exec mkdir -m 755 /var/log/ircd-hybrid-ru                                                                                                   
+@exec chown ircdru:ircdru /var/log/ircd-hybrid-ru                                                                                            
+@unexec rmdir /var/log/ircd-hybrid-ru 2>/dev/null || true                                                                                    
+@unexec rmdir %D/etc/ircd-hybrid-ru/codepages 2>/dev/null || true                                                                            
+@unexec rmdir %D/etc/ircd-hybrid-ru 2>/dev/null || true