From 78f7e709b9fde6ff5123f654f2befb082fe40619 Mon Sep 17 00:00:00 2001 From: Sergey Popov Date: Thu, 15 Apr 2021 14:37:16 +0300 Subject: [PATCH] Remove net-irc/psybnc --- net-irc/psybnc/Manifest | 1 - net-irc/psybnc/files/compile.diff | 79 --------- net-irc/psybnc/files/oidentd.conf.psybnc | 7 - .../psybnc/files/psybnc-2.4_beta1-config.h | 56 ------ .../files/psybnc-2.4_beta1-ldflags-fix.patch | 11 -- .../files/psybnc-2.4_beta1-multinetwork.patch | 13 -- .../files/psybnc-2.4_beta1-oidentd.patch | 13 -- .../files/psybnc-2.4_beta1-scripting.patch | 13 -- net-irc/psybnc/files/psybnc-oidentd.initd | 42 ----- net-irc/psybnc/files/psybnc.conf | 17 -- net-irc/psybnc/files/psybnc.confd | 5 - net-irc/psybnc/files/psybnc.initd | 42 ----- net-irc/psybnc/metadata.xml | 10 -- net-irc/psybnc/psybnc-2.4_beta1.ebuild | 163 ------------------ 14 files changed, 472 deletions(-) delete mode 100644 net-irc/psybnc/Manifest delete mode 100644 net-irc/psybnc/files/compile.diff delete mode 100644 net-irc/psybnc/files/oidentd.conf.psybnc delete mode 100644 net-irc/psybnc/files/psybnc-2.4_beta1-config.h delete mode 100644 net-irc/psybnc/files/psybnc-2.4_beta1-ldflags-fix.patch delete mode 100644 net-irc/psybnc/files/psybnc-2.4_beta1-multinetwork.patch delete mode 100644 net-irc/psybnc/files/psybnc-2.4_beta1-oidentd.patch delete mode 100644 net-irc/psybnc/files/psybnc-2.4_beta1-scripting.patch delete mode 100644 net-irc/psybnc/files/psybnc-oidentd.initd delete mode 100644 net-irc/psybnc/files/psybnc.conf delete mode 100644 net-irc/psybnc/files/psybnc.confd delete mode 100644 net-irc/psybnc/files/psybnc.initd delete mode 100644 net-irc/psybnc/metadata.xml delete mode 100644 net-irc/psybnc/psybnc-2.4_beta1.ebuild diff --git a/net-irc/psybnc/Manifest b/net-irc/psybnc/Manifest deleted file mode 100644 index 82f1c55..0000000 --- a/net-irc/psybnc/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST psyBNC-2.4BETA1.tar.gz 1060774 SHA256 4008693dc0f73c97e60d56c3a353158c17c0b4a3ba40e904a6947106003861ff diff --git a/net-irc/psybnc/files/compile.diff b/net-irc/psybnc/files/compile.diff deleted file mode 100644 index 830fb34..0000000 --- a/net-irc/psybnc/files/compile.diff +++ /dev/null @@ -1,79 +0,0 @@ -diff -Naurp src/p_blowfish.c src/p_blowfish.c ---- src/p_blowfish.c 2007-02-26 12:16:53.000000000 +0000 -+++ src/p_blowfish.c 2007-02-26 12:17:11.000000000 +0000 -@@ -31,7 +31,7 @@ static char rcsid[] = "@(#)$Id: p_blowfi - #include - #include - --char *strmncpy(char *dest, char *source, size_t len); -+char *strmncpy(char *dest, const char *source, size_t len); - char *lngtxt(int msgnum); - - #define pcontext { strmncpy(ctxt,__FILE__,sizeof(ctxt));strmncpy(cfunc,__FUNCTION__,sizeof(cfunc)); cline=__LINE__; } -diff -Naurp src/p_global.h src/p_global.h ---- src/p_global.h 2007-02-26 12:16:53.000000000 +0000 -+++ src/p_global.h 2007-02-26 12:17:11.000000000 +0000 -@@ -972,8 +972,8 @@ int checklogging(int usern); - #endif - - #ifndef P_MEMORY --unsigned long *__pmalloc(unsigned long size,char *module,char *function,int line); --void _pfree(void * pointer,char *module, char *function, int line); -+unsigned long *__pmalloc(unsigned long size,const char *module,const char *function,int line); -+void _pfree(void * pointer,char *module, const char *function, int line); - struct usert *user(int usern); - struct newpeert *newpeer(int usern); - struct datalinkt *datalink(int usern); -@@ -1092,7 +1092,7 @@ int replace(char *rps, char whatc, char - char *nobreak(char *tobreak); - char *randstring(int length); - char *strmcat(char *first,char *second); --char *strmncpy(char *dest, char *source, unsigned int len); -+char *strmncpy(char *dest, const char *source, unsigned int len); - int strmncasecmp(char *one, char *two); - int strmcmp(char *one, char *two); - int strmwildcmp(char *line, char *wildcard); -diff -Naurp src/p_memory.c src/p_memory.c ---- src/p_memory.c 2007-02-26 12:16:53.000000000 +0000 -+++ src/p_memory.c 2007-02-26 12:17:11.000000000 +0000 -@@ -32,7 +32,7 @@ FILE *logm=NULL; - - /* malloc-wrapper. No memory will log an error entry and kill the bouncer */ - --unsigned long *__pmalloc(unsigned long size,char *module,char *function, int line) -+unsigned long *__pmalloc(unsigned long size,const char *module,const char *function, int line) - { - unsigned long *rc; - if (!(rc=(unsigned long *)malloc(size))) -@@ -53,7 +53,7 @@ unsigned long *__pmalloc(unsigned long s - return rc; - } - --void _pfree(unsigned long *pointer, char *module, char *function, int line) -+void _pfree(unsigned long *pointer, char *module, const char *function, int line) - { - #ifdef LOGALLOC - if(logm==NULL) -diff -Naurp src/p_string.c src/p_string.c ---- src/p_string.c 2007-02-26 12:16:53.000000000 +0000 -+++ src/p_string.c 2007-02-26 12:17:11.000000000 +0000 -@@ -51,7 +51,7 @@ char *lngtxt(unsigned int msgnum) - - /* string copy with len and zero delimit */ - --char *strmncpy(char *dest, char *source, unsigned int len) -+char *strmncpy(char *dest, const char *source, unsigned int len) - { - char bf[strlen(source)+2]; - char *pt; -diff -Naurp src/match.c src/match.c ---- src/match.c 2007-02-26 12:26:10.000000000 +0000 -+++ src/match.c 2007-02-26 12:26:17.000000000 +0000 -@@ -36,6 +36,7 @@ - /* Remove the next line to use this in IrcII */ - #define EGGDROP - -+#include - - /* =================================================================== - * Best to leave stuff after this point alone, but go on and change diff --git a/net-irc/psybnc/files/oidentd.conf.psybnc b/net-irc/psybnc/files/oidentd.conf.psybnc deleted file mode 100644 index c8e4ed6..0000000 --- a/net-irc/psybnc/files/oidentd.conf.psybnc +++ /dev/null @@ -1,7 +0,0 @@ -user psybnc { - default { - allow spoof - allow spoof_all - allow spoof_privport - } -} diff --git a/net-irc/psybnc/files/psybnc-2.4_beta1-config.h b/net-irc/psybnc/files/psybnc-2.4_beta1-config.h deleted file mode 100644 index 12047c5..0000000 --- a/net-irc/psybnc/files/psybnc-2.4_beta1-config.h +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Configuration file for psyBNC, created by menuconf - */ - -/* Encryption */ - -#define CRYPT - -/* Encryption Type*/ - -#define BLOWFISH - -/* Allow Translation */ - -#define TRANSLATE - -/* Allow internal network */ - -#define INTNET - -/* Allow traffic logging */ - -#define TRAFFICLOG - -/* Allow linkage of bouncers */ - -#define LINKAGE - -/* Allow the dcc File-Functions */ - -#define DCCFILES - -/* Pipe dcc Chats */ - -#define DCCCHAT - -/* Allow to add more users */ - -#define MULTIUSER - -/* Number of max. Users */ - -#define MAXUSER 50 - -/* Number of max. Connections per User */ - -#define MAXCONN 99 - -/* The logging level */ - -#define LOGLEVEL 0 - -/* SSL-Security */ - -#define SSLSEC 2 - diff --git a/net-irc/psybnc/files/psybnc-2.4_beta1-ldflags-fix.patch b/net-irc/psybnc/files/psybnc-2.4_beta1-ldflags-fix.patch deleted file mode 100644 index 404859b..0000000 --- a/net-irc/psybnc/files/psybnc-2.4_beta1-ldflags-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- tools/autoconf.c.orig 2012-07-03 22:55:46.955338792 +0400 -+++ tools/autoconf.c 2012-07-03 22:56:17.977337001 +0400 -@@ -637,7 +637,7 @@ - fprintf(makefile,"TARGET = psybnc\n"); - fprintf(makefile,"\n"); - fprintf(makefile,"all: $(OBJS)\n"); -- fprintf(makefile," $(CC) -o $(TARGET) $(CFLAGS) $(OBJS) %s $(LIBS)\n", dnsobj); -+ fprintf(makefile," $(CC) -o $(TARGET) $(CFLAGS) ${LDFLAGS} $(OBJS) %s $(LIBS)\n", dnsobj); - /* fprintf(makefile," @strip $(TARGET)\n");*/ - if(ssl==0) - { diff --git a/net-irc/psybnc/files/psybnc-2.4_beta1-multinetwork.patch b/net-irc/psybnc/files/psybnc-2.4_beta1-multinetwork.patch deleted file mode 100644 index 0491e99..0000000 --- a/net-irc/psybnc/files/psybnc-2.4_beta1-multinetwork.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- config.h.orig 2012-07-03 23:34:31.863039326 +0400 -+++ config.h 2012-07-03 23:34:57.407038916 +0400 -@@ -10,6 +10,10 @@ - - #define BLOWFISH - -+/* Allow multiple irc connections per user */ -+ -+#define NETWORK -+ - /* Allow Translation */ - - #define TRANSLATE diff --git a/net-irc/psybnc/files/psybnc-2.4_beta1-oidentd.patch b/net-irc/psybnc/files/psybnc-2.4_beta1-oidentd.patch deleted file mode 100644 index fbb4b16..0000000 --- a/net-irc/psybnc/files/psybnc-2.4_beta1-oidentd.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- config.h.orig 2008-12-14 20:02:57.000000000 +0000 -+++ config.h 2008-12-14 20:03:35.000000000 +0000 -@@ -14,6 +14,10 @@ - - #define TRANSLATE - -+/* Support oIdentd */ -+ -+#define OIDENTD -+ - /* Allow internal network */ - - #define INTNET diff --git a/net-irc/psybnc/files/psybnc-2.4_beta1-scripting.patch b/net-irc/psybnc/files/psybnc-2.4_beta1-scripting.patch deleted file mode 100644 index 08dce4f..0000000 --- a/net-irc/psybnc/files/psybnc-2.4_beta1-scripting.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- config.h.orig 2009-01-03 17:30:41.000000000 +0000 -+++ config.h 2009-01-03 17:31:27.000000000 +0000 -@@ -26,6 +26,10 @@ - - #define TRAFFICLOG - -+/* Allow scripting */ -+ -+#define SCRIPTING -+ - /* Allow linkage of bouncers */ - - #define LINKAGE diff --git a/net-irc/psybnc/files/psybnc-oidentd.initd b/net-irc/psybnc/files/psybnc-oidentd.initd deleted file mode 100644 index cf95c21..0000000 --- a/net-irc/psybnc/files/psybnc-oidentd.initd +++ /dev/null @@ -1,42 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/psybnc/files/psybnc-oidentd.initd,v 1.1 2008/12/14 18:23:14 gurligebis Exp $ - -depend() { - need net oidentd -} - -check_config() { - if [[ ! -f ${PSYBNC_CONFIG} ]] - then - eerror "Please set \$PSYBNC_CONFIG in /etc/conf.d/psybnc!" - return 1 - fi - - if [[ ! -d "${PSYBNC_HOME}" ]] - then - eerror "Please set \$PSYBNC_HOME in /etc/conf.d/psybnc!" - return 1 - fi - - if [[ -z "${PSYBNC_USER}" ]] - then - eerror "Please set \$PSYBNC_USER in /etc/conf.d/psybnc!" - return 1 - fi -} - -start() { - check_config || return 1 - ebegin "Starting psyBNC" - start-stop-daemon --start --quiet --chuid "${PSYBNC_USER}" --chdir "${PSYBNC_HOME}" -e HOME="${PSYBNC_HOME}" --exec /usr/bin/psybnc -- "${PSYBNC_CONFIG}" &>/dev/null - eend $? -} - -stop() { - check_config || return 1 - ebegin "Stopping psyBNC" - start-stop-daemon --stop --quiet --pidfile "${PSYBNC_HOME}"/psybnc.pid --signal 9 - eend $? -} diff --git a/net-irc/psybnc/files/psybnc.conf b/net-irc/psybnc/files/psybnc.conf deleted file mode 100644 index 8a1ca89..0000000 --- a/net-irc/psybnc/files/psybnc.conf +++ /dev/null @@ -1,17 +0,0 @@ -# Name -PSYBNC.SYSTEM.ME=Gentoo - -# Default listener -PSYBNC.SYSTEM.PORT1=23998 -PSYBNC.SYSTEM.HOST1=* -PSYBNC.HOSTALLOWS.ENTRY0=*;* - -# Default SSL listener -PSYBNC.SYSTEM.PORT2=23889 -PSYBNC.SYSTEM.HOST2=S=* -PSYBNC.HOSTALLOWS.ENTRY1=*;* - -# Default user -USER1.USER.NICK=gentoo -USER1.USER.PASS=gentoo -USER1.USER.RIGHTS=1 diff --git a/net-irc/psybnc/files/psybnc.confd b/net-irc/psybnc/files/psybnc.confd deleted file mode 100644 index cdd8f31..0000000 --- a/net-irc/psybnc/files/psybnc.confd +++ /dev/null @@ -1,5 +0,0 @@ -# /etc/conf.d/psybnc - -PSYBNC_CONFIG="/etc/psybnc/psybnc.conf" -PSYBNC_HOME="/var/lib/psybnc" -PSYBNC_USER="psybnc" diff --git a/net-irc/psybnc/files/psybnc.initd b/net-irc/psybnc/files/psybnc.initd deleted file mode 100644 index 12e7b5a..0000000 --- a/net-irc/psybnc/files/psybnc.initd +++ /dev/null @@ -1,42 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/psybnc/files/psybnc.initd,v 1.2 2007/02/26 00:03:08 gurligebis Exp $ - -depend() { - need net -} - -check_config() { - if [[ ! -f ${PSYBNC_CONFIG} ]] - then - eerror "Please set \$PSYBNC_CONFIG in /etc/conf.d/psybnc!" - return 1 - fi - - if [[ ! -d "${PSYBNC_HOME}" ]] - then - eerror "Please set \$PSYBNC_HOME in /etc/conf.d/psybnc!" - return 1 - fi - - if [[ -z "${PSYBNC_USER}" ]] - then - eerror "Please set \$PSYBNC_USER in /etc/conf.d/psybnc!" - return 1 - fi -} - -start() { - check_config || return 1 - ebegin "Starting psyBNC" - start-stop-daemon --start --quiet --chuid "${PSYBNC_USER}" --chdir "${PSYBNC_HOME}" --exec /usr/bin/psybnc -- "${PSYBNC_CONFIG}" &>/dev/null - eend $? -} - -stop() { - check_config || return 1 - ebegin "Stopping psyBNC" - start-stop-daemon --stop --quiet --pidfile "${PSYBNC_HOME}"/psybnc.pid --signal 9 - eend $? -} diff --git a/net-irc/psybnc/metadata.xml b/net-irc/psybnc/metadata.xml deleted file mode 100644 index c406596..0000000 --- a/net-irc/psybnc/metadata.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - Adds support for oidentd - Adds scripting support - Adds support for multiple networks - - psyBNC is a multi-user and multi-server gateway to IRC networks - diff --git a/net-irc/psybnc/psybnc-2.4_beta1.ebuild b/net-irc/psybnc/psybnc-2.4_beta1.ebuild deleted file mode 100644 index 7380535..0000000 --- a/net-irc/psybnc/psybnc-2.4_beta1.ebuild +++ /dev/null @@ -1,163 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="2" - -inherit eutils versionator toolchain-funcs flag-o-matic user -MY_PV="$(get_version_component_range 1-2)BETA1" -PSYBNC_HOME="/var/lib/psybnc" - -DESCRIPTION="psyBNC is a multi-user and multi-server gateway to IRC networks" -HOMEPAGE="http://www.psybnc.at/index.html" -SRC_URI="http://www.psybnc.dk/download/psyBNC-${MY_PV}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~sparc ~x86 ~ppc" -IUSE="ipv6 ssl oidentd scripting multinetwork" - -DEPEND="ssl? ( >=dev-libs/openssl-0.9.7d ) - oidentd? ( >=net-misc/oidentd-2.0 ) - net-dns/c-ares" -RDEPEND="${DEPEND}" -S="${WORKDIR}"/"${PN}" - -pkg_setup() { - enewgroup psybnc - enewuser psybnc -1 -1 ${PSYBNC_HOME} psybnc -} - -src_unpack() { - unpack ${A} - cd "${S}" - - # Useless files - rm -f */INFO - - # Pretend we already have a certificate, we generate it in pkg_config - mkdir -p key - touch key/psybnc.cert.pem - - if [[ -f ${ROOT}/usr/share/psybnc/salt.h ]] - then - einfo "Using existing salt.h for password encryption" - cp "${ROOT}"/usr/share/psybnc/salt.h salt.h - fi - - # Pinkbyte: copy bundled config.h - cp "${FILESDIR}"/${P}-config.h "${S}"/config.h -} - -src_prepare() { - epatch "${FILESDIR}/compile.diff" - epatch "${FILESDIR}/${P}-ldflags-fix.patch" - - # add oidentd - use oidentd && epatch "${FILESDIR}/${P}-oidentd.patch" - - # add scripting support - use scripting && epatch "${FILESDIR}/${P}-scripting.patch" - - # add multinetwork support - use multinetwork && epatch "${FILESDIR}/${P}-multinetwork.patch" - - # Prevent stripping the binary - sed -i -e "/@strip/ d" tools/autoconf.c -} - -src_compile() { - use ipv6 || rm -f tools/chkipv6.c - use ssl || rm -f tools/chkssl.c - - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die "emake failed" -} - -src_install() { - dobin psybnc - - insinto /usr/share/psybnc - doins -r help lang salt.h - fperms 0600 /usr/share/psybnc/salt.h - - insinto /etc/psybnc - doins "${FILESDIR}"/psybnc.conf - - keepdir "${PSYBNC_HOME}"/{log,motd,scripts} - dosym /usr/share/psybnc/lang "${PSYBNC_HOME}"/lang - dosym /usr/share/psybnc/help "${PSYBNC_HOME}"/help - - fowners psybnc:psybnc "${PSYBNC_HOME}"/{,log,motd,scripts} /etc/psybnc/psybnc.conf - fperms 0750 "${PSYBNC_HOME}"/{,log,motd,scripts} - fperms 0640 /etc/psybnc/psybnc.conf - - if use ssl - then - keepdir /etc/psybnc/ssl - dosym /etc/psybnc/ssl "${PSYBNC_HOME}"/key - else - # Drop SSL listener from psybnc.conf - sed -i -e "/^# Default SSL listener$/,+4 d" "${D}"/etc/psybnc/psybnc.conf - fi - - if use oidentd - then - insinto /etc - doins "${FILESDIR}"/oidentd.conf.psybnc - fperms 640 /etc/oidentd.conf.psybnc - # install init-script with oidentd-support - newinitd "${FILESDIR}"/psybnc-oidentd.initd psybnc - else - # install init-script without oidentd-support - newinitd "${FILESDIR}"/psybnc.initd psybnc - fi - - newconfd "${FILESDIR}"/psybnc.confd psybnc - - dodoc CHANGES FAQ README scripts/SCRIPTING TODO - docinto example-script - dodoc scripts/example/DEFAULT.SCRIPT -} - -pkg_config() { - if use ssl - then - if [[ -f ${ROOT}/etc/psybnc/ssl/psybnc.cert.pem || -f ${ROOT}/etc/psybnc/ssl/psybnc.key.pem ]] - then - ewarn "Existing /etc/psybnc/psybnc.cert.pem or /etc/psybnc/psybnc.key.pem found!" - ewarn "Remove /etc/psybnc/psybnc.*.pem and run emerge --config =${CATEGORY}/${PF} again." - return - fi - - einfo "Generating certificate request..." - openssl req -new -out "${ROOT}"/etc/psybnc/ssl/psybnc.req.pem -keyout "${ROOT}"/etc/psybnc/ssl/psybnc.key.pem -nodes - einfo "Generating self-signed certificate..." - openssl req -x509 -days 365 -in "${ROOT}"/etc/psybnc/ssl/psybnc.req.pem -key "${ROOT}"/etc/psybnc/ssl/psybnc.key.pem -out "${ROOT}"/etc/psybnc/ssl/psybnc.cert.pem - einfo "Setting permissions on files..." - chown root:psybnc "${ROOT}"/etc/psybnc/ssl/psybnc.{cert,key,req}.pem - chmod 0640 "${ROOT}"/etc/psybnc/ssl/psybnc.{cert,key,req}.pem - fi -} - -pkg_postinst() { - if use ssl - then - elog - elog "Please run \"emerge --config =${CATEGORY}/${PF}\" to create needed SSL certificates." - fi - if use oidentd - then - elog - elog "You have enabled oidentd-support. You will need to set" - elog "up your /etc/oident.conf file before running psybnc. An example" - elog "for psyBNC can be found under /etc/oidentd.conf.psybnc" - fi - elog - elog "You can connect to psyBNC on port 23998 with user gentoo and password gentoo." - elog "Please edit the psyBNC configuration at /etc/psybnc/psybnc.conf to change this." - elog - elog "To be able to reuse an existing psybnc.conf, you need to make sure that the" - elog "old salt.h is available at /usr/share/psybnc/salt.h when compiling a new" - elog "version of psyBNC. It is needed for password encryption and decryption." - elog -}