Date: Wed, 10 Aug 2005 15:09:44 -0400 (EDT) From: Diane Bruce <db@db.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: db@night.db.net Subject: ports/84776: Update to current ircd-hybrid Message-ID: <200508101909.j7AJ9i4U053248@night.db.net> Resent-Message-ID: <200508101910.j7AJA8hS061398@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 84776
>Category: ports
>Synopsis: Update to current ircd-hybrid
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Aug 10 19:10:07 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Diane Bruce
>Release: FreeBSD 5.4-RELEASE-p3 i386
>Organization:
not very.
>Environment:
System: FreeBSD night.db.net 5.4-RELEASE-p3 FreeBSD 5.4-RELEASE-p3 #0: Tue Jul 5 10:31:25 EDT 2005 db@night.db.net:/usr/obj/usr/src/sys/NIGHT i386
>Description:
Update to current hybrid
>How-To-Repeat:
>Fix:
diff -u -r /usr/ports/irc/ircd-hybrid/Makefile ircd-hybrid/Makefile
--- /usr/ports/irc/ircd-hybrid/Makefile Thu Jul 21 11:07:44 2005
+++ ircd-hybrid/Makefile Wed Aug 10 14:46:02 2005
@@ -6,15 +6,14 @@
#
PORTNAME= ircd-hybrid
-PORTVERSION= 7.0.2
-PORTREVISION= 2
+PORTVERSION= 7.1.1
CATEGORIES= irc ipv6
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
MASTER_SITE_SUBDIR= ircd-hybrid
EXTRACT_SUFX= .tgz
-MAINTAINER= so14k@so14k.com
-COMMENT= An irc daemon with a number of new features
+MAINTAINER= db@db.net
+COMMENT= A fast irc daemon with a number of new features
MAN8= ircd.8
@@ -23,15 +22,12 @@
USE_REINPLACE= yes
PLIST_SUB+= PORTVERSION=${PORTVERSION}
-EXTRA_PATCHES= ${WRKDIR}/patch-include-config.h
#
# User Configurable Variables
#
# PREFIX - Where to install ircd-hybrid. Default is /usr/local/ircd
-# WITH_KQUEUE - Use kqueue(2) instead of poll(2).
# WITH_OPENSSL - Enable openssl. Allows use of CHALLENGE and encrypted links.
-# WITH_IPV6 - Enable IPv6 Support.
# WITHOUT_SHARED_MODULES - Disable shared modules. More secure but reduces flexability.
# WITHOUT_ASSERT - Disable parts of the debugging code.
# WITH_SMALL_NET - Tunes the memory allocation for small networks.
@@ -42,19 +38,11 @@
CONFIGURE_ARGS+= --prefix=${PREFIX}
.endif
-.if defined(WITH_KQUEUE)
-CONFIGURE_ARGS+= --enable-kqueue
-.endif
-
.if defined(WITH_OPENSSL)
USE_OPENSSL= yes
CONFIGURE_ARGS+= --enable-openssl=${OPENSSLINC}/openssl
.endif
-.if defined(WITH_IPV6)
-CONFIGURE_ARGS+= --enable-ipv6
-.endif
-
.if defined(WITHOUT_SHARED_MODULES)
CONFIGURE_ARGS+= --disable-shared-modules
PLIST_SUB+= SHAREDMODULES="@comment "
@@ -86,23 +74,20 @@
--ohelpdir=${PREFIX}/share/${PORTNAME}-${PORTVERSION}/help/opers \
--messagedir=${PREFIX}/share/${PORTNAME}-${PORTVERSION}/messages \
-pre-patch:
- @${SED} -e "s#%%PORTVERSION%%#${PORTVERSION}#" ${FILESDIR}/include-config.h.pre-patch > ${WRKDIR}/patch-include-config.h
-
-post-patch:
- @${REINPLACE_CMD} -e "s#man8#man/man8#" ${WRKSRC}/doc/Makefile.in
- @${MV} ${WRKSRC}/doc/ircd.motd ${WRKSRC}/doc/ircd.motd.sample
- @${MV} ${WRKSRC}/doc/kline.conf ${WRKSRC}/doc/kline.conf.sample
- @${MV} ${WRKSRC}/doc/dline.conf ${WRKSRC}/doc/dline.conf.sample
-
pre-install:
${SETENV} "PKG_PREFIX=${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
${MKDIR} ${PREFIX}/etc/ircd-hybrid ${PREFIX}/share/${PORTNAME}-${PORTVERSION}
${MKDIR} ${PREFIX}/share/${PORTNAME}-${PORTVERSION}/help/
+ ${MKDIR} /var/run/ircd
+ ${CHOWN} ircd:ircd /var/run/ircd
post-install:
@${SED} -e "s#%PREFIX%#${PREFIX}#" ${FILESDIR}/ircd-hybrid.sh > ${WRKDIR}/ircd-hybrid.sh
@${INSTALL_SCRIPT} ${WRKDIR}/ircd-hybrid.sh ${PREFIX}/etc/rc.d
@${SED} -e "s#/usr/local/#${PREFIX}/#" ${PKGMESSAGE}
+ @${INSTALL_SCRIPT} ${WRKSRC}/etc/example.conf.quick ${PREFIX}/etc/ircd-hybrid
+ @${INSTALL_SCRIPT} ${WRKSRC}/etc/example.efnet.conf ${PREFIX}/etc/ircd-hybrid
+ @${INSTALL_SCRIPT} ${WRKSRC}/etc/simple.conf ${PREFIX}/etc/ircd-hybrid
+ @${CHOWN} ircd:ircd /var/log/ircd
.include <bsd.port.mk>
diff -u -r /usr/ports/irc/ircd-hybrid/distinfo ircd-hybrid/distinfo
--- /usr/ports/irc/ircd-hybrid/distinfo Tue Sep 14 17:26:47 2004
+++ ircd-hybrid/distinfo Tue Aug 2 23:16:22 2005
@@ -1,2 +1,2 @@
-MD5 (ircd-hybrid-7.0.2.tgz) = e21a3bfac97d75701c04b9ca33b06453
-SIZE (ircd-hybrid-7.0.2.tgz) = 1147231
+MD5 (ircd-hybrid-7.1.1.tgz) = 97d5ca375831bb9cc42348383b836cf2
+SIZE (ircd-hybrid-7.1.1.tgz) = 1190396
Only in /usr/ports/irc/ircd-hybrid/files: include-config.h.pre-patch
diff -u -r /usr/ports/irc/ircd-hybrid/files/ircd-hybrid.sh ircd-hybrid/files/ircd-hybrid.sh
--- /usr/ports/irc/ircd-hybrid/files/ircd-hybrid.sh Tue Jul 26 15:38:47 2005
+++ ircd-hybrid/files/ircd-hybrid.sh Sat Jul 23 15:22:53 2005
@@ -1,19 +1,14 @@
#!/bin/sh
-PIDFILE=/var/run/ircd.pid
-
if [ $# -eq 0 -o x$1 = xstart ]; then
if [ -x %PREFIX%/bin/ircd ]; then
- touch $PIDFILE
- chown ircd $PIDFILE
su -fm ircd -c %PREFIX%/bin/ircd && echo ' ircd'
fi
fi
if [ x$1 = xstop ]; then
- if [ -s $PIDFILE ]; then
- kill `cat $PIDFILE`
+ if [ -f /var/run/ircd/ircd.pid ]; then
+ kill `cat /var/run/ircd/ircd.pid`
else
# oh well
killall ircd
fi
- rm -f $PIDFILE
fi
Only in ircd-hybrid/files: patch-Makefile.in
diff -u -r /usr/ports/irc/ircd-hybrid/files/patch-configure ircd-hybrid/files/patch-configure
--- /usr/ports/irc/ircd-hybrid/files/patch-configure Thu Jan 29 13:21:06 2004
+++ ircd-hybrid/files/patch-configure Sat Jul 23 16:23:52 2005
@@ -1,6 +1,6 @@
---- configure.orig Sat May 31 01:30:18 2003
-+++ configure Wed Jan 7 03:06:07 2004
-@@ -334,6 +334,12 @@
+--- configure.orig Sat Jul 9 09:09:19 2005
++++ configure Sat Jul 23 16:23:25 2005
+@@ -351,6 +351,12 @@
oldincludedir='/usr/include'
infodir='${prefix}/info'
mandir='${prefix}/man'
@@ -13,7 +13,7 @@
ac_prev=
for ac_option
-@@ -462,6 +468,24 @@
+@@ -479,6 +485,24 @@
-mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
mandir=$ac_optarg ;;
@@ -38,17 +38,45 @@
-nfp | --nfp | --nf)
# Obsolete; use --without-fp.
with_fp=no ;;
-@@ -653,7 +677,8 @@
+@@ -670,7 +694,8 @@
# Be sure to have absolute paths.
for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-- localstatedir libdir includedir oldincludedir infodir mandir
-+ localstatedir libdir includedir oldincludedir infodir mandir \
+- localstatedir libdir includedir oldincludedir infodir mandir
++ localstatedir libdir includedir oldincludedir infodir mandir \
+ moduledir automoduledir uhelpdir ohelpdir messagedir logsdir
do
eval ac_val=$`echo $ac_var`
case $ac_val in
-@@ -8918,6 +8943,12 @@
+@@ -10693,6 +10718,13 @@
+
+ cat >>confdefs.h <<_ACEOF
+ #define IRCD_PREFIX "$ac_default_prefix"
++#define MODPATH "$moduledir/"
++#define AMODPATH "$automoduledir/"
++#define UHPATH "$uhelpdir/"
++#define HPATH "$ohelpdir/"
++#define MSGPATH "$messagedir/"
++#define LOGPATH "$logsdir"
++#define ETCPATH "$sysconfdir"
+ _ACEOF
+
+
+@@ -10703,6 +10735,13 @@
+
+ cat >>confdefs.h <<_ACEOF
+ #define IRCD_PREFIX "$prefix"
++#define MODPATH "$moduledir/"
++#define AMODPATH "$automoduledir/"
++#define UHPATH "$uhelpdir/"
++#define HPATH "$ohelpdir/"
++#define MSGPATH "$messagedir/"
++#define LOGPATH "$logsdir"
++#define ETCPATH "$sysconfdir"
+ _ACEOF
+
+
+@@ -11323,6 +11362,12 @@
s,@oldincludedir@,$oldincludedir,;t t
s,@infodir@,$infodir,;t t
s,@mandir@,$mandir,;t t
Only in ircd-hybrid/files: patch-contrib_Makefile.in
Only in ircd-hybrid/files: patch-contrib_m_help.c
Only in /usr/ports/irc/ircd-hybrid/files: patch-doc-Makefile.in
Only in /usr/ports/irc/ircd-hybrid/files: patch-help-Makefile
Only in ircd-hybrid/files: patch-include_defaults.h
Only in ircd-hybrid/files: patch-include_setup.h.in
Only in /usr/ports/irc/ircd-hybrid/files: patch-messages-Makefile
Only in ircd-hybrid/files: patch-messages_Makefile.in
Only in /usr/ports/irc/ircd-hybrid/files: patch-modules-Makefile
Only in ircd-hybrid/files: patch-modules_Makefile.in
Only in /usr/ports/irc/ircd-hybrid/files: patch-src-Makefile
Only in ircd-hybrid/files: patch-src_Makefile.in
Only in ircd-hybrid/files: patch-src_modules.c
Only in /usr/ports/irc/ircd-hybrid/files: patch-tools-Makefile
diff -u -r /usr/ports/irc/ircd-hybrid/pkg-descr ircd-hybrid/pkg-descr
--- /usr/ports/irc/ircd-hybrid/pkg-descr Tue Feb 4 17:09:50 2003
+++ ircd-hybrid/pkg-descr Sat Jul 23 16:52:39 2005
@@ -1,9 +1,10 @@
A port of the ircd-hybrid IRC daemon.
ircd-hybrid includes a number of improvements over a standard
-ircd-2.8 server, including compressed server<->server links, chamode
+ircd-2.8 server, including compressed server<->server links, chanmode
+e, and TS5 support.
WWW: http://www.ircd-hybrid.org/
-- David-T
+- Diane Bruce
+db@db.net
diff -u -r /usr/ports/irc/ircd-hybrid/pkg-message ircd-hybrid/pkg-message
--- /usr/ports/irc/ircd-hybrid/pkg-message Tue Sep 14 17:26:47 2004
+++ ircd-hybrid/pkg-message Sat Jul 23 10:30:55 2005
@@ -1,17 +1,11 @@
ircd-hybrid has now been installed.
*** IMPORTANT: ***
-- The old config format WILL NOT WORK
-- The old kline format WILL NOT WORK
Please read the INSTALL file for more information.
-You should now copy /usr/local/etc/ircd-hybrid/*.sample to
-/usr/local/etc/ircd-hybrid/*, and them to suit your needs.
-
-Please note: you should copy _all_ the sample files
-to the corresponding configuration file, even if you
-just leave it empty, otherwise ircd-hybrid may refuse
-to start.
+You should now copy /usr/local/etc/ircd-hybrid/example.conf to
+/usr/local/etc/ircd-hybrid/ircd.conf, and then edit to suit your needs.
+ircd-hybrid will not start without /usr/local/etc/ircd-hybrid/ircd.conf
You may then start the server by running:
Only in /usr/ports/irc/ircd-hybrid: pkg-plist
>
> Responsible-Changed-From-To: freebsd-ports-bugs->pav
> Responsible-Changed-By: pav
> Responsible-Changed-When: Wed Aug 10 18:15:11 GMT 2005
> Responsible-Changed-Why:
> POke
>
> http://www.freebsd.org/cgi/query-pr.cgi?pr=84773
>
--
- Diane Bruce db@db.net
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200508101909.j7AJ9i4U053248>