13 files changed, 0 insertions, 285 deletions

diff --git a/irc/psybnc/files/patch-Makefile b/irc/psybnc/files/patch-Makefile
deleted file mode 100644
index 013844412a81..000000000000
--- a/irc/psybnc/files/patch-Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
---- Makefile.orig	2007-03-20 14:02:50 UTC
-+++ Makefile
-@@ -7,7 +7,7 @@ all:	$(OBJS)
- 	@$(CC) tools/convconf.c -o tools/convconf
- 	@tools/convconf
- 	@echo [*] Running Autoconfig.
--	@$(CC) -I. tools/autoconf.c -o tools/autoconf
-+	@$(CC) -I. tools/autoconf.c -o tools/autoconf -DPSYBASE=\"$(PSYBASE)\" -DPREFIX=\"$(PREFIX)\"
- 	@tools/autoconf
- 	@echo [*] Compiling MakeSalt for Encryption..
- 	@$(CC) -I. -o makesalt tools/makesalt.c
-@@ -23,7 +23,7 @@ menuconfig:
- 	@$(CC) tools/convconf.c -o tools/convconf
- 	@tools/convconf
- 	@echo [*] Running Autoconfig.
--	@$(CC) -I. tools/autoconf.c -o tools/autoconf
-+	@$(CC) -I. tools/autoconf.c -o tools/autoconf -DPSYBASE=\"$(PSYBASE)\" -DPREFIX=\"$(PREFIX)\"
- 	@tools/autoconf
- 	@echo [*] Creating Menu, please wait.
- 	@echo This needs the 'ncurses' library. If it is not available, menuconf wont work. If you are using 'curses', use make menuconfig-curses instead.
-@@ -39,7 +39,7 @@ menuconfig-curses:
- 	@$(CC) tools/convconf.c -o tools/convconf
- 	@tools/convconf
- 	@echo [*] Running Autoconfig.
--	@$(CC) -I. tools/autoconf.c -o tools/autoconf
-+	@$(CC) -I. tools/autoconf.c -o tools/autoconf -DPSYBASE=\"$(PSYBASE)\" -DPREFIX=\"$(PREFIX)\"
- 	@tools/autoconf
- 	@echo [*] Creating Menu, please wait.
- 	@echo This needs the 'curses' library. If it is not available, menuconf wont work.
diff --git a/irc/psybnc/files/patch-lang_english.lng b/irc/psybnc/files/patch-lang_english.lng
deleted file mode 100644
index 48c65f706605..000000000000
--- a/irc/psybnc/files/patch-lang_english.lng
+++ /dev/null
@@ -1,11 +0,0 @@
---- lang/english.lng.orig	2008-10-22 19:09:46 UTC
-+++ lang/english.lng
-@@ -1999,7 +1999,7 @@ msg0994=SYSTEM
- ; psybnc.c line 201:
- msg0995=PORT1
- ; psybnc.c line 203:
--msg0996=No Listenports/-hosts defined.˙Run either 'make menuconfig' to setup˙or add:˙PSYBNC.SYSTEM.PORT1=yourport˙and˙PSYBNC.SYSTEM.HOST1=*˙to the psybnc.conf˙
-+msg0996=No Listenports/-hosts defined.˙Add:˙PSYBNC.SYSTEM.PORT1=yourport˙and˙PSYBNC.SYSTEM.HOST1=*˙to the psybnc.conf˙
- ; psybnc.c line 207:
- msg0997=SYSTEM
- ; psybnc.c line 212:
diff --git a/irc/psybnc/files/patch-lang_german.lng b/irc/psybnc/files/patch-lang_german.lng
deleted file mode 100644
index ef291091da49..000000000000
--- a/irc/psybnc/files/patch-lang_german.lng
+++ /dev/null
@@ -1,11 +0,0 @@
---- lang/german.lng.orig	2008-10-22 19:10:34 UTC
-+++ lang/german.lng
-@@ -2004,7 +2004,7 @@ msg0994=SYSTEM
- ; psybnc.c line 201:
- msg0995=PORT1
- ; psybnc.c line 203:
--msg0996=Keine Listen-Ports definiert.˙Starte 'make menuconfig' ˙oder fuege:˙PSYBNC.SYSTEM.PORT1=deinport˙und˙PSYBNC.SYSTEM.HOST1=*˙zur psybnc.conf hinzu˙
-+msg0996=Keine Listen-Ports definiert.˙Fuege:˙PSYBNC.SYSTEM.PORT1=deinport˙und˙PSYBNC.SYSTEM.HOST1=*˙zur psybnc.conf hinzu˙
- ; psybnc.c line 207:
- msg0997=SYSTEM
- ; psybnc.c line 212:
diff --git a/irc/psybnc/files/patch-lang_italiano.lng b/irc/psybnc/files/patch-lang_italiano.lng
deleted file mode 100644
index e08978a9e5d2..000000000000
--- a/irc/psybnc/files/patch-lang_italiano.lng
+++ /dev/null
@@ -1,11 +0,0 @@
---- lang/italiano.lng.orig	2008-10-22 19:10:54 UTC
-+++ lang/italiano.lng
-@@ -1999,7 +1999,7 @@ msg0994=SYSTEM
- ; psybnc.c line 201:
- msg0995=PORT1
- ; psybnc.c line 203:
--msg0996=Nessuna porta/host di listening definite.˙Esegui 'make menuconfig' per il setup˙oppure aggiungi:˙PSYBNC.SYSTEM.PORT1=tuaporta˙e˙PSYBNC.SYSTEM.HOST1=*˙al file psybnc.conf˙
-+msg0996=Nessuna porta/host di listening definite.˙Aggiungi:˙PSYBNC.SYSTEM.PORT1=tuaporta˙e˙PSYBNC.SYSTEM.HOST1=*˙al file psybnc.conf˙
- ; psybnc.c line 207:
- msg0997=SYSTEM
- ; psybnc.c line 212:
diff --git a/irc/psybnc/files/patch-src_match.c b/irc/psybnc/files/patch-src_match.c
deleted file mode 100644
index de4407673c75..000000000000
--- a/irc/psybnc/files/patch-src_match.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/match.c.orig	2016-06-20 14:41:27 UTC
-+++ src/match.c
-@@ -36,6 +36,7 @@
- /* Remove the next line to use this in IrcII */
- #define EGGDROP
- 
-+#include <p_global.h>
- 
- /* ===================================================================
-  * Best to leave stuff after this point alone, but go on and change
diff --git a/irc/psybnc/files/patch-src_p__blowfish.c b/irc/psybnc/files/patch-src_p__blowfish.c
deleted file mode 100644
index 610f3a2cd4c0..000000000000
--- a/irc/psybnc/files/patch-src_p__blowfish.c
+++ /dev/null
@@ -1,38 +0,0 @@
---- src/p_blowfish.c.orig	2016-06-20 14:41:27 UTC
-+++ src/p_blowfish.c
-@@ -27,16 +27,21 @@
- static char rcsid[] = "@(#)$Id: p_blowfish.c,v 1.3 2005/06/04 18:00:14 hisi Exp $";
- #endif
- 
-+#include <p_global.h>
-+/*
- #include <stdio.h>
- #include <string.h>
- #include <config.h>
- 
- char *strmncpy(char *dest, char *source, size_t len);
- char *lngtxt(int msgnum);
-+*/
- 
-+/*
- #define pcontext { strmncpy(ctxt,__FILE__,sizeof(ctxt));strmncpy(cfunc,__FUNCTION__,sizeof(cfunc)); cline=__LINE__; }
- #define pmalloc(n) __pmalloc((n),__FILE__,__FUNCTION__,__LINE__)
- #define free(n) _pfree(n,__FILE__,__FUNCTION__,__LINE__)
-+*/
- 
- unsigned char *hashstring(unsigned char *str,int len);
- unsigned char *unhashstring(unsigned char *str);
-@@ -478,10 +483,11 @@ char * BLOWencrypt(unsigned char *str)
-    char *p, *s, *dest, *d, *pt;
-    char rim[5],ep[5],rep[5];
-    int i;
--   dest = (char *) pmalloc((strlen(str) + 9) * 2);
-+   dest = __pmalloc((strlen(str) + 9) * 2, "p_blowfish.c", "BLOWencrypt", 481);
-+   dest = pmalloc((strlen(str) + 9) * 2);
-    *dest=0;
-    /* pad fake string with 8 bytes to make sure there's enough */
--   s = (char *) pmalloc(strlen(str) + 9);
-+   s =  pmalloc(strlen(str) + 9);
-    strcpy(s, str);
-    p = s;
-    while (*p)
diff --git a/irc/psybnc/files/patch-src_p__global.h b/irc/psybnc/files/patch-src_p__global.h
deleted file mode 100644
index 71b50ff458d8..000000000000
--- a/irc/psybnc/files/patch-src_p__global.h
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/p_global.h.orig	2016-06-20 14:41:27 UTC
-+++ src/p_global.h
-@@ -972,7 +972,7 @@ int checklogging(int usern);
- #endif
- 
- #ifndef P_MEMORY
--unsigned long *__pmalloc(unsigned long size,char *module,char *function,int line);
-+char *__pmalloc(unsigned long size,char *module,char *function,int line);
- void _pfree(void * pointer,char *module, char *function, int line);
- struct usert *user(int usern);
- struct newpeert *newpeer(int usern);
-@@ -1267,8 +1267,8 @@ extern char * BLOW_stringdecrypt(unsigne
- 
- #endif
- 
--#define pcontext { strmncpy(ctxt,__FILE__,sizeof(ctxt)); strmncpy(cfunc,__FUNCTION__,sizeof(cfunc)); cline=__LINE__; }
--#define pmalloc(n) __pmalloc((n),__FILE__,__FUNCTION__,__LINE__)
-+#define pcontext { strmncpy(ctxt,__FILE__,sizeof(ctxt)); strmncpy(cfunc,(char*)__FUNCTION__,sizeof(cfunc)); cline=__LINE__; }
-+#define pmalloc(n) __pmalloc((n),__FILE__,(char*)__FUNCTION__,(int)__LINE__)
- 
- #define SSLCERT "key/psybnc.cert.pem"
- #define SSLKEY "key/psybnc.key.pem"
diff --git a/irc/psybnc/files/patch-src_p__idea.c b/irc/psybnc/files/patch-src_p__idea.c
deleted file mode 100644
index 4191c9a44231..000000000000
--- a/irc/psybnc/files/patch-src_p__idea.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/p_idea.c.orig	2016-06-20 14:41:27 UTC
-+++ src/p_idea.c
-@@ -50,6 +50,9 @@ static char rcsid[] = "@(#)$Id: p_idea.c
-  * string encryption by psychoid
-  */
- 
-+
-+#include <p_global.h>
-+/*
- #include <time.h>
- #include <string.h>
- #include <stdlib.h>
-@@ -62,7 +65,7 @@ extern int cline;
- 
- #define pcontext { strmncpy(ctxt,__FILE__,sizeof(ctxt));strmncpy(cfunc,__FUNCTION__,sizeof(cfunc)); cline=__LINE__; }
- #define pmalloc(n) __pmalloc((n),__FILE__,__FUNCTION__,__LINE__)
--
-+*/
- #ifdef CRYPT
- 
- #define IDEAROUNDS 8
diff --git a/irc/psybnc/files/patch-src_p__memory.c b/irc/psybnc/files/patch-src_p__memory.c
deleted file mode 100644
index 3d29fb64f9c5..000000000000
--- a/irc/psybnc/files/patch-src_p__memory.c
+++ /dev/null
@@ -1,34 +0,0 @@
---- src/p_memory.c.orig	2016-06-20 14:41:27 UTC
-+++ src/p_memory.c
-@@ -32,10 +32,10 @@ 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)
-+char *__pmalloc(unsigned long size,char *module,char *function, int line)
- {
--    unsigned long *rc;
--    if (!(rc=(unsigned long *)malloc(size)))
-+    char *rc;
-+    if (!(rc=(char *)malloc(size)))
-     {
- 	p_log(LOG_ERROR,-1,lngtxt(602),module,function,line);
- 	exit(0x0);
-@@ -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(char *pointer, char *module, char *function, int line)
- {
- #ifdef LOGALLOC
-     if(logm==NULL)
-@@ -67,7 +67,7 @@ void _pfree(unsigned long *pointer, char
-     free(pointer);
- }
- 
--#define free(a) _pfree((void *)a,__FILE__,__FUNCTION__,__LINE__)
-+#define free(a) _pfree((void *)a,__FILE__,(char*)__FUNCTION__,__LINE__)
- 
- /* struct wrappers. Those alloc, delete and return the needed structures */
- 
diff --git a/irc/psybnc/files/patch-src_p__string.c b/irc/psybnc/files/patch-src_p__string.c
deleted file mode 100644
index deaa2623baa7..000000000000
--- a/irc/psybnc/files/patch-src_p__string.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/p_string.c.orig	2016-06-20 14:41:27 UTC
-+++ src/p_string.c
-@@ -616,7 +616,7 @@ int loadlanguage(char *langf)
-     int msg;
-     pcontext;
-     clearlanguage();
--    ap_snprintf(lfname,sizeof(lfname),"lang/%s.lng",langf);
-+    ap_snprintf(lfname,sizeof(lfname),"%s/lang/%s.lng",PSYBASE, langf);
-     maxindex=0;
-     langname[0]=0;
-     lfile=fopen(lfname,"r");
diff --git a/irc/psybnc/files/patch-src_psybnc.c b/irc/psybnc/files/patch-src_psybnc.c
deleted file mode 100644
index a4c2ef801b3d..000000000000
--- a/irc/psybnc/files/patch-src_psybnc.c
+++ /dev/null
@@ -1,47 +0,0 @@
---- src/psybnc.c.orig	2016-06-20 14:41:27 UTC
-+++ src/psybnc.c
-@@ -44,6 +44,8 @@ int slice=0;
- 
- #ifdef HAVE_SSL
- 
-+int fexists(char *fname);
-+
- void initSSL()
- {
-     SSL_load_error_strings();
-@@ -171,13 +173,17 @@ main (int argc, char **argv)
-   if(argc==2)
-   {
-       strmncpy(configfile,argv[1],sizeof(configfile));
--  } else {
-+  } else if (fexists("psybnc.conf")) {
-+  		strcpy(configfile, "psybnc.conf");
-+  } else if (fexists(PREFIX "/etc/psybnc.conf")) {
-       strcpy(configfile,"psybnc.conf");  /* rcsid */
-+  } else {
-+  		strcpy(configfile, "psybnc.conf");
-   }
-   conffile=fopen(configfile,"r");
-   if(conffile==NULL)
-   {
--     printf("Configuration File %s not found, aborting\nRun 'make menuconfig' for creating a configuration or create the file manually.\n",conffile); /* rcsid */
-+     printf("Configuration file psybnc.conf not found in current directory or in " PREFIX "/etc/psybnc.conf.\n Copy " PREFIX "/etc/psybnc.conf.sample to the current directory as psybnc.conf :\n        cp " PREFIX "/etc/psybnc.conf.sample psybnc.conf\n\nOR create the file manually.\n"); /* rcsid */
-      exit (0x0);
-   }
-   fclose(conffile);
-@@ -302,3 +308,15 @@ main (int argc, char **argv)
-   bncmain();
- }
- 
-+int fexists(char *fname)
-+{
-+    FILE *fn;
-+    int rc=0;
-+    fn=fopen(fname,"r");
-+    if(fn!=NULL)
-+    {
-+	fclose(fn);
-+	rc=1;
-+    }
-+    return rc;
-+}
diff --git a/irc/psybnc/files/patch-tools_autoconf.c b/irc/psybnc/files/patch-tools_autoconf.c
deleted file mode 100644
index bbb25ca3c206..000000000000
--- a/irc/psybnc/files/patch-tools_autoconf.c
+++ /dev/null
@@ -1,24 +0,0 @@
---- tools/autoconf.c.orig	2016-06-20 14:41:27 UTC
-+++ tools/autoconf.c
-@@ -443,9 +443,9 @@ int main()
- 	fprintf(makefile,"INCLUDE = -I./src/ -I.\n");
-     fprintf(makefile,"OBJS	= src/psybnc.o src/match.o src/p_client.o src/p_crypt.o src/p_dcc.o src/p_hash.o src/p_idea.o src/p_inifunc.o src/p_link.o src/p_log.o src/p_memory.o src/p_network.o src/p_parse.o src/p_peer.o src/p_server.o src/p_socket.o src/p_string.o src/p_sysmsg.o src/p_userfile.o src/p_uchannel.o src/p_script.o src/p_topology.o src/p_intnet.o src/p_blowfish.o src/p_translate.o src/p_coredns.o src/snprintf.o %s\n",env);
-     if(provi==0)
--	fprintf(makefile,"DEFINE	= -DHAVE_CONFIG %s%s%s%s%s%s\n",sunosopt,bigopt,ipv6opt,timeopt,sslopt,dnsopt);
-+	fprintf(makefile,"DEFINE	= -DHAVE_CONFIG %s%s%s%s%s%s -DPSYBASE=\\\"%s\\\" -DPREFIX=\\\"%s\\\"\n",sunosopt,bigopt,ipv6opt,timeopt,sslopt,dnsopt, PSYBASE, PREFIX);
-     else
--	fprintf(makefile,"DEFINE	= -DHAVE_PROV_CONFIG %s%s%s%s%s%s\n",sunosopt,bigopt,ipv6opt,timeopt,sslopt,dnsopt);
-+	fprintf(makefile,"DEFINE	= -DHAVE_PROV_CONFIG %s%s%s%s%s%s -DPSYBASE=\\\"%s\\\" -DPREFIX=\\\"%s\\\"\n",sunosopt,bigopt,ipv6opt,timeopt,sslopt,dnsopt, PSYBASE, PREFIX);
-     fprintf(makefile,"TARGET	= psybnc\n");
-     fprintf(makefile,"\n");
-     fprintf(makefile,"all:	$(OBJS)\n");
-@@ -453,7 +453,8 @@ int main()
-     fprintf(makefile,"	@strip $(TARGET)\n");
-     if(ssl==0)
-     {
--	if(!fexists("key/psybnc.cert.pem")) /* only create, if not exist */
-+	if(!fexists(PSYBASE "/key/psybnc.cert.pem") && 
-+		!fexists("key/psybnc.cert.pem")) /* only create, if not exist */
- 	{
- 	    mkdir("key",0700);
- 	    fprintf(makefile,"	@echo \"*** GENERATING SSL-KEYS FROM CERTIFICATE **\"\n");
diff --git a/irc/psybnc/files/pkg-message.in b/irc/psybnc/files/pkg-message.in
deleted file mode 100644
index 26c0128bf74d..000000000000
--- a/irc/psybnc/files/pkg-message.in
+++ /dev/null
@@ -1,16 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-If you have not created SSL certificates for psybnc already, do so using the
-following commands:
-
-cd %%PSYBASE%%
-/usr/bin/openssl req -new -config key/ssl.cnf -out key/psybnc.req.pem \
-        -keyout key/psybnc.key.pem -nodes
-/usr/bin/openssl req -x509 -days 365 -in key/psybnc.req.pem \
-        -key key/psybnc.key.pem -out key/psybnc.cert.pem
-/usr/bin/openssl x509 -subject -dates -fingerprint -noout \
-        -in key/psybnc.cert.pem
-EOM
-}
-]