From 0638c67e640126d533e6c4427b553173b6c43d62 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <mail@waldemar-brodkorb.de>
Date: Tue, 31 Jan 2006 20:54:00 +0000
Subject: [PATCH] remove ser

SVN-Revision: 3100
---
 openwrt/Config.in.devel                       |   1 -
 openwrt/package/ser/Config.in                 |  10 --
 openwrt/package/ser/Makefile                  |  49 -------
 openwrt/package/ser/ipkg/ser.control          |   6 -
 openwrt/package/ser/patches/100-sc.patch      |  54 --------
 openwrt/package/ser/patches/110-locking.patch |  11 --
 openwrt/package/ser/patches/120-main.patch    |  26 ----
 .../package/ser/patches/200-no_libfl.patch    |  79 ------------
 .../ser/patches/210-runtime_paths.patch       | 122 ------------------
 .../ser/patches/220-default_config.patch      |  21 ---
 10 files changed, 379 deletions(-)
 delete mode 100644 openwrt/package/ser/Config.in
 delete mode 100644 openwrt/package/ser/Makefile
 delete mode 100644 openwrt/package/ser/ipkg/ser.control
 delete mode 100644 openwrt/package/ser/patches/100-sc.patch
 delete mode 100644 openwrt/package/ser/patches/110-locking.patch
 delete mode 100644 openwrt/package/ser/patches/120-main.patch
 delete mode 100644 openwrt/package/ser/patches/200-no_libfl.patch
 delete mode 100644 openwrt/package/ser/patches/210-runtime_paths.patch
 delete mode 100644 openwrt/package/ser/patches/220-default_config.patch

diff --git a/openwrt/Config.in.devel b/openwrt/Config.in.devel
index f271f302fb..8e382f6399 100644
--- a/openwrt/Config.in.devel
+++ b/openwrt/Config.in.devel
@@ -59,7 +59,6 @@ config BR2_sparc
 	tristate
 
 endif
-endchoice
 
 config BR2_ARCH
 	string
