From 2d3a640a9b65c70667dd5253e11bf185d40f0f32 Mon Sep 17 00:00:00 2001 From: Jiri Slachta Date: Tue, 1 Apr 2014 16:15:22 +0200 Subject: [PATCH] Removed obsolete packages openser and opensips in favor of kamailio. Signed-off-by: Jiri Slachta --- net/openser/Makefile | 339 ------------------- net/openser/patches/001-openser_cfg.patch | 33 -- net/openser/patches/002-sc.patch | 41 --- net/openser/patches/003-makefile_defs.patch | 71 ---- net/openser/patches/004-cfg_lex.patch | 13 - net/openser/patches/005-config_h.patch | 33 -- net/openser/patches/006-sc_dbtext.patch | 22 -- net/openser/patches/007-modules_build.patch | 57 ---- net/opensips/Makefile | 272 --------------- net/opensips/files/opensips.default | 13 - net/opensips/files/opensips.init | 19 -- net/opensips/patches/001-no_rej.patch | 21 -- net/opensips/patches/005-config_h.patch | 20 -- net/opensips/patches/007-modules_build.patch | 102 ------ 14 files changed, 1056 deletions(-) delete mode 100644 net/openser/Makefile delete mode 100644 net/openser/patches/001-openser_cfg.patch delete mode 100644 net/openser/patches/002-sc.patch delete mode 100644 net/openser/patches/003-makefile_defs.patch delete mode 100644 net/openser/patches/004-cfg_lex.patch delete mode 100644 net/openser/patches/005-config_h.patch delete mode 100644 net/openser/patches/006-sc_dbtext.patch delete mode 100644 net/openser/patches/007-modules_build.patch delete mode 100644 net/opensips/Makefile delete mode 100644 net/opensips/files/opensips.default delete mode 100755 net/opensips/files/opensips.init delete mode 100644 net/opensips/patches/001-no_rej.patch delete mode 100644 net/opensips/patches/005-config_h.patch delete mode 100644 net/opensips/patches/007-modules_build.patch diff --git a/net/openser/Makefile b/net/openser/Makefile deleted file mode 100644 index 889e472..0000000 --- a/net/openser/Makefile +++ /dev/null @@ -1,339 +0,0 @@ -# -# Copyright (C) 2006 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=openser -PKG_VERSION:=1.0.1 -PKG_RELEASE:=1 -PKG_MD5SUM:=eebc16665003ee92daf96b216d6f9563 -# PKG_VARIANT:=-tls # for tls version -PKG_VARIANT:= - -PKG_SOURCE_URL:=http://openser.org/pub/openser/$(PKG_VERSION)/src -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)$(PKG_VARIANT)_src.tar.gz - -include $(INCLUDE_DIR)/package.mk - -define Package/openser - SECTION:=net - CATEGORY:=Network - SUBMENU:=Telephony - TITLE:=Configurable, free SIP server - URL:=http://www.openser.org - MENU:=1 -endef - -define Package/openser/conffiles -/etc/openser/openser.cfg -endef - -define Package/openser-mod-acc - SECTION:=net - CATEGORY:=Network - DEPENDS:=openser +libradiusclient-ng - TITLE:=Accounting support - SUBMENU:=Telephony -endef - -define Package/openser-mod-auth - SECTION:=net - CATEGORY:=Network - DEPENDS:=openser - TITLE:=Authentication support - SUBMENU:=Telephony -endef - -define Package/openser-mod-auth-db - SECTION:=net - CATEGORY:=Network - DEPENDS:=openser - TITLE:=Authentication with database support - SUBMENU:=Telephony -endef - -define Package/openser-mod-auth-radius - SECTION:=net - CATEGORY:=Network - DEPENDS:=openser +libradiusclient-ng - TITLE:=Authentication with RADIUS support - SUBMENU:=Telephony -endef - -define Package/openser-mod-avp-radius - SECTION:=net - CATEGORY:=Network - DEPENDS:=openser +libradiusclient-ng - TITLE:=AVP with RADIUS support - SUBMENU:=Telephony -endef - -define Package/openser-mod-avpops - SECTION:=net - CATEGORY:=Network - DEPENDS:=openser - TITLE:=AVP options support - SUBMENU:=Telephony -endef - -define Package/openser-mod-dispatcher - SECTION:=net - CATEGORY:=Network - DEPENDS:=openser - TITLE:=Dispatcher support - SUBMENU:=Telephony -endef - -define Package/openser-mod-diversion - SECTION:=net - CATEGORY:=Network - DEPENDS:=openser - TITLE:=Diversion support - SUBMENU:=Telephony -endef - -define Package/openser-mod-flatstore - SECTION:=net - CATEGORY:=Network - DEPENDS:=openser - TITLE:=Flatstore support - SUBMENU:=Telephony -endef - -define Package/openser-mod-gflags - SECTION:=net - CATEGORY:=Network - DEPENDS:=openser - TITLE:=Gflags support - SUBMENU:=Telephony -endef - -define Package/openser-mod-group - SECTION:=net - CATEGORY:=Network - DEPENDS:=openser - TITLE:=Group support - SUBMENU:=Telephony -endef - -define Package/openser-mod-group-radius - SECTION:=net - CATEGORY:=Network - DEPENDS:=openser +libradiusclient-ng - TITLE:=Group with RADIUS support - SUBMENU:=Telephony -endef - -define Package/openser-mod-lcr - SECTION:=net - CATEGORY:=Network - DEPENDS:=openser openser-mod-mysql - TITLE:=Least Cost Routing support - SUBMENU:=Telephony -endef - -define Package/openser-mod-mediaproxy - SECTION:=net - CATEGORY:=Network - DEPENDS:=openser - TITLE:=Mediaproxy support - SUBMENU:=Telephony -endef - -define Package/openser-mod-msilo - SECTION:=net - CATEGORY:=Network - DEPENDS:=openser - TITLE:=MSilo support - SUBMENU:=Telephony -endef - -define Package/openser-mod-mysql - SECTION:=net - CATEGORY:=Network - DEPENDS:=openser +libmysqlclient - TITLE:=MySQL support - SUBMENU:=Telephony -endef - -define Package/openser-mod-nathelper - SECTION:=net - CATEGORY:=Network - DEPENDS:=openser - TITLE:=NAT helper support - SUBMENU:=Telephony -endef - -define Package/openser-mod-options - SECTION:=net - CATEGORY:=Network - DEPENDS:=openser - TITLE:=Options support - SUBMENU:=Telephony -endef - -define Package/openser-mod-pdt - SECTION:=net - CATEGORY:=Network - DEPENDS:=openser - TITLE:=PDT support - SUBMENU:=Telephony -endef - -define Package/openser-mod-permissions - SECTION:=net - CATEGORY:=Network - DEPENDS:=openser - TITLE:=Permissions support - SUBMENU:=Telephony -endef - -define Package/openser-mod-pike - SECTION:=net - CATEGORY:=Network - DEPENDS:=openser - TITLE:=PIKE support - SUBMENU:=Telephony -endef - -define Package/openser-mod-sms - SECTION:=net - CATEGORY:=Network - DEPENDS:=openser - TITLE:=SMS support - SUBMENU:=Telephony -endef - -define Package/openser-mod-speeddial - SECTION:=net - CATEGORY:=Network - DEPENDS:=openser - TITLE:=Speeddial supporte - SUBMENU:=Telephony -endef - -define Package/openser-mod-uac - SECTION:=net - CATEGORY:=Network - DEPENDS:=openser - TITLE:=UAC support - SUBMENU:=Telephony -endef - -define Package/openser-mod-uac-redirect - SECTION:=net - CATEGORY:=Network - DEPENDS:=openser - TITLE:=UAC with redirect support - SUBMENU:=Telephony -endef - -define Package/openser-mod-uri - SECTION:=net - CATEGORY:=Network - DEPENDS:=openser - TITLE:=URI support - SUBMENU:=Telephony -endef - -define Package/openser-mod-uri-db - SECTION:=net - CATEGORY:=Network - DEPENDS:=openser +openser-mod-mysql - TITLE:=URI with database support - SUBMENU:=Telephony -endef - -define Package/openser-mod-uri-radius - SECTION:=net - CATEGORY:=Network - DEPENDS:=openser +libradiusclient-ng - TITLE:=URI with RADIUS support - SUBMENU:=Telephony -endef - -define Package/openser-mod-xlog - SECTION:=net - CATEGORY:=Network - DEPENDS:=openser - TITLE:=Advanced logging support - SUBMENU:=Telephony -endef - -# Select here the modules for the ipk package -OPENSER_MODULES := sl tm rr maxfwd usrloc registrar dbtext textops exec - -OPENSER_MODULE_FILES := $(foreach module,$(OPENSER_MODULES),modules/$(module)/$(module).so) -OPENSER_MODULES := $(patsubst %,modules/%,$(OPENSER_MODULES)) - -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) \ - prefix=/ \ - extra_defs="-DUSE_PTHREAD_MUTEX " \ - CC="$(TARGET_CC)" \ - ARCH="$(ARCH)" \ - CFLAGS="$(TARGET_CFLAGS) $(FPIC)" \ - LOCALBASE="$(STAGING_DIR)/usr" \ - all utils/gen_ha1/gen_ha1 -endef - -define Package/openser/install - $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/sbin/ - $(CP) $(PKG_BUILD_DIR)/utils/gen_ha1/gen_ha1 $(1)/usr/sbin/openser_gen_ha1 - $(CP) $(PKG_BUILD_DIR)/scripts/sc $(1)/usr/sbin/openserctl - chmod 744 $(1)/usr/sbin/openserctl - $(CP) $(PKG_BUILD_DIR)/scripts/sc.dbtext $(1)/usr/sbin/dbtextctl - chmod 744 $(1)/usr/sbin/dbtextctl - $(INSTALL_DIR) $(1)/usr/lib/openser/modules - (cd $(PKG_BUILD_DIR);\ - $(CP) $(OPENSER_MODULE_FILES) $(1)/usr/lib/openser/modules/; \ - ) - $(INSTALL_DIR) $(1)/etc/openser - $(CP) $(PKG_BUILD_DIR)/etc/openser.cfg $(1)/etc/openser/ -endef - -define BuildPlugin - define Package/$(1)/install - [ -z "$(2)" ] || $(INSTALL_DIR) $$(1)/usr/lib/openser/modules/ - $(CP) $(PKG_BUILD_DIR)/modules/$(2)/$(2).so \ - $$(1)/usr/lib/openser/modules/ ; - endef - - $$(eval $$(call BuildPackage,$(1))) -endef - -$(eval $(call BuildPackage,openser)) -$(eval $(call BuildPlugin,openser-mod-acc,acc)) -$(eval $(call BuildPlugin,openser-mod-auth,auth)) -$(eval $(call BuildPlugin,openser-mod-auth-db,auth_db)) -$(eval $(call BuildPlugin,openser-mod-auth-radius,auth_radius)) -$(eval $(call BuildPlugin,openser-mod-avp-radius,avp_radius)) -$(eval $(call BuildPlugin,openser-mod-avpops,avpops)) -$(eval $(call BuildPlugin,openser-mod-dispatcher,dispatcher)) -$(eval $(call BuildPlugin,openser-mod-diversion,diversion)) -$(eval $(call BuildPlugin,openser-mod-flatstore,flatstore)) -$(eval $(call BuildPlugin,openser-mod-gflags,gflags)) -$(eval $(call BuildPlugin,openser-mod-group,group)) -$(eval $(call BuildPlugin,openser-mod-group-radius,group_radius)) -$(eval $(call BuildPlugin,openser-mod-lcr,lcr)) -$(eval $(call BuildPlugin,openser-mod-mediaproxy,mediaproxy)) -$(eval $(call BuildPlugin,openser-mod-msilo,msilo)) -$(eval $(call BuildPlugin,openser-mod-mysql,mysql)) -$(eval $(call BuildPlugin,openser-mod-nathelper,nathelper)) -$(eval $(call BuildPlugin,openser-mod-options,options)) -$(eval $(call BuildPlugin,openser-mod-pdt,pdt)) -$(eval $(call BuildPlugin,openser-mod-permissions,permissions)) -$(eval $(call BuildPlugin,openser-mod-pike,pike)) -$(eval $(call BuildPlugin,openser-mod-sms,sms)) -$(eval $(call BuildPlugin,openser-mod-speeddial,speeddial)) -$(eval $(call BuildPlugin,openser-mod-uac,uac)) -$(eval $(call BuildPlugin,openser-mod-uac-redirect,uac_redirect)) -$(eval $(call BuildPlugin,openser-mod-uri,uri)) -$(eval $(call BuildPlugin,openser-mod-uri-db,uri_db)) -$(eval $(call BuildPlugin,openser-mod-uri-radius,uri_radius)) -$(eval $(call BuildPlugin,openser-mod-xlog,xlog)) diff --git a/net/openser/patches/001-openser_cfg.patch b/net/openser/patches/001-openser_cfg.patch deleted file mode 100644 index f26e79e..0000000 --- a/net/openser/patches/001-openser_cfg.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- openser-1.0.0-tls.orig/etc/openser.cfg 2005-10-28 21:45:33.000000000 +0200 -+++ openser-1.0.0-tls/etc/openser.cfg 2006-01-07 01:39:01.077134312 +0100 -@@ -36,20 +36,20 @@ - # ------------------ module loading ---------------------------------- - - # Uncomment this if you want to use SQL database --#loadmodule "/usr/local/lib/openser/modules/mysql.so" -+#loadmodule "/usr/lib/openser/modules/mysql.so" - --loadmodule "/usr/local/lib/openser/modules/sl.so" --loadmodule "/usr/local/lib/openser/modules/tm.so" --loadmodule "/usr/local/lib/openser/modules/rr.so" --loadmodule "/usr/local/lib/openser/modules/maxfwd.so" --loadmodule "/usr/local/lib/openser/modules/usrloc.so" --loadmodule "/usr/local/lib/openser/modules/registrar.so" --loadmodule "/usr/local/lib/openser/modules/textops.so" -+loadmodule "/usr/lib/openser/modules/sl.so" -+loadmodule "/usr/lib/openser/modules/tm.so" -+loadmodule "/usr/lib/openser/modules/rr.so" -+loadmodule "/usr/lib/openser/modules/maxfwd.so" -+loadmodule "/usr/lib/openser/modules/usrloc.so" -+loadmodule "/usr/lib/openser/modules/registrar.so" -+loadmodule "/usr/lib/openser/modules/textops.so" - - # Uncomment this if you want digest authentication - # mysql.so must be loaded ! --#loadmodule "/usr/local/lib/openser/modules/auth.so" --#loadmodule "/usr/local/lib/openser/modules/auth_db.so" -+#loadmodule "/usr/lib/openser/modules/auth.so" -+#loadmodule "/usr/lib/openser/modules/auth_db.so" - - # ----------------- setting module-specific parameters --------------- - diff --git a/net/openser/patches/002-sc.patch b/net/openser/patches/002-sc.patch deleted file mode 100644 index 52ef9a6..0000000 --- a/net/openser/patches/002-sc.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- openser-1.0.0-tls.orig/scripts/sc 2005-08-11 14:08:02.000000000 +0200 -+++ openser-1.0.0-tls/scripts/sc 2006-01-29 02:18:43.319054456 +0100 -@@ -48,11 +48,15 @@ - STARTOPTIONS= # for example -dddd - fi - if [ -z "$DIR" ] ; then -- DIR=`dirname $0` -+ DIR=/usr/sbin - fi - if [ -z "$SERBIN" ] ; then - SERBIN=$DIR/openser - fi -+if [ -z "$SIP_DOMAIN" ] ; then -+ SIP_DOMAIN=$(nvram get sip_domain) -+fi -+ - - ##### ----------------------------------------------- ##### - ### openser's FIFO server -@@ -415,7 +419,7 @@ - fi - - if [ -z "$SERDOMAIN" ] ; then -- echo "domain unknown: use usernames with domain or set default domain in SIP_DOMAIN" -+ echo "domain unknown: use usernames with domain or set default domain in SIP_DOMAIN (with 'nvram set sip_domain=YOUR_SIP_DOMAIN')" - exit 1 - fi - } -@@ -671,11 +675,7 @@ - set_user $2 - fifo_cmd ul_show_contact $USRLOC_TABLE "$SERUSER@$SERDOMAIN" - elif [ $# -eq 1 ] ; then -- printf "Dumping all contacts may take long: are you sure you want to proceed? [Y|N] " > /dev/stderr -- 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 diff --git a/net/openser/patches/003-makefile_defs.patch b/net/openser/patches/003-makefile_defs.patch deleted file mode 100644 index a7275bd..0000000 --- a/net/openser/patches/003-makefile_defs.patch +++ /dev/null @@ -1,71 +0,0 @@ ---- openser-1.0.0-tls.orig/Makefile.defs 2005-10-28 18:32:39.000000000 +0200 -+++ openser-1.0.0-tls/Makefile.defs 2006-01-15 23:40:18.391547040 +0100 -@@ -917,7 +917,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 -@@ -955,7 +955,7 @@ - endif - OLD_SOLARIS= $(shell echo "$(OSREL)" | \ - sed -e 's/^5\.[0-6][^0-9]*$$/yes/' ) -- LIBS+= -L$(LOCALBASE)/lib -lfl -lxnet -lnsl -+ LIBS+= -L$(LOCALBASE)/lib -lxnet -lnsl - ifeq ($(OLD_SOLARIS), yes) - LIBS+=-lposix4 - else -@@ -970,9 +970,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 -@@ -987,7 +987,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 -@@ -1014,7 +1014,7 @@ - found_lock_method=yes - endif - YACC=yacc -- LIBS= -lfl -+ LIBS= - endif - - # OS X support, same as freebsd -@@ -1028,9 +1028,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) -@@ -1047,7 +1047,7 @@ - - #add libssl if needed - ifneq ($(TLS),) --DEFS+= -I$(LOCALBASE)/ssl/include -+DEFS+= -I$(LOCALBASE)/include - LIBS+= -L$(LOCALBASE)/lib -L$(LOCALBASE)/ssl/lib -lssl -lcrypto - endif - diff --git a/net/openser/patches/004-cfg_lex.patch b/net/openser/patches/004-cfg_lex.patch deleted file mode 100644 index 39eacb2..0000000 --- a/net/openser/patches/004-cfg_lex.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- openser-1.0.0-tls.orig/cfg.lex 2005-09-02 17:34:41.000000000 +0200 -+++ openser-1.0.0-tls/cfg.lex 2006-01-05 01:34:50.279630928 +0100 -@@ -85,6 +85,10 @@ - static char* addstr(struct str_buf *, char*, int); - static void count(); - -+ int yywrap(void) -+ { -+ return 1; -+ } - - %} - diff --git a/net/openser/patches/005-config_h.patch b/net/openser/patches/005-config_h.patch deleted file mode 100644 index 45af8f1..0000000 --- a/net/openser/patches/005-config_h.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- openser-1.0.0-tls.orig/config.h 2005-08-23 19:31:12.000000000 +0200 -+++ openser-1.0.0-tls/config.h 2006-01-05 01:42:14.101159800 +0100 -@@ -48,7 +48,7 @@ - #define MAX_LISTEN 16 - - /* default number of child processes started */ --#define CHILD_NO 8 -+#define CHILD_NO 4 - - #define RT_NO 40 /* routing tables number */ - #define FAILURE_RT_NO RT_NO /* on_failure routing tables number */ -@@ -68,10 +68,10 @@ - #define CONTENT_LENGTH "Content-Length: " - #define CONTENT_LENGTH_LEN (sizeof(CONTENT_LENGTH)-1) - --#define USER_AGENT "User-Agent: OpenSer (" VERSION " (" ARCH "/" OS"))" -+#define USER_AGENT "User-Agent: OpenSer " VERSION " (boozy.milkfish.org)" - #define USER_AGENT_LEN (sizeof(USER_AGENT)-1) - --#define SERVER_HDR "Server: OpenSer (" VERSION " (" ARCH "/" OS"))" -+#define SERVER_HDR "Server: OpenSer " VERSION " (boozy.milkfish.org)" - #define SERVER_HDR_LEN (sizeof(SERVER_HDR)-1) - - #define MAX_WARNING_LEN 256 -@@ -113,7 +113,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 - diff --git a/net/openser/patches/006-sc_dbtext.patch b/net/openser/patches/006-sc_dbtext.patch deleted file mode 100644 index 2a1b7ea..0000000 --- a/net/openser/patches/006-sc_dbtext.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- openser-1.0.0-tls.orig/scripts/sc.dbtext 2005-07-29 21:05:36.000000000 +0200 -+++ openser-1.0.0-tls/scripts/sc.dbtext 2006-01-29 02:30:31.795349688 +0100 -@@ -62,6 +62,10 @@ - ##### ----------------------------------------------- ##### - #### table names - -+if [ -z "$SIP_DOMAIN" ] ; then -+ SIP_DOMAIN=$(nvram get sip_domain) -+fi -+ - # UsrLoc Table - if [ -z "$UL_TABLE" ] ; then - UL_TABLE=location -@@ -247,7 +251,7 @@ - fi - - if [ -z "$SERDOMAIN" ] ; then -- echo -e "\nDomain unknown: use usernames with domain or set default domain in SIP_DOMAIN\n" -+ echo -e "\nDomain unknown: use usernames with domain or set default domain in SIP_DOMAIN (with 'nvram set sip_domain=YOUR_SIP_DOMAIN')\n" - exit 1 - fi - } diff --git a/net/openser/patches/007-modules_build.patch b/net/openser/patches/007-modules_build.patch deleted file mode 100644 index bdc9f65..0000000 --- a/net/openser/patches/007-modules_build.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- openser-1.0.1/Makefile 2006-02-15 20:52:21.000000000 +0100 -+++ openser-1.0.1.new/Makefile 2006-03-17 11:01:27.417488936 +0100 -@@ -46,8 +46,7 @@ - skip_modules?= - - # if not set on the cmd. line or the env, exclude this modules: --exclude_modules?= jabber cpl-c pa postgres mysql \ -- avp_radius auth_radius group_radius uri_radius -+exclude_modules?= jabber cpl-c pa postgres - # always exclude the CVS dir - override exclude_modules+= CVS $(skip_modules) - -diff -urN openser-1.0.1/modules/acc/Makefile openser-1.0.1.new/modules/acc/Makefile ---- openser-1.0.1/modules/acc/Makefile 2005-09-05 21:32:02.000000000 +0200 -+++ openser-1.0.1.new/modules/acc/Makefile 2006-03-17 10:38:14.333269928 +0100 -@@ -14,8 +14,8 @@ - DEFS+=-DSQL_ACC - - # uncomment the next two lines if you wish to enable RADIUS accounting --#DEFS+=-DRAD_ACC -I$(LOCALBASE)/include --#LIBS=-L$(LOCALBASE)/lib -lradiusclient-ng -+DEFS+=-DRAD_ACC -I$(LOCALBASE)/include -+LIBS=-L$(LOCALBASE)/lib -lradiusclient-ng - - # uncomment the next two lines if you wish to enable DIAMETER accounting - #DEFS+=-DDIAM_ACC -diff -urN openser-1.0.1/modules/mysql/Makefile openser-1.0.1.new/modules/mysql/Makefile ---- openser-1.0.1/modules/mysql/Makefile 2005-06-13 18:47:40.000000000 +0200 -+++ openser-1.0.1.new/modules/mysql/Makefile 2006-03-17 11:12:16.218856136 +0100 -@@ -9,14 +9,12 @@ - # mysql.h locations (freebsd,openbsd solaris) - DEFS +=-I$(LOCALBASE)/include -I$(LOCALBASE)/include/mysql \ - -I$(LOCALBASE)/mysql/include \ -- -I/usr/include/mysql - - # libmysqlclient locations on RH/Suse, Solaris /OpenBSD, FreeBSD - # (Debian does the right thing and puts it in /usr/lib) - LIBS=-L/usr/lib/mysql -L$(LOCALBASE)/lib -L$(LOCALBASE)/lib/mysql \ - -L$(LOCALBASE)/mysql/lib/mysql/ \ - -L$(LOCALBASE)/mysql/lib \ -- -L/usr/lib64/mysql \ - -lmysqlclient -lz - - include ../../Makefile.modules -diff -urN openser-1.0.1/modules/postgres/Makefile openser-1.0.1.new/modules/postgres/Makefile ---- openser-1.0.1/modules/postgres/Makefile 2005-07-01 16:52:34.000000000 +0200 -+++ openser-1.0.1.new/modules/postgres/Makefile 2006-03-17 11:13:22.150832952 +0100 -@@ -7,8 +7,7 @@ - NAME=postgres.so - - # libpq-fe.h locations --DEFS +=-I$(LOCALBASE)/include -I$(LOCALBASE)/pgsql/include \ -- -I/usr/include/postgresql -I/usr/include/postgresql/8.0 -+DEFS +=-I$(LOCALBASE)/include -I$(LOCALBASE)/pgsql/include -I$(LOCALBASE)/include/postgresql - LIBS=-L$(LOCALBASE)/lib -L$(LOCALBASE)/pgsql/lib -L$(LOCALBASE)/lib/pgsql \ - -lpq - diff --git a/net/opensips/Makefile b/net/opensips/Makefile deleted file mode 100644 index c90abf7..0000000 --- a/net/opensips/Makefile +++ /dev/null @@ -1,272 +0,0 @@ -# -# Copyright (C) 2009 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=opensips -PKG_VERSION:=1.5.3 -PKG_RELEASE:=1 -PKG_VARIANT:=-tls - -PKG_SOURCE_URL:=http://opensips.org/pub/opensips/$(PKG_VERSION)/src -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)$(PKG_VARIANT)_src.tar.gz -PKG_MD5SUM:=8a03167420c31da15405bed7630ed3e2 - -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)$(PKG_VARIANT) - -PKG_BUILD_DEPENDS:=curl expat libxml2 mysql openldap openssl pcre postgresql radiusclient-ng - -include $(INCLUDE_DIR)/package.mk - -TARGET_CFLAGS += $(FPIC) - -define Package/opensips/Default - SECTION:=net - CATEGORY:=Network - SUBMENU:=Telephony - URL:=http://www.opensips.org/ -endef - - -define Package/opensips -$(call Package/opensips/Default) - TITLE:=Open SIP Server - MENU:=1 -endef - -define Package/opensips-example -$(call Package/opensips/Default) - TITLE:=OpenSIPS example config - DEPENDS:=opensips \ - +opensips-mod-acc \ - +opensips-mod-maxfwd \ - +opensips-mod-mi-fifo \ - +opensips-mod-registrar \ - +opensips-mod-rr \ - +opensips-mod-signaling \ - +opensips-mod-sl \ - +opensips-mod-textops \ - +opensips-mod-tm \ - +opensips-mod-uri \ - +opensips-mod-uri-db \ - +opensips-mod-usrloc \ - +opensips-mod-xlog -endef - -define Package/opensips-example/conffiles -/etc/default/opensips -/etc/opensips/opensips.cfg -endef - - -define Package/opensips-tools -$(call Package/opensips/Default) - TITLE:=OpenSIPS control tools - DEPENDS:=opensips -endef - -define Package/opensips-tools/conffiles -/etc/opensips/opensipsctlrc -endef - - -PKG_EXCL_MODULES:= \ - auth_diameter \ - carrierroute \ - db_berkeley \ - db_oracle \ - db_unixodbc \ - mediaproxy \ - mi_xmlrpc \ - mmgeoip \ - osp \ - perl \ - perlvdb \ - snmpstats \ - -PKG_MAKE_ARGS:= \ - cfg-dir="etc/opensips/" \ - bin-dir="usr/sbin/" \ - data-dir="var/lib/opensips/" \ - lib-dir="usr/lib/opensips/" \ - modules-dir="usr/lib/opensips/modules/" \ - exclude_modules="$(PKG_EXCL_MODULES)" \ - - -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) $(PKG_MAKE_ARGS) \ - prefix=/ \ - extra_defs="-DUSE_PTHREAD_MUTEX " \ - CC="$(TARGET_CC)" \ - ARCH="$(ARCH)" \ - CFLAGS="$(TARGET_CFLAGS)" \ - ISSMP="no" \ - LOCALBASE="$(STAGING_DIR)/usr" \ - SYSBASE="$(STAGING_DIR)/usr" \ - PCRECFG= \ - all - $(MAKE) -C $(PKG_BUILD_DIR) $(PKG_MAKE_ARGS) \ - DESTDIR="$(PKG_INSTALL_DIR)" \ - install -endef - -define Package/opensips/install - $(INSTALL_DIR) $(1)/usr/sbin - $(CP) \ - $(PKG_INSTALL_DIR)/usr/sbin/opensips \ - $(1)/usr/sbin/ - $(INSTALL_DIR) $(1)/usr/lib/opensips/modules -endef - -define Package/opensips-example/install - $(INSTALL_DIR) $(1)/etc/opensips - $(CP) \ - $(PKG_INSTALL_DIR)/etc/opensips/opensips.cfg \ - $(1)/etc/opensips/ - $(SED) 's,$(PKG_INSTALL_DIR),,g' \ - $(1)/etc/opensips/opensips.cfg - $(INSTALL_DIR) $(1)/etc/default - $(INSTALL_DATA) ./files/opensips.default $(1)/etc/default/opensips - $(INSTALL_DIR) $(1)/etc/init.d - $(INSTALL_BIN) ./files/opensips.init $(1)/etc/init.d/opensips -endef - -define Package/opensips-tools/install - $(INSTALL_DIR) $(1)/etc/opensips - $(CP) \ - $(PKG_INSTALL_DIR)/etc/opensips/opensipsctlrc \ - $(1)/etc/opensips/ - $(INSTALL_DIR) $(1)/usr/sbin - $(CP) \ - $(PKG_INSTALL_DIR)/usr/sbin/opensips{ctl,dbctl,unix} \ - $(1)/usr/sbin/ - $(INSTALL_DIR) $(1)/usr/lib/opensips - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/opensips/opensipsctl \ - $(1)/usr/lib/opensips/ - $(SED) 's,/bin/bash,/bin/sh,g' \ - -e 's,$(PKG_INSTALL_DIR),,g' \ - $(1)/usr/sbin/opensips{ctl,dbctl} -endef - -define BuildPlugin - define Package/opensips-mod-$(1) - $$(call Package/opensips/Default) - TITLE:= OpenSIPS $(3) module - DEPENDS:=opensips $$(foreach m,$(4),+opensips-mod-$$m) $(5) - endef - - define Package/opensips-mod-$(1)/install - [ -z "$(2)" ] || $(INSTALL_DIR) $$(1)/usr/lib/opensips/modules/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/opensips/modules/$(2).so \ - $$(1)/usr/lib/opensips/modules/ ; - endef - - $$(eval $$(call BuildPackage,opensips-mod-$(1))) -endef - -$(eval $(call BuildPackage,opensips)) -$(eval $(call BuildPackage,opensips-example)) -$(eval $(call BuildPackage,opensips-tools)) -$(eval $(call BuildPlugin,acc,acc,Accounting,tm,)) -$(eval $(call BuildPlugin,alias-db,alias_db,Database-backend aliases,,)) -$(eval $(call BuildPlugin,auth,auth,Authentication Framework,signaling,)) -$(eval $(call BuildPlugin,auth-db,auth_db,Database-backend authentication,auth,)) -$(eval $(call BuildPlugin,auth-radius,auth_radius,RADIUS-backend authentication,auth,+libradiusclient-ng)) -$(eval $(call BuildPlugin,avp-radius,avp_radius,RADIUS-backend for AVP loading,,+libradiusclient-ng)) -$(eval $(call BuildPlugin,avpops,avpops,AVP operation,,)) -$(eval $(call BuildPlugin,benchmark,benchmark,Config benchmark,,)) -$(eval $(call BuildPlugin,call-control,call_control,Prepair application,dialog,)) -#$(eval $(call BuildPlugin,carrierroute,carrierroute,Carrier Routing,,+libconfuse)) -$(eval $(call BuildPlugin,cfgutils,cfgutils,Config utilities,,)) -$(eval $(call BuildPlugin,closeddial,closeddial,PBX-like features,,)) -$(eval $(call BuildPlugin,cpl-c,cpl-c,Call Processing language interpreter,tm sl usrloc,+libxml2)) -#$(eval $(call BuildPlugin,db-berkeley,db_berkeley,Berkeley DB Database-backend,,)) -$(eval $(call BuildPlugin,db-flatstore,db_flatstore,Fast writing-only text database-backed,,)) -$(eval $(call BuildPlugin,db-mysql,db_mysql,MySQL database-backend,,+libmysqlclient)) -#$(eval $(call BuildPlugin,db-oracle,db_oracle,Oracle Database-backend,,)) -$(eval $(call BuildPlugin,db-postgres,db_postgres,PostgreSQL Database-backend,,+libpq)) -$(eval $(call BuildPlugin,db-text,db_text,Text database-backend,,)) -#$(eval $(call BuildPlugin,db-unixodbc,db_unixodbc,UnixODBC Database-backend,,)) -$(eval $(call BuildPlugin,dialog,dialog,Dialog support,rr tm,)) -$(eval $(call BuildPlugin,dialplan,dialplan,Dialplan management,,)) -$(eval $(call BuildPlugin,dispatcher,dispatcher,Dispatcher,,)) -$(eval $(call BuildPlugin,diversion,diversion,Diversion header insertion,,)) -$(eval $(call BuildPlugin,domain,domain,Multi-domain support,,)) -$(eval $(call BuildPlugin,domainpolicy,domainpolicy,Domain policy,,)) -$(eval $(call BuildPlugin,drouting,drouting,Dynaming routing,,)) -$(eval $(call BuildPlugin,enum,enum,ENUM lookup,,)) -$(eval $(call BuildPlugin,exec,exec,External exec,,)) -$(eval $(call BuildPlugin,gflags,gflags,Global shared flags,,)) -$(eval $(call BuildPlugin,group,group,Database-backend user-groups,,)) -$(eval $(call BuildPlugin,group-radius,group_radius,RADIUS-backend user-groups,,+libradiusclient-ng)) -$(eval $(call BuildPlugin,h350,h350,H.350,ldap,+libopenldap)) -$(eval $(call BuildPlugin,identity,identity,Identity,,+libopenssl)) -$(eval $(call BuildPlugin,imc,imc,IM conferencing,db-mysql tm,)) -$(eval $(call BuildPlugin,jabber,jabber,Jabber,tm,+libexpat)) -$(eval $(call BuildPlugin,lcr,lcr,Least Cost Routing,tm,)) -$(eval $(call BuildPlugin,ldap,ldap,LDAP connector,,+libopenldap)) -$(eval $(call BuildPlugin,load_balancer,load_balancer,Load balancer,dialog,)) -$(eval $(call BuildPlugin,localcache,localcache,Local cache,,)) -$(eval $(call BuildPlugin,mangler,mangler,SIP mangler,,)) -$(eval $(call BuildPlugin,maxfwd,maxfwd,Max-Forward processor,,)) -$(eval $(call BuildPlugin,mi-datagram,mi_datagram,Datagram support for Management Interface,,)) -$(eval $(call BuildPlugin,mi-fifo,mi_fifo,FIFO support for Management Interface,,)) -#$(eval $(call BuildPlugin,mi-xmlrpc,mi_xmlrpc,XML-RPC support for Management Interface,,+xmlrpc-c)) -#$(eval $(call BuildPlugin,mediaproxy,mediaproxy,NAT traversal,,+mediaproxy)) -#$(eval $(call BuildPlugin,mmgeoip,mmgeoip,MaxMind GeoIP,,+libgeoip)) -$(eval $(call BuildPlugin,msilo,msilo,SIP message silo,tm,)) -$(eval $(call BuildPlugin,nat_traversal,nat_traversal,NAT traversal,dialog sl tm,)) -$(eval $(call BuildPlugin,nathelper,nathelper,NAT traversal helper,,+rtpproxy)) -$(eval $(call BuildPlugin,options,options,OPTIONS server replier,sl,)) -#$(eval $(call BuildPlugin,osp,osp,OSP peering,auth rr sl tm textops,+libosp)) -$(eval $(call BuildPlugin,path,path,SIP path insertion,rr,)) -$(eval $(call BuildPlugin,pdt,pdt,Prefix-to-Domain translator,,)) -$(eval $(call BuildPlugin,peering,peering,Perring,,+libradiusclient-ng)) -#$(eval $(call BuildPlugin,perl,perl,Perl,sl,+perl)) -#$(eval $(call BuildPlugin,perlvdb,perlvdb,Perl Virtual DB,perl,)) -$(eval $(call BuildPlugin,permissions,permissions,Permissions control,,)) -$(eval $(call BuildPlugin,pike,pike,Flood detector,,)) -$(eval $(call BuildPlugin,presence,presence,Presence server,signaling,+libxml2)) -$(eval $(call BuildPlugin,presence-dialoginfo,presence_dialoginfo,Dialog Event presence,presence,)) -$(eval $(call BuildPlugin,presence-mwi,presence_mwi,Message Waiting Indication presence,presence,)) -$(eval $(call BuildPlugin,presence-xcapdiff,presence_xcapdiff,XCAP-Diff presence,presence pua,)) -$(eval $(call BuildPlugin,presence-xml,presence_xml,XCAP presence,presence xcap-client,)) -$(eval $(call BuildPlugin,pua,pua,Presence User Agent,tm,+libxml2)) -$(eval $(call BuildPlugin,pua-bla,pua_bla,Bridged Line Appearence PUA,presence pua usrloc,)) -$(eval $(call BuildPlugin,pua-dialoginfo,pua_dialoginfo,Dialog Event PUA,dialog pua,)) -$(eval $(call BuildPlugin,pua-mi,pua_mi,PUA Management Interface,pua,)) -$(eval $(call BuildPlugin,pua-usrloc,pua_usrloc,PUA User Location,pua usrloc,)) -$(eval $(call BuildPlugin,pua-xmpp,pua_xmpp,PUA XMPP,presence pua xmpp,)) -$(eval $(call BuildPlugin,qos,qos,QoS control,dialog,)) -$(eval $(call BuildPlugin,ratelimit,ratelimit,Traffic shapping,,)) -$(eval $(call BuildPlugin,regex,regex,Regular Expression,,+libpcre)) -$(eval $(call BuildPlugin,registrar,registrar,SIP Registrar,signaling usrloc,)) -$(eval $(call BuildPlugin,rls,rls,Resource List Server,presence pua signaling tm,+libxml2)) -$(eval $(call BuildPlugin,rr,rr,Record-Route and Route,,)) -$(eval $(call BuildPlugin,seas,seas,SIP Express Application Server,tm,)) -$(eval $(call BuildPlugin,signaling,signaling,Signaling,sl tm,)) -$(eval $(call BuildPlugin,siptrace,siptrace,SIP trace,,)) -$(eval $(call BuildPlugin,sl,sl,Stateless replier,,)) -$(eval $(call BuildPlugin,sms,sms,SIP-to-SMS IM gateway,tm,)) -#$(eval $(call BuildPlugin,snmpstats,snmpstats,SNMP,presence usrloc,+libnetsnmp)) -$(eval $(call BuildPlugin,speeddial,speeddial,Per-user speed-dial controller,,)) -$(eval $(call BuildPlugin,statistics,statistics,Script statistics,,)) -$(eval $(call BuildPlugin,sst,sst,SIP Session Timer,dialog sl,)) -$(eval $(call BuildPlugin,textops,textops,Text operations,,)) -$(eval $(call BuildPlugin,tlsops,tlsops,TLS operations,,+libopenssl)) -$(eval $(call BuildPlugin,tm,tm,Transaction,,)) -$(eval $(call BuildPlugin,uac,uac,User Agent Client,tm,)) -$(eval $(call BuildPlugin,uac-redirect,uac_redirect,User Agent Client redirection,tm,)) -$(eval $(call BuildPlugin,uri,uri,Generic URI operation,,)) -$(eval $(call BuildPlugin,uri-db,uri_db,Database-backend SIP URI checking,,)) -$(eval $(call BuildPlugin,uri-radius,uri_radius,RADIUS-backend SIP URI checking,,+libradiusclient-ng)) -$(eval $(call BuildPlugin,userblacklist,userblacklist,User blacklists,,)) -$(eval $(call BuildPlugin,usrloc,usrloc,User location,,)) -$(eval $(call BuildPlugin,xcap-client,xcap_client,XCAP Client,,+libcurl +libxml2)) -$(eval $(call BuildPlugin,xlog,xlog,Advanced logger,,)) -$(eval $(call BuildPlugin,xmpp,xmpp,SIP-to-XMPP Gateway,tm,+libexpat)) diff --git a/net/opensips/files/opensips.default b/net/opensips/files/opensips.default deleted file mode 100644 index a61617b..0000000 --- a/net/opensips/files/opensips.default +++ /dev/null @@ -1,13 +0,0 @@ -# OPTIONS -# -n COUNT -# Specifies the number of children processes forked per interface -# -N COUNT -# Specifies the number of children processes forked to handle tcp incoming connections -# -m SIZE -# Size of the shared memory which will be allocated (in Megabytes). -# -u UID -# Changes the user id under which -# -g GID -# Changes the group id under which - -OPTIONS="-n 4 -m 4 - m 8" diff --git a/net/opensips/files/opensips.init b/net/opensips/files/opensips.init deleted file mode 100755 index 32654da..0000000 --- a/net/opensips/files/opensips.init +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh /etc/rc.common -# Copyright (C) 2009 OpenWrt.org -START=50 - -BIN=opensips -DEFAULT=/etc/default/$BIN -RUN_D=/var/run -PID_F=$RUN_D/$BIN.pid - -start() { - [ -f $DEFAULT ] && . $DEFAULT - mkdir -p $RUN_D - $BIN -P $PID_F $OPTIONS >/dev/null 2>&1 -} - -stop() { - [ -f $PID_F ] && kill $(cat $PID_F) -} - diff --git a/net/opensips/patches/001-no_rej.patch b/net/opensips/patches/001-no_rej.patch deleted file mode 100644 index 066249a..0000000 --- a/net/opensips/patches/001-no_rej.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/pvar.c.rej -+++ /dev/null -@@ -1,18 +0,0 @@ --*************** --*** 2409,2415 **** -- LM_ERR("invalid socket specification\n"); -- return -1; -- } --- si = grep_sock_info(&host, (unsigned short)port, -- (unsigned short)proto); -- if (si==NULL) -- return -1; ----- 2409,2416 ---- -- LM_ERR("invalid socket specification\n"); -- return -1; -- } --+ set_sip_defaults( port, proto); --+ si = grep_sock_info(&host, (unsigned short)port, -- (unsigned short)proto); -- if (si==NULL) -- return -1; diff --git a/net/opensips/patches/005-config_h.patch b/net/opensips/patches/005-config_h.patch deleted file mode 100644 index abd40d6..0000000 --- a/net/opensips/patches/005-config_h.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/config.h -+++ b/config.h -@@ -48,7 +48,7 @@ - - #define MAX_LISTEN 16 /*!< maximum number of addresses on which we will listen */ - --#define CHILD_NO 8 /*!< default number of child processes started */ -+#define CHILD_NO 4 /*!< default number of child processes started */ - - #define RT_NO 100 /*!< routing tables number */ - #define FAILURE_RT_NO RT_NO /*!< on_failure routing tables number */ -@@ -114,7 +114,7 @@ - #define SRV_MAX_PREFIX_LEN SRV_TLS_PREFIX_LEN - - #define PKG_MEM_POOL_SIZE 1024*1024 /*!< Used only if PKG_MALLOC is defined*/ --#define SHM_MEM_SIZE 32 /*!< Used if SH_MEM is defined*/ -+#define SHM_MEM_SIZE 8 /*!< Used if SH_MEM is defined*/ - - #define TIMER_TICK 1 /*!< one second */ - #define UTIMER_TICK 100*1000 /*!< 100 miliseconds*/ diff --git a/net/opensips/patches/007-modules_build.patch b/net/opensips/patches/007-modules_build.patch deleted file mode 100644 index 178b6e9..0000000 --- a/net/opensips/patches/007-modules_build.patch +++ /dev/null @@ -1,102 +0,0 @@ ---- a/modules/carrierroute/Makefile -+++ b/modules/carrierroute/Makefile -@@ -12,10 +12,8 @@ NAME=carrierroute.so - BUILDER = $(shell which confuse-config) - - ifeq ($(BUILDER),) -- CONFUSEDEFS=-I$(LOCALBASE)/include -I/usr/local/include -I/opt/include \ -- -I/usr/sfw/include -- CONFUSELIBS=-L$(LOCALBASE)/lib -L/usr/local/lib -L/usr/sfw/lib \ -- -L/opt/lib -lconfuse -+ CONFUSEDEFS=-I$(LOCALBASE)/include -+ CONFUSELIBS=-L$(LOCALBASE)/lib - else - CONFUSEDEFS = $(shell confuse-config --cflags) - CONFUSELIBS = $(shell confuse-config --libs) ---- a/modules/h350/Makefile -+++ b/modules/h350/Makefile -@@ -9,6 +9,8 @@ include ../../Makefile.defs - - auto_gen= - NAME=h350.so --LIBS= -+ -+DEFS+=-I$(LOCALBASE)/include -+LIBS=-L$(LOCALBASE)/lib -lldap - - include ../../Makefile.modules ---- a/modules/identity/Makefile -+++ b/modules/identity/Makefile -@@ -9,7 +9,7 @@ include ../../Makefile.defs - auto_gen= - NAME=identity.so - --DEFS+= -I$(LOCALBASE)/ssl/include -I$(LOCALBASE)/include -I/usr/sfw/include -I/usr/local/ssl/include --LIBS= -L$(LOCALBASE)/lib -L$(LOCALBASE)/ssl/lib -L/usr/sfw/lib -L/usr/local/ssl/lib -lssl -lcrypto -+DEFS+= -I$(LOCALBASE)/include -+LIBS= -L$(LOCALBASE)/lib -lssl -lcrypto - - include ../../Makefile.modules ---- a/modules/ldap/Makefile -+++ b/modules/ldap/Makefile -@@ -12,7 +12,8 @@ include ../../Makefile.defs - auto_gen= - NAME=ldap.so - --LIBS=-lldap -+DEFS+=-I$(LOCALBASE)/include -+LIBS=-L$(LOCALBASE)/lib -lldap - - ifeq ($(OS),solaris) - DEFS+=-I$(LOCALBASE)/include -I/usr/sfw/include -I/usr/local/include -I/opt/sfw/include -I/opt/csw/include ---- a/modules/pua_bla/Makefile -+++ b/modules/pua_bla/Makefile -@@ -9,8 +9,8 @@ include ../../Makefile.defs - auto_gen= - NAME=pua_bla.so - LIBS= --DEFS+=-I/usr/include/libxml2 -I$(LOCALBASE)/include/libxml2 -I$(LOCALBASE)/include --LIBS+=-L/usr/include/lib -L$(LOCALBASE)/lib -lxml2 -+DEFS+=-I$(LOCALBASE)/include/libxml2 -I$(LOCALBASE)/include -+LIBS+=-L$(LOCALBASE)/lib -lxml2 - - include ../../Makefile.modules - ---- a/modules/pua_xmpp/Makefile -+++ b/modules/pua_xmpp/Makefile -@@ -10,7 +10,7 @@ auto_gen= - NAME= pua_xmpp.so - LIBS= - --DEFS+=-I/usr/include/libxml2 -I$(LOCALBASE)/include/libxml2 -I$(LOCALBASE)/include --LIBS+=-L/usr/include/lib -L$(LOCALBASE)/lib -lxml2 -+DEFS+=-I$(LOCALBASE)/include/libxml2 -I$(LOCALBASE)/include -+LIBS+=-L$(LOCALBASE)/lib -lxml2 - - include ../../Makefile.modules ---- a/modules/regex/Makefile -+++ b/modules/regex/Makefile -@@ -20,8 +20,8 @@ ifneq ($(PCRECFG),) - - else - -- DEFS+=-I/usr/include -I/usr/sfw/include -I/usr/local/include -I/opt/csw/include -I$(LOCALBASE)/include -- LIBS=-I/usr/lib -I/usr/sfw/lib -I/usr/local/lib -I/opt/csw/lib -I$(LOCALBASE)/lib -lpcre -+ DEFS+=-I$(LOCALBASE)/include -+ LIBS=-L$(LOCALBASE)/lib -lpcre - - endif - ---- a/modules/tlsops/Makefile -+++ b/modules/tlsops/Makefile -@@ -7,8 +7,8 @@ auto_gen= - NAME=tlsops.so - LIBS= - --DEFS+= -I$(LOCALBASE)/ssl/include -I$(LOCALBASE)/include -I/usr/sfw/include -I/usr/local/ssl/include --LIBS+= -L$(LOCALBASE)/lib -L$(LOCALBASE)/ssl/lib -L/usr/sfw/lib -L/usr/local/ssl/lib -lssl -lcrypto -+DEFS+= -I$(LOCALBASE)/include -+LIBS+= -L$(LOCALBASE)/lib -lssl -lcrypto - - include ../../Makefile.modules - -- 2.30.2