9 files changed, 61 insertions, 79 deletions

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