From 386c77f85beda2b509d0695a4ad5251bdc503f1d Mon Sep 17 00:00:00 2001
From: pav <pav@FreeBSD.org>
Date: Tue, 16 Nov 2004 13:48:43 +0000
Subject: - Update to 7.1rc4

PR:		ports/73966
Submitted by:	Evgueni V. Gavrilov <aquatique@rusunix.org> (maintainer)
---
 irc/ircd-hybrid-ru/files/ircd-hybrid-ru.sh.sample  |  2 +-
 irc/ircd-hybrid-ru/files/patch-configure           | 11 -----------
 irc/ircd-hybrid-ru/files/patch-defaults.h          | 15 ---------------
 irc/ircd-hybrid-ru/files/patch-doc-Makefile.in     | 20 ++++++++++++++++++++
 irc/ircd-hybrid-ru/files/patch-etc-Makefile.in     | 11 -----------
 irc/ircd-hybrid-ru/files/patch-include-Makefile.in | 14 ++++++++++++++
 irc/ircd-hybrid-ru/files/patch-modules-Makefile.in | 11 -----------
 irc/ircd-hybrid-ru/files/patch-src-Makefile.in     | 22 +++++++++++++---------
 irc/ircd-hybrid-ru/files/patch-src-packet.c        | 10 +++++-----
 irc/ircd-hybrid-ru/files/patch-tools-Makefile.in   | 20 ++++++++++++++++++++
 10 files changed, 73 insertions(+), 63 deletions(-)
 delete mode 100644 irc/ircd-hybrid-ru/files/patch-configure
 delete mode 100644 irc/ircd-hybrid-ru/files/patch-defaults.h
 create mode 100644 irc/ircd-hybrid-ru/files/patch-doc-Makefile.in
 delete mode 100644 irc/ircd-hybrid-ru/files/patch-etc-Makefile.in
 create mode 100644 irc/ircd-hybrid-ru/files/patch-include-Makefile.in
 delete mode 100644 irc/ircd-hybrid-ru/files/patch-modules-Makefile.in
 create mode 100644 irc/ircd-hybrid-ru/files/patch-tools-Makefile.in

(limited to 'irc/ircd-hybrid-ru/files')

diff --git a/irc/ircd-hybrid-ru/files/ircd-hybrid-ru.sh.sample b/irc/ircd-hybrid-ru/files/ircd-hybrid-ru.sh.sample
index f62cb23..fae85a3 100644
--- a/irc/ircd-hybrid-ru/files/ircd-hybrid-ru.sh.sample
+++ b/irc/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'
+	echo -n ' ircd-hybrid-ru'
 	;;
 *)
 	echo "Usage: `basename $0` {start|stop}" >&2
