add psybnc package (thanks to Peter Feuerer)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@2355 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 files changed, 252 insertions, 0 deletions

diff --git a/openwrt/package/Config.in b/openwrt/package/Config.in
index 90847fd27f..7d1e83d560 100644
--- a/openwrt/package/Config.in
+++ b/openwrt/package/Config.in
@@ -25,6 +25,7 @@ source "package/nano/Config.in"
 source "package/osiris/Config.in"
 source "package/php4/Config.in"
 source "package/php5/Config.in"
+source "package/psybnc/Config.in"
 menu "sablevm........................... A Java Virtual Machine (JVM) implementation"
 source "package/sablevm/Config.in"
 source "package/sablevm-classpath/Config.in"
diff --git a/openwrt/package/Makefile b/openwrt/package/Makefile
index 9b5fe61e98..01e09097c4 100644
--- a/openwrt/package/Makefile
+++ b/openwrt/package/Makefile
@@ -150,6 +150,7 @@ package-$(BR2_COMPILE_POSTGRESQL) += postgresql
 package-$(BR2_PACKAGE_PPP) += ppp
 package-$(BR2_PACKAGE_PPTP) += pptp
 package-$(BR2_PACKAGE_PPTPD) += pptpd
+package-$(BR2_PACKAGE_PSYBNC) += psybnc
 package-$(BR2_PACKAGE_QUAGGA) += quagga
 package-$(BR2_PACKAGE_RADVD) += radvd
 package-$(BR2_PACKAGE_RARPD) += rarpd
