diff options
Diffstat (limited to 'net-irc')
-rw-r--r-- | net-irc/ultimate/Manifest | 1 | ||||
-rw-r--r-- | net-irc/ultimate/files/ultimate-3.0.2-config.patch.in | 30 | ||||
-rw-r--r-- | net-irc/ultimate/files/ultimate-3.0.2-entropy-path.patch | 58 | ||||
-rw-r--r-- | net-irc/ultimate/files/ultimate-3.0.2-make-failfast.patch | 76 | ||||
-rw-r--r-- | net-irc/ultimate/files/ultimate-3.0.2-open-mode.patch | 63 | ||||
-rw-r--r-- | net-irc/ultimate/files/ultimate-3.0.2-system-zlib-r1.patch | 53 | ||||
-rw-r--r-- | net-irc/ultimate/files/ultimateircd.conf | 5 | ||||
-rw-r--r-- | net-irc/ultimate/files/ultimateircd.conf.2 | 5 | ||||
-rw-r--r-- | net-irc/ultimate/files/ultimateircd.rc | 20 | ||||
-rw-r--r-- | net-irc/ultimate/files/ultimateircd.rc.2 | 20 | ||||
-rw-r--r-- | net-irc/ultimate/metadata.xml | 7 | ||||
-rw-r--r-- | net-irc/ultimate/ultimate-3.0.2-r2.ebuild | 94 |
12 files changed, 0 insertions, 432 deletions
diff --git a/net-irc/ultimate/Manifest b/net-irc/ultimate/Manifest deleted file mode 100644 index 2015116c91ef..000000000000 --- a/net-irc/ultimate/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST Ultimate3.0.2.tar.bz2 615944 BLAKE2B 30c4185b2111718f3d32d034201bb0caa19887104459275c19533ef703a5708d7c5ae0c0bbdce6a43d2b146276b981904ae7a89f31e70553a20cb19570c8a0cb SHA512 ed79f7f63faaa08fc901cfe58df430a051a6e0cc15b7484851f659fe2b5f23bb4b0235d8cc131284d9b6373d2da1b5d1376908d59dd0fc73496ac2d4561170ed diff --git a/net-irc/ultimate/files/ultimate-3.0.2-config.patch.in b/net-irc/ultimate/files/ultimate-3.0.2-config.patch.in deleted file mode 100644 index 5cb512fe896c..000000000000 --- a/net-irc/ultimate/files/ultimate-3.0.2-config.patch.in +++ /dev/null @@ -1,30 +0,0 @@ -diff -Nur Ultimate3.0.0.rc2.orig/include/config.h Ultimate3.0.0.rc2/include/config.h ---- Ultimate3.0.0.rc2.orig/include/config.h 2005-01-30 15:01:45.677952244 +0100 -+++ Ultimate3.0.0.rc2/include/config.h 2005-01-30 15:02:43.353895511 +0100 -@@ -127,13 +127,13 @@ - #endif - - /* dirs */ --#define DPATH IRCD_PREFIX -+#define DPATH IRCD_PREFIX - #define BINPATH IRCD_PREFIX "/bin/" --#define ETCPATH IRCD_PREFIX "/etc" --#define LOGPATH IRCD_PREFIX "/logs" -+#define ETCPATH "@GENTOO_PORTAGE_EPREFIX@/etc/ultimateircd" -+#define LOGPATH "@GENTOO_PORTAGE_EPREFIX@/var/log/ultimateircd" - - /* files */ --#define SPATH BINPATH "/ircd" /* ircd executable */ -+#define SPATH BINPATH "/ultimateircd" /* ircd executable */ - - #define CPATH ETCPATH "/ircd.conf" /* ircd.conf file */ - #define DCONF ETCPATH "/ircd.ini" /* Dynamic Configuration File */ -@@ -144,7 +144,7 @@ - #define SMPATH ETCPATH "/ircd.smotd" /* Short Message Of The Day */ - #define OMPATH ETCPATH "/ircd.opermotd" /* Operator Message Of The Day */ - #define RPATH ETCPATH "/ircd.rules" /* Rules File */ --#define PPATH ETCPATH "/ircd.pid" /* IRCd PID */ -+#define PPATH "@GENTOO_PORTAGE_EPREFIX@/var/run/ultimateircd/ircd.pid" /* IRCd PID */ - #define IRCDSSL_CPATH ETCPATH "/ircd.crt" /* Client SSL */ - #define IRCDSSL_KPATH ETCPATH "/ircd.key" /* Client SSL */ - diff --git a/net-irc/ultimate/files/ultimate-3.0.2-entropy-path.patch b/net-irc/ultimate/files/ultimate-3.0.2-entropy-path.patch deleted file mode 100644 index d99f29030723..000000000000 --- a/net-irc/ultimate/files/ultimate-3.0.2-entropy-path.patch +++ /dev/null @@ -1,58 +0,0 @@ -From: Nathan Phillip Brink <ohnobinki@ohnopublishing.net> -Subject: Store and retrieve entropy from a file in a directory - writable/readable by ultimateircd. -Date: 2011/04/28 - ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -32,7 +32,7 @@ - LEX = @LEX@ - LEXLIB = @LEXLIB@ - CCDV = @CCDV@ --CFLAGS = @IRC_CFLAGS@ -DIRCD_PREFIX=\"@prefix@\" -+CFLAGS = @IRC_CFLAGS@ -DIRCD_PREFIX=\"@prefix@\" -DLOCALSTATEDIR='"$(localstatedir)"' - LDFLAGS = @LDFLAGS@ - MKDEP = @MKDEP@ -DIRCD_PREFIX=\"@prefix@\" - MV = @MV@ ---- a/src/dh.c -+++ b/src/dh.c -@@ -214,10 +214,10 @@ - printf ("Done.\n"); - fclose (fp); - -- fp = fopen (".ircd.entropy", "w"); -+ fp = fopen (LOCALSTATEDIR "/.ircd.entropy", "w"); - if (!fp) - { -- printf ("Could not open .ircd.entropy for writing: %s\n", -+ printf ("Could not open " LOCALSTATEDIR "/.ircd.entropy for writing: %s\n", - strerror (errno)); - return 0; - } -@@ -225,7 +225,7 @@ - fwrite (randbuf, RAND_BYTES * 4, 1, fp); - fclose (fp); - -- RAND_load_file (".ircd.entropy", -1); -+ RAND_load_file (LOCALSTATEDIR "/.ircd.entropy", -1); - - return 1; - } -@@ -236,7 +236,7 @@ - int ret; - time_t now; - -- ret = RAND_load_file (".ircd.entropy", -1); -+ ret = RAND_load_file (LOCALSTATEDIR "/.ircd.entropy", -1); - if (ret <= 0) - { - if (!make_entropy ()) -@@ -250,7 +250,7 @@ - /* this is probably not too good, but it saves just writing - the whole state back to disk with no changes. */ - RAND_seed (&now, 4); -- RAND_write_file (".ircd.entropy"); -+ RAND_write_file (LOCALSTATEDIR "/.ircd.entropy"); - - return 0; - } diff --git a/net-irc/ultimate/files/ultimate-3.0.2-make-failfast.patch b/net-irc/ultimate/files/ultimate-3.0.2-make-failfast.patch deleted file mode 100644 index fa13f814de6e..000000000000 --- a/net-irc/ultimate/files/ultimate-3.0.2-make-failfast.patch +++ /dev/null @@ -1,76 +0,0 @@ -From: Nathan Phillip Brink <ohnobinki@ohnopublishing.net> -Subject: Cause build failures to be fail-fast instead of going undetected. -Date: 2011/04/27 - ---- a/Makefile.in -+++ b/Makefile.in -@@ -43,7 +43,7 @@ - @for i in $(SUBDIRS); do \ - echo "Building $$i";\ - cd $$i;\ -- ${MAKE} build; cd ..;\ -+ ${MAKE} build || exit 1; cd ..;\ - done - @echo ' ' - @echo '=================================================================' -@@ -62,7 +62,7 @@ - @for i in $(SUBDIRS); do \ - echo "Building $$i [profile]";\ - cd $$i;\ -- ${MAKEPROFILE} build; cd ..;\ -+ ${MAKEPROFILE} build || exit 1; cd ..;\ - done - - clean: -@@ -70,7 +70,7 @@ - @for i in $(SUBDIRS); do \ - echo "Cleaning $$i";\ - cd $$i;\ -- ${MAKE} clean; cd ..;\ -+ ${MAKE} clean || exit 1; cd ..;\ - done - -@if [ -f include/setup.h ] ; then \ - echo "To really restart installation, make distclean" ; \ -@@ -83,28 +83,28 @@ - @for i in $(SUBDIRS); do \ - echo "Cleaning $$i";\ - cd $$i;\ -- ${MAKE} distclean; cd ..;\ -+ ${MAKE} distclean || exit 1; cd ..;\ - done - - depend: - @for i in $(SUBDIRS); do \ - echo "depend ==> $$i";\ - cd $$i;\ -- ${MAKE} depend; cd ..;\ -+ ${MAKE} depend || exit 1; cd ..;\ - done - - install: all - @for i in $(SUBDIRS); do \ - echo "install ==> $$i";\ - cd $$i;\ -- ${MAKE} install; \ -+ ${MAKE} install || exit 1; \ - cd ..; \ - done - - @for i in $(SUBDIRS2); do \ - echo "install ==> $$i";\ - cd $$i;\ -- ${MAKE} install; \ -+ ${MAKE} install || exit 1; \ - cd ../../; \ - done - ---- a/tools/Makefile.in -+++ b/tools/Makefile.in -@@ -68,6 +68,7 @@ - - build: all - -+depend: - - mkpasswd: $(mkpasswd_OBJECTS) - $(CCDV)$(CC) ${CFLAGS} ${LDFLAGS} -o mkpasswd $(mkpasswd_OBJECTS) $(IRCDLIBS) diff --git a/net-irc/ultimate/files/ultimate-3.0.2-open-mode.patch b/net-irc/ultimate/files/ultimate-3.0.2-open-mode.patch deleted file mode 100644 index 30ec6c96e5d7..000000000000 --- a/net-irc/ultimate/files/ultimate-3.0.2-open-mode.patch +++ /dev/null @@ -1,63 +0,0 @@ -From: Nathan Phillip Brink <ohnobinki@ohnopublishing.net> -Subject: Provide the required third argument to open() when O_CREAT is - in the second argument. -Date: 2011/04/28 - ---- a/src/s_serv.c -+++ b/src/s_serv.c -@@ -4603,7 +4603,7 @@ - - #else /* LOCKFILE - MDP */ - -- if ((out = open (filename, O_RDWR | O_APPEND | O_CREAT)) == -1) -+ if ((out = open (filename, O_RDWR | O_APPEND | O_CREAT, 0600)) == -1) - { - sendto_one (source_p, ":%s NOTICE %s :Problem opening %s ", - me.name, parv[0], filename); -@@ -7397,7 +7397,7 @@ - syslog (LOG_INFO, "ADDCNLINE from %s for [%s] - Opening %s\n", - get_client_name (source_p, FALSE), parv[3], configfile); - #endif -- if ((out = open (configfile, O_RDWR | O_APPEND | O_CREAT)) == -1) -+ if ((out = open (configfile, O_RDWR | O_APPEND | O_CREAT, 0600)) == -1) - { - sendto_one (source_p, ":%s NOTICE %s :Problem opening %s ", - me.name, parv[0], configfile); -@@ -7770,7 +7770,7 @@ - syslog (LOG_INFO, "ADDOPER from %s for [%s] - Opening %s\n", - get_client_name (source_p, FALSE), parv[3], configfile); - #endif -- if ((out = open (configfile, O_RDWR | O_APPEND | O_CREAT)) == -1) -+ if ((out = open (configfile, O_RDWR | O_APPEND | O_CREAT, 0600)) == -1) - { - sendto_one (source_p, ":%s NOTICE %s :Problem opening %s ", - me.name, parv[0], configfile); -@@ -8090,7 +8090,7 @@ - syslog (LOG_INFO, "ADDQLINE from %s for [%s] - Opening %s\n", - get_client_name (source_p, FALSE), parv[1], configfile); - #endif -- if ((out = open (configfile, O_RDWR | O_APPEND | O_CREAT)) == -1) -+ if ((out = open (configfile, O_RDWR | O_APPEND | O_CREAT, 0600)) == -1) - { - sendto_one (source_p, ":%s NOTICE %s :Problem opening %s ", - me.name, parv[0], configfile); -@@ -8379,7 +8379,7 @@ - syslog (LOG_INFO, "ADDHLINE from %s for [%s] - Opening %s\n", - get_client_name (source_p, FALSE), parv[1], configfile); - #endif -- if ((out = open (configfile, O_RDWR | O_APPEND | O_CREAT)) == -1) -+ if ((out = open (configfile, O_RDWR | O_APPEND | O_CREAT, 0600)) == -1) - { - sendto_one (source_p, ":%s NOTICE %s :Problem opening %s ", - me.name, parv[0], configfile); -@@ -8663,7 +8663,7 @@ - syslog (LOG_INFO, "ADDULINE from %s for [%s] - Opening %s\n", - get_client_name (source_p, FALSE), parv[1], configfile); - #endif -- if ((out = open (configfile, O_RDWR | O_APPEND | O_CREAT)) == -1) -+ if ((out = open (configfile, O_RDWR | O_APPEND | O_CREAT, 0600)) == -1) - { - sendto_one (source_p, ":%s NOTICE %s :Problem opening %s ", - me.name, parv[0], configfile); - -Diff finished. Thu Apr 28 00:15:19 2011 diff --git a/net-irc/ultimate/files/ultimate-3.0.2-system-zlib-r1.patch b/net-irc/ultimate/files/ultimate-3.0.2-system-zlib-r1.patch deleted file mode 100644 index acbb71c73d42..000000000000 --- a/net-irc/ultimate/files/ultimate-3.0.2-system-zlib-r1.patch +++ /dev/null @@ -1,53 +0,0 @@ -From: Nathan Phillip Brink <ohnobinki@ohnopublishing.net> -Subject: Don't compile against internal zlib. Missing ./configure.ac - changes because ./configure.ac wasn't shipped with the dist - tarball. -Date: 2011/04/27 -Subject: Use @ZLIB_LIBS@ and @ZLIB_CFLAGS@ instead of $(ZLIB_LIBS) and - friends because we don't get AC_SUBST() declared as Makefile - variables for free. https://bugs.gentoo.org/371889 -Date: 2011/06/16 - ---- a/autoconf/configure.in -+++ b/autoconf/configure.in -@@ -702,6 +702,8 @@ - wi_ARG_DISABLE_CCDV - wi_PROG_CCDV - -+PKG_CHECK_MODULES([ZLIB], [zlib]) -+ - AC_SUBST(SSL_INCLUDES) - AC_SUBST(SSL_LIBS) - AC_SUBST(ENCRYPT_SRC) -@@ -716,7 +718,7 @@ - AC_SUBST(SEDOBJ) - AC_SUBST(CCDV) - --AC_OUTPUT(Makefile data/Makefile data/networks/Makefile src/Makefile tools/Makefile tools/ircdcron/Makefile tools/ssl-cert/Makefile zlib/Makefile) -+AC_OUTPUT(Makefile data/Makefile data/networks/Makefile src/Makefile tools/Makefile tools/ircdcron/Makefile tools/ssl-cert/Makefile) - - echo - echo ================================================================= ---- a/Makefile.in -+++ b/Makefile.in -@@ -28,3 +28,3 @@ - SHELL=/bin/sh --SUBDIRS=zlib src tools data @SUBDIR_MESSAGES@ -+SUBDIRS = src tools data @SUBDIR_MESSAGES@ - SUBDIRS2=data/networks tools/ircdcron tools/ssl-cert - ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -53,9 +53,9 @@ - SSL_LIBS = @SSL_LIBS@ - SSL_INCLUDES = @SSL_INCLUDES@ - --IRCDLIBS = ../zlib/libz.a @LIBS@ $(SSL_LIBS) -+IRCDLIBS = @ZLIB_LIBS@ @LIBS@ $(SSL_LIBS) - --INCLUDES = -I../include -I../zlib $(SSL_INCLUDES) -+INCLUDES = -I../include @ZLIB_CFLAGS@ $(SSL_INCLUDES) - CPPFLAGS = ${INCLUDES} @CPPFLAGS@ - - default: all - diff --git a/net-irc/ultimate/files/ultimateircd.conf b/net-irc/ultimate/files/ultimateircd.conf deleted file mode 100644 index 9955829f28d7..000000000000 --- a/net-irc/ultimate/files/ultimateircd.conf +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# user to run ultimate-ircd as -ULTIMATEIRCD_USER="nobody" diff --git a/net-irc/ultimate/files/ultimateircd.conf.2 b/net-irc/ultimate/files/ultimateircd.conf.2 deleted file mode 100644 index 8d2d2af3ab37..000000000000 --- a/net-irc/ultimate/files/ultimateircd.conf.2 +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# user to run ultimateircd as -ULTIMATEIRCD_USER="ultimateircd" diff --git a/net-irc/ultimate/files/ultimateircd.rc b/net-irc/ultimate/files/ultimateircd.rc deleted file mode 100644 index 8563d44ea412..000000000000 --- a/net-irc/ultimate/files/ultimateircd.rc +++ /dev/null @@ -1,20 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - use dns net -} - -start() { - ebegin "Starting ultimate-ircd" - start-stop-daemon --start --quiet --exec /usr/bin/ultimate-ircd \ - --chuid ${ULTIMATEIRCD_USER} &>/dev/null - eend $? -} - -stop() { - ebegin "Shutting down ultimate-ircd" - killall ultimate-ircd - eend $? -} diff --git a/net-irc/ultimate/files/ultimateircd.rc.2 b/net-irc/ultimate/files/ultimateircd.rc.2 deleted file mode 100644 index 327e5f3a5392..000000000000 --- a/net-irc/ultimate/files/ultimateircd.rc.2 +++ /dev/null @@ -1,20 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - use dns net -} - -start() { - ebegin "Starting ${SVCNAME}" - start-stop-daemon --start --quiet --exec /usr/bin/ultimateircd \ - --chuid ${ULTIMATEIRCD_USER} - eend $? -} - -stop() { - ebegin "Shutting down ${SVCNAME}" - start-stop-daemon --stop --pidfile /var/run/ultimateircd/ircd.pid - eend $? -} diff --git a/net-irc/ultimate/metadata.xml b/net-irc/ultimate/metadata.xml deleted file mode 100644 index 1f6e4b59748b..000000000000 --- a/net-irc/ultimate/metadata.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <upstream> - <remote-id type="sourceforge">ultimate</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-irc/ultimate/ultimate-3.0.2-r2.ebuild b/net-irc/ultimate/ultimate-3.0.2-r2.ebuild deleted file mode 100644 index f2f46b267897..000000000000 --- a/net-irc/ultimate/ultimate-3.0.2-r2.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -AT_M4DIR=autoconf -inherit autotools eutils fixheadtails prefix ssl-cert user - -MY_P=Ultimate${PV/_/.} - -DESCRIPTION="An IRCd server based on DALnet's DreamForge IRCd" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2" -HOMEPAGE="http://www.shadow-realm.org/" - -KEYWORDS="~amd64 ~ppc ~sparc x86 ~amd64-linux" -SLOT="0" -LICENSE="GPL-2" -IUSE="ssl" - -RDEPEND="sys-libs/zlib - ssl? ( dev-libs/openssl )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - rm -rf zlib || die - - cp "${FILESDIR}"/${P}-config.patch.in "${T}"/${P}-config.patch || die - eprefixify "${T}"/${P}-config.patch - epatch "${T}"/${P}-config.patch - - epatch "${FILESDIR}"/${P}-system-zlib-r1.patch - epatch "${FILESDIR}"/${P}-make-failfast.patch - epatch "${FILESDIR}"/${P}-open-mode.patch - epatch "${FILESDIR}"/${P}-entropy-path.patch - - mv autoconf/configure.in ./ || die - ht_fix_file configure.in - eautoreconf -} - -src_configure() { - econf \ - --sysconfdir="${EPREFIX}"/etc/ultimateircd \ - --localstatedir="${EPREFIX}"/var/lib/ultimateircd \ - --disable-ccdv \ - $(use_enable ssl openssl) -} - -src_compile() { - # Must rerun the depend stage because we removed the zlib/ dir to - # which the stale dependencies still refer. - emake depend - emake -} - -src_install() { - dodir /etc/ultimateircd - keepdir /var/{lib,log,run}/ultimateircd - - einstall \ - sysconfdir="${ED}"/etc/ultimateircd \ - localstatedir="${ED}"/var/lib/ultimateircd \ - networksubdir='$(sysconfdir)/networks' - - rm -rf "${ED}"/usr/{{ircd,kill,rehash},bin/{ircdchk,ssl-{cert,search}.sh}} "${ED}"/var/lib/ultimateircd/logs || die - dosym /var/log/ultimateircd /var/lib/ultimateircd/logs - - mv "${ED}"/usr/bin/ircd "${ED}"/usr/bin/ultimateircd || die - mv "${ED}"/usr/bin/mkpasswd "${ED}"/usr/bin/ultimateircd-mkpasswd || die - - newinitd "${FILESDIR}"/ultimateircd.rc.2 ultimateircd - newconfd "${FILESDIR}"/ultimateircd.conf.2 ultimateircd -} - -pkg_preinst() { - if ! use prefix; then - enewuser ultimateircd - fowners ultimateircd /var/{lib,log,run}/ultimateircd - fowners -R ultimateircd /etc/ultimateircd - fi - - fperms -R go-rwx /etc/ultimateircd - fperms 0700 /var/{lib,log,run}/ultimateircd -} - -pkg_postinst() { - if use ssl && [[ ! -e ${EROOT}etc/ultimateircd/ircd.crt ]]; then - install_cert /etc/ultimateircd/ircd - use prefix || chown ultimateircd "${EROOT}"etc/ultimateircd/ircd.{key,crt,pem} - fi -} |