diff options
| author | Beech Rintoul <beech@FreeBSD.org> | 2008-04-23 04:07:11 +0000 |
|---|---|---|
| committer | Beech Rintoul <beech@FreeBSD.org> | 2008-04-23 04:07:11 +0000 |
| commit | 882e9808677e3848be3ad8290fb959f756630b6e (patch) | |
| tree | 1972d089f20859102b24838841905b7dcf8fe486 /irc | |
| parent | 10f903546b299dc3f134ec6986493ff73106e9b0 (diff) | |
| download | ports-882e9808677e3848be3ad8290fb959f756630b6e.tar.gz ports-882e9808677e3848be3ad8290fb959f756630b6e.zip | |
Notes
Diffstat (limited to 'irc')
25 files changed, 972 insertions, 249 deletions
diff --git a/irc/ircd-ratbox-devel/Makefile b/irc/ircd-ratbox-devel/Makefile index 07c2d753b6d1..6eecaa5b1a8a 100644 --- a/irc/ircd-ratbox-devel/Makefile +++ b/irc/ircd-ratbox-devel/Makefile @@ -7,60 +7,58 @@ # ex: ts=8 PORTNAME= ircd-ratbox -PORTVERSION= 2.2.6 -PORTREVISION= 1 +#PORTVERSION= 3.0.0 +DISTVERSION= 3.0.0beta2 CATEGORIES= irc ipv6 -MASTER_SITES= ftp://ftp.ircd-ratbox.org/pub/ircd-ratbox/ \ - ftp://ftp.demon.co.uk/pub/mirrors/ircd-ratbox/ \ - http://www.ircd-ratbox.org/download/ \ - ftp://ftp.parodius.com/pub/ircd-ratbox/ \ - http://www.ircd-ratbox.org/download/old/ +MASTER_SITES= ftp://ftp.ircd-ratbox.org/pub/ircd-ratbox/testing/ \ + ftp://ftp.demon.co.uk/pub/mirrors/ircd-ratbox/testing/ \ + http://www.ircd-ratbox.org/download/testing/ \ + ftp://ftp.parodius.com/pub/ircd-ratbox/testing/old/ \ + http://www.ircd-ratbox.org/download/testing/old/ PKGNAMESUFFIX= -devel -EXTRACT_SUFX= .tgz MAINTAINER= moggie@elasticmind.net COMMENT= Advanced, stable IRC daemon, used widely on EFnet ('testing' release) CONFLICTS= ircd-ratbox-[0-9]* -MAN8= ircd.8 +USE_BZIP2= yes +#MAN8= ircd.8 USE_RC_SUBR= ircd-ratbox.sh +USE_SQLITE= 3 -LOGDIR= /var/log/${PORTNAME} -RUNDIR= /var/run/${PORTNAME} +LOGDIR?= /var/log/${PORTNAME} +RUNDIR?= /var/run/${PORTNAME} +DBDIR?= /var/db/${PORTNAME} SUB_FILES= pkg-message pkg-install -PLIST_SUB= LOGDIR=${LOGDIR} RUNDIR=${RUNDIR} -SUB_LIST= LOGDIR=${LOGDIR} RUNDIR=${RUNDIR} +PLIST_SUB= LOGDIR=${LOGDIR} RUNDIR=${RUNDIR} DBDIR=${DBDIR} +SUB_LIST= LOGDIR=${LOGDIR} RUNDIR=${RUNDIR} DBDIR=${DBDIR} GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-confdir=${PREFIX}/etc/${PORTNAME} \ - --with-logdir=/var/log/${PORTNAME} \ - --with-moduledir=${PREFIX}/lib/${PORTNAME}/modules \ - --with-helpdir=${DATADIR}/help +CONFIGURE_ARGS= --with-confdir=${PREFIX}/etc/${PORTNAME} \ + --with-logdir=/var/log/${PORTNAME} \ + --with-moduledir=${PREFIX}/lib/${PORTNAME}/modules \ + --with-helpdir=${DATADIR}/help \ + --libdir=${PREFIX}/lib/${PORTNAME} \ + --with-sqlite3-path=${LOCALBASE} PORTDOCS= [^i]*.txt README.* technical/[^i]*.txt Tao-of-IRC.* #-- Options ------------------------------------------------------------ -OPTIONS= KQUEUE "Use superior kqueue(2) instead of poll(2)" on \ - OPENSSL "Enable openssl support" on \ +OPTIONS= OPENSSL "Enable openssl support" on \ IPV6 "Enable IPv6 support" on \ ZIPLINKS "Enable ziplinks support" on \ SHARED_MODULES "Enable shared modules support" on \ ASSERT "Enable debugging code" off \ SMALL_NET "Tune server for small networks" off \ - SERVICES "Enable ratbox-services compatibility code" off + SERVICES "Enable ratbox-services compatibility code" off \ + SSLONLY "Enable SSL only chan' support (chanmode +S)" off #---------------------------------------------------------------------- .include <bsd.port.pre.mk> -.if defined(WITH_KQUEUE) -CONFIGURE_ARGS+= --enable-kqueue -.else -CONFIGURE_ARGS+= --enable-poll -.endif - .if defined(WITH_OPENSSL) .include "${PORTSDIR}/Mk/bsd.openssl.mk" CONFIGURE_ARGS+= --enable-openssl @@ -94,23 +92,22 @@ CONFIGURE_ARGS+= --enable-small-net CONFIGURE_ARGS+= --enable-services .endif +.if defined(WITH_SSLONLY) +CONFIGURE_ARGS+= --enable-sslonly-channels +.endif + #-- User Configuration ------------------------------------------------- .if defined(NICKLEN) CONFIGURE_ARGS+= --with-nicklen=${NICKLEN} .endif -.if defined(TOPICLEN) -CONFIGURE_ARGS+= --with-topiclen=${TOPICLEN} -.endif - #----------------------------------------------------------------------- pre-configure: @${ECHO_MSG} "" @${ECHO_MSG} "This port has additional options:" @${ECHO_MSG} " NICKLEN [default 9, max 50] - Max nick length on server" - @${ECHO_MSG} " TOPICLEN [default 160, max 390] - Max topic length" @${ECHO_MSG} "" @${ECHO_MSG} "Press CTRL+C now if you wish to set them." @${ECHO_MSG} "" @@ -124,6 +121,7 @@ post-patch: ${WRKSRC}/doc/example.conf \ ${WRKSRC}/doc/example.efnet.conf @${REINPLACE_CMD} -e "s#%%RUNDIR%%#${RUNDIR}#g" ${WRKSRC}/include/config.h + @${REINPLACE_CMD} -e "s#%%DBDIR%%#${DBDIR}#g" ${WRKSRC}/include/config.h pre-su-install: @${SETENV} "PKG_PREFIX=${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL diff --git a/irc/ircd-ratbox-devel/distinfo b/irc/ircd-ratbox-devel/distinfo index 66c1ae549f48..710d3decbe40 100644 --- a/irc/ircd-ratbox-devel/distinfo +++ b/irc/ircd-ratbox-devel/distinfo @@ -1,3 +1,3 @@ -MD5 (ircd-ratbox-2.2.6.tgz) = d288f8169e08d9031a115814a8a88033 -SHA256 (ircd-ratbox-2.2.6.tgz) = b6dd01a15d13f29c0a87f507a63b212b3fe7a62bcd101ac123ec75fcca847c35 -SIZE (ircd-ratbox-2.2.6.tgz) = 713577 +MD5 (ircd-ratbox-3.0.0beta2.tar.bz2) = 743b81cc1f12940a0bcb85dc176683b6 +SHA256 (ircd-ratbox-3.0.0beta2.tar.bz2) = 6874c9d23221331f76f54e860a51806c60cd77f78b4c876e515e41bef84b1c24 +SIZE (ircd-ratbox-3.0.0beta2.tar.bz2) = 1850499 diff --git a/irc/ircd-ratbox-devel/files/ircd-ratbox.sh.in b/irc/ircd-ratbox-devel/files/ircd-ratbox.sh.in index 2c42999e475d..2bc4c75fee55 100644 --- a/irc/ircd-ratbox-devel/files/ircd-ratbox.sh.in +++ b/irc/ircd-ratbox-devel/files/ircd-ratbox.sh.in @@ -14,6 +14,7 @@ ircd_ratbox_enable=${ircd_ratbox_enable:-"NO"} ircd_ratbox_user=${ircd_ratbox_user:-"ircd"} ircd_ratbox_group=${ircd_ratbox_group:-"ircd"} +conftest_cmd="ircd_ratbox_conftest" command="%%PREFIX%%/bin/ircd" pidfile=%%RUNDIR%%/ircd.pid required_files="%%PREFIX%%/etc/ircd-ratbox/ircd.conf" @@ -32,4 +33,12 @@ prestop() rm -f $pidfile } +ircd_ratbox_conftest() +{ + echo "Starting ircd-ratbox in configuration test only mode." + command_args="-conftest" + run_rc_command "start" +} + +extra_commands="conftest" run_rc_command "$1" diff --git a/irc/ircd-ratbox-devel/files/patch-Makefile.am b/irc/ircd-ratbox-devel/files/patch-Makefile.am new file mode 100644 index 000000000000..913d7ce3cb2d --- /dev/null +++ b/irc/ircd-ratbox-devel/files/patch-Makefile.am @@ -0,0 +1,18 @@ +--- ./Makefile.am.orig Tue Jan 22 16:15:08 2008 ++++ ./Makefile.am Tue Apr 22 02:20:19 2008 +@@ -24,13 +24,13 @@ + + if !STATIC_MODULES + +-SUBDIRS = libratbox libltdl src modules tools doc help bandb ssld resolver ident ++SUBDIRS = libratbox libltdl src modules tools doc help bandb ssld resolver ident contrib + ircd_LDADD = libratbox/src/libratbox.la src/libcore.la $(LIBLTDL) + ircd_LDFLAGS = $(EXTRA_FLAGS) -dlopen self + + else + +-SUBDIRS = libratbox libltdl modules src tools doc help bandb ssld resolver ident ++SUBDIRS = libratbox libltdl modules src tools doc help bandb ssld resolver ident contrib + ircd_LDADD = libratbox/src/libratbox.la modules/libmodules.la src/libcore.la modules/static_modules.o $(LIBLTDL) $(DLOPEN) + + diff --git a/irc/ircd-ratbox-devel/files/patch-Makefile.in b/irc/ircd-ratbox-devel/files/patch-Makefile.in index 199c2bf72f8e..824f8a3b09d9 100644 --- a/irc/ircd-ratbox-devel/files/patch-Makefile.in +++ b/irc/ircd-ratbox-devel/files/patch-Makefile.in @@ -1,11 +1,171 @@ ---- Makefile.in.orig Fri Dec 10 21:28:20 2004 -+++ Makefile.in Mon Jan 23 17:10:28 2006 -@@ -46,7 +46,7 @@ - # the system one. - #CFLAGS= -DNDEBUG -g -O2 -D"FD_SETSIZE=1024" - SHELL=/bin/sh --SUBDIRS=modules adns src tools servlink doc help -+SUBDIRS=modules adns src tools servlink doc help contrib - CLEANDIRS = ${SUBDIRS} contrib - RSA_FILES=rsa_respond/README rsa_respond/respond.c rsa_respond/Makefile - +--- ./Makefile.in.orig Fri Mar 7 16:10:01 2008 ++++ ./Makefile.in Tue Apr 22 02:20:19 2008 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -14,7 +14,7 @@ + + @SET_MAKE@ + +-# $Id: Makefile.in 25099 2008-03-07 16:10:01Z androsyn $ ++# $Id: Makefile.am 25012 2008-01-22 16:15:08Z androsyn $ + # + # okay so i've flattened out the build stuff here. + # this is really for the best since so many things depend +@@ -73,7 +73,7 @@ + ircd_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(ircd_LDFLAGS) \ + $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include ++DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +@@ -99,7 +99,7 @@ + ETAGS = etags + CTAGS = ctags + DIST_SUBDIRS = libratbox libltdl src modules tools doc help bandb ssld \ +- resolver ident ++ resolver ident contrib + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + distdir = $(PACKAGE)-$(VERSION) + top_distdir = $(distdir) +@@ -133,7 +133,6 @@ + CYGPATH_W = @CYGPATH_W@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -171,7 +170,6 @@ + MKDIR_P = @MKDIR_P@ + MODULE_DIR = @MODULE_DIR@ + MV = @MV@ +-NMEDIT = @NMEDIT@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +@@ -265,8 +263,8 @@ + AM_CFLAGS = $(WARNFLAGS) + ircd_SOURCES = src/main.c + @MINGW_TRUE@EXTRA_FLAGS = -no-undefined -Wl,--enable-runtime-pseudo-reloc -export-symbols-regex '*' +-@STATIC_MODULES_FALSE@SUBDIRS = libratbox libltdl src modules tools doc help bandb ssld resolver ident +-@STATIC_MODULES_TRUE@SUBDIRS = libratbox libltdl modules src tools doc help bandb ssld resolver ident ++@STATIC_MODULES_FALSE@SUBDIRS = libratbox libltdl src modules tools doc help bandb ssld resolver ident contrib ++@STATIC_MODULES_TRUE@SUBDIRS = libratbox libltdl modules src tools doc help bandb ssld resolver ident contrib + @STATIC_MODULES_FALSE@ircd_LDADD = libratbox/src/libratbox.la src/libcore.la $(LIBLTDL) + @STATIC_MODULES_TRUE@ircd_LDADD = libratbox/src/libratbox.la modules/libmodules.la src/libcore.la modules/static_modules.o $(LIBLTDL) $(DLOPEN) + @STATIC_MODULES_FALSE@ircd_LDFLAGS = $(EXTRA_FLAGS) -dlopen self +@@ -339,8 +337,8 @@ + || test -f $$p1 \ + ; then \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ +- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ +- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ ++ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ ++ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + else :; fi; \ + done + +@@ -486,8 +484,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ +- END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ $(AWK) ' { files[$$0] = 1; } \ ++ END { for (i in files) print i; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -512,8 +510,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ +- END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ $(AWK) ' { files[$$0] = 1; } \ ++ END { for (i in files) print i; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -523,12 +521,13 @@ + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ ++ here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ +- END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ $(AWK) ' { files[$$0] = 1; } \ ++ END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -599,10 +598,6 @@ + tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 + $(am__remove_distdir) + +-dist-lzma: distdir +- tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma +- $(am__remove_distdir) +- + dist-tarZ: distdir + tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z + $(am__remove_distdir) +@@ -629,8 +624,6 @@ + GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ + *.tar.bz2*) \ + bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ +- *.tar.lzma*) \ +- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ + *.tar.Z*) \ + uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ + *.shar.gz*) \ +@@ -790,20 +783,20 @@ + .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am am--refresh check check-am clean clean-binPROGRAMS \ + clean-generic clean-libtool ctags ctags-recursive dist \ +- dist-all dist-bzip2 dist-gzip dist-lzma dist-shar dist-tarZ \ +- dist-zip distcheck distclean distclean-compile \ +- distclean-generic distclean-hdr distclean-libtool \ +- distclean-tags distcleancheck distdir distuninstallcheck dvi \ +- dvi-am html html-am info info-am install install-am \ +- install-binPROGRAMS install-data install-data-am install-dvi \ +- install-dvi-am install-exec install-exec-am install-html \ +- install-html-am install-info install-info-am install-man \ +- install-pdf install-pdf-am install-ps install-ps-am \ +- install-strip installcheck installcheck-am installdirs \ +- installdirs-am maintainer-clean maintainer-clean-generic \ +- mostlyclean mostlyclean-compile mostlyclean-generic \ +- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ +- uninstall uninstall-am uninstall-binPROGRAMS ++ dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ dist-zip \ ++ distcheck distclean distclean-compile distclean-generic \ ++ distclean-hdr distclean-libtool distclean-tags distcleancheck \ ++ distdir distuninstallcheck dvi dvi-am html html-am info \ ++ info-am install install-am install-binPROGRAMS install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs installdirs-am maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-compile \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags tags-recursive uninstall uninstall-am \ ++ uninstall-binPROGRAMS + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/irc/ircd-ratbox-devel/files/patch-contrib_Makefile.am b/irc/ircd-ratbox-devel/files/patch-contrib_Makefile.am new file mode 100644 index 000000000000..4cba5afdba4b --- /dev/null +++ b/irc/ircd-ratbox-devel/files/patch-contrib_Makefile.am @@ -0,0 +1,10 @@ +--- ./contrib/Makefile.am.orig Fri Mar 7 16:10:01 2008 ++++ ./contrib/Makefile.am Tue Apr 22 02:20:19 2008 +@@ -10,7 +10,6 @@ + AM_CFLAGS=$(WARNFLAGS) + + SRCS = \ +-example_module.c \ + m_42.c \ + m_clearchan.c \ + m_flags.c \ diff --git a/irc/ircd-ratbox-devel/files/patch-contrib_Makefile.in b/irc/ircd-ratbox-devel/files/patch-contrib_Makefile.in index bdb7811db55e..4cc3bc1b2674 100644 --- a/irc/ircd-ratbox-devel/files/patch-contrib_Makefile.in +++ b/irc/ircd-ratbox-devel/files/patch-contrib_Makefile.in @@ -1,12 +1,37 @@ ---- contrib/Makefile.in.orig Thu Jun 17 23:19:00 2004 -+++ contrib/Makefile.in Mon Jan 23 17:17:00 2006 -@@ -43,8 +43,7 @@ - spy_stats_p_notice.c \ - spy_trace_notice.c \ - spy_whois_notice.c \ -- spy_whois_notice_global.c \ -- example_module.c -+ spy_whois_notice_global.c - - OBJS = ${SRCS:.c=.so} +--- ./contrib/Makefile.in.orig Fri Mar 7 16:10:01 2008 ++++ ./contrib/Makefile.in Tue Apr 22 02:20:19 2008 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10 from Makefile.am. + # @configure_input@ + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -66,7 +66,6 @@ + CYGPATH_W = @CYGPATH_W@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -104,7 +103,6 @@ + MKDIR_P = @MKDIR_P@ + MODULE_DIR = @MODULE_DIR@ + MV = @MV@ +-NMEDIT = @NMEDIT@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +@@ -199,7 +197,6 @@ + INCLUDES = -I../include -I../libratbox/include $(INCLTDL) + AM_CFLAGS = $(WARNFLAGS) + SRCS = \ +-example_module.c \ + m_42.c \ + m_clearchan.c \ + m_flags.c \ diff --git a/irc/ircd-ratbox-devel/files/patch-doc_Makefile.in b/irc/ircd-ratbox-devel/files/patch-doc_Makefile.in index 5d60cc8aab3d..e5456732d1ea 100644 --- a/irc/ircd-ratbox-devel/files/patch-doc_Makefile.in +++ b/irc/ircd-ratbox-devel/files/patch-doc_Makefile.in @@ -1,6 +1,6 @@ ---- doc/Makefile.in.orig Fri Jun 18 01:19:00 2004 -+++ doc/Makefile.in Fri Jan 27 07:03:15 2006 -@@ -53,28 +53,9 @@ +--- ./doc/Makefile.in.orig Fri Mar 7 16:30:59 2008 ++++ ./doc/Makefile.in Tue Apr 22 02:20:19 2008 +@@ -43,21 +43,10 @@ fi install: install-mkdirs build @@ -11,14 +11,7 @@ - fi; \ - $(INSTALL_DATA) $$i $(DESTDIR)$(confdir); \ - done -- -- @for i in $(DEFAULTCONFS); do \ -- if test ! -f $(DESTDIR)$(confdir)/$$i; then \ -- echo "ircd: creating config file ($$i)"; \ -- ${TOUCH} $(DESTDIR)$(confdir)/$$i; \ -- fi; \ -- done -- + -@if test ! -f $(DESTDIR)$(confdir)/ircd.motd; then \ echo "ircd: installing motd file (ircd.motd)"; \ - $(INSTALL_DATA) ircd.motd $(DESTDIR)$(confdir); \ @@ -29,4 +22,4 @@ + $(INSTALL_DATA) ircd.motd $(DESTDIR)$(confdir)/ircd.motd.sample; \ fi - @echo "ircd: installing manpage" + all: diff --git a/irc/ircd-ratbox-devel/files/patch-doc_example.conf b/irc/ircd-ratbox-devel/files/patch-doc_example.conf index ac40435cf404..6af27dffa786 100644 --- a/irc/ircd-ratbox-devel/files/patch-doc_example.conf +++ b/irc/ircd-ratbox-devel/files/patch-doc_example.conf @@ -1,6 +1,23 @@ ---- doc/example.conf.orig Tue Aug 21 00:37:55 2007 -+++ doc/example.conf Tue Aug 21 00:37:55 2007 -@@ -117,16 +117,16 @@ +--- ./doc/example.conf.orig Mon Mar 10 20:28:36 2008 ++++ ./doc/example.conf Tue Apr 22 02:23:42 2008 +@@ -93,13 +93,13 @@ + default_max_clients = 10000; + + /* ssl_private_key: our ssl private key */ +- ssl_private_key = "etc/test.key"; ++ ssl_private_key = "/usr/local/etc/ssl/test.key"; + + /* ssl_cert: certificate for our ssl server */ +- ssl_cert = "etc/test.cert"; ++ ssl_cert = "/usr/local/etc/ssl/test.cert"; + + /* ssl_dh_params: DH parameters, generate with openssl dhparam -out dh.pem 1024 */ +- ssl_dh_params = "etc/dh.pem"; ++ ssl_dh_params = "/usr/local/etc/ssl/dh.pem"; + + /* ssld_count: number of ssld processes you want to start, if you have a really busy + * server, using N-1 where N is the number of cpu/cpu cores you have might be useful +@@ -132,16 +132,16 @@ * - operspylog: operspy usage * - ioerrorlog: IO errors */ @@ -27,8 +44,8 @@ }; /* class {}: contain information about classes for users (OLD Y:) */ -@@ -314,7 +314,7 @@ - * A password should not be defined when this is used, see +@@ -337,7 +337,7 @@ + * A password should not be defined when this is used, see * doc/challenge.txt for more information. */ - #rsa_public_key_file = "/usr/local/ircd/etc/oper.pub"; @@ -36,7 +53,7 @@ /* umodes: the specific umodes this oper gets when they oper. * If this is specified an oper will not be given oper_umodes -@@ -898,7 +898,7 @@ +@@ -946,7 +946,7 @@ * * only define if servlink is not in same directory as ircd itself. */ @@ -45,8 +62,8 @@ /* use egd: if your system does not have *random devices yet you * want to use OpenSSL and encrypted links, enable this. Beware - -@@ -948,8 +948,9 @@ - /* module path: paths to search for modules specified below and +@@ -999,8 +999,9 @@ + /* module path: paths to search for modules specified below and * in /modload. */ - path = "/usr/local/ircd/modules"; diff --git a/irc/ircd-ratbox-devel/files/patch-doc_example.efnet.conf b/irc/ircd-ratbox-devel/files/patch-doc_example.efnet.conf index d9e521b3c1a3..3d3e7699046c 100644 --- a/irc/ircd-ratbox-devel/files/patch-doc_example.efnet.conf +++ b/irc/ircd-ratbox-devel/files/patch-doc_example.efnet.conf @@ -1,5 +1,5 @@ ---- doc/example.efnet.conf.orig Tue Aug 21 00:37:55 2007 -+++ doc/example.efnet.conf Tue Aug 21 00:37:55 2007 +--- ./doc/example.efnet.conf.orig Wed Sep 5 20:00:42 2007 ++++ ./doc/example.efnet.conf Tue Apr 22 02:26:59 2008 @@ -119,16 +119,16 @@ * - operspylog: operspy usage * - ioerrorlog: IO errors @@ -27,16 +27,16 @@ }; /* class {}: contain information about classes for users (OLD Y:) */ -@@ -317,7 +317,7 @@ - * A password should not be defined when this is used, see +@@ -316,7 +316,7 @@ + * A password should not be defined when this is used, see * doc/challenge.txt for more information. */ - #rsa_public_key_file = "/usr/local/ircd/etc/oper.pub"; -+ #rsa_public_key_file = "%%PREFIX%%/etc/ircd-ratbox/oper.pub"; ++ #rsa_public_key_file = "%%PREFIX%%/etc/oper.pub"; /* umodes: the specific umodes this oper gets when they oper. * If this is specified an oper will not be given oper_umodes -@@ -908,7 +908,7 @@ +@@ -906,7 +906,7 @@ * * only define if servlink is not in same directory as ircd itself. */ @@ -45,14 +45,14 @@ /* use egd: if your system does not have *random devices yet you * want to use OpenSSL and encrypted links, enable this. Beware - -@@ -958,8 +958,9 @@ - /* module path: paths to search for modules specified below and +@@ -956,8 +956,9 @@ + /* module path: paths to search for modules specified below and * in /modload. */ - path = "/usr/local/ircd/modules"; - path = "/usr/local/ircd/modules/autoload"; + path = "%%PREFIX%%/lib/ircd-ratbox/modules/"; -+ path = "%%PREFIX%%/lib/ircd-ratbox/modules/autoload/"; ++ path = "%%PREFIX%%/lib/ircd-ratbox/autoload/"; + path = "%%PREFIX%%/lib/ircd-ratbox/modules/contrib/"; /* module: the name of a module to load on startup/rehash */ diff --git a/irc/ircd-ratbox-devel/files/patch-help_Makefile.in b/irc/ircd-ratbox-devel/files/patch-help_Makefile.in index 8c7be9fe25b0..5a5fa952b768 100644 --- a/irc/ircd-ratbox-devel/files/patch-help_Makefile.in +++ b/irc/ircd-ratbox-devel/files/patch-help_Makefile.in @@ -1,5 +1,5 @@ ---- help/Makefile.in.orig Mon Sep 12 16:58:45 2005 -+++ help/Makefile.in Mon Jan 23 23:15:32 2006 +--- ./help/Makefile.in.orig Fri Sep 1 19:20:19 2006 ++++ ./help/Makefile.in Tue Apr 22 02:20:19 2008 @@ -63,14 +63,6 @@ rm -f opers/index.tmp diff --git a/irc/ircd-ratbox-devel/files/patch-include_config.h b/irc/ircd-ratbox-devel/files/patch-include_config.h index 523b94915e00..cdafb97b7cee 100644 --- a/irc/ircd-ratbox-devel/files/patch-include_config.h +++ b/irc/ircd-ratbox-devel/files/patch-include_config.h @@ -1,19 +1,22 @@ ---- include/config.h.orig Thu Jan 20 11:04:40 2005 -+++ include/config.h Fri Jan 27 02:25:37 2006 -@@ -56,6 +56,7 @@ +--- ./include/config.h.orig Wed Sep 5 20:08:21 2007 ++++ ./include/config.h Tue Apr 22 02:20:19 2008 +@@ -54,15 +54,17 @@ #define LOGPATH LOG_DIR #define UHPATH HELP_DIR "/users" #define HPATH HELP_DIR "/opers" -+#define RUNPATH "%%RUNDIR%%" ++#define RUNPATH "/var/run/ircd-ratbox" ++#define DBPTH "/var/db/ircd-ratbox" /* files */ #define SPATH BINPATH "/ircd" /* ircd executable */ -@@ -68,7 +69,7 @@ - #define RPATH ETCPATH "/ircd.rsa" /* ircd rsa private keyfile */ + #define SLPATH BINPATH "/servlink" /* servlink executable */ + #define CPATH ETCPATH "/ircd.conf" /* ircd.conf file */ +-#define DBPATH ETCPATH "/ban.db" ++#define DBPATH DBPTH "/ban.db" #define MPATH ETCPATH "/ircd.motd" /* MOTD file */ #define LPATH LOGPATH "/ircd.log" /* ircd logfile */ -#define PPATH ETCPATH "/ircd.pid" /* pid file */ +#define PPATH RUNPATH "/ircd.pid" /* pid file */ #define OPATH ETCPATH "/opers.motd" /* oper MOTD file */ - /* IGNORE_BOGUS_TS + /* TS6_ONLY diff --git a/irc/ircd-ratbox-devel/files/patch-libltdl_Makefile.am b/irc/ircd-ratbox-devel/files/patch-libltdl_Makefile.am new file mode 100644 index 000000000000..6582b944b97d --- /dev/null +++ b/irc/ircd-ratbox-devel/files/patch-libltdl_Makefile.am @@ -0,0 +1,17 @@ +--- ./libltdl/Makefile.am.orig Tue Sep 4 23:06:44 2007 ++++ ./libltdl/Makefile.am Tue Apr 22 02:20:19 2008 +@@ -1,7 +1,7 @@ + ## Process this file with automake to produce Makefile.in + + AUTOMAKE_OPTIONS = no-dependencies foreign +- ++CONVENIENCE_LTDL=1 + if INSTALL_LTDL + include_HEADERS = ltdl.h + lib_LTLIBRARIES = libltdl.la +@@ -30,3 +30,5 @@ + $(libltdl_la_OBJECTS) $(libltdlc_la_OBJECTS): libtool + libtool: $(LIBTOOL_DEPS) + $(SHELL) ./config.status --recheck ++ ++install-includeHEADERS: diff --git a/irc/ircd-ratbox-devel/files/patch-libltdl_aclocal.m4 b/irc/ircd-ratbox-devel/files/patch-libltdl_aclocal.m4 new file mode 100644 index 000000000000..30324b0e25ef --- /dev/null +++ b/irc/ircd-ratbox-devel/files/patch-libltdl_aclocal.m4 @@ -0,0 +1,109 @@ +--- ./libltdl/aclocal.m4.orig Tue Sep 4 23:06:44 2007 ++++ ./libltdl/aclocal.m4 Tue Apr 22 02:20:19 2008 +@@ -1,7 +1,7 @@ +-# generated automatically by aclocal 1.10 -*- Autoconf -*- ++# generated automatically by aclocal 1.10.1 -*- Autoconf -*- + + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +-# 2005, 2006 Free Software Foundation, Inc. ++# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -11,12 +11,15 @@ + # even the implied warranty of MERCHANTABILITY or FITNESS FOR A + # PARTICULAR PURPOSE. + +-m4_if(m4_PACKAGE_VERSION, [2.61],, +-[m4_fatal([this file was generated for autoconf 2.61. +-You have another version of autoconf. If you want to use that, +-you should regenerate the build system entirely.], [63])]) ++m4_ifndef([AC_AUTOCONF_VERSION], ++ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl ++m4_if(AC_AUTOCONF_VERSION, [2.61],, ++[m4_warning([this file was generated for autoconf 2.61. ++You have another version of autoconf. It may work, but is not guaranteed to. ++If you have problems, you may need to regenerate the build system entirely. ++To do so, use the procedure documented by the package, typically `autoreconf'.])]) + +-# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. ++# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -31,7 +34,7 @@ + [am__api_version='1.10' + dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to + dnl require some minimum version. Point them to the right macro. +-m4_if([$1], [1.10], [], ++m4_if([$1], [1.10.1], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl + ]) + +@@ -47,8 +50,10 @@ + # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. + # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. + AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +-[AM_AUTOMAKE_VERSION([1.10])dnl +-_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)]) ++[AM_AUTOMAKE_VERSION([1.10.1])dnl ++m4_ifndef([AC_AUTOCONF_VERSION], ++ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl ++_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) + + # AM_AUX_DIR_EXPAND -*- Autoconf -*- + +@@ -320,7 +325,7 @@ + # each Makefile.in and add a new line on top of each file to say so. + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. +- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then ++ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`AS_DIRNAME("$mf")` + else + continue +@@ -380,13 +385,13 @@ + # Do all the work for Automake. -*- Autoconf -*- + + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +-# 2005, 2006 Free Software Foundation, Inc. ++# 2005, 2006, 2008 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 12 ++# serial 13 + + # This macro actually does too much. Some checks are only needed if + # your package does certain things. But this isn't really a big deal. +@@ -491,16 +496,17 @@ + # our stamp files there. + AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], + [# Compute $1's index in $config_headers. ++_am_arg=$1 + _am_stamp_count=1 + for _am_header in $config_headers :; do + case $_am_header in +- $1 | $1:* ) ++ $_am_arg | $_am_arg:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac + done +-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) ++echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) + + # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. + # +@@ -772,7 +778,7 @@ + + # _AM_SUBST_NOTMAKE(VARIABLE) + # --------------------------- +-# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in. ++# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. + # This macro is traced by Automake. + AC_DEFUN([_AM_SUBST_NOTMAKE]) + diff --git a/irc/ircd-ratbox-devel/files/patch-libltdl_configure b/irc/ircd-ratbox-devel/files/patch-libltdl_configure new file mode 100644 index 000000000000..2ff4e38b6351 --- /dev/null +++ b/irc/ircd-ratbox-devel/files/patch-libltdl_configure @@ -0,0 +1,41 @@ +--- ./libltdl/configure.orig Tue Sep 4 23:06:44 2007 ++++ ./libltdl/configure Tue Apr 22 02:20:19 2008 +@@ -23654,21 +23654,22 @@ + fi + rm -f "$tmp/out12" + # Compute $ac_file's index in $config_headers. ++_am_arg=$ac_file + _am_stamp_count=1 + for _am_header in $config_headers :; do + case $_am_header in +- $ac_file | $ac_file:* ) ++ $_am_arg | $_am_arg:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac + done +-echo "timestamp for $ac_file" >`$as_dirname -- $ac_file || +-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X$ac_file : 'X\(//\)[^/]' \| \ +- X$ac_file : 'X\(//\)$' \| \ +- X$ac_file : 'X\(/\)' \| . 2>/dev/null || +-echo X$ac_file | ++echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || ++$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$_am_arg" : 'X\(//\)[^/]' \| \ ++ X"$_am_arg" : 'X\(//\)$' \| \ ++ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || ++echo X"$_am_arg" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q +@@ -23705,7 +23706,7 @@ + # each Makefile.in and add a new line on top of each file to say so. + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. +- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then ++ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`$as_dirname -- "$mf" || + $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$mf" : 'X\(//\)[^/]' \| \ diff --git a/irc/ircd-ratbox-devel/files/patch-modules_Makefile.am b/irc/ircd-ratbox-devel/files/patch-modules_Makefile.am new file mode 100644 index 000000000000..6a19d48b561b --- /dev/null +++ b/irc/ircd-ratbox-devel/files/patch-modules_Makefile.am @@ -0,0 +1,20 @@ +--- ./modules/Makefile.am.orig Wed Feb 6 16:45:19 2008 ++++ ./modules/Makefile.am Tue Apr 22 02:20:19 2008 +@@ -327,15 +327,9 @@ + move-old-modules: + # move the old module directory out of the way, stale modules cause massive + # amounts of problems. +- -@if test -d $(DESTDIR)$(moduledir)-old; then \ +- $(RM) -rf $(DESTDIR)$(moduledir)-old; \ +- fi +- -@if test -d $(DESTDIR)$(moduledir); then \ +- echo "ircd: backing up modules"; \ +- $(MV) $(DESTDIR)$(moduledir) $(DESTDIR)$(moduledir)-old; \ +- $(MKDIR_P) $(DESTDIR)$(moduledir); \ ++ -@if test ! -d $(DESTDIR)$(moduledir); then \ ++ mkdir $(DESTDIR)$(moduledir); \ + fi +- + + else # !STATIC_MODULES + diff --git a/irc/ircd-ratbox-devel/files/patch-modules_Makefile.in b/irc/ircd-ratbox-devel/files/patch-modules_Makefile.in index 09c39d6f5f7f..2d46eefa898d 100644 --- a/irc/ircd-ratbox-devel/files/patch-modules_Makefile.in +++ b/irc/ircd-ratbox-devel/files/patch-modules_Makefile.in @@ -1,16 +1,180 @@ ---- modules/Makefile.in.orig Sun Jul 17 18:55:27 2005 -+++ modules/Makefile.in Mon Jan 23 23:19:03 2006 -@@ -147,13 +147,6 @@ - -@if test ! -d $(DESTDIR)$(moduledir); then \ - mkdir $(DESTDIR)$(moduledir); \ - fi -- -@if test -d $(DESTDIR)$(moduledir)-old; then \ -- rm -rf $(DESTDIR)$(moduledir)-old; \ -- fi -- -@if test -d $(DESTDIR)$(moduledir); then \ -- echo "ircd: backing up modules"; \ -- mv $(DESTDIR)$(moduledir) $(DESTDIR)$(moduledir)-old; \ -- fi - - @mkdir -p -m 755 $(DESTDIR)$(moduledir) - @mkdir -p -m 755 $(DESTDIR)$(automoduledir) +--- ./modules/Makefile.in.orig Fri Mar 7 16:10:01 2008 ++++ ./modules/Makefile.in Tue Apr 22 02:20:19 2008 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -666,7 +666,7 @@ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(m_xline_la_LDFLAGS) $(LDFLAGS) -o $@ + @STATIC_MODULES_FALSE@am_m_xline_la_rpath = -rpath $(modulesdir) +-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include ++DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +@@ -781,7 +781,6 @@ + CYGPATH_W = @CYGPATH_W@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -819,7 +818,6 @@ + MKDIR_P = @MKDIR_P@ + MODULE_DIR = @MODULE_DIR@ + MV = @MV@ +-NMEDIT = @NMEDIT@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +@@ -1296,8 +1294,8 @@ + @STATIC_MODULES_TRUE@ @list='$(core_LTLIBRARIES)'; for p in $$list; do \ + @STATIC_MODULES_TRUE@ if test -f $$p; then \ + @STATIC_MODULES_TRUE@ f=$(am__strip_dir) \ +-@STATIC_MODULES_TRUE@ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(coreLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(coredir)/$$f'"; \ +-@STATIC_MODULES_TRUE@ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(coreLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(coredir)/$$f"; \ ++@STATIC_MODULES_TRUE@ echo " $(LIBTOOL) --mode=install $(coreLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(coredir)/$$f'"; \ ++@STATIC_MODULES_TRUE@ $(LIBTOOL) --mode=install $(coreLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(coredir)/$$f"; \ + @STATIC_MODULES_TRUE@ else :; fi; \ + @STATIC_MODULES_TRUE@ done + +@@ -1305,8 +1303,8 @@ + @$(NORMAL_UNINSTALL) + @list='$(core_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ +- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(coredir)/$$p'"; \ +- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(coredir)/$$p"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(coredir)/$$p'"; \ ++ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(coredir)/$$p"; \ + done + + clean-coreLTLIBRARIES: +@@ -1323,8 +1321,8 @@ + @list='$(libmodules_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ +- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libmodulesLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libmodulesdir)/$$f'"; \ +- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libmodulesLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libmodulesdir)/$$f"; \ ++ echo " $(LIBTOOL) --mode=install $(libmodulesLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libmodulesdir)/$$f'"; \ ++ $(LIBTOOL) --mode=install $(libmodulesLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libmodulesdir)/$$f"; \ + else :; fi; \ + done + +@@ -1332,8 +1330,8 @@ + @$(NORMAL_UNINSTALL) + @list='$(libmodules_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ +- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libmodulesdir)/$$p'"; \ +- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libmodulesdir)/$$p"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libmodulesdir)/$$p'"; \ ++ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libmodulesdir)/$$p"; \ + done + + clean-libmodulesLTLIBRARIES: +@@ -1350,8 +1348,8 @@ + @STATIC_MODULES_TRUE@ @list='$(modules_LTLIBRARIES)'; for p in $$list; do \ + @STATIC_MODULES_TRUE@ if test -f $$p; then \ + @STATIC_MODULES_TRUE@ f=$(am__strip_dir) \ +-@STATIC_MODULES_TRUE@ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(modulesLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(modulesdir)/$$f'"; \ +-@STATIC_MODULES_TRUE@ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(modulesLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(modulesdir)/$$f"; \ ++@STATIC_MODULES_TRUE@ echo " $(LIBTOOL) --mode=install $(modulesLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(modulesdir)/$$f'"; \ ++@STATIC_MODULES_TRUE@ $(LIBTOOL) --mode=install $(modulesLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(modulesdir)/$$f"; \ + @STATIC_MODULES_TRUE@ else :; fi; \ + @STATIC_MODULES_TRUE@ done + +@@ -1359,8 +1357,8 @@ + @$(NORMAL_UNINSTALL) + @list='$(modules_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ +- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(modulesdir)/$$p'"; \ +- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(modulesdir)/$$p"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(modulesdir)/$$p'"; \ ++ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(modulesdir)/$$p"; \ + done + + clean-modulesLTLIBRARIES: +@@ -1377,8 +1375,8 @@ + @list='$(services_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ +- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(servicesLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(servicesdir)/$$f'"; \ +- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(servicesLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(servicesdir)/$$f"; \ ++ echo " $(LIBTOOL) --mode=install $(servicesLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(servicesdir)/$$f'"; \ ++ $(LIBTOOL) --mode=install $(servicesLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(servicesdir)/$$f"; \ + else :; fi; \ + done + +@@ -1386,8 +1384,8 @@ + @$(NORMAL_UNINSTALL) + @list='$(services_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ +- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(servicesdir)/$$p'"; \ +- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(servicesdir)/$$p"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(servicesdir)/$$p'"; \ ++ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(servicesdir)/$$p"; \ + done + + clean-servicesLTLIBRARIES: +@@ -1684,8 +1682,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ +- END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ $(AWK) ' { files[$$0] = 1; } \ ++ END { for (i in files) print i; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -1697,8 +1695,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ +- END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ $(AWK) ' { files[$$0] = 1; } \ ++ END { for (i in files) print i; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -1708,12 +1706,13 @@ + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ ++ here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ +- END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ $(AWK) ' { files[$$0] = 1; } \ ++ END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -1891,13 +1890,8 @@ + @STATIC_MODULES_FALSE@move-old-modules: + # move the old module directory out of the way, stale modules cause massive + # amounts of problems. +-@STATIC_MODULES_FALSE@ -@if test -d $(DESTDIR)$(moduledir)-old; then \ +-@STATIC_MODULES_FALSE@ $(RM) -rf $(DESTDIR)$(moduledir)-old; \ +-@STATIC_MODULES_FALSE@ fi +-@STATIC_MODULES_FALSE@ -@if test -d $(DESTDIR)$(moduledir); then \ +-@STATIC_MODULES_FALSE@ echo "ircd: backing up modules"; \ +-@STATIC_MODULES_FALSE@ $(MV) $(DESTDIR)$(moduledir) $(DESTDIR)$(moduledir)-old; \ +-@STATIC_MODULES_FALSE@ $(MKDIR_P) $(DESTDIR)$(moduledir); \ ++@STATIC_MODULES_FALSE@ -@if test ! -d $(DESTDIR)$(moduledir); then \ ++@STATIC_MODULES_FALSE@ mkdir $(DESTDIR)$(moduledir); \ + @STATIC_MODULES_FALSE@ fi + @STATIC_MODULES_TRUE@static_modules.c: static_modules.c.SH + @STATIC_MODULES_TRUE@ $(SHELL) static_modules.c.SH $(MSRCS) $(CORE_SRCS) $(SERVICES_SRCS) diff --git a/irc/ircd-ratbox-devel/files/patch-servlink_Makefile.in b/irc/ircd-ratbox-devel/files/patch-servlink_Makefile.in deleted file mode 100644 index 39832cf4f987..000000000000 --- a/irc/ircd-ratbox-devel/files/patch-servlink_Makefile.in +++ /dev/null @@ -1,12 +0,0 @@ ---- servlink/Makefile.in.orig Thu Jun 17 23:19:00 2004 -+++ servlink/Makefile.in Fri Jan 27 02:29:59 2006 -@@ -51,9 +51,6 @@ - install: build - @echo "ircd: installing servlink ($(PROGS))" - @for i in $(PROGS); do \ -- if test -f $(DESTDIR)$(bindir)/$$i; then \ -- $(MV) $(DESTDIR)$(bindir)/$$i $(DESTDIR)$(bindir)/$$i.old; \ -- fi; \ - $(INSTALL_BIN) $$i $(DESTDIR)$(bindir); \ - done - diff --git a/irc/ircd-ratbox-devel/files/patch-src_Makefile.in b/irc/ircd-ratbox-devel/files/patch-src_Makefile.in deleted file mode 100644 index 8c05204e83d8..000000000000 --- a/irc/ircd-ratbox-devel/files/patch-src_Makefile.in +++ /dev/null @@ -1,12 +0,0 @@ ---- src/Makefile.in.orig Thu Feb 24 01:48:06 2005 -+++ src/Makefile.in Fri Jan 27 02:29:08 2006 -@@ -125,9 +125,6 @@ - fi - @echo "ircd: installing ircd ($(PROGS))" - @for i in $(PROGS); do \ -- if test -f $(DESTDIR)$(bindir)/$$i; then \ -- $(MV) $(DESTDIR)$(bindir)/$$i $(DESTDIR)$(bindir)/$$i.old; \ -- fi; \ - $(INSTALL_BIN) $$i $(DESTDIR)$(bindir); \ - done - diff --git a/irc/ircd-ratbox-devel/files/patch-tools_Makefile.am b/irc/ircd-ratbox-devel/files/patch-tools_Makefile.am new file mode 100644 index 000000000000..b173a3a19398 --- /dev/null +++ b/irc/ircd-ratbox-devel/files/patch-tools_Makefile.am @@ -0,0 +1,11 @@ +--- ./tools/Makefile.am.orig Sun Mar 16 14:12:14 2008 ++++ ./tools/Makefile.am Tue Apr 22 02:20:19 2008 +@@ -9,7 +9,3 @@ + mkpasswd_SOURCES = mkpasswd.c + + mkpasswd_LDADD = ../libratbox/src/libratbox.la +- +- +-install-exec-hook: +- $(INSTALL) genssl.sh $(DESTDIR)$(bindir) +\ No newline at end of file diff --git a/irc/ircd-ratbox-devel/files/patch-tools_Makefile.in b/irc/ircd-ratbox-devel/files/patch-tools_Makefile.in index 7d3a70444b7d..61992999ca4b 100644 --- a/irc/ircd-ratbox-devel/files/patch-tools_Makefile.in +++ b/irc/ircd-ratbox-devel/files/patch-tools_Makefile.in @@ -1,12 +1,140 @@ ---- tools/Makefile.in.orig Thu Jun 17 23:19:00 2004 -+++ tools/Makefile.in Fri Jan 27 02:30:32 2006 -@@ -92,9 +92,6 @@ - install: install-mkdirs build - @echo "ircd: installing tools ($(PROGS))" - @for i in $(PROGS); do \ -- if test -f $(DESTDIR)$(bindir)/$$i; then \ -- $(MV) $(DESTDIR)$(bindir)/$$i $(DESTDIR)$(bindir)/$$i.old; \ -- fi; \ - $(INSTALL_BIN) $$i $(DESTDIR)$(bindir); \ - done; \ - $(RM) -f $(DESTDIR)$(bindir)/vimotd $(DESTDIR)$(bindir)/viklines +--- ./tools/Makefile.in.orig Sun Mar 16 14:12:14 2008 ++++ ./tools/Makefile.in Tue Apr 22 02:20:19 2008 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -14,7 +14,7 @@ + + @SET_MAKE@ + +-# $Id: Makefile.in 25125 2008-03-16 14:12:14Z androsyn $ ++# $Id: Makefile.am 25125 2008-03-16 14:12:14Z androsyn $ + + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ +@@ -51,7 +51,7 @@ + am_mkpasswd_OBJECTS = mkpasswd.$(OBJEXT) + mkpasswd_OBJECTS = $(am_mkpasswd_OBJECTS) + mkpasswd_DEPENDENCIES = ../libratbox/src/libratbox.la +-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include ++DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +@@ -90,7 +90,6 @@ + CYGPATH_W = @CYGPATH_W@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -128,7 +127,6 @@ + MKDIR_P = @MKDIR_P@ + MODULE_DIR = @MODULE_DIR@ + MV = @MV@ +-NMEDIT = @NMEDIT@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +@@ -260,8 +258,8 @@ + || test -f $$p1 \ + ; then \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ +- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ +- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ ++ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ ++ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + else :; fi; \ + done + +@@ -323,8 +321,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ +- END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ $(AWK) ' { files[$$0] = 1; } \ ++ END { for (i in files) print i; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -336,8 +334,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ +- END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ $(AWK) ' { files[$$0] = 1; } \ ++ END { for (i in files) print i; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -347,12 +345,13 @@ + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ ++ here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ +- END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ $(AWK) ' { files[$$0] = 1; } \ ++ END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -447,8 +446,6 @@ + install-dvi: install-dvi-am + + install-exec-am: install-binPROGRAMS +- @$(NORMAL_INSTALL) +- $(MAKE) $(AM_MAKEFLAGS) install-exec-hook + + install-html: install-html-am + +@@ -482,25 +479,22 @@ + + uninstall-am: uninstall-binPROGRAMS + +-.MAKE: install-am install-exec-am install-strip ++.MAKE: install-am install-strip + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ + clean-generic clean-libtool ctags distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-binPROGRAMS install-data install-data-am install-dvi \ +- install-dvi-am install-exec install-exec-am install-exec-hook \ +- install-html install-html-am install-info install-info-am \ +- install-man install-pdf install-pdf-am install-ps \ +- install-ps-am install-strip installcheck installcheck-am \ +- installdirs maintainer-clean maintainer-clean-generic \ +- mostlyclean mostlyclean-compile mostlyclean-generic \ +- mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ +- uninstall-am uninstall-binPROGRAMS +- ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-info install-info-am install-man \ ++ install-pdf install-pdf-am install-ps install-ps-am \ ++ install-strip installcheck installcheck-am installdirs \ ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ ++ pdf pdf-am ps ps-am tags uninstall uninstall-am \ ++ uninstall-binPROGRAMS + +-install-exec-hook: +- $(INSTALL) genssl.sh $(DESTDIR)$(bindir) + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: diff --git a/irc/ircd-ratbox-devel/files/pkg-install.in b/irc/ircd-ratbox-devel/files/pkg-install.in index 135cee12edb2..37fe4782f367 100644 --- a/irc/ircd-ratbox-devel/files/pkg-install.in +++ b/irc/ircd-ratbox-devel/files/pkg-install.in @@ -102,12 +102,17 @@ mkdir -p %%RUNDIR%% \ && chown ircd:ircd %%RUNDIR%% \ && chmod 750 %%RUNDIR%% +mkdir -p %%DBDIR%% \ +&& chown ircd:ircd %%DBDIR%% \ +&& chmod 750 %%DBDIR%% + # Secure permissions if we think this is a fresh install -if [ ! -f ${PKG_PREFIX}/etc/ircd-ratbox/ircd.conf ]; then - chown -R ircd:ircd ${PKG_PREFIX}/etc/ircd-ratbox/ - chmod 750 ${PKG_PREFIX}/etc/ircd-ratbox/ - chmod 640 ${PKG_PREFIX}/etc/ircd-ratbox/* +if [ ! -f %%PREFIX%%/etc/ircd-ratbox/ircd.conf ]; then + echo "Setting permissions for config dir and files." + chown -R ircd:ircd %%PREFIX%%/etc/ircd-ratbox/ + chmod 750 %%PREFIX%%/etc/ircd-ratbox/ + chmod 640 %%PREFIX%%/etc/ircd-ratbox/* fi #----------------------------------------------------------------------- diff --git a/irc/ircd-ratbox-devel/files/pkg-message.in b/irc/ircd-ratbox-devel/files/pkg-message.in index 9b7506da1667..f6f35d95de92 100644 --- a/irc/ircd-ratbox-devel/files/pkg-message.in +++ b/irc/ircd-ratbox-devel/files/pkg-message.in @@ -1,5 +1,5 @@ ------------------------------------------------------------------------ -ircd-ratbox has been successfully installed. +ircd-ratbox-devel has been successfully installed. Sample 'ircd.conf' and 'ircd.motd' files have been created in the ircd-ratbox configuration directory. A sample configuration file is @@ -12,5 +12,10 @@ server can be started by running: %%PREFIX%%/etc/rc.d/ircd-ratbox start +You can check your ircd.conf configuration file for syntactical errors +using the following rc.d script command: + + %%PREFIX%%/etc/rc.d/ircd-ratbox conftest + Be sure to check out 'ratbox-services' if you need a services package. ------------------------------------------------------------------------ diff --git a/irc/ircd-ratbox-devel/pkg-descr b/irc/ircd-ratbox-devel/pkg-descr index e3b103c2c8a1..1e74eabc693f 100644 --- a/irc/ircd-ratbox-devel/pkg-descr +++ b/irc/ircd-ratbox-devel/pkg-descr @@ -1,11 +1,23 @@ This is a port of the ircd-ratbox IRC daemon. -This version is the 'testing' branch: it usually contains more features, -but may contain as of yet unidentified bugs. Admins on smaller networks -may prefer to use it over the standard production release. +This version is the 'testing' branch; it usually contains more features, +but may contain as of yet unidentified bugs. Admins wishing to try out new +features or test the development release may prefer to use it over the +standard production release. ircd-ratbox is the primary ircd used on EFnet; it combines the stability of an ircd required for a large production network together with a rich set of features, making it also suitable for use on smaller networks. +Changes Include: + o Optional SSL support to enable encrypted connections between clients + and servers, as well as server to server links. + o Add support for SSL only channels, channel mode +S. + o Bundled sqlite3 for handling and storing k/x/d lines. + o Support for global CIDR limits. + o Added adminwall allowing admins to broadcast messages to each other. + o Creation of new library archive 'libratbox'. + o Support for force nick changes. + o New ssld and bandb processes for SSL connections and ban checking. + WWW: http://www.ircd-ratbox.org/ diff --git a/irc/ircd-ratbox-devel/pkg-plist b/irc/ircd-ratbox-devel/pkg-plist index 19f94e7b079f..fc4b2fa5d6c0 100644 --- a/irc/ircd-ratbox-devel/pkg-plist +++ b/irc/ircd-ratbox-devel/pkg-plist @@ -1,96 +1,10 @@ -bin/convertilines -bin/convertklines +bin/bandb +bin/bantool +bin/ident bin/ircd bin/mkpasswd -bin/servlink -bin/viconf -bin/viklines -bin/vimotd -etc/ircd-ratbox/ircd-efnet.conf.sample -lib/ircd-ratbox/modules/autoload/m_accept.so -lib/ircd-ratbox/modules/autoload/m_admin.so -lib/ircd-ratbox/modules/autoload/m_away.so -lib/ircd-ratbox/modules/autoload/m_cap.so -lib/ircd-ratbox/modules/autoload/m_capab.so -lib/ircd-ratbox/modules/autoload/m_close.so -lib/ircd-ratbox/modules/autoload/m_cmessage.so -lib/ircd-ratbox/modules/autoload/m_connect.so -lib/ircd-ratbox/modules/autoload/m_dline.so -lib/ircd-ratbox/modules/autoload/m_encap.so -lib/ircd-ratbox/modules/autoload/m_etrace.so -lib/ircd-ratbox/modules/autoload/m_gline.so -lib/ircd-ratbox/modules/autoload/m_help.so -lib/ircd-ratbox/modules/autoload/m_info.so -lib/ircd-ratbox/modules/autoload/m_invite.so -lib/ircd-ratbox/modules/autoload/m_ison.so -lib/ircd-ratbox/modules/autoload/m_kline.so -lib/ircd-ratbox/modules/autoload/m_knock.so -lib/ircd-ratbox/modules/autoload/m_links.so -lib/ircd-ratbox/modules/autoload/m_list.so -lib/ircd-ratbox/modules/autoload/m_locops.so -lib/ircd-ratbox/modules/autoload/m_lusers.so -lib/ircd-ratbox/modules/autoload/m_map.so -lib/ircd-ratbox/modules/autoload/m_monitor.so -lib/ircd-ratbox/modules/autoload/m_motd.so -lib/ircd-ratbox/modules/autoload/m_names.so -lib/ircd-ratbox/modules/autoload/m_oper.so -lib/ircd-ratbox/modules/autoload/m_operspy.so -lib/ircd-ratbox/modules/autoload/m_pass.so -lib/ircd-ratbox/modules/autoload/m_ping.so -lib/ircd-ratbox/modules/autoload/m_pong.so -lib/ircd-ratbox/modules/autoload/m_post.so -lib/ircd-ratbox/modules/autoload/m_rehash.so -lib/ircd-ratbox/modules/autoload/m_restart.so -lib/ircd-ratbox/modules/autoload/m_resv.so -lib/ircd-ratbox/modules/autoload/m_set.so -lib/ircd-ratbox/modules/autoload/m_stats.so -lib/ircd-ratbox/modules/autoload/m_svinfo.so -lib/ircd-ratbox/modules/autoload/m_tb.so -lib/ircd-ratbox/modules/autoload/m_testline.so -lib/ircd-ratbox/modules/autoload/m_testmask.so -lib/ircd-ratbox/modules/autoload/m_time.so -lib/ircd-ratbox/modules/autoload/m_topic.so -lib/ircd-ratbox/modules/autoload/m_trace.so -lib/ircd-ratbox/modules/autoload/m_unreject.so -lib/ircd-ratbox/modules/autoload/m_user.so -lib/ircd-ratbox/modules/autoload/m_userhost.so -lib/ircd-ratbox/modules/autoload/m_users.so -lib/ircd-ratbox/modules/autoload/m_version.so -lib/ircd-ratbox/modules/autoload/m_wallops.so -lib/ircd-ratbox/modules/autoload/m_who.so -lib/ircd-ratbox/modules/autoload/m_whois.so -lib/ircd-ratbox/modules/autoload/m_whowas.so -lib/ircd-ratbox/modules/autoload/m_xline.so -lib/ircd-ratbox/modules/contrib/m_clearchan.so -lib/ircd-ratbox/modules/contrib/m_flags.so -lib/ircd-ratbox/modules/contrib/m_force.so -lib/ircd-ratbox/modules/contrib/m_mkpasswd.so -lib/ircd-ratbox/modules/contrib/m_ojoin.so -lib/ircd-ratbox/modules/contrib/m_okick.so -lib/ircd-ratbox/modules/contrib/m_olist.so -lib/ircd-ratbox/modules/contrib/m_opme.so -lib/ircd-ratbox/modules/contrib/m_webirc.so -lib/ircd-ratbox/modules/contrib/spy_admin_notice.so -lib/ircd-ratbox/modules/contrib/spy_info_notice.so -lib/ircd-ratbox/modules/contrib/spy_links_notice.so -lib/ircd-ratbox/modules/contrib/spy_motd_notice.so -lib/ircd-ratbox/modules/contrib/spy_stats_notice.so -lib/ircd-ratbox/modules/contrib/spy_stats_p_notice.so -lib/ircd-ratbox/modules/contrib/spy_whois_notice.so -lib/ircd-ratbox/modules/contrib/spy_whois_notice_global.so -lib/ircd-ratbox/modules/m_die.so -lib/ircd-ratbox/modules/m_error.so -lib/ircd-ratbox/modules/m_join.so -lib/ircd-ratbox/modules/m_kick.so -lib/ircd-ratbox/modules/m_kill.so -lib/ircd-ratbox/modules/m_message.so -lib/ircd-ratbox/modules/m_mode.so -lib/ircd-ratbox/modules/m_nick.so -lib/ircd-ratbox/modules/m_part.so -lib/ircd-ratbox/modules/m_quit.so -lib/ircd-ratbox/modules/m_server.so -lib/ircd-ratbox/modules/m_sjoin.so -lib/ircd-ratbox/modules/m_squit.so +bin/resolver +bin/ssld %%DATADIR%%/help/opers/accept %%DATADIR%%/help/opers/admin %%DATADIR%%/help/opers/away @@ -128,6 +42,7 @@ lib/ircd-ratbox/modules/m_squit.so %%DATADIR%%/help/opers/modload %%DATADIR%%/help/opers/modrestart %%DATADIR%%/help/opers/modunload +%%DATADIR%%/help/opers/monitor %%DATADIR%%/help/opers/motd %%DATADIR%%/help/opers/names %%DATADIR%%/help/opers/nick @@ -218,6 +133,94 @@ lib/ircd-ratbox/modules/m_squit.so %%DATADIR%%/help/users/who %%DATADIR%%/help/users/whois %%DATADIR%%/help/users/whowas +lib/ircd-ratbox/libcore.la +lib/ircd-ratbox/libcore.so +lib/ircd-ratbox/libratbox.la +lib/ircd-ratbox/libratbox.so +@unexec f="%D/lib/ircd-ratbox/modules/autoload/m_services.so"; if [ -f "$f" ]; then rm -f "$f"; fi +@unexec f="%D/lib/ircd-ratbox/modules/autoload/m_services.la"; if [ -f "$f" ]; then rm -f "$f"; fi +lib/ircd-ratbox/modules/autoload/m_accept.so +lib/ircd-ratbox/modules/autoload/m_admin.so +lib/ircd-ratbox/modules/autoload/m_adminwall.so +lib/ircd-ratbox/modules/autoload/m_away.so +lib/ircd-ratbox/modules/autoload/m_cap.so +lib/ircd-ratbox/modules/autoload/m_capab.so +lib/ircd-ratbox/modules/autoload/m_close.so +lib/ircd-ratbox/modules/autoload/m_cmessage.so +lib/ircd-ratbox/modules/autoload/m_connect.so +lib/ircd-ratbox/modules/autoload/m_dline.so +lib/ircd-ratbox/modules/autoload/m_encap.so +lib/ircd-ratbox/modules/autoload/m_gline.so +lib/ircd-ratbox/modules/autoload/m_help.so +lib/ircd-ratbox/modules/autoload/m_info.so +lib/ircd-ratbox/modules/autoload/m_invite.so +lib/ircd-ratbox/modules/autoload/m_ison.so +lib/ircd-ratbox/modules/autoload/m_kline.so +lib/ircd-ratbox/modules/autoload/m_knock.so +lib/ircd-ratbox/modules/autoload/m_links.so +lib/ircd-ratbox/modules/autoload/m_list.so +lib/ircd-ratbox/modules/autoload/m_locops.so +lib/ircd-ratbox/modules/autoload/m_lusers.so +lib/ircd-ratbox/modules/autoload/m_map.so +lib/ircd-ratbox/modules/autoload/m_monitor.so +lib/ircd-ratbox/modules/autoload/m_motd.so +lib/ircd-ratbox/modules/autoload/m_names.so +lib/ircd-ratbox/modules/autoload/m_oper.so +lib/ircd-ratbox/modules/autoload/m_operspy.so +lib/ircd-ratbox/modules/autoload/m_pass.so +lib/ircd-ratbox/modules/autoload/m_ping.so +lib/ircd-ratbox/modules/autoload/m_pong.so +lib/ircd-ratbox/modules/autoload/m_post.so +lib/ircd-ratbox/modules/autoload/m_rehash.so +lib/ircd-ratbox/modules/autoload/m_restart.so +lib/ircd-ratbox/modules/autoload/m_resv.so +lib/ircd-ratbox/modules/autoload/m_set.so +lib/ircd-ratbox/modules/autoload/m_stats.so +lib/ircd-ratbox/modules/autoload/m_svinfo.so +lib/ircd-ratbox/modules/autoload/m_tb.so +lib/ircd-ratbox/modules/autoload/m_testline.so +lib/ircd-ratbox/modules/autoload/m_testmask.so +lib/ircd-ratbox/modules/autoload/m_time.so +lib/ircd-ratbox/modules/autoload/m_topic.so +lib/ircd-ratbox/modules/autoload/m_trace.so +lib/ircd-ratbox/modules/autoload/m_unreject.so +lib/ircd-ratbox/modules/autoload/m_user.so +lib/ircd-ratbox/modules/autoload/m_userhost.so +lib/ircd-ratbox/modules/autoload/m_version.so +lib/ircd-ratbox/modules/autoload/m_wallops.so +lib/ircd-ratbox/modules/autoload/m_who.so +lib/ircd-ratbox/modules/autoload/m_whois.so +lib/ircd-ratbox/modules/autoload/m_whowas.so +lib/ircd-ratbox/modules/autoload/m_xline.so +lib/ircd-ratbox/modules/contrib/m_42.so +lib/ircd-ratbox/modules/contrib/m_clearchan.so +lib/ircd-ratbox/modules/contrib/m_flags.so +lib/ircd-ratbox/modules/contrib/m_force.so +lib/ircd-ratbox/modules/contrib/m_mkpasswd.so +lib/ircd-ratbox/modules/contrib/m_ojoin.so +lib/ircd-ratbox/modules/contrib/m_okick.so +lib/ircd-ratbox/modules/contrib/m_olist.so +lib/ircd-ratbox/modules/contrib/m_opme.so +lib/ircd-ratbox/modules/contrib/spy_admin_notice.so +lib/ircd-ratbox/modules/contrib/spy_info_notice.so +lib/ircd-ratbox/modules/contrib/spy_links_notice.so +lib/ircd-ratbox/modules/contrib/spy_motd_notice.so +lib/ircd-ratbox/modules/contrib/spy_stats_notice.so +lib/ircd-ratbox/modules/contrib/spy_stats_p_notice.so +lib/ircd-ratbox/modules/contrib/spy_whois_notice.so +lib/ircd-ratbox/modules/contrib/spy_whois_notice_global.so +lib/ircd-ratbox/modules/m_die.so +lib/ircd-ratbox/modules/m_error.so +lib/ircd-ratbox/modules/m_join.so +lib/ircd-ratbox/modules/m_kick.so +lib/ircd-ratbox/modules/m_kill.so +lib/ircd-ratbox/modules/m_message.so +lib/ircd-ratbox/modules/m_mode.so +lib/ircd-ratbox/modules/m_nick.so +lib/ircd-ratbox/modules/m_part.so +lib/ircd-ratbox/modules/m_quit.so +lib/ircd-ratbox/modules/m_server.so +lib/ircd-ratbox/modules/m_squit.so @dirrm lib/ircd-ratbox/modules/autoload @dirrm lib/ircd-ratbox/modules/contrib @dirrm lib/ircd-ratbox/modules @@ -226,10 +229,7 @@ lib/ircd-ratbox/modules/m_squit.so @dirrm %%DATADIR%%/help/opers @dirrm %%DATADIR%%/help @dirrm %%DATADIR%% -@unexec f="%D/etc/ircd-ratbox/dline.conf"; if [ ! -s "$f" ]; then rm -f "$f"; fi -@unexec f="%D/etc/ircd-ratbox/kline.conf"; if [ ! -s "$f" ]; then rm -f "$f"; fi -@unexec f="%D/etc/ircd-ratbox/resv.conf"; if [ ! -s "$f" ]; then rm -f "$f"; fi -@unexec f="%D/etc/ircd-ratbox/xline.conf"; if [ ! -s "$f" ]; then rm -f "$f"; fi +etc/ircd-ratbox/ircd-efnet.conf.sample @unexec if cmp -s %D/etc/ircd-ratbox/ircd.conf.sample %D/etc/ircd-ratbox/ircd.conf; then rm -f %D/etc/ircd-ratbox/ircd.conf; fi etc/ircd-ratbox/ircd.conf.sample @exec if [ ! -f %D/etc/ircd-ratbox/ircd.conf ] ; then cp -p %D/%F %B/ircd.conf; fi @@ -237,5 +237,7 @@ etc/ircd-ratbox/ircd.conf.sample etc/ircd-ratbox/ircd.motd.sample @exec if [ ! -f %D/etc/ircd-ratbox/ircd.motd ] ; then cp -p %D/%F %B/ircd.motd; fi @dirrmtry etc/ircd-ratbox +@cwd / @dirrmtry %%LOGDIR%% @dirrmtry %%RUNDIR%% +@dirrmtry %%DBDIR%% |