diff --git a/openwrt/package/psybnc/Config.in b/openwrt/package/psybnc/Config.in
new file mode 100644
index 0000000000..6c76b68e1e
--- /dev/null
+++ b/openwrt/package/psybnc/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_PSYBNC
+	prompt "psybnc............................ An IRC-Bouncer with many features"
+	tristate
+	default m if CONFIG_DEVEL
+	help
+	  psyBNC is an easy-to-use, multi-user, permanent 
+	  IRC-Bouncer with many features. Some of its features
+	  vhost- and relay support to connected bouncers and an 
+	  extensive online help system. Many other helpful 
+	  functions are included.
+	  
+	  http://www.psybnc.info/
+
diff --git a/openwrt/package/psybnc/Makefile b/openwrt/package/psybnc/Makefile
new file mode 100644
index 0000000000..f48a191740
--- /dev/null
+++ b/openwrt/package/psybnc/Makefile
@@ -0,0 +1,39 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=psybnc
+PKG_VERSION:=2.3.2-7
+PKG_RELEASE:=1
+PKG_MD5SUM:=4b893a92f914813450e0921b2894ad6c
+
+PKG_SOURCE_URL:=http://www.psybnc.info/download/beta/
+PKG_SOURCE:=psyBNC-$(PKG_VERSION).tar.gz
+PKG_CAT:=zcat
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
+
+include $(TOPDIR)/package/rules.mk
+
+$(eval $(call PKG_template,PSYBNC,psybnc,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+
+$(PKG_BUILD_DIR)/.built:
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		CC="$(TARGET_CC)" \
+		CFLAGS="$(TARGET_CFLAGS)" \
+		HOSTCC="$(HOSTCC)" \
+		all
+	touch $@
+
+$(IPKG_PSYBNC): 
+	install -d -m0755 $(IDIR_PSYBNC)/usr/share/psybnc/lang/
+	install -d -m0755 $(IDIR_PSYBNC)/usr/share/psybnc/log/
+	install -d -m0755 $(IDIR_PSYBNC)/usr/sbin/
+	install -m0755 $(PKG_BUILD_DIR)/psybnc $(IDIR_PSYBNC)/usr/share/psybnc/
+	install -m0600 $(PKG_BUILD_DIR)/psybnc.conf $(IDIR_PSYBNC)/usr/share/psybnc/
+	install -m0644 $(PKG_BUILD_DIR)/lang/english.lng $(IDIR_PSYBNC)/usr/share/psybnc/lang/
+	install -m0755 $(PKG_BUILD_DIR)/psybnc.sh $(IDIR_PSYBNC)/usr/sbin/psybnc
+	$(RSTRIP) $(IDIR_PSYBNC)
+	$(IPKG_BUILD) $(IDIR_PSYBNC) $(PACKAGE_DIR)
+
+mostlyclean:
+	-$(MAKE) -C $(PKG_BUILD_DIR) clean
+	rm -f $(PKG_BUILD_DIR)/.built
diff --git a/openwrt/package/psybnc/ipkg/psybnc.control b/openwrt/package/psybnc/ipkg/psybnc.control
new file mode 100644
index 0000000000..92e92ce7cf
--- /dev/null
+++ b/openwrt/package/psybnc/ipkg/psybnc.control
@@ -0,0 +1,4 @@
+Package: psybnc
+Priority: optional
+Section: net
+Description: IRC-Bouncer with many features
diff --git a/openwrt/package/psybnc/patches/Makefile.patch b/openwrt/package/psybnc/patches/Makefile.patch
new file mode 100644
index 0000000000..2db956072c
--- /dev/null
+++ b/openwrt/package/psybnc/patches/Makefile.patch
@@ -0,0 +1,59 @@
+--- psybnc/Makefile	2005-06-04 20:22:45.000000000 +0200
++++ psybnc_patched/Makefile	2005-11-04 11:50:28.879157626 +0100
+@@ -1,16 +1,16 @@
+-CC	= gcc
++HOSTCC	= gcc
+ CCFLAGS = 
+ 
+ all:	$(OBJS)
+ 	@echo Initializing bouncer compilation
+ 	@echo [*] Running Conversion Tool for older psyBNC Data.
+-	@$(CC) tools/convconf.c -o tools/convconf
++	@$(HOSTCC) tools/convconf.c -o tools/convconf
+ 	@tools/convconf
+ 	@echo [*] Running Autoconfig.
+-	@$(CC) -I. tools/autoconf.c -o tools/autoconf
++	@$(HOSTCC) -I. tools/autoconf.c -o tools/autoconf
+ 	@tools/autoconf
+ 	@echo [*] Compiling MakeSalt for Encryption..
+-	@$(CC) -I. -o makesalt tools/makesalt.c
++	@$(HOSTCC) -I. -o makesalt tools/makesalt.c
+ 	@./makesalt
+ 	@echo [*] Compiling Bouncer..
+ 	@make -f makefile.out
+@@ -20,14 +20,14 @@
+ menuconfig:
+ 	@echo Initializing Menu-Configuration
+ 	@echo [*] Running Conversion Tool for older psyBNC Data.
+-	@$(CC) tools/convconf.c -o tools/convconf
++	@$(HOSTCC) tools/convconf.c -o tools/convconf
+ 	@tools/convconf
+ 	@echo [*] Running Autoconfig.
+-	@$(CC) -I. tools/autoconf.c -o tools/autoconf
++	@$(HOSTCC) -I. tools/autoconf.c -o tools/autoconf
+ 	@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.
+-	@$(CC) menuconf/menuconf.c menuconf/inputbox.c menuconf/util.c menuconf/checklist.c menuconf/menubox.c menuconf/textbox.c src/snprintf.c -I. -lncurses -lm -o menuconf/menuconf 2>/dev/null
++	@$(HOSTCC) menuconf/menuconf.c menuconf/inputbox.c menuconf/util.c menuconf/checklist.c menuconf/menubox.c menuconf/textbox.c src/snprintf.c -I. -lncurses -lm -o menuconf/menuconf 2>/dev/null
+ 	@menuconf/menuconf
+ 	@clear
+ 	@echo Now compile psyBNC using make, if not yet compiled, or if Options were changed.
+@@ -36,14 +36,14 @@
+ menuconfig-curses:
+ 	@echo Initializing Menu-Configuration using Curses
+ 	@echo [*] Running Conversion Tool for older psyBNC Data.
+-	@$(CC) tools/convconf.c -o tools/convconf
++	@$(HOSTCC) tools/convconf.c -o tools/convconf
+ 	@tools/convconf
+ 	@echo [*] Running Autoconfig.
+-	@$(CC) -I. tools/autoconf.c -o tools/autoconf
++	@$(HOSTCC) -I. tools/autoconf.c -o tools/autoconf
+ 	@tools/autoconf
+ 	@echo [*] Creating Menu, please wait.
+ 	@echo This needs the 'curses' library. If it is not available, menuconf wont work.
+-	@$(CC) menuconf/menuconf.c menuconf/inputbox.c menuconf/util.c menuconf/checklist.c menuconf/menubox.c menuconf/textbox.c src/snprintf.c -DNONCURSES -I. -lcurses -lm -o menuconf/menuconf 2>/dev/null
++	@$(HOSTCC) menuconf/menuconf.c menuconf/inputbox.c menuconf/util.c menuconf/checklist.c menuconf/menubox.c menuconf/textbox.c src/snprintf.c -DNONCURSES -I. -lcurses -lm -o menuconf/menuconf 2>/dev/null
+ 	@menuconf/menuconf
+ 	@clear
+ 	@echo Now compile psyBNC using make, if not yet compiled, or if Options were changed.
diff --git a/openwrt/package/psybnc/patches/psybnc.conf.patch b/openwrt/package/psybnc/patches/psybnc.conf.patch
new file mode 100644
index 0000000000..98e9ad5a9b
--- /dev/null
+++ b/openwrt/package/psybnc/patches/psybnc.conf.patch
@@ -0,0 +1,14 @@
+diff -Naur psybnc/psybnc.conf psybnc_finish/psybnc.conf
+--- psybnc/psybnc.conf	1970-01-01 01:00:00.000000000 +0100
++++ psybnc_finish/psybnc.conf	2005-11-03 18:27:44.726264185 +0100
+@@ -0,0 +1,10 @@
++PSYBNC.SYSTEM.PORT1=50001
++PSYBNC.SYSTEM.ME=psybnc_mipsel
++PSYBNC.SYSTEM.HOST1=*
++PSYBNC.HOSTALLOWS.ENTRY0=*;*
++USER1.USER.NICK=change_me
++USER1.USER.USER=psybnc_admin
++USER1.USER.PASS=change_me
++USER1.USER.RIGHTS=1
++USER1.USER.VLINK=0
++USER1.USER.LOGIN=psybnc_admin
diff --git a/openwrt/package/psybnc/patches/psybnc.patch b/openwrt/package/psybnc/patches/psybnc.patch
new file mode 100644
index 0000000000..32f2165ea0
--- /dev/null
+++ b/openwrt/package/psybnc/patches/psybnc.patch
@@ -0,0 +1,105 @@
+diff -ur psybnc/config.h psybnc_finish/config.h
+--- psybnc/config.h	2005-06-04 20:22:45.000000000 +0200
++++ psybnc_finish/config.h	2005-11-03 17:05:40.802998216 +0100
+@@ -1,40 +1,7 @@
+-/* $Id: config.h,v 1.2 2005/06/04 18:05:33 hisi Exp $ */
+ /*
+  * 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
+@@ -47,28 +14,27 @@
+ 
+ #define MAXCONN 99
+ 
+-/* Allow the usage of scripts */
++/* Use blocking DNS */
+ 
+-#define SCRIPTING
++#define BLOCKDNS
+ 
+ /* Allow multiple irc connections per user */
+ 
+ #define NETWORK
+ 
+-/* Allow Proxy Support */
++/* The logging level */
+ 
+-#define PROXYS
++#define LOGLEVEL 2
+ 
+-/* The logging level */
++/* The ctcp Version reply */
+ 
+-#define LOGLEVEL 0
++#define CTCPVERSION "psyBNC 2.3.2-7 running on mipsel, ported by piie visit www.linuX-gamers.net"
+ 
+-/* SSL-Security */
++/* The Path to SSL */
+ 
+-#define SSLSEC 2
++#define SSLPATH "/tmp/"
+ 
+-/* Blocking DNS is preferred. Non Blocking DNS is experimental */
++/* SSL-Security */
++
++#define SSLSEC 0
+ 
+-#ifndef BLOCKDNS
+-#define BLOCKDNS
+-#endif
+diff -ur psybnc/tools/autoconf.c psybnc_finish/tools/autoconf.c
+--- psybnc/tools/autoconf.c	2005-06-04 20:22:45.000000000 +0200
++++ psybnc_finish/tools/autoconf.c	2005-10-29 14:46:49.000000000 +0200
+@@ -425,7 +425,7 @@
+ 	printf("Can't create makefile.out .. aborting\n");
+ 	exit(0x1);
+     }
+-    fprintf(makefile,"CC	= gcc\n");
++    fprintf(makefile,"CC	= mipsel-linux-gcc\n");
+     fprintf(makefile,"SRC	= src/\n");
+ #ifdef BOUNDCHECK
+     fprintf(makefile,"CFLAGS  = -O -fbounds-checking -fno-builtin\n");
+@@ -450,7 +450,7 @@
+     fprintf(makefile,"\n");
+     fprintf(makefile,"all:	$(OBJS)\n");
+     fprintf(makefile,"	$(CC) -o $(TARGET) $(CFLAGS) $(OBJS) $(LIBS)\n");
+-    fprintf(makefile,"	@strip $(TARGET)\n");
++    /*fprintf(makefile,"	@strip $(TARGET)\n");*/
+     if(ssl==0)
+     {
+ 	if(!fexists("key/psybnc.cert.pem")) /* only create, if not exist */
diff --git a/openwrt/package/psybnc/patches/startscript.patch b/openwrt/package/psybnc/patches/startscript.patch
new file mode 100644
index 0000000000..635213db7b
--- /dev/null
+++ b/openwrt/package/psybnc/patches/startscript.patch
@@ -0,0 +1,16 @@
+diff -Naur psybnc/psybnc.sh psybnc_patched/psybnc.sh
+--- psybnc/psybnc.sh	1970-01-01 01:00:00.000000000 +0100
++++ psybnc_finish/psybnc.sh	2005-11-04 12:51:26.478557377 +0100
+@@ -0,0 +1,12 @@
++#!/bin/sh
++
++PDIR=$(pwd);
++cd /usr/share/psybnc;
++./psybnc "$@";
++cd "$PDIR";
++
++echo;
++echo;
++echo "Configuration is located at /usr/share/psybnc/psybnc.conf";
++echo "everything can be configured within your chatclient,";
++echo "after logging in as psybnc_admin ( /bhelp shows bnc help )";