8 files changed, 157 insertions, 0 deletions

diff --git a/irc/psybnc/files/patch-aa b/irc/psybnc/files/patch-aa
new file mode 100644
index 000000000000..85e3a71c6aed
--- /dev/null
+++ b/irc/psybnc/files/patch-aa
@@ -0,0 +1,29 @@
+--- ./Makefile	Sun Jul  7 18:09:25 2002
++++ ../../psybnc.mina/Makefile	Sun Nov 24 19:41:57 2002
+@@ -7,7 +7,7 @@
+ 	@$(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 @@
+ 	@$(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 @@
+ 	@$(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-ab b/irc/psybnc/files/patch-ab
new file mode 100644
index 000000000000..67225e322250
--- /dev/null
+++ b/irc/psybnc/files/patch-ab
@@ -0,0 +1,11 @@
+--- ./lang/english.lng	Sat Jun  1 18:07:47 2002
++++ ../../psybnc.mina/lang/english.lng	Sun Nov 24 19:14:01 2002
+@@ -1998,7 +1998,7 @@
+ ; 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-ac b/irc/psybnc/files/patch-ac
new file mode 100644
index 000000000000..8f19c8cb4808
--- /dev/null
+++ b/irc/psybnc/files/patch-ac
@@ -0,0 +1,11 @@
+--- ./lang/german.lng	Sat Jun  1 18:08:01 2002
++++ ../../psybnc.mina/lang/german.lng	Sun Nov 24 19:14:22 2002
+@@ -2003,7 +2003,7 @@
+ ; 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-ad b/irc/psybnc/files/patch-ad
new file mode 100644
index 000000000000..8b26de115606
--- /dev/null
+++ b/irc/psybnc/files/patch-ad
@@ -0,0 +1,11 @@
+--- ./lang/italiano.lng	Sat Jun  1 18:08:25 2002
++++ ../../psybnc.mina/lang/italiano.lng	Sun Nov 24 19:14:44 2002
+@@ -1998,7 +1998,7 @@
+ ; 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-ae b/irc/psybnc/files/patch-ae
new file mode 100644
index 000000000000..5138e6cbb9e4
--- /dev/null
+++ b/irc/psybnc/files/patch-ae
@@ -0,0 +1,13 @@
+--- ./src/p_global.h	Sun Jul  7 08:07:23 2002
++++ ../../psybnc.mina/src/p_global.h	Sun Nov 24 18:20:55 2002
+@@ -1264,8 +1264,8 @@
+ #define pcontext { strmncpy(ctxt,__FILE__,sizeof(ctxt)); strmncpy(cfunc,__FUNCTION__,sizeof(cfunc)); cline=__LINE__; }
+ #define pmalloc(n) __pmalloc((n),__FILE__,__FUNCTION__,__LINE__)
+ 
+-#define SSLCERT "key/psybnc.cert.pem"
+-#define SSLKEY "key/psybnc.key.pem"
++#define SSLCERT PSYBASE "/key/psybnc.cert.pem"
++#define SSLKEY PSYBASE "/key/psybnc.key.pem"
+ 
+ #ifdef HAVE_SSL
+ #ifndef SSLSEC
diff --git a/irc/psybnc/files/patch-af b/irc/psybnc/files/patch-af
new file mode 100644
index 000000000000..94851f48e29a
--- /dev/null
+++ b/irc/psybnc/files/patch-af
@@ -0,0 +1,12 @@
+ #ifndef SSLSEC
+--- ./src/p_string.c	Fri Jul 19 09:01:52 2002
++++ ../../psybnc.mina/src/p_string.c	Sun Nov 24 17:58:56 2002
+@@ -613,7 +613,7 @@
+     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-ag b/irc/psybnc/files/patch-ag
new file mode 100644
index 000000000000..07c3209c5d86
--- /dev/null
+++ b/irc/psybnc/files/patch-ag
@@ -0,0 +1,47 @@
+--- ./src/psybnc.c	Wed Jul 24 17:19:05 2002
++++ ../../psybnc.mina/src/psybnc.c	Sun Nov 24 19:54:52 2002
+@@ -43,6 +43,8 @@
+ 
+ #ifdef HAVE_SSL
+ 
++int fexists(char *fname);
++
+ void initSSL()
+ {
+     SSL_load_error_strings();
+@@ -170,13 +172,17 @@
+   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);
+@@ -301,3 +307,15 @@
+   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-ah b/irc/psybnc/files/patch-ah
new file mode 100644
index 000000000000..b93ae35f9bc5
--- /dev/null
+++ b/irc/psybnc/files/patch-ah
@@ -0,0 +1,23 @@
+--- ./tools/autoconf.c	Fri May 17 13:21:08 2002
++++ ../../psybnc.mina/tools/autoconf.c	Sun Nov 24 19:43:42 2002
+@@ -442,9 +442,9 @@
+ 	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");
+@@ -452,7 +452,7 @@
+     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")) /* only create, if not exist */
+ 	{
+ 	    mkdir("key",0700);
+ 	    fprintf(makefile,"	@echo \"*** GENERATING SSL-KEYS FROM CERTIFICATE **\"\n");