diff --git a/irc/ircd-hybrid-ru/files/patch-configure b/irc/ircd-hybrid-ru/files/patch-configure
deleted file mode 100644
index 1da7b9f5..0000000
--- a/irc/ircd-hybrid-ru/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Thu Oct  9 17:38:48 2003
-+++ configure	Sun Dec 14 14:35:48 2003
-@@ -1944,7 +1944,7 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  ac_cv_prog_cc_g=yes
-+  ac_cv_prog_cc_g=no
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
diff --git a/irc/ircd-hybrid-ru/files/patch-defaults.h b/irc/ircd-hybrid-ru/files/patch-defaults.h
deleted file mode 100644
index 70eb87d..0000000
--- a/irc/ircd-hybrid-ru/files/patch-defaults.h
+++ /dev/null
@@ -1,15 +0,0 @@
---- include/defaults.h.orig	Sun Oct  5 02:31:17 2003
-+++ include/defaults.h	Sun Dec 14 16:29:00 2003
-@@ -49,9 +49,9 @@
- #define DPATH   IRCD_PREFIX                                                     
- #define BINPATH IRCD_PREFIX "/bin/"
- #define MSGPATH IRCD_PREFIX "/messages/"
--#define ETCPATH IRCD_PREFIX "/etc"
--#define LOGPATH IRCD_PREFIX "/logs"
--#define MODPATH IRCD_PREFIX "/modules/"
-+#define ETCPATH IRCD_PREFIX "/etc/ircd-hybrid-ru"
-+#define LOGPATH             "/var/log/ircd-hybrid-ru"
-+#define MODPATH IRCD_PREFIX "/lib/ircd-hybrid-ru-modules/"
- 
- /* files */
- #define SPATH   BINPATH "/ircd"                 /* ircd executable */
diff --git a/irc/ircd-hybrid-ru/files/patch-doc-Makefile.in b/irc/ircd-hybrid-ru/files/patch-doc-Makefile.in
new file mode 100644
index 0000000..10b829b
--- /dev/null
+++ b/irc/ircd-hybrid-ru/files/patch-doc-Makefile.in
@@ -0,0 +1,20 @@
+--- 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/irc/ircd-hybrid-ru/files/patch-etc-Makefile.in b/irc/ircd-hybrid-ru/files/patch-etc-Makefile.in
deleted file mode 100644
index 873c8b2..0000000
--- a/irc/ircd-hybrid-ru/files/patch-etc-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- etc/Makefile.in.orig	Sun Dec 14 14:56:56 2003
-+++ etc/Makefile.in	Sun Dec 14 14:57:51 2003
-@@ -27,6 +27,8 @@
- 		echo $(INSTALL_DATA) $$i $(sysconfdir); \
- 		$(INSTALL_DATA) $$i $(sysconfdir); \
- 	done
-+	mkdir -p $(sysconfdir)/codepage; \
-+	$(INSTALL_DATA) codepage/* $(sysconfdir)/codepage/
- 
- 	@echo "Note: more example configuration files can be found in this directory (etc/)."
- 	
diff --git a/irc/ircd-hybrid-ru/files/patch-include-Makefile.in b/irc/ircd-hybrid-ru/files/patch-include-Makefile.in
new file mode 100644
index 0000000..3f7c0db
--- /dev/null
+++ b/irc/ircd-hybrid-ru/files/patch-include-Makefile.in
@@ -0,0 +1,14 @@
+--- 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/irc/ircd-hybrid-ru/files/patch-modules-Makefile.in b/irc/ircd-hybrid-ru/files/patch-modules-Makefile.in
deleted file mode 100644
index 8c21fc4..0000000
--- a/irc/ircd-hybrid-ru/files/patch-modules-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/Makefile.in.orig	Sun Dec 14 15:13:18 2003
-+++ modules/Makefile.in	Sun Dec 14 15:13:52 2003
-@@ -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 $(SSL_INCLUDES)
diff --git a/irc/ircd-hybrid-ru/files/patch-src-Makefile.in b/irc/ircd-hybrid-ru/files/patch-src-Makefile.in
index d10f7a0..300e5d7 100644
--- a/irc/ircd-hybrid-ru/files/patch-src-Makefile.in
+++ b/irc/ircd-hybrid-ru/files/patch-src-Makefile.in
@@ -1,11 +1,15 @@
---- src/Makefile.in.orig	Sun Dec 14 14:44:19 2003
-+++ src/Makefile.in	Sun Dec 14 14:44:37 2003
-@@ -128,7 +128,7 @@
- 
- install-mkdirs:
- 	mkdir -p $(prefix) $(exec_prefix) $(bindir) $(sysconfdir) \
--		$(localstatedir)/logs 
-+		/var/log/ircd-hybrid-ru
+--- 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
  
  install: install-mkdirs build
- 	@for i in $(PROGS); do \
diff --git a/irc/ircd-hybrid-ru/files/patch-src-packet.c b/irc/ircd-hybrid-ru/files/patch-src-packet.c
index 2d192ac..e9b0c04 100644
--- a/irc/ircd-hybrid-ru/files/patch-src-packet.c
+++ b/irc/ircd-hybrid-ru/files/patch-src-packet.c
@@ -1,11 +1,11 @@
---- src/packet.c.orig	Mon Jun 21 09:43:24 2004
-+++ src/packet.c	Mon Jun 21 09:44:15 2004
-@@ -467,7 +467,7 @@
+--- src/packet.c.orig	Mon Nov 15 14:41:32 2004
++++ src/packet.c	Mon Nov 15 14:42:04 2004
+@@ -531,7 +531,7 @@
    parse_client_queued(client_p);
  
    /* Check to make sure we're not flooding */
 -  if (IsPerson(client_p) &&
 +  if (!(IsServer(client_p) || IsHandshake(client_p) || IsConnecting(client_p)) &&
-       (dbuf_length(&client_p->localClient->buf_recvq) >
-        (unsigned int)ConfigFileEntry.client_flood))
+       (linebuf_alloclen(&client_p->localClient->buf_recvq) >
+        ConfigFileEntry.client_flood))
    {
diff --git a/irc/ircd-hybrid-ru/files/patch-tools-Makefile.in b/irc/ircd-hybrid-ru/files/patch-tools-Makefile.in
new file mode 100644
index 0000000..c807f05
--- /dev/null
+++ b/irc/ircd-hybrid-ru/files/patch-tools-Makefile.in
@@ -0,0 +1,20 @@
+--- 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
-- 
cgit v1.1