diff --git a/openwrt/package/ser/Config.in b/openwrt/package/ser/Config.in
deleted file mode 100644
index 21dccb7e7a..0000000000
--- a/openwrt/package/ser/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config BR2_PACKAGE_SER
-	prompt "ser............................... SIP Express Router"
-	tristate
-	default m if CONFIG_DEVEL
-	help
-	  SIP Express Router (ser) is a high-performance,
-	  configurable, free SIP server.
-	  
-	  http://www.iptel.org/ser/
-
diff --git a/openwrt/package/ser/Makefile b/openwrt/package/ser/Makefile
deleted file mode 100644
index 0457996951..0000000000
--- a/openwrt/package/ser/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id$
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=ser
-PKG_VERSION:=0.8.14
-PKG_RELEASE:=1
-PKG_MD5SUM:=3e2e12c8dfbd7dad9199304093de0838
-
-PKG_SOURCE_URL:=ftp://ftp.berlios.de/pub/ser/$(PKG_VERSION)/src
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_src.tar.gz
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_CAT:=zcat
-
-include $(TOPDIR)/package/rules.mk
-
-$(eval $(call PKG_template,SER,ser,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-
-SER_MODULES := sl tm rr maxfwd usrloc registrar dbtext textops nathelper
-
-SER_MODULE_FILES := $(foreach module,$(SER_MODULES),modules/$(module)/$(module).so)
-SER_MODULES := $(patsubst %,modules/%,$(SER_MODULES))
-
-$(PKG_BUILD_DIR)/.configured:
-	touch $@
-
-$(PKG_BUILD_DIR)/.built:
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		extra_defs="-DUSE_PTHREAD_MUTEX "  \
-		CC="$(TARGET_CC)" \
-		ARCH="$(ARCH)" \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		modules all
-	touch $@
-
-$(IPKG_SER):
-	mkdir -p $(IDIR_SER)/usr/sbin
-	cp -a $(PKG_BUILD_DIR)/$(PKG_NAME) $(IDIR_SER)/usr/sbin/
-	-$(STRIP) $(IDIR_SER)/usr/sbin/*
-	cp -a $(PKG_BUILD_DIR)/scripts/sc $(IDIR_SER)/usr/sbin/serctl
-	mkdir -p $(IDIR_SER)/usr/lib/ser/modules
-	(cd $(PKG_BUILD_DIR);\
-		cp -a $(SER_MODULE_FILES) $(IDIR_SER)/usr/lib/ser/modules/; \
-	)
-	$(STRIP) $(IDIR_SER)/usr/lib/ser/modules/*
-	mkdir -p $(IDIR_SER)/etc/ser
-	cp -a $(PKG_BUILD_DIR)/etc/ser.cfg $(IDIR_SER)/etc/ser/
-	$(IPKG_BUILD) $(IDIR_SER) $(PACKAGE_DIR)
-
diff --git a/openwrt/package/ser/ipkg/ser.control b/openwrt/package/ser/ipkg/ser.control
deleted file mode 100644
index 63216a7d65..0000000000
--- a/openwrt/package/ser/ipkg/ser.control
+++ /dev/null
@@ -1,6 +0,0 @@
-Package: ser
-Priority: optional
-Section: net
-Description: SIP Express Router
- SIP Express Router (ser) is a high-performance,
- configurable, free SIP server.
diff --git a/openwrt/package/ser/patches/100-sc.patch b/openwrt/package/ser/patches/100-sc.patch
deleted file mode 100644
index 25ecb9b965..0000000000
--- a/openwrt/package/ser/patches/100-sc.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- ser-0.8.14.orig/scripts/sc	2004-07-27 11:41:40.000000000 +0200
-+++ ser-0.8.14/scripts/sc	2005-02-07 23:10:30.000000000 +0100
-@@ -19,7 +19,7 @@
- # configuration for starting/stopping ser
- PID_FILE=/var/run/ser.pid
- SYSLOG=1 # 0=output to console, 1=output to syslog
--STARTOPTIONS= # for example -dddd
-+STARTOPTIONS="-m 5"
- 
- # ser's FIFO server
- if [ -z "$SER_FIFO" ]; then
-@@ -338,11 +338,7 @@
- 			if [ $# -eq 2 ] ; then
- 				fifo_cmd ul_show_contact $UL_TABLE $2
- 			elif [ $# -eq 1 ] ; then
--				printf "Dumping all contacts may take long: are you sure you want to proceed? [Y|N] "
--				read answer
--				if [ "$answer" = "y" -o "$answer" = "Y" ] ; then
--					fifo_cmd ul_dump
--				fi
-+			        fifo_cmd ul_dump
- 			else
- 				echo "wrong number of params for usrloc show"
- 				usage
-@@ -590,7 +586,7 @@
- case $1 in
- 
- 	start)
--		DIR=`dirname $0`
-+		DIR=/usr/sbin
- 		echo
- 		printf "Starting SER : "
- 		if [ -r $PID_FILE ] ; then
-@@ -612,6 +608,7 @@
- 		printf "Stopping SER : "
- 		if [ -r $PID_FILE ] ; then
- 			kill `cat $PID_FILE`
-+                        rm $PID_FILE
- 			echo "stopped"
- 		else
- 			echo No PID file found!
-@@ -621,10 +618,11 @@
- 	;;
- 
- 	restart)
--	        DIR=`dirname $0`
-+	        DIR=/usr/sbin
- 		printf "Stopping SER : "
- 		if [ -r $PID_FILE ] ; then
- 			kill `cat $PID_FILE`
-+                        rm $PID_FILE
- 			echo "stopped"
- 		else
- 			echo No PID file found! SER problably not running
diff --git a/openwrt/package/ser/patches/110-locking.patch b/openwrt/package/ser/patches/110-locking.patch
deleted file mode 100644
index 196f71441e..0000000000
--- a/openwrt/package/ser/patches/110-locking.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ser-0.8.14.orig/locking.h	2004-07-27 01:18:35.000000000 +0200
-+++ ser-0.8.14/locking.h	2004-12-26 15:39:03.000000000 +0100
-@@ -67,6 +67,8 @@
- #define _locking_h
- 
- /* the order is important */
-+#include <errno.h>
-+#include "dprint.h"
- #include "lock_ops.h"
- #include "lock_alloc.h" 
- 
diff --git a/openwrt/package/ser/patches/120-main.patch b/openwrt/package/ser/patches/120-main.patch
deleted file mode 100644
index eacd0cc23c..0000000000
--- a/openwrt/package/ser/patches/120-main.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- ser-0.8.14.orig/main.c	2004-06-28 17:41:21.000000000 +0200
-+++ ser-0.8.14/main.c	2005-01-07 23:24:27.000000000 +0100
-@@ -1447,18 +1447,20 @@
- 	/* seed the prng */
- 	/* try to use /dev/random if possible */
- 	seed=0;
-+/* this read call is blocking on OpenWRT, further investigations are necessary
- 	if ((rfd=open("/dev/random", O_RDONLY))!=-1){
- try_again:
- 		if (read(rfd, (void*)&seed, sizeof(seed))==-1){
--			if (errno==EINTR) goto try_again; /* interrupted by signal */
-+			if (errno==EINTR) goto try_again; 
- 			LOG(L_WARN, "WARNING: could not read from /dev/random (%d)\n",
- 						errno);
- 		}
- 		DBG("read %u from /dev/random\n", seed);
- 			close(rfd);
- 	}else{
--		LOG(L_WARN, "WARNING: could not open /dev/random (%d)\n", errno);
--	}
-+*/
-+		LOG(L_WARN, "WARNING: could not read from /dev/random (%d)\n", errno);
-+//	}
- 	seed+=getpid()+time(0);
- 	DBG("seeding PRNG with %u\n", seed);
- 	srand(seed);
diff --git a/openwrt/package/ser/patches/200-no_libfl.patch b/openwrt/package/ser/patches/200-no_libfl.patch
deleted file mode 100644
index 93533aba7b..0000000000
--- a/openwrt/package/ser/patches/200-no_libfl.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-Binary files ser-0.8.14.old/.cfg.lex.swp and ser-0.8.14.dev/.cfg.lex.swp differ
-diff -urN ser-0.8.14.old/Makefile.defs ser-0.8.14.dev/Makefile.defs
---- ser-0.8.14.old/Makefile.defs	2004-07-27 13:38:33.000000000 +0200
-+++ ser-0.8.14.dev/Makefile.defs	2005-05-01 01:18:12.000000000 +0200
-@@ -660,7 +660,7 @@
- endif
- YACC_FLAGS=-d -b cfg
- # on solaris add -lxnet (e.g. LIBS= -lxnet)
--LIBS= -lfl -ldl -lresolv
-+LIBS=  -ldl -lresolv
- 
- 
- #os specific stuff
-@@ -695,7 +695,7 @@
- ifeq ($(CC_NAME), suncc)
- 	LIBS= -lfast -ldl -lresolv
- endif
--	LIBS+= -L/usr/local/lib -lfl -lxnet -lrt -lnsl 
-+	LIBS+= -L/usr/local/lib  -lxnet -lrt -lnsl 
- 	# -lrt needed for sched_yield
- endif
- 
-@@ -705,9 +705,9 @@
- 	ifneq ($(found_lock_method), yes)
- 		DEFS+= -DUSE_PTHREAD_MUTEX  # try pthread sems
- 		found_lock_method=yes
--		LIBS= -pthread -lfl  #dlopen is in libc
-+		LIBS= -pthread   #dlopen is in libc
- 	else
--		LIBS= -lfl  #dlopen is in libc
-+		LIBS=   #dlopen is in libc
- 	endif
- 	YACC=yacc
- endif
-@@ -722,7 +722,7 @@
- 	# (symbols on openbsd are prefixed by "_")
- 	YACC=yacc
- 	# no sched_yield on openbsd unless linking with c_r (not recommended)
--	LIBS= -lfl 
-+	LIBS=  
- 	OPENBSD_IS_AOUT= $(shell echo "$(OSREL)" | \
- 				sed -e 's/^3\.[0-3][^0-9]*$$/yes/' |sed -e 's/^[0-2]\..*/yes/')
- 	
-@@ -740,7 +740,7 @@
- 		found_lock_method=yes
- 	endif
- 	YACC=yacc
--	LIBS= -lfl 
-+	LIBS=  
- endif
- 
- # OS X support, same as freebsd
-@@ -754,9 +754,9 @@
- 	ifneq ($(found_lock_method), yes)
- 		DEFS+= -DUSE_PTHREAD_MUTEX  # try pthread sems
- 		found_lock_method=yes
--		LIBS= -pthread -lfl -lresolv  #dlopen is in libc
-+		LIBS= -pthread  -lresolv  #dlopen is in libc
- 	else
--		LIBS= -lfl -lresolv  #dlopen is in libc
-+		LIBS=  -lresolv  #dlopen is in libc
- 	endif
- 	LDFLAGS=        # darwin doesn't like -O2 or -E
- 	MOD_LDFLAGS= -bundle -bundle_loader ../../$(MAIN_NAME)
-diff -urN ser-0.8.14.old/cfg.lex ser-0.8.14.dev/cfg.lex
---- ser-0.8.14.old/cfg.lex	2004-02-12 17:17:48.000000000 +0100
-+++ ser-0.8.14.dev/cfg.lex	2005-05-01 01:23:03.000000000 +0200
-@@ -71,7 +71,10 @@
- 
- 	static char* addstr(char*, char**);
- 	static void count();
--
-+	int yywrap(void)
-+	{
-+		return 1;
-+	}
- 
- %}
- 
diff --git a/openwrt/package/ser/patches/210-runtime_paths.patch b/openwrt/package/ser/patches/210-runtime_paths.patch
deleted file mode 100644
index 5d30e118cd..0000000000
--- a/openwrt/package/ser/patches/210-runtime_paths.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-diff -urN ser-0.8.14.old/Makefile ser-0.8.14.dev/Makefile
---- ser-0.8.14.old/Makefile	2004-07-27 01:18:34.000000000 +0200
-+++ ser-0.8.14.dev/Makefile	2005-05-01 01:29:25.000000000 +0200
-@@ -194,8 +194,8 @@
- # binary dist. tar.gz
- .PHONY: bin
- bin:
--	mkdir -p tmp/ser/usr/local
--	$(MAKE) install basedir=tmp/ser prefix=/usr/local 
-+	mkdir -p tmp/ser/usr
-+	$(MAKE) install basedir=tmp/ser prefix=/usr 
- 	$(TAR) -C tmp/ser/ -zcf ../$(NAME)-$(RELEASE)_$(OS)_$(ARCH).tar.gz .
- 	rm -rf tmp/ser
- 
-@@ -207,9 +207,9 @@
- sunpkg:
- 	mkdir -p tmp/ser
- 	mkdir -p tmp/ser_sun_pkg
--	$(MAKE) install basedir=tmp/ser prefix=/usr/local
-+	$(MAKE) install basedir=tmp/ser prefix=/usr
- 	(cd solaris; \
--	pkgmk -r ../tmp/ser/usr/local -o -d ../tmp/ser_sun_pkg/ -v "$(RELEASE)" ;\
-+	pkgmk -r ../tmp/ser/usr -o -d ../tmp/ser_sun_pkg/ -v "$(RELEASE)" ;\
- 	cd ..)
- 	cat /dev/null > ../$(NAME)-$(RELEASE)-$(OS)-$(ARCH)-local
- 	pkgtrans -s tmp/ser_sun_pkg/ ../$(NAME)-$(RELEASE)-$(OS)-$(ARCH)-local \
-diff -urN ser-0.8.14.old/Makefile.defs ser-0.8.14.dev/Makefile.defs
---- ser-0.8.14.old/Makefile.defs	2005-05-01 01:18:12.000000000 +0200
-+++ ser-0.8.14.dev/Makefile.defs	2005-05-01 01:42:55.000000000 +0200
-@@ -64,20 +64,20 @@
- # extra CC command line options (e.g  -march=athlon-mp)
- CC_EXTRA_OPTS ?=
-  # install location
--DESTDIR ?= /usr/local
-+DESTDIR ?= /usr
- PREFIX ?= $(DESTDIR)
--LOCALBASE ?= /usr/local
-+LOCALBASE ?= /usr
- prefix = $(PREFIX)
- # install path is $(basedir) $(prefix) 
- # example:
--#  creating a bin. archive in /tmp, which unpacks in /usr/local
-+#  creating a bin. archive in /tmp, which unpacks in /usr
- #  basedir=/tmp
--#  prefix=/usr/local
-+#  prefix=/usr
- 
- BASEDIR ?=
- basedir = $(BASEDIR)
- # install prefixes for various stuff
--cfg-prefix = $(basedir)$(prefix)
-+cfg-prefix = /
- bin-prefix = $(basedir)$(prefix)
- modules-prefix = $(basedir)$(prefix)
- doc-prefix = $(basedir)$(prefix)
-@@ -117,7 +117,7 @@
- endif
- ut-prefix = bin/
- # target dirs for various stuff
--cfg-target = $(prefix)/$(cfg-dir)
-+cfg-target = /$(cfg-dir)
- modules-target = $(prefix)/$(modules-dir)
- 
- 
-@@ -688,14 +688,14 @@
- 		#MOD_LDFLAGS=-g -G
- 	endif
- ifneq ($(TLS),)
--	DEFS+= -I/usr/local/ssl/include
-+	DEFS+= -I/usr/ssl/include
- endif
- 	YACC=yacc
- 
- ifeq ($(CC_NAME), suncc)
- 	LIBS= -lfast -ldl -lresolv
- endif
--	LIBS+= -L/usr/local/lib  -lxnet -lrt -lnsl 
-+	LIBS+= -L/usr/lib  -lxnet -lrt -lnsl 
- 	# -lrt needed for sched_yield
- endif
- 
-@@ -773,7 +773,7 @@
- 
- #add libssl if needed
- ifneq ($(TLS),)
--LIBS+= -L/usr/local/lib -L/usr/local/ssl/lib -lssl  -lcrypto
-+LIBS+= -L/usr/lib -L/usr/ssl/lib -lssl  -lcrypto
- endif
- 
- ifneq ($(found_lock_method), yes)
-diff -urN ser-0.8.14.old/etc/ser.cfg ser-0.8.14.dev/etc/ser.cfg
---- ser-0.8.14.old/etc/ser.cfg	2003-11-10 16:35:15.000000000 +0100
-+++ ser-0.8.14.dev/etc/ser.cfg	2005-05-01 01:28:43.000000000 +0200
-@@ -26,19 +26,19 @@
- # ------------------ module loading ----------------------------------
- 
- # Uncomment this if you want to use SQL database
--#loadmodule "/usr/local/lib/ser/modules/mysql.so"
-+#loadmodule "/usr/lib/ser/modules/mysql.so"
- 
--loadmodule "/usr/local/lib/ser/modules/sl.so"
--loadmodule "/usr/local/lib/ser/modules/tm.so"
--loadmodule "/usr/local/lib/ser/modules/rr.so"
--loadmodule "/usr/local/lib/ser/modules/maxfwd.so"
--loadmodule "/usr/local/lib/ser/modules/usrloc.so"
--loadmodule "/usr/local/lib/ser/modules/registrar.so"
-+loadmodule "/usr/lib/ser/modules/sl.so"
-+loadmodule "/usr/lib/ser/modules/tm.so"
-+loadmodule "/usr/lib/ser/modules/rr.so"
-+loadmodule "/usr/lib/ser/modules/maxfwd.so"
-+loadmodule "/usr/lib/ser/modules/usrloc.so"
-+loadmodule "/usr/lib/ser/modules/registrar.so"
- 
- # Uncomment this if you want digest authentication
- # mysql.so must be loaded !
--#loadmodule "/usr/local/lib/ser/modules/auth.so"
--#loadmodule "/usr/local/lib/ser/modules/auth_db.so"
-+#loadmodule "/usr/lib/ser/modules/auth.so"
-+#loadmodule "/usr/lib/ser/modules/auth_db.so"
- 
- # ----------------- setting module-specific parameters ---------------
- 
diff --git a/openwrt/package/ser/patches/220-default_config.patch b/openwrt/package/ser/patches/220-default_config.patch
deleted file mode 100644
index 7a766f2209..0000000000
--- a/openwrt/package/ser/patches/220-default_config.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -urN ser-0.8.14.old/config.h ser-0.8.14.dev/config.h
---- ser-0.8.14.old/config.h	2004-04-27 22:28:59.000000000 +0200
-+++ ser-0.8.14.dev/config.h	2005-05-01 01:48:00.000000000 +0200
-@@ -53,7 +53,7 @@
- #define MAX_LISTEN 16
- 
- /* default number of child processes started */
--#define CHILD_NO    8
-+#define CHILD_NO    2
- 
- #define RT_NO 20 /* routing tables number */
- #define FAILURE_RT_NO RT_NO /* on_failure routing tables number */
-@@ -117,7 +117,7 @@
- #define PKG_MEM_POOL_SIZE 1024*1024
- 
- /*used if SH_MEM is defined*/
--#define SHM_MEM_SIZE 32
-+#define SHM_MEM_SIZE 8
- 
- #define TIMER_TICK 1
- 
-- 
2.30.2