@@ -16,6 +16,9 @@

 #  2003-04-07  hacked to work with solaris install (andrei)

 #  2003-04-17  exclude modules overwritable from env. or cmd. line,

 #               added include_modules and skip_modules (andrei)

+#  2003-05-30  added extra_defs & EXTRA_DEFS

+#               Makefile.defs force-included to allow recursive make

+#               calls -- see comment (andrei)

 #

 auto_gen=lex.yy.c cfg.tab.c   #lexx, yacc etc

@@ -49,7 +52,10 @@ extra_objs=$(extra_sources:.c=.o)

 static_defs= $(foreach  mod, $(static_modules), \

 		-DSTATIC_$(shell echo $(mod) | tr [:lower:] [:upper:]) )

-DEFS=$(static_defs)

+

+override extra_defs+=$(static_defs) $(EXTRA_DEFS)

+export extra_defs

+

 modules=$(filter-out $(addprefix modules/, \

 			$(exclude_modules) $(static_modules)), \

 			$(wildcard modules/*))

@@ -67,12 +73,26 @@ NAME=ser

 ALLDEP=Makefile Makefile.sources Makefile.defs Makefile.rules

 #include general defs (like CC, CFLAGS  a.s.o)

+# hack to force makefile.defs re-inclusion (needed when make calls itself with

+# other options -- e.g. make bin)

+makefile_defs=0

+DEFS:=

 include Makefile.defs

 #export relevant variables to the sub-makes

 export DEFS PROFILE CC  LD MKDEP MKTAGS CFLAGS LDFLAGS MOD_CFLAGS MOD_LDFLAGS

 export LEX YACC YACC_FLAGS

 export PREFIX LOCALBASE

+# export relevant variables for recursive calls of this makefile 

+# (e.g. make deb)

+#export LIBS

+#export TAR 

+#export NAME RELEASE OS ARCH 

+#export cfg-prefix cfg-dir bin-prefix bin-dir modules-prefix modules-dir

+#export doc-prefix doc-dir man-prefix man-dir ut-prefix ut-dir

+#export cfg-target modules-target

+#export INSTALL INSTALL-CFG INSTALL-BIN INSTALL-MODULES INSTALL-DOC INSTALL-MAN 

+#export INSTALL-TOUCH

 # include the common rules

@@ -122,10 +142,10 @@ dbg: ser

 .PHONY: tar

 tar: mantainer-clean 

 	$(TAR) -C .. \

-		--exclude=$(notdir $(CURDIR))/test \

-		--exclude=$(notdir $(CURDIR))/tmp \

-		--exclude=$(notdir $(CURDIR))/debian/ser \

-		--exclude=$(notdir $(CURDIR))/debian/ser-mysql-module \

+		--exclude=$(notdir $(CURDIR))/test* \

+		--exclude=$(notdir $(CURDIR))/tmp* \

+		--exclude=$(notdir $(CURDIR))/debian/ser* \

+		--exclude=CVS* \

 		 -zcf ../$(NAME)-$(RELEASE)_src.tar.gz  $(notdir $(CURDIR)) 

 # binary dist. tar.gz

@@ -7,6 +7,7 @@

 #   INSTALL, TAR , CC, LEX, YACC,

 #   CPU, CC_EXTRA_OPTS,

 #   exclude_modules, skip_modules, include_modules

+#   extra_defs

 #

 # History:

 # --------

@@ -21,6 +22,7 @@

 #               for, used only with gcc-3.x) (andrei)

 #  2003-05-23  check if this makefile was already included (andrei)

 #              removed -DDIGEST_DOMAIN (andrei)

+#  2003-05-30  added extra_defs (andrei)

 # check if already included/exported

@@ -35,7 +37,7 @@ export makefile_defs

 VERSION = 0

 PATCHLEVEL = 8

 SUBLEVEL =   11

-EXTRAVERSION = pre28

+EXTRAVERSION = pre29

 RELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)

 OS = $(shell uname -s | sed -e s/SunOS/solaris/ | tr "[A-Z]" "[a-z]")

@@ -185,7 +187,8 @@ YACC := $(shell echo "$${YACC}")

 #		disable the tcp Nagle algorithm (lower delay)

-DEFS+= -DNAME='"$(NAME)"' -DVERSION='"$(RELEASE)"' -DARCH='"$(ARCH)"' \

+DEFS+= $(extra_defs) \

+	 -DNAME='"$(NAME)"' -DVERSION='"$(RELEASE)"' -DARCH='"$(ARCH)"' \

 	 -DOS='"$(OS)"' -DCOMPILER='"$(CC_VER)"' -D__CPU_$(ARCH) -D__OS_$(OS) \

 	 -DCFG_DIR='"$(cfg-target)"'\

 	 -DPKG_MALLOC \

@@ -1,14 +1,27 @@

+ser (0.8.11-pre29) unstable; urgency=low

+

+  * RFC3261 support (TCP, loose routing)

+

+  * lots of new modules:  rich access control lists (permissions), database in

+    textfile support (dbtext), presence agent (pa), enum support (enum),

+    voicemail interface (vm), NAT traversal utility for Cisco/ATA NAT

+    (nathelper)

+

+  * arhitectural  improvements

+

+ -- Andrei Pelinescu-Onciul <pelinescu-onciul@fokus.fraunhofer.de>  Fri, 30 May 2003 18:11:52 +0200

+

 ser (0.8.10) unstable; urgency=low

-  * fixes lots of  bugs in 0.8.9 (log not working, ipv6 address conversion)

-  

-  * introduces port support in uri matching with myself

-  

-  * faster hash function (statefull performance increase ~10%)

+ * fixes lots of  bugs in 0.8.9 (log not working, ipv6 address conversion)

+

+ * introduces port support in uri matching with myself

+

+ * faster hash function (statefull performance increase ~10%)

-  * modules updates (sms, jabber)

+ * modules updates (sms, jabber)

-  * the jabber module is in a separate package now (it depends on libexpat)

+ * the jabber module is in a separate package now (it depends on libexpat)

  -- Andrei Pelinescu-Onciul <pelinescu-onciul@fokus.gmd.de>  Tue, 4 Nov 2002 17:23:37 +0200

@@ -1,8 +1,8 @@

 Source: ser

 Section: net

 Priority: optional

-Maintainer: Andrei Pelinescu-Onciul <pelinescu-onciul@fokus.gmd.de>

-Build-Depends: debhelper (>> 3.0.0), libmysqlclient-dev, libexpat1-dev, zlib1g-dev

+Maintainer: Andrei Pelinescu-Onciul <pelinescu-onciul@fokus.fraunhofer.de>

+Build-Depends: debhelper (>> 3.0.0), libmysqlclient-dev, libexpat1-dev, zlib1g-dev, libradius1-dev

 Standards-Version: 3.5.2

 Package: ser

@@ -35,3 +35,11 @@ Description: contains the jabber module (sip-jabber message translation)

  This has been split out of the main ser package, so that ser will not

  depend upon libexpat. This module will enable you to use ser to translate

   sip messages into jabber messages.

+

+Package: ser-radius-modules

+Architecture: any

+Depends: ${shlibs:Depends}, ser (= ${Source-Version})

+Description: contains the jabber module (sip-jabber message translation)

+ This has been split out of the main ser package, so that ser will not

+ depend upon libradius1. This modules will enable you to authenticate, 

+ do group membership checking or check the messages uris using radius.

@@ -3,6 +3,11 @@

 # GNU copyright 1997 to 1999 by Joey Hess.

 #

 # $Id$

+#

+# History:

+# --------

+#  2003-05-30  updated for the 0.8.11 release, changed modules list and

+#              some ser make options (andrei)

 # Uncomment this to turn on verbose mode.

@@ -11,6 +16,24 @@

 # This is the debhelper compatibility version to use.

 export DH_COMPAT=3

+# modules not in the "main" package or unstable 

+EXCLUDED_MODULES=	mysql jabber auth_radius group_radius uri_radius \

+					postgress snmp cpl cpl-c ext extcmd mangler pdt

+

+# modules depending on mysql

+MYSQL_MODULES=mysql

+#jabber related modules

+JABBER_MODULES=jabber

+#module depending on radiusclient

+RADIUS_MODULES=auth_radius group_radius uri_radius

+

+# the same but with path prepended (needed for modules="...")

+MYSQL_MOD_PATH=$(addprefix modules/, $(MYSQL_MODULES))

+JABBER_MOD_PATH=$(addprefix modules/, $(JABBER_MODULES))

+RADIUS_MOD_PATH=$(addprefix modules/, $(RADIUS_MODULES))

+

+

+

 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))

@@ -34,9 +57,10 @@ build-stamp: configure-stamp

 	dh_testdir

 	# Add here commands to compile the package.

-	$(MAKE) all  exclude_modules="mysql jabber" cfg-target=/etc/ser/

-	$(MAKE) modules modules=modules/mysql cfg-target=/etc/ser/

-	$(MAKE) modules modules=modules/jabber cfg-target=/etc/ser/

+	$(MAKE) all  skip_modules="$(EXCLUDED_MODULES)" cfg-target=/etc/ser/

+	$(MAKE) modules modules="$(MYSQL_MOD_PATH)" cfg-target=/etc/ser/

+	$(MAKE) modules modules="$(JABBER_MOD_PATH)" cfg-target=/etc/ser/

+	$(MAKE) modules modules="$(RADIUS_MOD_PATH)" cfg-target=/etc/ser/

 	#/usr/bin/docbook-to-man debian/ser.sgml > ser.1

 	touch build-stamp

@@ -47,7 +71,9 @@ clean:

 	rm -f build-stamp configure-stamp

 	# Add here commands to clean up after the build process.

-	-$(MAKE) clean

+	-$(MAKE) \

+		include_modules="$(MYSQL_MODULES) $(JABBER_MODULES) $(RADIUS_MODULES)"\

+		 clean

 	dh_clean

@@ -58,23 +84,29 @@ install: build

 	dh_installdirs

 	# Add here commands to install the package into debian/ser

-	$(MAKE) install  exclude_modules="mysql jabber" \

+	$(MAKE) install  skip_modules="$(EXCLUDED_MODULES)" \

 		basedir=$(CURDIR)/debian/ser \

 		prefix=/usr \

 		cfg-prefix=$(CURDIR)/debian/ser \

 		cfg-target=/etc/ser/

 	# install only the mysql module

-	$(MAKE) install-modules modules=modules/mysql  \

+	$(MAKE) install-modules modules="$(MYSQL_MOD_PATH)"  \

 		basedir=$(CURDIR)/debian/ser-mysql-module \

 		prefix=/usr \

 		cfg-prefix=$(CURDIR)/debian/ser-mysql-module \

 		cfg-target=/etc/ser/

 	#install only the jabber module

-	$(MAKE) install-modules modules=modules/jabber  \

+	$(MAKE) install-modules modules="$(JABBER_MOD_PATH)"  \

 		basedir=$(CURDIR)/debian/ser-jabber-module \

 		prefix=/usr \

 		cfg-prefix=$(CURDIR)/debian/ser-jabber-module \

 		cfg-target=/etc/ser/

+	#install only the radius modules

+	$(MAKE) install-modules modules="$(RADIUS_MOD_PATH)"  \

+		basedir=$(CURDIR)/debian/ser-radius-modules \

+		prefix=/usr \

+		cfg-prefix=$(CURDIR)/debian/ser-radius-modules \

+		cfg-target=/etc/ser/

 	#dh_movefiles

new file mode 100644

@@ -0,0 +1 @@

+libradiusclient 0 libradius1 (>= 0.3.2-5)