diff options
author | Nathan Phillip Brink <binki@gentoo.org> | 2012-02-21 02:17:49 +0000 |
---|---|---|
committer | Nathan Phillip Brink <binki@gentoo.org> | 2012-02-21 02:17:49 +0000 |
commit | 743fafdf1aa81150098da0917bd0f34ed6744435 (patch) | |
tree | 7a7ab20ad0c9c61be86d859de77084105c3f76d5 /net-irc/unrealircd/files | |
parent | Drop old atheme-services-6.0.9 in favor of atheme-services-6.0.9-r1. (diff) | |
download | historical-743fafdf1aa81150098da0917bd0f34ed6744435.tar.gz historical-743fafdf1aa81150098da0917bd0f34ed6744435.tar.bz2 historical-743fafdf1aa81150098da0917bd0f34ed6744435.zip |
Drop old versions as bug #395579 (stabilization of 3.2.9) is resolved.
Package-Manager: portage-2.2.0_alpha84-r1/cvs/Linux x86_64
Diffstat (limited to 'net-irc/unrealircd/files')
-rw-r--r-- | net-irc/unrealircd/files/unrealircd-system-cares.patch | 134 | ||||
-rw-r--r-- | net-irc/unrealircd/files/unrealircd-system-tre.patch | 64 | ||||
-rw-r--r-- | net-irc/unrealircd/files/unrealircd.confd | 16 | ||||
-rw-r--r-- | net-irc/unrealircd/files/unrealircd.rc | 30 |
4 files changed, 0 insertions, 244 deletions
diff --git a/net-irc/unrealircd/files/unrealircd-system-cares.patch b/net-irc/unrealircd/files/unrealircd-system-cares.patch deleted file mode 100644 index 2e4d5f047051..000000000000 --- a/net-irc/unrealircd/files/unrealircd-system-cares.patch +++ /dev/null @@ -1,134 +0,0 @@ -Makes unrealircd-3.2.8 able to use a vanilla, system >=net-dns/c-ares-1.5.3 -Expects the unrealircd-system-tre.patch to be applied beforehand ---- autoconf/configure.in 2009-03-29 18:35:15.000000000 -0400 -+++ autoconf/configure.in 2009-03-29 18:45:54.000000000 -0400 -@@ -393,6 +393,7 @@ - AC_ARG_WITH(operoverride-verify, [AC_HELP_STRING([--with-operoverride-verify], [Require opers to invite themselves to +s/+p channels])], - AC_DEFINE(OPEROVERRIDE_VERIFY)) - AC_ARG_WITH(system-tre, [AC_HELP_STRING([--with-system-tre], [Use the system tre package instead of bundled, discovered using pkg-config])], [], [with_system_tre=no ]) -+AC_ARG_WITH(system-cares, [AC_HELP_STRING([--with-system-cares], [Use the system c-ares (at least version 1.5.3) package instead of bundled c-ares, discovered using pkg-config])], [], [with_system_cares=no ]) - CHECK_SSL - CHECK_ZLIB - CHECK_LIBCURL -@@ -462,6 +463,7 @@ - PKG_CHECK_MODULES([TRE], tre >= 0.7.5) - ]) - -+AS_IF([test "x$with_system_cares" = "xno"],[ - dnl REMEMBER TO CHANGE WITH A NEW C-ARES RELEASE! - cares_version="1.6.0" - AC_MSG_RESULT(extracting c-ares resolver library) -@@ -484,10 +486,9 @@ - $ac_cv_prog_MAKER || exit 1 - AC_MSG_RESULT(installing c-ares resolver library) - $ac_cv_prog_MAKER install || exit 1 --CARESINCDIR="$cur_dir/extras/c-ares/include" --AC_SUBST(CARESINCDIR) --CARESLIBDIR="-L../extras/c-ares/lib" --AC_SUBST(CARESLIBDIR) -+CARES_CFLAGS="$cur_dir/extras/c-ares/include" -+AC_SUBST(CARES_CFLAGS) -+CARES_LIBS="-L../extras/c-ares/lib" - - dnl Set default library parameters for when pkg-config is not available - CARESLIBSALT="-lcares" -@@ -504,15 +505,20 @@ - dnl from above. Also, if pkg-config returns an empty result (ex: on fbsd - dnl or older versions it might be missing --static) then also use defaults. - if test "x$ac_cv_path_PKGCONFIG" = "x" ; then -- CARESLIBS="$CARESLIBSALT" -+ CARES_LIBS="$CARES_LIBS $CARESLIBSALT" - else -- CARESLIBS="`$ac_cv_path_PKGCONFIG --static --libs libcares.pc`" -- if test "x$CARESLIBS" = "x" ; then -- CARESLIBS="$CARESLIBSALT" -+ CARES_LIBSPRE="$CARES_LIBS" -+ CARES_LIBS="$CARES_LIBS `$ac_cv_path_PKGCONFIG --static --libs libcares.pc`" -+ if test "$CARES_LIBS" = "$CARES_LIBSPRE " ; then -+ CARES_LIBS="$CARES_LIBS $CARESLIBSALT" - fi - fi --AC_SUBST(CARESLIBS) -+AC_SUBST(CARES_LIBS) - cd $cur_dir -+],[ -+dnl use pkg-config for system c-ares: -+PKG_CHECK_MODULES([CARES], libcares >= 1.5.3) -+]) - - - AC_OUTPUT(Makefile src/modules/Makefile unreal ircdcron/ircdchk) - - ---- Makefile.in 2009-03-29 18:35:15.000000000 -0400 -+++ Makefile.in 2009-03-29 18:48:03.000000000 -0400 -@@ -34,11 +34,11 @@ - # - - #XCFLAGS=-O -g -export-dynamic --IRCDLIBS=@IRCDLIBS@ @TRE_LIBS@ @CARESLIBS@ -+IRCDLIBS=@IRCDLIBS@ @TRE_LIBS@ @CARES_LIBS@ - CRYPTOLIB=@CRYPTOLIB@ - OPENSSLINCLUDES= - --XCFLAGS=@TRE_CFLAGS@ -I@CARESINCDIR@ @CARESLIBDIR@ @CFLAGS@ -+XCFLAGS=@TRE_CFLAGS@ -I@CARES_CFLAGS@ @CFLAGS@ - # - # use the following on MIPS: - #CFLAGS= -systype bsd43 -DSYSTYPE_BSD43 -I$(INCLUDEDIR) - ---- src/res.c (revision 333) -+++ src/res.c (working copy) -@@ -49,7 +49,7 @@ - #include <res.h> - - /* Prevent crashes due to invalid prototype/ABI */ --#if ARES_VERSION < 0x010600 -+#if ARES_VERSION < 0x010503 - #error "You have an old c-ares version on your system and/or Unreals c-ares failed to compile!" - #endif - -@@ -736,21 +736,35 @@ - } else - if (*param == 'i') /* INFORMATION */ - { -- struct ares_config_info inf; -+ struct ares_options inf; - int i; -+ int optmask; - -- ares_get_config(&inf, resolver_channel); -+ ares_save_options(resolver_channel, &inf, &optmask); - - sendtxtnumeric(sptr, "****** DNS Configuration Information ******"); - sendtxtnumeric(sptr, " c-ares version: %s",ares_version(NULL)); -- sendtxtnumeric(sptr, " timeout: %d", inf.timeout); -- sendtxtnumeric(sptr, " tries: %d", inf.tries); -- sendtxtnumeric(sptr, " # of servers: %d", inf.numservers); -- for (i = 0; i < inf.numservers; i++) -- sendtxtnumeric(sptr, " server #%d: %s", i+1, inf.servers[i] ? inf.servers[i] : "[???]"); -- -+ -+ if(optmask & ARES_OPT_TIMEOUTMS) -+ sendtxtnumeric(sptr, " timeout: %d", inf.timeout); -+ if(optmask & ARES_OPT_TRIES) -+ sendtxtnumeric(sptr, " tries: %d", inf.tries); -+ if(optmask & ARES_OPT_SERVERS) -+ { -+ sendtxtnumeric(sptr, " # of servers: %d", inf.nservers); -+ for (i = 0; i < inf.nservers; i++) -+ sendtxtnumeric(sptr, " server #%d: %s", i+1, inet_ntoa(inf.servers[i])); -+ } -+ if(optmask & ARES_OPT_DOMAINS) -+ { -+ sendtxtnumeric(sptr, " # of search domains: %d", inf.ndomains); -+ for (i = 0; i < inf.ndomains; i++) -+ sendtxtnumeric(sptr, " domain #%d: %s", i+1, inf.domains[i]); -+ } - /* TODO: free or get memleak ! */ - sendtxtnumeric(sptr, "****** End of DNS Configuration Info ******"); -+ -+ ares_destroy_options(&inf); - } else /* STATISTICS */ - { - sendtxtnumeric(sptr, "DNS CACHE Stats:"); diff --git a/net-irc/unrealircd/files/unrealircd-system-tre.patch b/net-irc/unrealircd/files/unrealircd-system-tre.patch deleted file mode 100644 index 272e92c1936e..000000000000 --- a/net-irc/unrealircd/files/unrealircd-system-tre.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff -ru ./Makefile.in /var/tmp/portage/net-irc/unrealircd-3.2.8/work/Unreal3.2/Makefile.in ---- Makefile.in 2006-06-05 19:16:34.000000000 -0400 -+++ Makefile.in 2009-03-03 18:59:32.000000000 -0500 -@@ -34,11 +34,11 @@ - # - - #XCFLAGS=-O -g -export-dynamic --IRCDLIBS=@IRCDLIBS@ @TRELIBS@ @CARESLIBS@ -+IRCDLIBS=@IRCDLIBS@ @TRE_LIBS@ @CARESLIBS@ - CRYPTOLIB=@CRYPTOLIB@ - OPENSSLINCLUDES= - --XCFLAGS=-I@TREINCDIR@ -I@CARESINCDIR@ @CARESLIBDIR@ @CFLAGS@ -+XCFLAGS=@TRE_CFLAGS@ -I@CARESINCDIR@ @CARESLIBDIR@ @CFLAGS@ - # - # use the following on MIPS: - #CFLAGS= -systype bsd43 -DSYSTYPE_BSD43 -I$(INCLUDEDIR) -Only in /var/tmp/portage/net-irc/unrealircd-3.2.8/work/Unreal3.2: Makefile.in.~1.1.2.23.2.6.~ -diff -ru ./configure.in /var/tmp/portage/net-irc/unrealircd-3.2.8/work/Unreal3.2/configure.in ---- autoconf/configure.in 2009-02-01 11:43:33.000000000 -0500 -+++ autoconf/configure.in 2009-03-03 19:01:23.000000000 -0500 -@@ -392,6 +392,7 @@ - AC_DEFINE(DISABLE_USERMOD)) - AC_ARG_WITH(operoverride-verify, [AC_HELP_STRING([--with-operoverride-verify], [Require opers to invite themselves to +s/+p channels])], - AC_DEFINE(OPEROVERRIDE_VERIFY)) -+AC_ARG_WITH(system-tre, [AC_HELP_STRING([--with-system-tre], [Use the system tre package instead of bundled, discovered using pkg-config])], [], [with_system_tre=no ]) - CHECK_SSL - CHECK_ZLIB - CHECK_LIBCURL -@@ -424,6 +425,7 @@ - ;; - esac - -+AS_IF([test "x$with_system_tre" = "xno"],[ - dnl REMEMBER TO CHANGE WITH A NEW TRE RELEASE! - tre_version="0.7.5" - AC_MSG_RESULT(extracting TRE regex library) -@@ -446,16 +448,20 @@ - $ac_cv_prog_MAKER || exit 1 - AC_MSG_RESULT(installing TRE regex library) - $ac_cv_prog_MAKER install || exit 1 --TREINCDIR="$cur_dir/extras/regexp/include" --AC_SUBST(TREINCDIR) -+TRE_CFLAGS="-I$cur_dir/extras/regexp/include" -+AC_SUBST(TRE_CFLAGS) - if test "x$ac_cv_path_PKGCONFIG" = "x" ; then -- TRELIBS="-L../extras/regexp/lib -ltre" -+ TRE_LIBS="-L../extras/regexp/lib -ltre" - else -- TRELIBS=`$ac_cv_path_PKGCONFIG --libs tre.pc` -+ TRE_LIBS=`$ac_cv_path_PKGCONFIG --libs tre.pc` - fi --AC_SUBST(TRELIBS) -+AC_SUBST(TRE_LIBS) - cd $cur_dir -- -+],[ -+dnl use pkgconfig for tre: -+PKG_PROG_PKG_CONFIG(0.17) -+PKG_CHECK_MODULES([TRE], tre >= 0.7.5) -+]) - - dnl REMEMBER TO CHANGE WITH A NEW C-ARES RELEASE! - cares_version="1.6.0" diff --git a/net-irc/unrealircd/files/unrealircd.confd b/net-irc/unrealircd/files/unrealircd.confd deleted file mode 100644 index 922d9922abef..000000000000 --- a/net-irc/unrealircd/files/unrealircd.confd +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/unrealircd/files/unrealircd.confd,v 1.4 2004/07/24 00:17:37 swegener Exp $ - -# user to run unrealircd as -UNREALIRCD_USER="unrealircd" - -# extra options to pass to unrealircd ... -# useful if you want to specify conf files other -# than the default -# -# [-h servername] -# [-p portnumber] -# [-x loglevel] -# [-t] (to enable debug output) -UNREALIRCD_OPTS="" diff --git a/net-irc/unrealircd/files/unrealircd.rc b/net-irc/unrealircd/files/unrealircd.rc deleted file mode 100644 index 05414ac63a56..000000000000 --- a/net-irc/unrealircd/files/unrealircd.rc +++ /dev/null @@ -1,30 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/unrealircd/files/unrealircd.rc,v 1.9 2011/12/21 18:25:03 binki Exp $ - -extra_started_commands="reload" - -depend() { - use dns net - provide ircd -} - -start() { - ebegin "Starting unrealircd" - start-stop-daemon --start --quiet --exec /usr/bin/unrealircd \ - --chuid ${UNREALIRCD_USER} -- ${UNREALIRCD_OPTS} &>/dev/null - eend $? -} - -stop() { - ebegin "Shutting down unrealircd" - start-stop-daemon --stop --quiet --exec /usr/bin/unrealircd - eend $? -} - -reload() { - ebegin "Re-Loading unrealircd" - killall -1 unrealircd - eend $? -} |