Date: Sun, 12 Oct 2003 14:12:07 +0800 From: "Kang Liu" <liukang@bjpu.edu.cn> To: <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/57880: [patch]update irc/ircd-hybrid to 6.4.1 Message-ID: <000001c39087$c44cfb70$e04e70ca@lkatschool> Resent-Message-ID: <200310120620.h9C6KGLf004069@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 57880
>Category: ports
>Synopsis: [patch]update irc/ircd-hybrid to 6.4.1
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sat Oct 11 23:20:16 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: Kang Liu
>Release: FreeBSD 5.1-CURRENT i386
>Organization:
Beijing University of Technology
>Environment:
System: FreeBSD www.lemon4ssc.org 5.1-CURRENT FreeBSD 5.1-CURRENT #25: Mon Oct 6 12:04:16 CST 2003
root@www.lemon4ssc.org:/usr/obj/usr/src/sys/IPFW i386
>Description:
just update irc/ircd-hybrid to 6.4.1.
>How-To-Repeat:
n/a
>Fix:
(files/patch-ae should be deleted)
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/irc/ircd-hybrid/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- Makefile 7 May 2003 05:04:48 -0000 1.24
+++ Makefile 12 Oct 2003 06:09:58 -0000
@@ -6,7 +6,7 @@
#
PORTNAME= ircd-hybrid
-PORTVERSION= 6.3.1
+PORTVERSION= 6.4.1
CATEGORIES= irc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ircd-hybrid
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/irc/ircd-hybrid/distinfo,v
retrieving revision 1.11
diff -u -r1.11 distinfo
--- distinfo 4 Feb 2003 22:09:50 -0000 1.11
+++ distinfo 12 Oct 2003 06:09:58 -0000
@@ -1 +1 @@
-MD5 (ircd-hybrid-6.3.1.tgz) = 117bb857b165a2a92e7f43eeac3e78d6
+MD5 (ircd-hybrid-6.4.1.tgz) = 141d54a6a6b649b2b602a8d6d30a3bb7
Index: files/patch-ab
===================================================================
RCS file: /home/ncvs/ports/irc/ircd-hybrid/files/patch-ab,v
retrieving revision 1.6
diff -u -r1.6 patch-ab
--- files/patch-ab 31 Mar 2002 15:32:26 -0000 1.6
+++ files/patch-ab 12 Oct 2003 06:09:58 -0000
@@ -1,6 +1,6 @@
---- configure.orig Thu Mar 21 16:58:58 2002
-+++ configure Thu Mar 21 17:00:54 2002
-@@ -2517,7 +2517,7 @@
+--- configure.orig Sun Oct 12 13:43:27 2003
++++ configure Sun Oct 12 13:44:49 2003
+@@ -2469,7 +2469,7 @@
ac_given_srcdir=$srcdir
ac_given_INSTALL="$INSTALL"
@@ -9,7 +9,7 @@
EOF
cat >> $CONFIG_STATUS <<EOF
-@@ -2615,7 +2615,7 @@
+@@ -2553,7 +2553,7 @@
cat >> $CONFIG_STATUS <<EOF
@@ -17,4 +17,4 @@
+CONFIG_FILES=\${CONFIG_FILES-"Makefile adns/Makefile src/Makefile tools/Makefile include/config.h tools/install_ircd"}
EOF
cat >> $CONFIG_STATUS <<\EOF
- for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
+ for ac_file in .. $CONFIG_FILES; do if test "x$ac_file"
Index: files/patch-ac
===================================================================
RCS file: /home/ncvs/ports/irc/ircd-hybrid/files/patch-ac,v
retrieving revision 1.4
diff -u -r1.4 patch-ac
--- files/patch-ac 31 Mar 2002 15:32:26 -0000 1.4
+++ files/patch-ac 12 Oct 2003 06:09:58 -0000
@@ -1,5 +1,5 @@
---- include/config.h.in.orig Thu Mar 21 16:37:57 2002
-+++ include/config.h.in Thu Mar 21 16:41:01 2002
+--- include/config.h.in.orig Sun Oct 12 13:46:28 2003
++++ include/config.h.in Sun Oct 12 13:48:15 2003
@@ -100,8 +100,9 @@
*
*/
@@ -12,7 +12,7 @@
#define CPATH "ircd.conf"
#define KPATH "kline.conf"
#define DLPATH "kline.conf"
-@@ -208,8 +209,8 @@
+@@ -208,13 +209,13 @@
*
* These need to be defined if you want to use SYSLOG logging, too.
*/
@@ -21,5 +21,12 @@
+#define FNAME_USERLOG "@prefix@/share/ircd/users"
+#define FNAME_OPERLOG "@prefix@/share/ircd/opers"
+ /* FNAME_OPERSPYLOG and FNAME_OPERSPYRLOG - logs of OPERSPY usage!
+ */
+-#define FNAME_OPERSPYLOG "/usr/local/ircd/operspy.local.log"
+-#define FNAME_OPERSPYRLOG "/usr/local/ircd/operspy.remote.log"
++#define FNAME_OPERSPYLOG "@prefix@/ircd/operspy.local.log"
++#define FNAME_OPERSPYRLOG "@prefix@/ircd/operspy.remote.log"
+
+
/* RFC1035_ANAL
- * Defining this causes ircd to reject hostnames with non-compliant chars.
Index: files/patch-ad
===================================================================
RCS file: /home/ncvs/ports/irc/ircd-hybrid/files/patch-ad,v
retrieving revision 1.3
diff -u -r1.3 patch-ad
--- files/patch-ad 31 Mar 2002 15:32:26 -0000 1.3
+++ files/patch-ad 12 Oct 2003 06:09:58 -0000
@@ -1,15 +1,15 @@
---- tools/install_ircd.in.orig Thu Mar 21 16:41:59 2002
-+++ tools/install_ircd.in Thu Mar 21 16:47:07 2002
+--- tools/install_ircd.in.orig Sun Oct 12 13:29:16 2003
++++ tools/install_ircd.in Sun Oct 12 13:34:17 2003
@@ -7,6 +7,14 @@
# Fixed.
#
+if [ "x@prefix@" != "x${PREFIX}" ]; then
-+ echo "ERROR: Different prefix used to install than for configure/build."
-+ echo "The prefix is compiled into the binary, thus this will not work."
-+ echo "Please be sure to use the same \$PREFIX throughout building of"
-+ echo "this port."
-+ exit 1
++ echo "ERROR: Different prefix used to install than for configure/build."
++ echo "The prefix is compiled into the binary, thus this will not work."
++ echo "Please be sure to use the same \$PREFIX throughout building of"
++ echo "this port."
++ exit 1
+fi
+
# Path to install-sh
@@ -23,23 +23,15 @@
DPATH=`grep '#define.DPATH' include/config.h|awk '{print $3}'|tr -d \"`;
SPATH=`grep '#define.SPATH' include/config.h|awk '{print $3}'|tr -d \"`;
CPATH=`grep '#define.CPATH' include/config.h|awk '{print $3}'|tr -d \"`;
-@@ -48,6 +57,7 @@
- PPATH=`grep '#define.PPATH' include/config.h|awk '{print $3}'|tr -d \"`;
- HPATH=`grep '#define.HPATH' include/config.h|awk '{print $3}'|tr -d \"`;
-
-+BPATH=`dir_concat ${BPATH}`;
- SPATH=`dir_concat ${SPATH}`;
- CPATH=`dir_concat ${CPATH}`;
- KPATH=`dir_concat ${KPATH}`;
-@@ -56,6 +66,7 @@
+@@ -56,6 +65,7 @@
PPATH=`dir_concat ${PPATH}`;
HPATH=`dir_concat ${HPATH}`;
-+# BPATH = binary directory
++# BPATH = binary directory,
# DPATH = directory,
# SPATH = server executable,
# CPATH = conf file,
-@@ -76,86 +87,46 @@
+@@ -76,86 +86,48 @@
# try to install their ircd.conf file, unless it already exists.
# install ircd, save old one as ircd.old
dir_make `dirname ${SPATH}`
@@ -76,7 +68,7 @@
-fi
+echo installing a sample MOTD in ${MPATH}.sample
+echo "This is ircd-hybrid MOTD replace it with something better" \
-+ > ${MPATH}.sample;
++ > ${MPATH}.sample;
+chown 72:72 ${MPATH}.sample;
# try to install their kpath file unless it already exists.
@@ -89,6 +81,7 @@
-fi
+touch ${KPATH}.sample;
+chown 72:72 ${KPATH}.sample;
++
# try to install their opers.txt file, in all cases
dir_make `dirname ${HPATH}`
@@ -122,22 +115,23 @@
- echo installing viconf as ${DPATH}viconf${EXESUFFIX}
- $INSTALL_SH -c tools/viconf${EXESUFFIX} ${DPATH}viconf${EXESUFFIX}
- rm -f ${DPATH}vimotd${EXESUFFIX} ${DPATH}viklines${EXESUFFIX}
-- ln ${DPATH}viconf${EXESUFFIX} ${DPATH}vimotd${EXESUFFIX}
-- ln ${DPATH}viconf${EXESUFFIX} ${DPATH}viklines${EXESUFFIX};
+- ln -s ${DPATH}viconf${EXESUFFIX} ${DPATH}vimotd${EXESUFFIX}
+- ln -s ${DPATH}viconf${EXESUFFIX} ${DPATH}viklines${EXESUFFIX};
-else
- echo installing viconf as ${DPATH}viconf${EXESUFFIX}
- echo previous viconf saved as viconf${EXESUFFIX}.old
- mv ${DPATH}viconf${EXESUFFIX} ${DPATH}viconf${EXESUFFIX}.old
- $INSTALL_SH -c tools/viconf${EXESUFFIX} ${DPATH}viconf${EXESUFFIX}
- rm -f ${DPATH}vimotd${EXESUFFIX} ${DPATH}viklines${EXESUFFIX}
-- ln ${DPATH}viconf${EXESUFFIX} ${DPATH}vimotd${EXESUFFIX}
-- ln ${DPATH}viconf${EXESUFFIX} ${DPATH}viklines${EXESUFFIX};
+- ln -s ${DPATH}viconf${EXESUFFIX} ${DPATH}vimotd${EXESUFFIX}
+- ln -s ${DPATH}viconf${EXESUFFIX} ${DPATH}viklines${EXESUFFIX};
-fi
+echo installing viconf as ${BPATH}viconf${EXESUFFIX}
+$INSTALL_SH -o 72 -g 72 -c tools/viconf${EXESUFFIX} ${BPATH}viconf${EXESUFFIX}
+rm -f ${BPATH}vimotd${EXESUFFIX} ${BPATH}viklines${EXESUFFIX}
+ln ${BPATH}viconf${EXESUFFIX} ${BPATH}vimotd${EXESUFFIX}
+ln ${BPATH}viconf${EXESUFFIX} ${BPATH}viklines${EXESUFFIX};
++
# install ircd.8
-dir_make ${DPATH}man8
Index: files/patch-ae
===================================================================
RCS file: /home/ncvs/ports/irc/ircd-hybrid/files/patch-ae,v
retrieving revision 1.3
diff -u -r1.3 patch-ae
--- files/patch-ae 31 Mar 2002 15:32:26 -0000 1.3
+++ files/patch-ae 12 Oct 2003 06:09:58 -0000
@@ -1,11 +0,0 @@
---- Makefile.in.orig Thu Mar 21 16:47:44 2002
-+++ Makefile.in Thu Mar 21 16:47:57 2002
-@@ -22,7 +22,7 @@
- RM=@RM@
-
- # Default CFLAGS
--CFLAGS = -g -O2 -DNDEBUG
-+CFLAGS += -DNDEBUG
-
- # Default make flags - you may want to uncomment this on a multicpu machine
- #MFLAGS = -j 4
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?000001c39087$c44cfb70$e04e70ca>