From d91b772cb89aadf1ee8d66f9711ea1220297658d Mon Sep 17 00:00:00 2001 From: Sam James Date: Mon, 24 Oct 2022 12:46:29 +0100 Subject: net-irc/psybnc: rename patches Signed-off-by: Sam James --- net-irc/psybnc/Manifest | 1 + net-irc/psybnc/files/compile.diff | 79 ---------------------- net-irc/psybnc/files/ldflags-fix.patch | 12 ---- net-irc/psybnc/files/psybnc-2.3.2.9-compile.patch | 79 ++++++++++++++++++++++ .../psybnc/files/psybnc-2.3.2.9-ldflags-fix.patch | 12 ++++ net-irc/psybnc/psybnc-2.3.2.9-r4.ebuild | 26 +++---- 6 files changed, 106 insertions(+), 103 deletions(-) delete mode 100644 net-irc/psybnc/files/compile.diff delete mode 100644 net-irc/psybnc/files/ldflags-fix.patch create mode 100644 net-irc/psybnc/files/psybnc-2.3.2.9-compile.patch create mode 100644 net-irc/psybnc/files/psybnc-2.3.2.9-ldflags-fix.patch (limited to 'net-irc/psybnc') diff --git a/net-irc/psybnc/Manifest b/net-irc/psybnc/Manifest index 7feaa0cb2399..9ff638d4d120 100644 --- a/net-irc/psybnc/Manifest +++ b/net-irc/psybnc/Manifest @@ -1 +1,2 @@ DIST psyBNC-2.3.2-9.tar.gz 318676 BLAKE2B 0197aa3bc8c770738a7d4d5a5a79b77f7a0cafeef60ccca1167172b28af05c0cd9836f7e9816c873dafa2e55b0bf9ce54cfbe3958939405f58f7f3874ec7ea64 SHA512 b664f57610e54fadd938b359a0e8052b8fe3dd36bd1ee339f36ee22ae4d36a76e803425c5133f925ac18c01767ffbc8a2f471c014b5b76b05894cfea9fe5416b +DIST psyBNC-2.4.3.tar.gz 1108733 BLAKE2B e0f02cab97b503301db0a4c111497e4f99b75d8d2c798b2b5d97997a4c4921d8a7de8dabad79c1291fa4b7efce0d1ed0c7dede1345b155561bb6ce6033b591bb SHA512 02228baef6fa889d5e12bfa715facc2eab3b033c01b1f799a1c6c995ef9eedfacf3ed328c875f52595d64c47124c20e4145288b2636182dea17ec9027d367bb7 diff --git a/net-irc/psybnc/files/compile.diff b/net-irc/psybnc/files/compile.diff deleted file mode 100644 index 99e55b6d8cdc..000000000000 --- a/net-irc/psybnc/files/compile.diff +++ /dev/null @@ -1,79 +0,0 @@ -diff -Naurp a/src/p_blowfish.c b/src/p_blowfish.c ---- a/src/p_blowfish.c 2007-02-26 12:16:53.000000000 +0000 -+++ b/src/p_blowfish.c 2007-02-26 12:17:11.000000000 +0000 -@@ -31,7 +31,7 @@ static char rcsid[] = "@(#)# $Id$ - #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 a/src/p_global.h b/src/p_global.h ---- a/src/p_global.h 2007-02-26 12:16:53.000000000 +0000 -+++ b/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 a/src/p_memory.c b/src/p_memory.c ---- a/src/p_memory.c 2007-02-26 12:16:53.000000000 +0000 -+++ b/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 a/src/p_string.c b/src/p_string.c ---- a/src/p_string.c 2007-02-26 12:16:53.000000000 +0000 -+++ b/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 a/src/match.c b/src/match.c ---- a/src/match.c 2007-02-26 12:26:10.000000000 +0000 -+++ b/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/ldflags-fix.patch b/net-irc/psybnc/files/ldflags-fix.patch deleted file mode 100644 index f5bc776b1e6b..000000000000 --- a/net-irc/psybnc/files/ldflags-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -aurp a/tools/autoconf.c b/tools/autoconf.c ---- a/tools/autoconf.c 2010-10-10 20:25:29.295001235 +0000 -+++ b/tools/autoconf.c 2010-10-10 20:26:02.738999569 +0000 -@@ -449,7 +449,7 @@ int main() - fprintf(makefile,"TARGET = psybnc\n"); - fprintf(makefile,"\n"); - fprintf(makefile,"all: $(OBJS)\n"); -- fprintf(makefile," $(CC) -o $(TARGET) $(CFLAGS) $(OBJS) $(LIBS)\n"); -+ fprintf(makefile," $(CC) -o $(TARGET) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS)\n"); - fprintf(makefile," @strip $(TARGET)\n"); - if(ssl==0) - { diff --git a/net-irc/psybnc/files/psybnc-2.3.2.9-compile.patch b/net-irc/psybnc/files/psybnc-2.3.2.9-compile.patch new file mode 100644 index 000000000000..99e55b6d8cdc --- /dev/null +++ b/net-irc/psybnc/files/psybnc-2.3.2.9-compile.patch @@ -0,0 +1,79 @@ +diff -Naurp a/src/p_blowfish.c b/src/p_blowfish.c +--- a/src/p_blowfish.c 2007-02-26 12:16:53.000000000 +0000 ++++ b/src/p_blowfish.c 2007-02-26 12:17:11.000000000 +0000 +@@ -31,7 +31,7 @@ static char rcsid[] = "@(#)# $Id$ + #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 a/src/p_global.h b/src/p_global.h +--- a/src/p_global.h 2007-02-26 12:16:53.000000000 +0000 ++++ b/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 a/src/p_memory.c b/src/p_memory.c +--- a/src/p_memory.c 2007-02-26 12:16:53.000000000 +0000 ++++ b/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 a/src/p_string.c b/src/p_string.c +--- a/src/p_string.c 2007-02-26 12:16:53.000000000 +0000 ++++ b/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 a/src/match.c b/src/match.c +--- a/src/match.c 2007-02-26 12:26:10.000000000 +0000 ++++ b/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/psybnc-2.3.2.9-ldflags-fix.patch b/net-irc/psybnc/files/psybnc-2.3.2.9-ldflags-fix.patch new file mode 100644 index 000000000000..f5bc776b1e6b --- /dev/null +++ b/net-irc/psybnc/files/psybnc-2.3.2.9-ldflags-fix.patch @@ -0,0 +1,12 @@ +diff -aurp a/tools/autoconf.c b/tools/autoconf.c +--- a/tools/autoconf.c 2010-10-10 20:25:29.295001235 +0000 ++++ b/tools/autoconf.c 2010-10-10 20:26:02.738999569 +0000 +@@ -449,7 +449,7 @@ int main() + fprintf(makefile,"TARGET = psybnc\n"); + fprintf(makefile,"\n"); + fprintf(makefile,"all: $(OBJS)\n"); +- fprintf(makefile," $(CC) -o $(TARGET) $(CFLAGS) $(OBJS) $(LIBS)\n"); ++ fprintf(makefile," $(CC) -o $(TARGET) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS)\n"); + fprintf(makefile," @strip $(TARGET)\n"); + if(ssl==0) + { diff --git a/net-irc/psybnc/psybnc-2.3.2.9-r4.ebuild b/net-irc/psybnc/psybnc-2.3.2.9-r4.ebuild index 001c32520db9..684b08d88a1f 100644 --- a/net-irc/psybnc/psybnc-2.3.2.9-r4.ebuild +++ b/net-irc/psybnc/psybnc-2.3.2.9-r4.ebuild @@ -11,7 +11,7 @@ PSYBNC_HOME="/var/lib/psybnc" DESCRIPTION="A multi-user and multi-server gateway to IRC networks" HOMEPAGE="http://www.psybnc.at/index.html" SRC_URI="http://www.psybnc.at/download/beta/psyBNC-${MY_PV}.tar.gz" -S="${WORKDIR}/${PN}" +S="${WORKDIR}"/${PN} LICENSE="GPL-2" SLOT="0" @@ -26,6 +26,11 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}"/${PN}-2.3.2.9-compile.patch + "${FILESDIR}"/${PN}-2.3.2.9-ldflags-fix.patch +) + src_unpack() { unpack ${A} cd "${S}" || die @@ -45,17 +50,14 @@ src_unpack() { src_prepare() { default - eapply "${FILESDIR}/compile.diff" - eapply "${FILESDIR}/ldflags-fix.patch" - - # add oidentd - use oidentd && eapply "${FILESDIR}/${P}-oidentd.patch" + # Add oidentd + use oidentd && PATCHES+=( "${FILESDIR}"/${P}-oidentd.patch ) - # add scripting support - use scripting && eapply "${FILESDIR}/${P}-scripting.patch" + # Add scripting support + use scripting && PATCHES+=( "${FILESDIR}"/${P}-scripting.patch ) - # add multinetwork support - use multinetwork && eapply "${FILESDIR}/${P}-multinetwork.patch" + # Add multinetwork support + use multinetwork && PATCHES+=( "${FILESDIR}"/${P}-multinetwork.patch ) # Prevent stripping the binary sed -i -e "/@strip/ d" tools/autoconf.c || die @@ -103,10 +105,10 @@ src_install() { insinto /etc doins "${FILESDIR}"/oidentd.conf.psybnc fperms 640 /etc/oidentd.conf.psybnc - # install init-script with oidentd-support + # Install init-script with oidentd-support newinitd "${FILESDIR}"/psybnc-oidentd.initd psybnc else - # install init-script without oidentd-support + # Install init-script without oidentd-support newinitd "${FILESDIR}"/psybnc.initd psybnc fi -- cgit v1.2.3-65-gdbad