From 27227ea9cc57d2739f594a83d417059596018211 Mon Sep 17 00:00:00 2001 From: adrianp Date: Tue, 3 Jan 2006 13:09:25 +0000 Subject: Update to 7.2.0 > -- ircd-hybrid-7.2.0 RELNOTES > o) Fixed broken operwall = yes; > o) Added 'umode' directive to oper{}. List of modes to get on /OPER. > o) Fixed a WHOIS bug > o) Fixed bug where we would increase Count.invisi even > if invisible_on_connect is turned off > o) Removed invite_ops_only, controlled by paranoid (+p) now > o) Better DDoS protection > o) Fixed va_list bug on amd64 > o) Fixed /dev/poll > > > -- ircd-hybrid-7.2rc1 RELNOTES > o) ircd can dynamically change all its client/fd limits at runtime > o) Added epoll as the primary I/O engine under Linux > o) Local channels will not show up in remote /WHOIS > o) Added hidden_name which allows customized hidden server names > o) Added restrict_channels to define a static channel set > o) Added --disable-gline-voting to disable G-Line votes > for small networks or people who don't want it. > o) Allow accumulating more ip= entries in an exempt{} block > o) Various improvements and bugfixes > o) Make win32 build usable > o) Fixed ban caching bug > o) Cosmetical fixes to TIME > o) Get "KLINE nick" to work with clients that have a spoof > o) Fixed RESV/XLINE bug in conjunction with names that include escaped > characters such as \*, \?, \#. > > > -- ircd-hybrid-7.2beta1 RELNOTES > o) Usermode +G, like +g, but allow messaging from people on common channels > o) Usermode +D - "deaf", don't receive channel messages > o) RXLINE and RKLINE - commands for setting regexp K/X lines > o) Join flood is now detected and reported to +b opers > o) Re-added REJECT_HOLD - lock clients for a while before throwing away > o) ping_warning, a class{} option to notify opers before "Ping timeout" > o) New hooking system, modularised: usermodes, iauth, message filtering etc. > o) Network I/O speedups > o) Various cleanups and bugfixes > o) Support for client SSL > o) Support for services (contrib/m_services.c) > o) IP cloaking module (contrib/ip_cloaking.c) > o) Native win32 build --- chat/ircd-hybrid/MESSAGE | 6 +- chat/ircd-hybrid/Makefile | 12 +-- chat/ircd-hybrid/PLIST | 195 ++++++-------------------------------- chat/ircd-hybrid/distinfo | 15 ++- chat/ircd-hybrid/options.mk | 3 +- chat/ircd-hybrid/patches/patch-aa | 10 +- chat/ircd-hybrid/patches/patch-ab | 8 +- chat/ircd-hybrid/patches/patch-ac | 45 ++++++--- chat/ircd-hybrid/patches/patch-ae | 13 --- 9 files changed, 85 insertions(+), 222 deletions(-) delete mode 100644 chat/ircd-hybrid/patches/patch-ae (limited to 'chat/ircd-hybrid') diff --git a/chat/ircd-hybrid/MESSAGE b/chat/ircd-hybrid/MESSAGE index 973e1c8b4d3..53dccf9741b 100644 --- a/chat/ircd-hybrid/MESSAGE +++ b/chat/ircd-hybrid/MESSAGE @@ -1,13 +1,11 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.4 2005/11/13 22:40:00 adrianp Exp $ +$NetBSD: MESSAGE,v 1.5 2006/01/03 13:09:25 adrianp Exp $ -ircd-hybrid is now installed. Do note that three programs have changed +ircd-hybrid is now installed. Do note some programs have changed names to more readily reflect their ircd-hybrid function; make sure to prefix them with "ircd-hybrid": - convertconf -> ircd-hybrid-convertconf mkpasswd -> ircd-hybrid-mkpasswd - viconf -> ircd-hybrid-viconf The documentation can be found at ${PREFIX}/share/doc/ircd-hybrid. diff --git a/chat/ircd-hybrid/Makefile b/chat/ircd-hybrid/Makefile index b4fdea3e1d0..2ea634c25bc 100644 --- a/chat/ircd-hybrid/Makefile +++ b/chat/ircd-hybrid/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.25 2005/12/29 06:21:32 jlam Exp $ +# $NetBSD: Makefile,v 1.26 2006/01/03 13:09:25 adrianp Exp $ -DISTNAME= ircd-hybrid-7.1.3 +DISTNAME= ircd-hybrid-7.2.0 EXTRACT_SUFX= .tgz CATEGORIES= chat MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ircd-hybrid/} @@ -110,17 +110,9 @@ post-install: cd ${WRKSRC}/messages && \ ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} install - ${INSTALL_PROGRAM} ${WRKSRC}/tools/convertconf \ - ${PREFIX}/bin/ircd-hybrid-convertconf - ${INSTALL_PROGRAM} ${WRKSRC}/tools/convertilines \ - ${PREFIX}/bin/convertilines - ${INSTALL_PROGRAM} ${WRKSRC}/tools/convertklines \ - ${PREFIX}/bin/convertklines ${INSTALL_PROGRAM} ${WRKSRC}/tools/encspeed \ ${PREFIX}/bin/encspeed ${INSTALL_PROGRAM} ${WRKSRC}/tools/mkpasswd \ ${PREFIX}/bin/ircd-hybrid-mkpasswd - ${INSTALL_PROGRAM} ${WRKSRC}/tools/viconf \ - ${PREFIX}/bin/ircd-hybrid-viconf .include "../../mk/bsd.pkg.mk" diff --git a/chat/ircd-hybrid/PLIST b/chat/ircd-hybrid/PLIST index 7572be84b17..2e95461a399 100644 --- a/chat/ircd-hybrid/PLIST +++ b/chat/ircd-hybrid/PLIST @@ -1,77 +1,8 @@ -@comment $NetBSD: PLIST,v 1.4 2005/11/13 22:40:00 adrianp Exp $ -bin/convertilines -bin/convertklines +@comment $NetBSD: PLIST,v 1.5 2006/01/03 13:09:25 adrianp Exp $ bin/encspeed bin/ircd -bin/ircd-hybrid-convertconf bin/ircd-hybrid-mkpasswd -bin/ircd-hybrid-viconf bin/servlink -include/ircd-hybrid-7/balloc.h -include/ircd-hybrid-7/channel.h -include/ircd-hybrid-7/channel_mode.h -include/ircd-hybrid-7/client.h -include/ircd-hybrid-7/cluster.h -include/ircd-hybrid-7/common.h -include/ircd-hybrid-7/control.h -include/ircd-hybrid-7/dalloca.h -include/ircd-hybrid-7/dbuf.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/inet_misc.h -include/ircd-hybrid-7/io.h -include/ircd-hybrid-7/irc_getaddrinfo.h -include/ircd-hybrid-7/irc_getnameinfo.h -include/ircd-hybrid-7/irc_res.h -include/ircd-hybrid-7/irc_reslib.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/list.h -include/ircd-hybrid-7/listener.h -include/ircd-hybrid-7/m_info.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/restart.h -include/ircd-hybrid-7/resv.h -include/ircd-hybrid-7/rlimits.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/send.h -include/ircd-hybrid-7/serno.h -include/ircd-hybrid-7/servlink.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/userhost.h -include/ircd-hybrid-7/whowas.h lib/ircd-hybrid/modules/autoload/m_accept.so lib/ircd-hybrid/modules/autoload/m_admin.so lib/ircd-hybrid/modules/autoload/m_away.so @@ -84,7 +15,10 @@ lib/ircd-hybrid/modules/autoload/m_cryptlink.so lib/ircd-hybrid/modules/autoload/m_drop.so lib/ircd-hybrid/modules/autoload/m_encap.so lib/ircd-hybrid/modules/autoload/m_eob.so +lib/ircd-hybrid/modules/autoload/m_etrace.so lib/ircd-hybrid/modules/autoload/m_gline.so +lib/ircd-hybrid/modules/autoload/m_hash.so +lib/ircd-hybrid/modules/autoload/m_help.so lib/ircd-hybrid/modules/autoload/m_info.so lib/ircd-hybrid/modules/autoload/m_invite.so lib/ircd-hybrid/modules/autoload/m_ison.so @@ -100,6 +34,7 @@ lib/ircd-hybrid/modules/autoload/m_map.so lib/ircd-hybrid/modules/autoload/m_motd.so lib/ircd-hybrid/modules/autoload/m_names.so lib/ircd-hybrid/modules/autoload/m_nburst.so +lib/ircd-hybrid/modules/autoload/m_omotd.so lib/ircd-hybrid/modules/autoload/m_oper.so lib/ircd-hybrid/modules/autoload/m_operwall.so lib/ircd-hybrid/modules/autoload/m_pass.so @@ -109,6 +44,8 @@ lib/ircd-hybrid/modules/autoload/m_post.so lib/ircd-hybrid/modules/autoload/m_rehash.so lib/ircd-hybrid/modules/autoload/m_restart.so lib/ircd-hybrid/modules/autoload/m_resv.so +lib/ircd-hybrid/modules/autoload/m_rkline.so +lib/ircd-hybrid/modules/autoload/m_rxline.so lib/ircd-hybrid/modules/autoload/m_set.so lib/ircd-hybrid/modules/autoload/m_stats.so lib/ircd-hybrid/modules/autoload/m_svinfo.so @@ -149,9 +86,7 @@ share/doc/ircd-hybrid/README.messages share/doc/ircd-hybrid/RELNOTES share/doc/ircd-hybrid/doc/CIDR.txt share/doc/ircd-hybrid/doc/LazyLinks.txt -share/doc/ircd-hybrid/doc/Tao-of-IRC.940110 share/doc/ircd-hybrid/doc/challenge.txt -share/doc/ircd-hybrid/doc/channels.txt share/doc/ircd-hybrid/doc/guidelines.txt share/doc/ircd-hybrid/doc/index.txt share/doc/ircd-hybrid/doc/ircd.8 @@ -159,13 +94,10 @@ share/doc/ircd-hybrid/doc/kline.txt share/doc/ircd-hybrid/doc/messages.txt share/doc/ircd-hybrid/doc/modeg.txt share/doc/ircd-hybrid/doc/modes.txt -share/doc/ircd-hybrid/doc/operguide.txt -share/doc/ircd-hybrid/doc/opermyth.txt share/doc/ircd-hybrid/doc/resv.txt share/doc/ircd-hybrid/doc/server-version-info share/doc/ircd-hybrid/doc/serverhide.txt share/doc/ircd-hybrid/doc/technical/Persistent_Clients.txt -share/doc/ircd-hybrid/doc/technical/README.TSora share/doc/ircd-hybrid/doc/technical/README.openssl share/doc/ircd-hybrid/doc/technical/cryptlink.txt share/doc/ircd-hybrid/doc/technical/event.txt @@ -175,7 +107,10 @@ share/doc/ircd-hybrid/doc/technical/hostmask.txt share/doc/ircd-hybrid/doc/technical/index.txt share/doc/ircd-hybrid/doc/technical/network.txt share/doc/ircd-hybrid/doc/technical/rfc1459.txt +share/doc/ircd-hybrid/doc/technical/rfc2812.txt +share/doc/ircd-hybrid/doc/technical/rfc2813.txt share/doc/ircd-hybrid/doc/technical/send.txt +share/doc/ircd-hybrid/doc/technical/ts3.txt share/doc/ircd-hybrid/doc/technical/ts5.txt share/doc/ircd-hybrid/doc/technical/ts6.txt share/doc/ircd-hybrid/doc/technical/whats-new-code.txt @@ -185,99 +120,35 @@ share/examples/ircd-hybrid/example.conf.quick share/examples/ircd-hybrid/example.efnet.conf share/examples/ircd-hybrid/simple.conf share/examples/rc.d/ircd-hybrid -share/ircd-hybrid/help/opers/accept -share/ircd-hybrid/help/opers/admin -share/ircd-hybrid/help/opers/away -share/ircd-hybrid/help/opers/capab -share/ircd-hybrid/help/opers/cburst -share/ircd-hybrid/help/opers/challenge -share/ircd-hybrid/help/opers/client -share/ircd-hybrid/help/opers/close -share/ircd-hybrid/help/opers/cmode -share/ircd-hybrid/help/opers/connect -share/ircd-hybrid/help/opers/credits -share/ircd-hybrid/help/opers/cryptlink -share/ircd-hybrid/help/opers/die -share/ircd-hybrid/help/opers/dline -share/ircd-hybrid/help/opers/dmem -share/ircd-hybrid/help/opers/drop -share/ircd-hybrid/help/opers/eob -share/ircd-hybrid/help/opers/error -share/ircd-hybrid/help/opers/gline -share/ircd-hybrid/help/opers/help +share/ircd-hybrid/help/opers/capture +share/ircd-hybrid/help/opers/chghost +share/ircd-hybrid/help/opers/chgident +share/ircd-hybrid/help/opers/chgname +share/ircd-hybrid/help/opers/classlist +share/ircd-hybrid/help/opers/clearchan +share/ircd-hybrid/help/opers/ctrace +share/ircd-hybrid/help/opers/delspoof +share/ircd-hybrid/help/opers/flags +share/ircd-hybrid/help/opers/forcejoin +share/ircd-hybrid/help/opers/forcepart share/ircd-hybrid/help/opers/index -share/ircd-hybrid/help/opers/info -share/ircd-hybrid/help/opers/invite -share/ircd-hybrid/help/opers/ison -share/ircd-hybrid/help/opers/join -share/ircd-hybrid/help/opers/kick -share/ircd-hybrid/help/opers/kill -share/ircd-hybrid/help/opers/kline -share/ircd-hybrid/help/opers/knock -share/ircd-hybrid/help/opers/knockll -share/ircd-hybrid/help/opers/links -share/ircd-hybrid/help/opers/list -share/ircd-hybrid/help/opers/lljoin -share/ircd-hybrid/help/opers/llnick -share/ircd-hybrid/help/opers/locops -share/ircd-hybrid/help/opers/lusers -share/ircd-hybrid/help/opers/modlist -share/ircd-hybrid/help/opers/modload -share/ircd-hybrid/help/opers/modrestart -share/ircd-hybrid/help/opers/modunload -share/ircd-hybrid/help/opers/motd -share/ircd-hybrid/help/opers/names -share/ircd-hybrid/help/opers/nburst -share/ircd-hybrid/help/opers/nick -share/ircd-hybrid/help/opers/notice -share/ircd-hybrid/help/opers/oper -share/ircd-hybrid/help/opers/operwall -share/ircd-hybrid/help/opers/part -share/ircd-hybrid/help/opers/pass -share/ircd-hybrid/help/opers/ping -share/ircd-hybrid/help/opers/pong -share/ircd-hybrid/help/opers/post -share/ircd-hybrid/help/opers/privmsg -share/ircd-hybrid/help/opers/quit -share/ircd-hybrid/help/opers/rehash -share/ircd-hybrid/help/opers/restart -share/ircd-hybrid/help/opers/resv -share/ircd-hybrid/help/opers/server -share/ircd-hybrid/help/opers/set -share/ircd-hybrid/help/opers/sjoin -share/ircd-hybrid/help/opers/squit -share/ircd-hybrid/help/opers/stats -share/ircd-hybrid/help/opers/svinfo -share/ircd-hybrid/help/opers/testline -share/ircd-hybrid/help/opers/time -share/ircd-hybrid/help/opers/topic -share/ircd-hybrid/help/opers/trace -share/ircd-hybrid/help/opers/uhelp -share/ircd-hybrid/help/opers/umode -share/ircd-hybrid/help/opers/undline -share/ircd-hybrid/help/opers/ungline -share/ircd-hybrid/help/opers/unkline -share/ircd-hybrid/help/opers/unresv -share/ircd-hybrid/help/opers/unxline -share/ircd-hybrid/help/opers/user -share/ircd-hybrid/help/opers/userhost -share/ircd-hybrid/help/opers/users -share/ircd-hybrid/help/opers/version -share/ircd-hybrid/help/opers/wallops -share/ircd-hybrid/help/opers/who -share/ircd-hybrid/help/opers/whois -share/ircd-hybrid/help/opers/whowas -share/ircd-hybrid/help/opers/xline +share/ircd-hybrid/help/opers/jupe +share/ircd-hybrid/help/opers/ltrace +share/ircd-hybrid/help/opers/mkpasswd +share/ircd-hybrid/help/opers/ojoin +share/ircd-hybrid/help/opers/opme +share/ircd-hybrid/help/opers/spoof +share/ircd-hybrid/help/opers/svsnick +share/ircd-hybrid/help/opers/uncapture share/ircd-hybrid/help/users/accept share/ircd-hybrid/help/users/admin share/ircd-hybrid/help/users/away share/ircd-hybrid/help/users/challenge share/ircd-hybrid/help/users/cmode -share/ircd-hybrid/help/users/credits share/ircd-hybrid/help/users/error +share/ircd-hybrid/help/users/flags share/ircd-hybrid/help/users/help share/ircd-hybrid/help/users/index -share/ircd-hybrid/help/users/info share/ircd-hybrid/help/users/invite share/ircd-hybrid/help/users/ison share/ircd-hybrid/help/users/join @@ -289,18 +160,14 @@ share/ircd-hybrid/help/users/lusers share/ircd-hybrid/help/users/motd share/ircd-hybrid/help/users/names share/ircd-hybrid/help/users/nick -share/ircd-hybrid/help/users/notice share/ircd-hybrid/help/users/oper share/ircd-hybrid/help/users/part share/ircd-hybrid/help/users/pass share/ircd-hybrid/help/users/ping share/ircd-hybrid/help/users/pong -share/ircd-hybrid/help/users/privmsg share/ircd-hybrid/help/users/quit -share/ircd-hybrid/help/users/stats share/ircd-hybrid/help/users/time share/ircd-hybrid/help/users/topic -share/ircd-hybrid/help/users/umode share/ircd-hybrid/help/users/user share/ircd-hybrid/help/users/userhost share/ircd-hybrid/help/users/users @@ -309,6 +176,7 @@ share/ircd-hybrid/help/users/who share/ircd-hybrid/help/users/whois share/ircd-hybrid/help/users/whowas share/ircd-hybrid/messages/ayb.lang +share/ircd-hybrid/messages/custom.lang share/ircd-hybrid/messages/ircd-croatian.lang share/ircd-hybrid/messages/ircd-danish.lang share/ircd-hybrid/messages/ircd-dutch.lang @@ -331,4 +199,3 @@ share/ircd-hybrid/messages/ircd-swedish.lang @dirrm lib/ircd-hybrid/modules/autoload @dirrm lib/ircd-hybrid/modules @dirrm lib/ircd-hybrid -@dirrm include/ircd-hybrid-7 diff --git a/chat/ircd-hybrid/distinfo b/chat/ircd-hybrid/distinfo index 9321b72cc49..d0d80d15c08 100644 --- a/chat/ircd-hybrid/distinfo +++ b/chat/ircd-hybrid/distinfo @@ -1,10 +1,9 @@ -$NetBSD: distinfo,v 1.4 2005/12/13 18:03:24 joerg Exp $ +$NetBSD: distinfo,v 1.5 2006/01/03 13:09:25 adrianp Exp $ -SHA1 (ircd-hybrid-7.1.3.tgz) = 302b7d82f0a40844fb522f476eb6ba957a36a746 -RMD160 (ircd-hybrid-7.1.3.tgz) = 32684e1e39fc361956d8cc57a82cff857993c877 -Size (ircd-hybrid-7.1.3.tgz) = 1167422 bytes -SHA1 (patch-aa) = 4b1e58cdaca2c6b0f4f1f7a9a81e48dcd54b5613 -SHA1 (patch-ab) = 1f7fbfb91c7ef039c3de26fb36b4c5c036373bc3 -SHA1 (patch-ac) = 5bc7624d7626ecbd5fb0a576cc8538c181fdbd73 +SHA1 (ircd-hybrid-7.2.0.tgz) = 55c727d92ed4416f72372cc47c3af39904172322 +RMD160 (ircd-hybrid-7.2.0.tgz) = 2d5ba31343a1ff844eaf68f523d430b840fe7ee0 +Size (ircd-hybrid-7.2.0.tgz) = 990320 bytes +SHA1 (patch-aa) = 5ffdd9e30835e026ac900b1d83469c205b9d1bac +SHA1 (patch-ab) = da98233fe21eb7054f6f9011f6dfbe2db04be0d5 +SHA1 (patch-ac) = 2c85c151d9d938d17cb1c50fce231a108dfcaa31 SHA1 (patch-ad) = 7ed782cb6df7586223201847e2cbed56a882154c -SHA1 (patch-ae) = 34387491b7f0288dcefe586a662ea6c10fcb7526 diff --git a/chat/ircd-hybrid/options.mk b/chat/ircd-hybrid/options.mk index 32efd85872a..421ece7880f 100644 --- a/chat/ircd-hybrid/options.mk +++ b/chat/ircd-hybrid/options.mk @@ -1,8 +1,7 @@ -# $NetBSD: options.mk,v 1.2 2005/11/13 22:58:05 adrianp Exp $ +# $NetBSD: options.mk,v 1.3 2006/01/03 13:09:25 adrianp Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.ircd-hybrid PKG_SUPPORTED_OPTIONS= efnet ssl halfops small-net ziplinks - PKG_SUGGESTED_OPTIONS= ssl ziplinks .include "../../mk/bsd.options.mk" diff --git a/chat/ircd-hybrid/patches/patch-aa b/chat/ircd-hybrid/patches/patch-aa index ede2163c61d..1b6cddb0d52 100644 --- a/chat/ircd-hybrid/patches/patch-aa +++ b/chat/ircd-hybrid/patches/patch-aa @@ -1,13 +1,13 @@ -$NetBSD: patch-aa,v 1.2 2005/11/13 22:40:00 adrianp Exp $ +$NetBSD: patch-aa,v 1.3 2006/01/03 13:09:25 adrianp Exp $ ---- Makefile.in.orig 2003-07-18 01:41:39.000000000 +0100 +--- Makefile.in.orig 2005-12-22 00:01:36.000000000 +0000 +++ Makefile.in @@ -25,7 +25,7 @@ RM = @RM@ #MFLAGS = -j 4 - DEPEND_DIRS = modules src servlink + DEPEND_DIRS = lib modules src servlink BUILD_DIRS = ${DEPEND_DIRS} tools --INSTALL_DIRS = ${BUILD_DIRS} etc doc include -+INSTALL_DIRS = ${DEPEND_DIRS} doc include +-INSTALL_DIRS = ${BUILD_DIRS} etc doc help ++INSTALL_DIRS = ${BUILD_DIRS} doc help CLEAN_DIRS = ${BUILD_DIRS} contrib # Anywhere that we can make install, we obviously can rm -f Makefile DISTCLEAN_DIRS = ${INSTALL_DIRS} contrib messages diff --git a/chat/ircd-hybrid/patches/patch-ab b/chat/ircd-hybrid/patches/patch-ab index b19539f3bf1..b418b304e16 100644 --- a/chat/ircd-hybrid/patches/patch-ab +++ b/chat/ircd-hybrid/patches/patch-ab @@ -1,6 +1,6 @@ -$NetBSD: patch-ab,v 1.2 2005/11/13 22:40:00 adrianp Exp $ +$NetBSD: patch-ab,v 1.3 2006/01/03 13:09:25 adrianp Exp $ ---- modules/Makefile.in.orig 2005-07-31 19:03:33.000000000 +0100 +--- modules/Makefile.in.orig 2005-12-22 00:02:58.000000000 +0000 +++ modules/Makefile.in @@ -23,7 +23,7 @@ IRCDLIBS = @LIBS@ $(SSL_LIBS) @@ -10,8 +10,8 @@ $NetBSD: patch-ab,v 1.2 2005/11/13 22:40:00 adrianp Exp $ +moduledir = ${prefix}/lib/ircd-hybrid/modules automoduledir = ${moduledir}/autoload - INCLUDES = -I../include $(SSL_INCLUDES) -@@ -127,16 +127,6 @@ libmodules.a: $(S_OBJS) + INCLUDES = -I../include -I../lib/pcre $(SSL_INCLUDES) +@@ -133,16 +133,6 @@ libmodules.a: $(S_OBJS) install-mkdirs: mkdir -p $(prefix) diff --git a/chat/ircd-hybrid/patches/patch-ac b/chat/ircd-hybrid/patches/patch-ac index 6c678867bc1..844333ad999 100644 --- a/chat/ircd-hybrid/patches/patch-ac +++ b/chat/ircd-hybrid/patches/patch-ac @@ -1,15 +1,36 @@ -$NetBSD: patch-ac,v 1.2 2005/11/13 22:40:00 adrianp Exp $ +$NetBSD: patch-ac,v 1.3 2006/01/03 13:09:25 adrianp Exp $ ---- contrib/Makefile.in.orig 2005-11-13 18:12:26.000000000 +0000 -+++ contrib/Makefile.in -@@ -29,8 +29,8 @@ IRCDLIBS = @LIBS@ $(SSL_LIBS) - INCLUDES = -I../include $(SSL_INCLUDES) - CPPFLAGS = ${INCLUDES} @CPPFLAGS@ +--- contrib/help/Makefile.in.orig 2005-12-09 05:52:54.000000000 +0000 ++++ contrib/help/Makefile.in +@@ -7,8 +7,8 @@ RM= @RM@ --uhelpdir = ${prefix}/help/users --ohelpdir = ${prefix}/help/opers -+uhelpdir = ${prefix}/share/ircd-hybrid/help/users -+ohelpdir = ${prefix}/share/ircd-hybrid/help/opers + prefix= @prefix@ + exec_prefix= @execprefix@ +-uhelpdir= ${prefix}/help/users +-ohelpdir= ${prefix}/help/opers ++uhelpdir= ${prefix}/share/ircd-hybrid/help/users ++ohelpdir= ${prefix}/share/ircd-hybrid/help/opers - SYMLINKS = topic accept cmode admin names links away whowas \ - version kick who invite quit join list nick oper part \ + SYMLINKS= topic accept cmode admin names links away whowas \ + version kick who invite quit join list nick oper part \ +@@ -21,13 +21,13 @@ depend: + + install: + @echo installing help files... +- -@if test ! -d $(prefix)/help; then \ +- echo "mkdir $(prefix)/help"; \ +- mkdir $(prefix)/help; \ +- echo "mkdir $(prefix)/help/users"; \ +- mkdir $(prefix)/help/users; \ +- echo "mkdir $(prefix)/help/opers"; \ +- mkdir $(prefix)/help/opers; \ ++ -@if test ! -d $(prefix)/share/ircd-hybrid/help; then \ ++ echo "mkdir $(prefix)/share/ircd-hybrid/help"; \ ++ mkdir $(prefix)/share/ircd-hybrid/help; \ ++ echo "mkdir $(prefix)/share/ircd-hybrid/help/users"; \ ++ mkdir $(prefix)/share/ircd-hybrid/help/users; \ ++ echo "mkdir $(prefix)/share/ircd-hybrid/help/opers"; \ ++ mkdir $(prefix)/share/ircd-hybrid/help/opers; \ + fi + @for help in opers/*; do \ + if [ -f $$help ]; then \ diff --git a/chat/ircd-hybrid/patches/patch-ae b/chat/ircd-hybrid/patches/patch-ae deleted file mode 100644 index 1ebe387baf1..00000000000 --- a/chat/ircd-hybrid/patches/patch-ae +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ae,v 1.3 2005/12/13 18:03:24 joerg Exp $ - ---- configure.orig 2005-12-13 17:56:13.000000000 +0000 -+++ configure -@@ -7531,7 +7531,7 @@ cat >>conftest.$ac_ext <<_ACEOF - int - main () - { --if ( (OPENSSL_VERSION_NUMBER & 0x00906000) == 0x00906000) -+if ( OPENSSL_VERSION_NUMBER >= 0x00906000) - exit(0); else exit(1); - ; - return 0; -- cgit v1.2.3