From d32ef4fdb82deff32fa00bdd3e269abaa5f54eab Mon Sep 17 00:00:00 2001 From: nbd Date: Fri, 25 Mar 2005 18:44:22 +0000 Subject: add sip express router git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@455 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/ser/patches/no-libfl.patch | 77 +++++++++++++++++++++ package/ser/patches/runtime-paths.patch | 119 ++++++++++++++++++++++++++++++++ 2 files changed, 196 insertions(+) create mode 100644 package/ser/patches/no-libfl.patch create mode 100644 package/ser/patches/runtime-paths.patch (limited to 'package/ser/patches') diff --git a/package/ser/patches/no-libfl.patch b/package/ser/patches/no-libfl.patch new file mode 100644 index 000000000..4a301a029 --- /dev/null +++ b/package/ser/patches/no-libfl.patch @@ -0,0 +1,77 @@ +diff -urN ser-0.9.0.old/Makefile.defs ser-0.9.0/Makefile.defs +--- ser-0.9.0.old/Makefile.defs 2004-12-16 18:50:40.000000000 +0100 ++++ ser-0.9.0/Makefile.defs 2005-03-25 15:24:03.000000000 +0100 +@@ -788,7 +788,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 +@@ -826,7 +826,7 @@ + endif + OLD_SOLARIS= $(shell echo "$(OSREL)" | \ + sed -e 's/^5\.[0-6][^0-9]*$$/yes/' ) +- LIBS+= -L/usr/local/lib -lfl -lxnet -lnsl ++ LIBS+= -L/usr/local/lib -lxnet -lnsl + ifeq ($(OLD_SOLARIS), yes) + LIBS+=-lposix4 + else +@@ -841,9 +841,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 +@@ -858,7 +858,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/') + # exception: on sparc openbsd 3.2 is elf and not aout +@@ -885,7 +885,7 @@ + found_lock_method=yes + endif + YACC=yacc +- LIBS= -lfl ++ LIBS= + endif + + # OS X support, same as freebsd +@@ -899,9 +899,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.9.0.old/cfg.lex ser-0.9.0/cfg.lex +--- ser-0.9.0.old/cfg.lex 2004-11-30 17:28:23.000000000 +0100 ++++ ser-0.9.0/cfg.lex 2005-03-25 15:27:49.000000000 +0100 +@@ -90,6 +90,10 @@ + static char* addstr(struct str_buf *, char*, int); + static void count(); + ++ int yywrap(void) ++ { ++ return 1; ++ } + + %} + diff --git a/package/ser/patches/runtime-paths.patch b/package/ser/patches/runtime-paths.patch new file mode 100644 index 000000000..483623e18 --- /dev/null +++ b/package/ser/patches/runtime-paths.patch @@ -0,0 +1,119 @@ +diff -urN ser-0.9.0.old/etc/ser.cfg ser-0.9.0/etc/ser.cfg +--- ser-0.9.0.old/etc/ser.cfg 2004-11-30 17:28:24.000000000 +0100 ++++ ser-0.9.0/etc/ser.cfg 2005-03-25 17:23:32.000000000 +0100 +@@ -25,20 +25,20 @@ + # ------------------ 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/local/lib/ser/modules/textops.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" ++loadmodule "/usr/lib/ser/modules/textops.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 -urN ser-0.9.0.old/Makefile ser-0.9.0/Makefile +--- ser-0.9.0.old/Makefile 2004-12-08 20:06:12.000000000 +0100 ++++ ser-0.9.0/Makefile 2005-03-25 17:21:35.000000000 +0100 +@@ -198,8 +198,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 + +@@ -211,9 +211,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.9.0.old/Makefile.defs ser-0.9.0/Makefile.defs +--- ser-0.9.0.old/Makefile.defs 2005-03-25 15:28:58.000000000 +0100 ++++ ser-0.9.0/Makefile.defs 2005-03-25 17:26:09.000000000 +0100 +@@ -68,15 +68,15 @@ + # 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) +@@ -121,7 +121,7 @@ + endif + ut-prefix = bin/ + # target dirs for various stuff +-cfg-target = $(prefix)/$(cfg-dir) ++cfg-target = /$(cfg-dir) + bin-target = $(prefix)/$(bin-dir) + modules-target = $(prefix)/$(modules-dir) + doc-target = $(prefix)/$(doc-dir) +@@ -817,7 +817,7 @@ + #MOD_LDFLAGS=-g -G + endif + ifneq ($(TLS),) +- DEFS+= -I/usr/local/ssl/include ++ DEFS+= -I/usr/ssl/include + endif + YACC=yacc + +@@ -826,7 +826,7 @@ + endif + OLD_SOLARIS= $(shell echo "$(OSREL)" | \ + sed -e 's/^5\.[0-6][^0-9]*$$/yes/' ) +- LIBS+= -L/usr/local/lib -lxnet -lnsl ++ LIBS+= -L/usr/lib -lxnet -lnsl + ifeq ($(OLD_SOLARIS), yes) + LIBS+=-lposix4 + else +@@ -918,7 +918,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) -- cgit v1.2.3