소스 검색

- packaginf info merge from 0.9.4

Andrei Pelinescu-Onciul 20 년 전
부모
커밋
13ca8551fe
23개의 변경된 파일633개의 추가작업 그리고 112개의 파일을 삭제
  1. 28 0
      debian/changelog
  2. 40 4
      debian/control
  3. 69 5
      debian/rules
  4. 2 0
      debian/ser.examples
  5. 0 1
      debian/shlibs.local
  6. 8 6
      freebsd/Makefile
  7. 1 1
      freebsd/distinfo
  8. 1 1
      freebsd/pkg-descr
  9. 33 10
      freebsd/pkg-plist
  10. 106 0
      gentoo/ser-0.8.12.ebuild
  11. 106 0
      gentoo/ser-0.8.14.ebuild
  12. 1 1
      netbsd/DESCR
  13. 15 8
      netbsd/Makefile
  14. 33 10
      netbsd/PLIST
  15. 1 1
      netbsd/distinfo
  16. 8 6
      openbsd/Makefile
  17. 1 1
      openbsd/distinfo
  18. 1 1
      openbsd/pkg/DESCR
  19. 34 10
      openbsd/pkg/PLIST
  20. 35 28
      rpm/ser.spec-4.1
  21. 80 12
      rpm/ser.spec.fedora
  22. 2 2
      solaris/pkginfo
  23. 28 4
      solaris/prototype

+ 28 - 0
debian/changelog

@@ -1,3 +1,31 @@
+ser (0.9.4-0.1) unstable; urgency=low
+
+  * new upstream minor release 
+
+ -- Andrei Pelinescu-Onciul <[email protected]>  Fri, 02 Sep 2005 14:49:37 +0200
+
+ser (0.9.3-0.2) unstable; urgency=low
+
+  * missing init.d/ser fixed 
+
+ -- Andrei Pelinescu-Onciul <[email protected]>  Tue, 28 Jun 2005 23:56:05 +0200
+
+ser (0.9.3-0.1) unstable; urgency=low
+
+  * new upstream release 
+  * added ser-cpl-module, ser-pa-module, ser-postgres-module,
+    ser-acc-db-module and ser-acc-radius-module
+  * ser-radius-modules depend now on libradiusclient-ng2 
+    (not in official Debian archives)
+
+ -- Andrei Pelinescu-Onciul <[email protected]>  Thu, 23 Jun 2005 16:43:35 +0200
+
+ser (0.8.14) unstable; urgency=low
+
+  * new upstream release 
+
+ -- Andrei Pelinescu-Onciul <[email protected]>  Fri, 23 Jul 2004 16:00:04 +0200
+
 ser (0.8.12) unstable; urgency=low
 
   * new upstream release (improved tcp support, set_advertised_address a.s.o)

+ 40 - 4
debian/control

@@ -1,15 +1,15 @@
 Source: ser
 Section: net
 Priority: optional
-Maintainer: Andrei Pelinescu-Onciul <[email protected]>
-Build-Depends: debhelper (>= 4), libmysqlclient-dev, libexpat1-dev, libradius1-dev
+Maintainer: Andrei Pelinescu-Onciul <[email protected]>
+Build-Depends: debhelper (>= 4), libmysqlclient-dev, libexpat1-dev, libradiusclient-ng-dev, libxml2-dev, libpq-dev
 Standards-Version: 3.5.2
 
 Package: ser
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
-Suggests: ser-mysql-module, ser-jabber-module
-Conflicts: ser-mysql-module (<< ${Source-Version}), ser-jabber-module (<< ${Source-Version}), ser-radius-modules (<< ${Source-Version})
+Suggests: ser-mysql-module, ser-jabber-module, ser-cpl-module, ser-pa-module, ser-radius-modules
+Conflicts: ser-mysql-module (<< ${Source-Version}), ser-jabber-module (<< ${Source-Version}), ser-radius-modules (<< ${Source-Version}), ser-cpl-module (<< ${Source-Version}), ser-pa-module (<< ${Source-Version}), ser-postgres-module (<< ${Source-Version}), ser-acc-db-module (<< ${Source-Version}), ser-acc-radius-module (<< ${Source-Version})
 Description: Sip Express Router, very fast and configurable SIP proxy
  ser or SIP Express Router is a very fast and flexible SIP (RFC3621)
  proxy server. Written entirely in C, ser can handle thousands calls
@@ -37,6 +37,20 @@ Description: contains the jabber module (sip-jabber message translation)
  depend upon libexpat. This module will enable you to use ser to translate
   sip messages into jabber messages.
 
+Package: ser-cpl-module
+Architecture: any
+Depends: ${shlibs:Depends}, ser (= ${Source-Version})
+Description: contains the cpl-c module (CPL support)
+ This has been split out of the main ser package, so that ser will not
+ depend upon libxml2.
+
+Package: ser-pa-module
+Architecture: any
+Depends: ${shlibs:Depends}, ser (= ${Source-Version})
+Description: contains the pa module (Presence server support)
+ This has been split out of the main ser package, so that ser will not
+ depend upon libxml2.
+
 Package: ser-radius-modules
 Architecture: any
 Depends: ${shlibs:Depends}, ser (= ${Source-Version})
@@ -44,3 +58,25 @@ Description: contains the ser radius modules
  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.
+
+Package: ser-postgres-module
+Architecture: any
+Depends: ${shlibs:Depends}, ser (= ${Source-Version})
+Description: contains the postgres database connectivity module
+ This has been split out of the main ser package, so that ser will not
+ depend upon libbpq. This module will enable you to use the digest
+ authentication module or persistent user location entries.
+
+Package: ser-acc-db-module
+Architecture: any
+Depends: ${shlibs:Depends}, ser (= ${Source-Version})
+Suggests: ser-mysql-module
+Description: contains the ser acc module, with db support 
+ This modules will enable you to do accounting in a database. 
+ You need also a database interface module like mysql or postgres.
+
+Package: ser-acc-radius-module
+Architecture: any
+Depends: ${shlibs:Depends}, ser (= ${Source-Version})
+Description: contains the ser acc module, with radius support 
+ This modules will enable you to do accounting over radius. 

+ 69 - 5
debian/rules

@@ -12,6 +12,11 @@
 #              & small fixes (andrei)
 #  2003-08-29  replaced modules-install with modules-install-all, to 
 #               install also the modules doc (andrei)
+#  2004-07-23  added ext and commented out the radius modules
+#              (the current radius modules depend on radiusclient-ng which
+#               is not yet part of debian)  (andrei)
+#  2005-06-23  added cpl-c, pa & re-enabled radius (with libradiusclient-ng)
+#                (andrei)
 
 
 # Uncomment this to turn on verbose mode.
@@ -25,20 +30,31 @@ export DEB_BUILD_OPTIONS:="$(DEB_BUILD_OPTIONS) nostrip"
 
 # 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 
+					avp_radius pa postgres snmp cpl cpl-c ext extcmd 
 
 # 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
+RADIUS_MODULES=auth_radius group_radius uri_radius avp_radius
+#cpl related modules
+CPL_MODULES=cpl-c
+# pa related modules
+PA_MODULES=pa
+# postgres modules
+POSTGRES_MODULES=postgres
+# acc module
+ACC_MODULE=acc
 
 # 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))
-
+CPL_MOD_PATH=$(addprefix modules/, $(CPL_MODULES))
+PA_MOD_PATH=$(addprefix modules/, $(PA_MODULES))
+POSTGRES_MOD_PATH=$(addprefix modules/, $(POSTGRES_MODULES))
+ACC_MOD_PATH=$(addprefix modules/, $(ACC_MODULE))
 
 
 
@@ -68,6 +84,12 @@ build-stamp: configure-stamp
 	$(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/
+	$(MAKE) modules modules="$(CPL_MOD_PATH)" cfg-target=/etc/ser/
+	$(MAKE) modules modules="$(PA_MOD_PATH)" cfg-target=/etc/ser/
+	# postgres will generate lots of warnings
+	$(MAKE) modules modules="$(POSTGRES_MOD_PATH)" cfg-target=/etc/ser/
+	# acc-db & acc-radius are compiled on install, because they share
+	#  the same source tree with acc
 	#/usr/bin/docbook-to-man debian/ser.sgml > ser.1
 
 	touch build-stamp
@@ -79,8 +101,8 @@ clean:
 
 	# Add here commands to clean up after the build process.
 	-$(MAKE) \
-		include_modules="$(MYSQL_MODULES) $(JABBER_MODULES) $(RADIUS_MODULES)"\
-		 clean
+		include_modules="$(MYSQL_MODULES) $(JABBER_MODULES) $(RADIUS_MODULES)\
+							$(CPL_MODULES) $(PA_MODULES) " clean
 
 	dh_clean
 
@@ -117,6 +139,48 @@ install: build
 		cfg-prefix=$(CURDIR)/debian/ser-radius-modules \
 		cfg-target=/etc/ser/ \
 		doc-dir=share/doc/ser-radius-modules
+	#install only the cpl module
+	$(MAKE) install-modules-all modules="$(CPL_MOD_PATH)"  \
+		basedir=$(CURDIR)/debian/ser-cpl-module \
+		prefix=/usr \
+		cfg-prefix=$(CURDIR)/debian/ser-cpl-module \
+		cfg-target=/etc/ser/ \
+		doc-dir=share/doc/ser-cpl-module
+	#install only the pa module
+	$(MAKE) install-modules-all modules="$(PA_MOD_PATH)"  \
+		basedir=$(CURDIR)/debian/ser-pa-module \
+		prefix=/usr \
+		cfg-prefix=$(CURDIR)/debian/ser-pa-module \
+		cfg-target=/etc/ser/ \
+		doc-dir=share/doc/ser-pa-module
+	#install only the postgres module
+	$(MAKE) install-modules-all modules="$(POSTGRES_MOD_PATH)"  \
+		basedir=$(CURDIR)/debian/ser-postgres-module \
+		prefix=/usr \
+		cfg-prefix=$(CURDIR)/debian/ser-postgres-module \
+		cfg-target=/etc/ser/ \
+		doc-dir=share/doc/ser-postgres-module
+	# Ugly hacks to make 2 new versions from acc: ac_db & acc_radius
+	#install only the acc db version module
+	cd $(ACC_MOD_PATH); $(MAKE) proper; cd ../..; \
+	$(MAKE) install-modules-all modules="$(ACC_MOD_PATH)" \
+		basedir=$(CURDIR)/debian/ser-acc-db-module \
+		prefix=/usr \
+		cfg-prefix=$(CURDIR)/debian/ser-acc-db-module \
+		cfg-target=/etc/ser/ \
+		doc-dir=share/doc/ser-acc-db-module \
+		NAME=acc_db.so modules_names=acc_db.so EXTRA_DEFS=-DSQL_ACC ;\
+	cd $(ACC_MOD_PATH); $(MAKE) proper NAME=acc_db.so; cd ../..
+	#install only the acc radius version module
+	$(MAKE) install-modules-all modules="$(ACC_MOD_PATH)"  \
+		basedir=$(CURDIR)/debian/ser-acc-radius-module \
+		prefix=/usr \
+		cfg-prefix=$(CURDIR)/debian/ser-acc-radius-module \
+		cfg-target=/etc/ser/ \
+		doc-dir=share/doc/ser-acc-radius-module \
+		NAME=acc_radius.so modules_names=acc_radius.so EXTRA_DEFS=-DRAD_ACC \
+		LIBS=-lradiusclient-ng ; \
+	cd $(ACC_MOD_PATH); $(MAKE) proper NAME=acc_radius.so; cd ../..
 	#dh_movefiles
 
 

+ 2 - 0
debian/ser.examples

@@ -10,4 +10,6 @@ examples/redirect.cfg
 examples/replicate.cfg
 examples/serial_183.cfg
 examples/uas.cfg
+examples/vm_proxy.cfg
+examples/voicemail.cfg
 examples/welcome.cfg

+ 0 - 1
debian/shlibs.local

@@ -1 +0,0 @@
-libradiusclient 0 libradius1 (>= 0.3.2-5)

+ 8 - 6
freebsd/Makefile

@@ -9,11 +9,11 @@
 
 
 PORTNAME= ser
-PORTVERSION= 0.8.12
+PORTVERSION= 0.9.4
 CATEGORIES= net
-MASTER_SITES= ftp://ftp.berlios.de/pub/ser/0.8.12/src/
+MASTER_SITES= ftp://ftp.berlios.de/pub/ser/0.9.4/src/
 
-MAINTAINER= [email protected]
+MAINTAINER= [email protected]
 
 .include <bsd.port.pre.mk>
 
@@ -34,16 +34,18 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}_src
 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 # build by default mysql and jabber
-MAKE_ENV= include_modules="mysql jabber"
+MAKE_ENV= include_modules="mysql jabber cpl-c pa"
 
 
 
 
 # depends on mysql and libexpat because of the above modules
 BUILD_DEPENDS= ${LOCALBASE}/include/expat.h:${PORTSDIR}/textproc/expat* \
-               ${LOCALBASE}/include/mysql/mysql.h:${PORTSDIR}/databases/mysql32*-client
+               ${LOCALBASE}/include/mysql/mysql.h:${PORTSDIR}/databases/mysql*-client \
+               ${LOCALBASE}/include/libxml2/libxml/uri.h:${PORTSDIR}/textproc/libxml2* 
 LIB_DEPENDS=   expat:${PORTSDIR}/textproc/expat* \
-               mysqlclient.10:${PORTSDIR}/databases/mysql32*-client
+               mysqlclient:${PORTSDIR}/databases/mysql*-client \
+               xml2:${PORTSDIR}/textproc/libxml2
 
 pre-fetch:
 

+ 1 - 1
freebsd/distinfo

@@ -1 +1 @@
-MD5 (ser-0.8.12_src.tar.gz) = 070509795c5be4fe684dbfc36d42780a
+MD5 (ser-0.9.4_src.tar.gz) = d12d56d76c86b59dd51a43b3251b7d3a

+ 1 - 1
freebsd/pkg-descr

@@ -6,7 +6,7 @@ architecture allows only required functionality to be loaded.
 Currently the following modules are available: Digest Authentication,
 CPL scripts, Instant Messaging, MySQL support, Presence Agent, Radius
 Authentication, Record Routing, SMS Gateway, Jabber Gateway, Transaction
-Module, Registrar and User Location.
+Module, Registrar, User Location, NAT Traversal, a.s.o.
 
 
 WWW: http://www.iptel.org/ser/

+ 33 - 10
freebsd/pkg-plist

@@ -1,23 +1,30 @@
+etc/ser/dictionary.ser
 etc/ser/ser.cfg
-sbin/ser
-sbin/serctl
-sbin/ser_mysql.sh
-sbin/gen_ha1
 lib/ser/modules/acc.so
 lib/ser/modules/auth.so
 lib/ser/modules/auth_db.so
 lib/ser/modules/auth_diameter.so
+lib/ser/modules/avp.so
+lib/ser/modules/avp_db.so
+lib/ser/modules/avpops.so
+lib/ser/modules/cpl-c.so
 lib/ser/modules/dbtext.so
+lib/ser/modules/dispatcher.so
+lib/ser/modules/diversion.so
 lib/ser/modules/domain.so
 lib/ser/modules/enum.so
 lib/ser/modules/exec.so
+lib/ser/modules/flatstore.so
+lib/ser/modules/gflags.so
 lib/ser/modules/group.so
 lib/ser/modules/jabber.so
 lib/ser/modules/mangler.so
 lib/ser/modules/maxfwd.so
+lib/ser/modules/mediaproxy.so
 lib/ser/modules/msilo.so
 lib/ser/modules/mysql.so
 lib/ser/modules/nathelper.so
+lib/ser/modules/options.so
 lib/ser/modules/pa.so
 lib/ser/modules/pdt.so
 lib/ser/modules/permissions.so
@@ -27,31 +34,46 @@ lib/ser/modules/registrar.so
 lib/ser/modules/rr.so
 lib/ser/modules/sl.so
 lib/ser/modules/sms.so
+lib/ser/modules/speeddial.so
 lib/ser/modules/textops.so
 lib/ser/modules/tm.so
 lib/ser/modules/uri.so
+lib/ser/modules/uri_db.so
 lib/ser/modules/usrloc.so
-lib/ser/modules/vm.so
 lib/ser/modules/xlog.so
-share/doc/ser/README
-share/doc/ser/INSTALL
-share/doc/ser/README-MODULES
+sbin/gen_ha1
+sbin/ser
+sbin/ser_mysql.sh
+sbin/serctl
+sbin/serunix
 share/doc/ser/AUTHORS
+share/doc/ser/INSTALL
 share/doc/ser/NEWS
+share/doc/ser/README
+share/doc/ser/README-MODULES
 share/doc/ser/README.acc
 share/doc/ser/README.auth
 share/doc/ser/README.auth_db
 share/doc/ser/README.auth_diameter
-share/doc/ser/README.domain
+share/doc/ser/README.avp
+share/doc/ser/README.avp_db
+share/doc/ser/README.avpops
+share/doc/ser/README.cpl-c
 share/doc/ser/README.dbtext
+share/doc/ser/README.dispatcher
+share/doc/ser/README.diversion
+share/doc/ser/README.domain
 share/doc/ser/README.enum
 share/doc/ser/README.exec
+share/doc/ser/README.flatstore
+share/doc/ser/README.gflags
 share/doc/ser/README.group
 share/doc/ser/README.jabber
 share/doc/ser/README.mangler
 share/doc/ser/README.maxfwd
 share/doc/ser/README.msilo
 share/doc/ser/README.nathelper
+share/doc/ser/README.options
 share/doc/ser/README.pa
 share/doc/ser/README.pdt
 share/doc/ser/README.permissions
@@ -61,11 +83,12 @@ share/doc/ser/README.registrar
 share/doc/ser/README.rr
 share/doc/ser/README.sl
 share/doc/ser/README.sms
+share/doc/ser/README.speeddial
 share/doc/ser/README.textops
 share/doc/ser/README.tm
 share/doc/ser/README.uri
+share/doc/ser/README.uri_db
 share/doc/ser/README.usrloc
-share/doc/ser/README.vm
 share/doc/ser/README.xlog
 @dirrm share/doc/ser
 @dirrm etc/ser

+ 106 - 0
gentoo/ser-0.8.12.ebuild

@@ -0,0 +1,106 @@
+# Copyright 1999-2003 Fraunhofer Fokus
+# Distributed under the terms of the GNU General Public License v2
+# $Header$
+
+DESCRIPTION="SIP Express Router"
+
+HOMEPAGE="http://www.iptel.org/ser"
+SRC_URI="ftp://ftp.berlios.de/pub/ser/0.8.12/src/${P}_src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc"
+IUSE="debug ipv6 mysql postgres"
+
+DEPEND=">=sys-devel/gcc-2.95.3
+		>=sys-devel/bison-1.35
+		>=sys-devel/flex-2.5.4a
+		mysql? ( >=dev-db/mysql-3.23.52 )
+		postgres? ( >=dev-db/postgresql-7.3.4 )"
+
+S="${WORKDIR}/${P}"
+
+inc_mod=""
+make_options=""
+
+check_mods() {
+	if [ "`use mysql`" ]; then
+		inc_mod="${inc_mod} mysql"
+	fi
+	if [ "`use postgres`" ]; then
+		inc_mod="${inc_mod} postgres"
+	fi
+	
+	# test some additional modules for which
+	# no USE variables exist
+	
+	# jabber module requires dev-libs/expat
+	if [ -f "/usr/include/expat.h" ]; then
+		inc_mod="${inc_mod} jabber"
+	fi
+	# Radius modules requires installed radiusclient
+	# which is not in portage yet
+	if [ -f "/usr/include/radiusclient.h" -o  -f "/usr/local/include/radisuclient.h" ]; then
+		inc_mod="${inc_mod} auth_radius group_radius uri_radius"
+	fi
+}
+
+src_compile() {
+	if [ ! "`use ipv6`" ]; then
+		cp Makefile.defs Makefile.defs.orig 
+		sed -e "s/-DUSE_IPV6//g" Makefile.defs.orig > Makefile.defs;
+	fi
+	# optimization can result in strange debuging symbols so omit it in case
+	if [ "`use debug`" ]; then
+		make_options="${make_options} mode=debug"
+	else
+		make_options="${make_options} CFLAGS=${CFLAGS}"
+	fi
+
+	check_mods
+
+	make all "${make_options}" \
+		prefix=${D}/ \
+		include_modules="${inc_mod}" \
+		cfg-prefix=/ \
+		cfg-target=/etc/ser/ || die
+}
+
+src_install () {
+	check_mods
+
+	make install \
+		prefix=${D}/ \
+		include_modules="${inc_mod}" \
+		bin-prefix=${D}/usr/sbin \
+		bin-dir="" \
+		cfg-prefix=${D}/etc \
+		cfg-dir=ser/ \
+		cfg-target=/etc/ser \
+		modules-prefix=${D}/usr/lib/ser \
+		modules-dir=modules \
+		modules-target=/usr/lib/ser/modules/ \
+		man-prefix=${D}/usr/share/man \
+		man-dir="" \
+		doc-prefix=${D}/usr/share/doc \
+		doc-dir=${P} || die
+	exeinto /etc/init.d
+	newexe gentoo/ser.init ser
+
+	# fix what the Makefile don't do
+	if [ ! "`use mysql`" ]; then
+		rm ${D}/usr/sbin/ser_mysql.sh
+	fi
+}
+
+pkg_postinst() {
+	einfo "WARNING: If you upgraded from a previous Ser version"
+	einfo "please read the README, NEWS and INSTALL files in the"
+	einfo "documentation directory because the database and the"
+	einfo "configuration file of old Ser versions are incompatible"
+	einfo "with the current version."
+}
+
+pkg_prerm () {
+	/etc/init.d/ser stop >/dev/null
+}

+ 106 - 0
gentoo/ser-0.8.14.ebuild

@@ -0,0 +1,106 @@
+# Copyright 1999-2003 Fraunhofer Fokus
+# Distributed under the terms of the GNU General Public License v2
+# $Header$
+
+DESCRIPTION="SIP Express Router"
+
+HOMEPAGE="http://www.iptel.org/ser"
+SRC_URI="ftp://ftp.berlios.de/pub/ser/0.8.14/src/${P}_src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc"
+IUSE="debug ipv6 mysql postgres"
+
+DEPEND=">=sys-devel/gcc-2.95.3
+		>=sys-devel/bison-1.35
+		>=sys-devel/flex-2.5.4a
+		mysql? ( >=dev-db/mysql-3.23.52 )
+		postgres? ( >=dev-db/postgresql-7.3.4 )"
+
+S="${WORKDIR}/${P}"
+
+inc_mod=""
+make_options=""
+
+check_mods() {
+	if [ "`use mysql`" ]; then
+		inc_mod="${inc_mod} mysql"
+	fi
+	if [ "`use postgres`" ]; then
+		inc_mod="${inc_mod} postgres"
+	fi
+	
+	# test some additional modules for which
+	# no USE variables exist
+	
+	# jabber module requires dev-libs/expat
+	if [ -f "/usr/include/expat.h" ]; then
+		inc_mod="${inc_mod} jabber"
+	fi
+	# Radius modules requires installed radiusclient
+	# which is not in portage yet
+	if [ -f "/usr/include/radiusclient.h" -o  -f "/usr/local/include/radisuclient.h" ]; then
+		inc_mod="${inc_mod} auth_radius group_radius uri_radius"
+	fi
+}
+
+src_compile() {
+	if [ ! "`use ipv6`" ]; then
+		cp Makefile.defs Makefile.defs.orig 
+		sed -e "s/-DUSE_IPV6//g" Makefile.defs.orig > Makefile.defs;
+	fi
+	# optimization can result in strange debuging symbols so omit it in case
+	if [ "`use debug`" ]; then
+		make_options="${make_options} mode=debug"
+	else
+		make_options="${make_options} CFLAGS=${CFLAGS}"
+	fi
+
+	check_mods
+
+	make all "${make_options}" \
+		prefix=${D}/ \
+		include_modules="${inc_mod}" \
+		cfg-prefix=/ \
+		cfg-target=/etc/ser/ || die
+}
+
+src_install () {
+	check_mods
+
+	make install \
+		prefix=${D}/ \
+		include_modules="${inc_mod}" \
+		bin-prefix=${D}/usr/sbin \
+		bin-dir="" \
+		cfg-prefix=${D}/etc \
+		cfg-dir=ser/ \
+		cfg-target=/etc/ser \
+		modules-prefix=${D}/usr/lib/ser \
+		modules-dir=modules \
+		modules-target=/usr/lib/ser/modules/ \
+		man-prefix=${D}/usr/share/man \
+		man-dir="" \
+		doc-prefix=${D}/usr/share/doc \
+		doc-dir=${P} || die
+	exeinto /etc/init.d
+	newexe gentoo/ser.init ser
+
+	# fix what the Makefile don't do
+	if [ ! "`use mysql`" ]; then
+		rm ${D}/usr/sbin/ser_mysql.sh
+	fi
+}
+
+pkg_postinst() {
+	einfo "WARNING: If you upgraded from a previous Ser version"
+	einfo "please read the README, NEWS and INSTALL files in the"
+	einfo "documentation directory because the database and the"
+	einfo "configuration file of old Ser versions are incompatible"
+	einfo "with the current version."
+}
+
+pkg_prerm () {
+	/etc/init.d/ser stop >/dev/null
+}

+ 1 - 1
netbsd/DESCR

@@ -6,7 +6,7 @@ architecture allows only required functionality to be loaded.
 Currently the following modules are available: Digest Authentication,
 CPL scripts, Instant Messaging, MySQL support, Presence Agent, Radius
 Authentication, Record Routing, SMS Gateway, Jabber Gateway, Transaction
-Module, Registrar and User Location.
+Module, Registrar, User Location, NAT Traversal, a.s.o.
 
 
 WWW: http://www.iptel.org/ser/

+ 15 - 8
netbsd/Makefile

@@ -10,34 +10,41 @@
 COMMENT= "SIP Express Router"
 
 PORTNAME= ser
-PORTVERSION= 0.8.12
+PORTVERSION= 0.9.4
 CATEGORIES= net
-MASTER_SITES= ftp://ftp.berlios.de/pub/ser/0.8.12/src/
+MASTER_SITES= ftp://ftp.berlios.de/pub/ser/0.9.4/src/
 
-MAINTAINER= [email protected]
+MAINTAINER= [email protected]
 
 MAN8=ser.8
 MAN5=ser.cfg.5
 # MANCOMPRESSED must not be specified (if defined is assumed to be yes)
 
-
-USE_GMAKE= yes
+# netbsd 2.0
+USE_TOOLS+=	gmake
+#netbsd 1.6
+USE_GMAKE= yes     
 # we override the DISTFILE NAME
 DISTNAME= ${PORTNAME}-${PORTVERSION}
 DISTFILES= ${DISTNAME}_src.tar.gz
 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 # build by default mysql and jabber
-MAKE_ENV= include_modules="mysql jabber"
+MAKE_ENV= include_modules="mysql jabber cpl-c pa"
 
-# depends on expat and mysqlclient because of the above modules
+# depends on expat, mysqlclient and libxml2 because of the above modules
 DEPENDS= expat-[0-9]*:../../textproc/expat \
-         mysql-client>=3.23.35:../../databases/mysql-client
+         mysql-client>=3.23.35:../../databases/mysql-client \
+         libxml2*:../../textproc/libxml2
 
 #.include "/usr/pkgsrc/mk/bsd.prefs.mk"
 
 pre-fetch:
 
+.include "../../textproc/expat/buildlink3.mk"
+.include "../../databases/mysql-client/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+
 .include "../../mk/bsd.pkg.mk"
 
 

+ 33 - 10
netbsd/PLIST

@@ -1,23 +1,30 @@
+etc/ser/dictionary.ser
 etc/ser/ser.cfg
-sbin/ser
-sbin/serctl
-sbin/ser_mysql.sh
-sbin/gen_ha1
 lib/ser/modules/acc.so
 lib/ser/modules/auth.so
 lib/ser/modules/auth_db.so
 lib/ser/modules/auth_diameter.so
+lib/ser/modules/avp.so
+lib/ser/modules/avp_db.so
+lib/ser/modules/avpops.so
+lib/ser/modules/cpl-c.so
 lib/ser/modules/dbtext.so
+lib/ser/modules/dispatcher.so
+lib/ser/modules/diversion.so
 lib/ser/modules/domain.so
 lib/ser/modules/enum.so
 lib/ser/modules/exec.so
+lib/ser/modules/flatstore.so
+lib/ser/modules/gflags.so
 lib/ser/modules/group.so
 lib/ser/modules/jabber.so
 lib/ser/modules/mangler.so
 lib/ser/modules/maxfwd.so
+lib/ser/modules/mediaproxy.so
 lib/ser/modules/msilo.so
 lib/ser/modules/mysql.so
 lib/ser/modules/nathelper.so
+lib/ser/modules/options.so
 lib/ser/modules/pa.so
 lib/ser/modules/pdt.so
 lib/ser/modules/permissions.so
@@ -27,31 +34,46 @@ lib/ser/modules/registrar.so
 lib/ser/modules/rr.so
 lib/ser/modules/sl.so
 lib/ser/modules/sms.so
+lib/ser/modules/speeddial.so
 lib/ser/modules/textops.so
 lib/ser/modules/tm.so
 lib/ser/modules/uri.so
+lib/ser/modules/uri_db.so
 lib/ser/modules/usrloc.so
-lib/ser/modules/vm.so
 lib/ser/modules/xlog.so
-share/doc/ser/README
-share/doc/ser/INSTALL
-share/doc/ser/README-MODULES
+sbin/gen_ha1
+sbin/ser
+sbin/ser_mysql.sh
+sbin/serctl
+sbin/serunix
 share/doc/ser/AUTHORS
+share/doc/ser/INSTALL
 share/doc/ser/NEWS
+share/doc/ser/README
+share/doc/ser/README-MODULES
 share/doc/ser/README.acc
 share/doc/ser/README.auth
 share/doc/ser/README.auth_db
 share/doc/ser/README.auth_diameter
-share/doc/ser/README.domain
+share/doc/ser/README.avp
+share/doc/ser/README.avp_db
+share/doc/ser/README.avpops
+share/doc/ser/README.cpl-c
 share/doc/ser/README.dbtext
+share/doc/ser/README.dispatcher
+share/doc/ser/README.diversion
+share/doc/ser/README.domain
 share/doc/ser/README.enum
 share/doc/ser/README.exec
+share/doc/ser/README.flatstore
+share/doc/ser/README.gflags
 share/doc/ser/README.group
 share/doc/ser/README.jabber
 share/doc/ser/README.mangler
 share/doc/ser/README.maxfwd
 share/doc/ser/README.msilo
 share/doc/ser/README.nathelper
+share/doc/ser/README.options
 share/doc/ser/README.pa
 share/doc/ser/README.pdt
 share/doc/ser/README.permissions
@@ -61,11 +83,12 @@ share/doc/ser/README.registrar
 share/doc/ser/README.rr
 share/doc/ser/README.sl
 share/doc/ser/README.sms
+share/doc/ser/README.speeddial
 share/doc/ser/README.textops
 share/doc/ser/README.tm
 share/doc/ser/README.uri
+share/doc/ser/README.uri_db
 share/doc/ser/README.usrloc
-share/doc/ser/README.vm
 share/doc/ser/README.xlog
 @dirrm share/doc/ser
 @dirrm etc/ser

+ 1 - 1
netbsd/distinfo

@@ -1 +1 @@
-MD5 (ser-0.8.12_src.tar.gz) = 070509795c5be4fe684dbfc36d42780a
+MD5 (ser-0.9.4_src.tar.gz) = d12d56d76c86b59dd51a43b3251b7d3a

+ 8 - 6
openbsd/Makefile

@@ -10,11 +10,11 @@
 COMMENT= "SIP Express Router"
 
 PORTNAME= ser
-PORTVERSION= 0.8.12
+PORTVERSION= 0.9.4
 CATEGORIES= net
-MASTER_SITES= ftp://ftp.berlios.de/pub/ser/0.8.12/src/
+MASTER_SITES= ftp://ftp.berlios.de/pub/ser/0.9.4/src/
 
-MAINTAINER= [email protected]
+MAINTAINER= [email protected] 
 
 MAN8=ser.8
 MAN5=ser.cfg.5
@@ -34,13 +34,15 @@ DISTFILES= ${DISTNAME}_src.tar.gz
 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 # build by default mysql and jabber
-MAKE_ENV= include_modules="mysql jabber"
+MAKE_ENV= include_modules="mysql jabber cpl-c pa"
 
 # depends on mysql and libexpat because of the above modules
 BUILD_DEPENDS= :expat-1.*:textproc/expat \
-               :mysql-client-3.23.*:databases/mysql
+               :mysql-client-[3-].*:databases/mysql \
+               :libxml-2.*:textproc/libxml
 LIB_DEPENDS=   expat.2:expat-1.*:textproc/expat \
-               lib/mysql/mysqlclient.10:mysql-client-3.23.*:databases/mysql
+               lib/mysql/mysqlclient.10:mysql-client-[3-].*:databases/mysql \
+               xml2:libxml-2.*:textproc/libxml
 
 
 

+ 1 - 1
openbsd/distinfo

@@ -1 +1 @@
-MD5 (ser-0.8.12_src.tar.gz) = 070509795c5be4fe684dbfc36d42780a
+MD5 (ser-0.9.4_src.tar.gz) = d12d56d76c86b59dd51a43b3251b7d3a

+ 1 - 1
openbsd/pkg/DESCR

@@ -6,7 +6,7 @@ architecture allows only required functionality to be loaded.
 Currently the following modules are available: Digest Authentication,
 CPL scripts, Instant Messaging, MySQL support, Presence Agent, Radius
 Authentication, Record Routing, SMS Gateway, Jabber Gateway, Transaction
-Module, Registrar and User Location.
+Module, Registrar, User Location, NAT Traversal, a.s.o.
 
 
 WWW: http://www.iptel.org/ser/

+ 34 - 10
openbsd/pkg/PLIST

@@ -1,23 +1,30 @@
+etc/ser/dictionary.ser
 etc/ser/ser.cfg
-sbin/ser
-sbin/serctl
-sbin/ser_mysql.sh
-sbin/gen_ha1
 lib/ser/modules/acc.so
 lib/ser/modules/auth.so
 lib/ser/modules/auth_db.so
 lib/ser/modules/auth_diameter.so
+lib/ser/modules/avp.so
+lib/ser/modules/avp_db.so
+lib/ser/modules/avpops.so
+lib/ser/modules/cpl-c.so
 lib/ser/modules/dbtext.so
+lib/ser/modules/dispatcher.so
+lib/ser/modules/diversion.so
 lib/ser/modules/domain.so
 lib/ser/modules/enum.so
 lib/ser/modules/exec.so
+lib/ser/modules/flatstore.so
+lib/ser/modules/gflags.so
 lib/ser/modules/group.so
 lib/ser/modules/jabber.so
 lib/ser/modules/mangler.so
 lib/ser/modules/maxfwd.so
+lib/ser/modules/mediaproxy.so
 lib/ser/modules/msilo.so
 lib/ser/modules/mysql.so
 lib/ser/modules/nathelper.so
+lib/ser/modules/options.so
 lib/ser/modules/pa.so
 lib/ser/modules/pdt.so
 lib/ser/modules/permissions.so
@@ -27,30 +34,46 @@ lib/ser/modules/registrar.so
 lib/ser/modules/rr.so
 lib/ser/modules/sl.so
 lib/ser/modules/sms.so
+lib/ser/modules/speeddial.so
 lib/ser/modules/textops.so
 lib/ser/modules/tm.so
 lib/ser/modules/uri.so
+lib/ser/modules/uri_db.so
 lib/ser/modules/usrloc.so
-lib/ser/modules/vm.so
 lib/ser/modules/xlog.so
-share/doc/ser/README
-share/doc/ser/INSTALL
-share/doc/ser/README-MODULES
+sbin/gen_ha1
+sbin/ser
+sbin/ser_mysql.sh
+sbin/serctl
+sbin/serunix
 share/doc/ser/AUTHORS
+share/doc/ser/INSTALL
 share/doc/ser/NEWS
+share/doc/ser/README
+share/doc/ser/README-MODULES
 share/doc/ser/README.acc
 share/doc/ser/README.auth
 share/doc/ser/README.auth_db
 share/doc/ser/README.auth_diameter
-share/doc/ser/README.domain
+share/doc/ser/README.avp
+share/doc/ser/README.avp_db
+share/doc/ser/README.avpops
+share/doc/ser/README.cpl-c
 share/doc/ser/README.dbtext
+share/doc/ser/README.dispatcher
+share/doc/ser/README.diversion
+share/doc/ser/README.domain
 share/doc/ser/README.enum
 share/doc/ser/README.exec
+share/doc/ser/README.flatstore
+share/doc/ser/README.gflags
 share/doc/ser/README.group
 share/doc/ser/README.jabber
 share/doc/ser/README.mangler
+share/doc/ser/README.maxfwd
 share/doc/ser/README.msilo
 share/doc/ser/README.nathelper
+share/doc/ser/README.options
 share/doc/ser/README.pa
 share/doc/ser/README.pdt
 share/doc/ser/README.permissions
@@ -60,11 +83,12 @@ share/doc/ser/README.registrar
 share/doc/ser/README.rr
 share/doc/ser/README.sl
 share/doc/ser/README.sms
+share/doc/ser/README.speeddial
 share/doc/ser/README.textops
 share/doc/ser/README.tm
 share/doc/ser/README.uri
+share/doc/ser/README.uri_db
 share/doc/ser/README.usrloc
-share/doc/ser/README.vm
 share/doc/ser/README.xlog
 @dirrm share/doc/ser
 @dirrm etc/ser

+ 35 - 28
rpm/ser.spec-4.1

@@ -1,8 +1,8 @@
 %define name    ser
-%define ver     0.8.12
+%define ver     0.8.14
 %define rel     0
 
-%define EXCLUDED_MODULES	mysql jabber auth_radius group_radius uri_radius postgress snmp cpl cpl-c ext extcmd
+%define EXCLUDED_MODULES	mysql jabber auth_radius group_radius uri_radius postgres snmp cpl cpl-c extcmd
 %define MYSQL_MODULES		mysql
 %define JABBER_MODULES		jabber
 %define RADIUS_MODULES		auth_radius group_radius uri_radius
@@ -55,15 +55,15 @@ BuildPrereq:  expat-devel
 %description jabber
 The ser-jabber package contains a sip to jabber message translator.
 
-%package  radius
-Summary:  ser radius authentication, group and uri check modules.
-Group:    System Environment/Daemons
-Requires: ser = %ver
-BuildPrereq:  radiusclient-devel
+#%package  radius
+#Summary:  ser radius authentication, group and uri check modules.
+#Group:    System Environment/Daemons
+#Requires: ser = %ver
+#BuildPrereq:  radiusclient-devel
 
-%description radius
-The ser-radius package contains modules for radius authentication, group
- membership and uri checking.
+#%description radius
+#The ser-radius package contains modules for radius authentication, group
+# membership and uri checking.
 
 %prep
 %setup
@@ -98,16 +98,16 @@ make install-doc modules="modules/%JABBER_MODULES" \
 		prefix=/usr \
 		cfg-prefix=$RPM_BUILD_ROOT \
 		cfg-target=/%{_sysconfdir}/ser/ 
-make install-modules modules="%RADIUS_MOD_PATH" \
-		basedir=$RPM_BUILD_ROOT \
-		prefix=/usr \
-		cfg-prefix=$RPM_BUILD_ROOT \
-		cfg-target=/%{_sysconfdir}/ser/ 
-make install-doc modules="%RADIUS_MOD_PATH" \
-		basedir=$RPM_BUILD_ROOT \
-		prefix=/usr \
-		cfg-prefix=$RPM_BUILD_ROOT \
-		cfg-target=/%{_sysconfdir}/ser/ 
+#make install-modules modules="%RADIUS_MOD_PATH" \
+#		basedir=$RPM_BUILD_ROOT \
+#		prefix=/usr \
+#		cfg-prefix=$RPM_BUILD_ROOT \
+#		cfg-target=/%{_sysconfdir}/ser/ 
+#make install-doc modules="%RADIUS_MOD_PATH" \
+#		basedir=$RPM_BUILD_ROOT \
+#		prefix=/usr \
+#		cfg-prefix=$RPM_BUILD_ROOT \
+#		cfg-target=/%{_sysconfdir}/ser/ 
 
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d
 install -m755 $RPM_SOURCE_DIR/ser.init \
@@ -145,6 +145,7 @@ fi
 %doc %{_docdir}/ser/README.domain
 %doc %{_docdir}/ser/README.enum
 %doc %{_docdir}/ser/README.exec
+%doc %{_docdir}/ser/README.ext
 %doc %{_docdir}/ser/README.group
 %doc %{_docdir}/ser/README.mangler
 %doc %{_docdir}/ser/README.maxfwd
@@ -180,9 +181,11 @@ fi
 %{_libdir}/ser/modules/domain.so
 %{_libdir}/ser/modules/enum.so
 %{_libdir}/ser/modules/exec.so
+%{_libdir}/ser/modules/ext.so
 %{_libdir}/ser/modules/group.so
 %{_libdir}/ser/modules/mangler.so
 %{_libdir}/ser/modules/maxfwd.so
+%{_libdir}/ser/modules/mediaproxy.so
 %{_libdir}/ser/modules/msilo.so
 %{_libdir}/ser/modules/nathelper.so
 %{_libdir}/ser/modules/pa.so
@@ -222,19 +225,23 @@ fi
 
 %{_libdir}/ser/modules/jabber.so
 
-%files radius
-%defattr(-,root,root)
-%doc %{_docdir}/ser/README.auth_radius
-%doc %{_docdir}/ser/README.group_radius
-%doc %{_docdir}/ser/README.uri_radius
+#%files radius
+#%defattr(-,root,root)
+#%doc %{_docdir}/ser/README.auth_radius
+#%doc %{_docdir}/ser/README.group_radius
+#%doc %{_docdir}/ser/README.uri_radius
 
-%{_libdir}/ser/modules/auth_radius.so
-%{_libdir}/ser/modules/group_radius.so
-%{_libdir}/ser/modules/uri_radius.so
+#%{_libdir}/ser/modules/auth_radius.so
+#%{_libdir}/ser/modules/group_radius.so
+#%{_libdir}/ser/modules/uri_radius.so
 
 
 %changelog
 
+* Fri Jul 23 2004 Andrei Pelinescu - Onciul <[email protected]>
+- changed vesion to 0.8.14 (new upstream release)
+- added ext to the modules list, removed the radius modules (they depend on radiusclient-ng now)
+
 * Fri Nov 14 2003 Andrei Pelinescu - Onciul <[email protected]>
 - changed vesion to 0.8.12 (new upstream release)
 - added auth_diameter, pdt & mangler to the modules list

+ 80 - 12
rpm/ser.spec.fedora

@@ -1,13 +1,17 @@
-%define EXCLUDED_MODULES	mysql jabber auth_radius group_radius uri_radius postgress snmp cpl cpl-c extcmd
+%define EXCLUDED_MODULES	mysql jabber auth_radius group_radius uri_radius avp_radius pa postgres snmp cpl cpl-c ext extcmd
 %define MYSQL_MODULES		mysql
 %define JABBER_MODULES		jabber
-%define RADIUS_MODULES		auth_radius group_radius uri_radius
+%define RADIUS_MODULES		auth_radius group_radius uri_radius avp_radius
+%define CPL_MODULES		cpl-c
+%define PA_MODULES		pa
+%define POSTGRES_MODULES		postgres
+%define ACC_MODULE		acc
 %define RADIUS_MOD_PATH		modules/auth_radius modules/group_radius modules/uri_radius
 
 
 Summary:      SIP Express Router, very fast and flexible SIP Proxy
 Name:         ser
-Version:      0.8.14
+Version:      0.9.4
 Release:      fc2.0
 Copyright:    GPL
 Group:        System Environment/Daemons
@@ -56,17 +60,37 @@ BuildPrereq:  expat-devel
 The ser-jabber package contains a sip to jabber message translator.
 
 
+# commented out due to missing libradiusclient-ng
 #%package  radius
 #Summary:  ser radius authentication, group and uri check modules.
 #Group:    System Environment/Daemons
 #Requires: ser = %{version}
-#BuildPrereq:  radiusclient-devel
+#BuildPrereq:  radiusclient-ng-devel
 
 
 #%description radius
 #The ser-radius package contains modules for radius authentication, group
 # membership and uri checking.
 
+%package  cpl 
+Summary:  CPL support.
+Group:    System Environment/Daemons
+Requires: ser = %{version}
+BuildPrereq:  xml2-devel
+
+%package  pa 
+Summary:  presence server support.
+Group:    System Environment/Daemons
+Requires: ser = %{version}
+BuildPrereq:  xml2-devel
+
+%package  postgres
+Summary:  postgres connectivity for the SIP Express Router.
+Group:    System Environment/Daemons
+Requires: ser = %{version}
+BuildPrereq:  libpq-devel
+
+
 
 %prep
 %setup
@@ -76,7 +100,10 @@ The ser-jabber package contains a sip to jabber message translator.
 make all skip_modules="%EXCLUDED_MODULES"      cfg-target=/%{_sysconfdir}/ser/
 make modules modules="modules/%MYSQL_MODULES"  cfg-target=/%{_sysconfdir}/ser/
 make modules modules="modules/%JABBER_MODULES" cfg-target=/%{_sysconfdir}/ser/
-make modules modules="%RADIUS_MOD_PATH"        cfg-target=/%{_sysconfdir}/ser/
+#make modules modules="%RADIUS_MOD_PATH"        cfg-target=/%{_sysconfdir}/ser/
+make modules modules="modules/%CPL_MODULES"    cfg-target=/%{_sysconfdir}/ser/
+make modules modules="modules/%PA_MODULES"     cfg-target=/%{_sysconfdir}/ser/
+make modules modules="modules/%POSTGRES_MODULES" cfg-target=/%{_sysconfdir}/ser/
 
 
 %install
@@ -86,17 +113,12 @@ make install skip_modules="%EXCLUDED_MODULES" \
 		prefix=%{_prefix} \
 		cfg-prefix=%{buildroot} \
 		cfg-target=/%{_sysconfdir}/ser/ 
-make install-modules modules="modules/%MYSQL_MODULES" \
+make install-modules-all modules="modules/%MYSQL_MODULES" \
 		basedir=%{buildroot} \
 		prefix=%{_prefix} \
 		cfg-prefix=%{buildroot} \
 		cfg-target=/%{_sysconfdir}/ser/ 
-make install-modules modules="modules/%JABBER_MODULES" \
-		basedir=%{buildroot} \
-		prefix=%{_prefix} \
-		cfg-prefix=%{buildroot} \
-		cfg-target=/%{_sysconfdir}/ser/ 
-make install-doc modules="modules/%JABBER_MODULES" \
+make install-modules-all modules="modules/%JABBER_MODULES" \
 		basedir=%{buildroot} \
 		prefix=%{_prefix} \
 		cfg-prefix=%{buildroot} \
@@ -111,6 +133,21 @@ make install-doc modules="modules/%JABBER_MODULES" \
 #		prefix=%{_prefix} \
 #		cfg-prefix=%{buildroot} \
 #		cfg-target=/%{_sysconfdir}/ser/ 
+make install-modules-all modules="modules/%CPL_MODULES" \
+		basedir=%{buildroot} \
+		prefix=%{_prefix} \
+		cfg-prefix=%{buildroot} \
+		cfg-target=/%{_sysconfdir}/ser/ 
+make install-modules-all modules="modules/%PA_MODULES" \
+		basedir=%{buildroot} \
+		prefix=%{_prefix} \
+		cfg-prefix=%{buildroot} \
+		cfg-target=/%{_sysconfdir}/ser/ 
+make install-modules-all modules="modules/%POSTGRES_MODULES" \
+		basedir=%{buildroot} \
+		prefix=%{_prefix} \
+		cfg-prefix=%{buildroot} \
+		cfg-target=/%{_sysconfdir}/ser/ 
 install -m755 -D %{SOURCE1} %{buildroot}/%{_initrddir}/ser
 
 
@@ -144,6 +181,12 @@ fi
 %exclude %{_libdir}/ser/modules/jabber.so
 #%exclude %{_docdir}/ser/README.*_radius
 #%exclude %{_libdir}/ser/modules/*_radius.so
+%exclude %{_docdir}/ser/README.cpl-c
+%exclude %{_libdir}/ser/modules/cpl-c.so
+%exclude %{_docdir}/ser/README.pa
+%exclude %{_libdir}/ser/modules/pa.so
+%exclude %{_docdir}/ser/README.postgres
+%exclude %{_libdir}/ser/modules/postgres.so
 
 
 %files mysql
@@ -164,8 +207,33 @@ fi
 #%{_libdir}/ser/modules/*_radius.so
 
 
+%files cpl 
+%defattr(-,root,root)
+%doc %{_docdir}/ser/README.cpl-c
+%{_libdir}/ser/modules/cpl-c.so
+
+
+%files pa 
+%defattr(-,root,root)
+%doc %{_docdir}/ser/README.pa
+%{_libdir}/ser/modules/pa.so
+
+
+%files postgres 
+%defattr(-,root,root)
+%doc %{_docdir}/ser/README.postgres
+%{_libdir}/ser/modules/postgres.so
+
+
 %changelog
 
+* Fri Sep 02 2005 Andrei Pelinescu - Onciul <[email protected]>
+- changed vesion to 0.9.4 (new upstream release)
+
+* Fri Jun 28 2005 Andrei Pelinescu - Onciul <[email protected]>
+- changed vesion to 0.9.3 (new upstream release)
+- added cpl, pa and postgres to the modules list
+
 * Tue Nov 23 2004 Gabriel Somlo <[email protected]>
 - reworked spec file for fedora core 2
 - replaced absolute paths with macros wherever possible

+ 2 - 2
solaris/pkginfo

@@ -1,8 +1,8 @@
 PKG=IPTELser
 ARCH=sparc
-VERSION=0.8.12
+VERSION=0.9.4
 CATEGORY=application
-EMAIL=[email protected]
+EMAIL=[email protected]
 NAME= ser or SIP Express Router is a very fast and flexible SIP proxy server
 SUNW_ISA=sparcv9
 BASEDIR=/usr/local

+ 28 - 4
solaris/prototype

@@ -2,12 +2,14 @@
 i pkginfo=pkginfo
 d none etc 0755 bin bin
 d none etc/ser 0755 bin bin
+e none etc/ser/dictionary.ser 0644 bin bin
 e none etc/ser/ser.cfg 0644 bin bin
 d none sbin 0755 bin bin
+f none sbin/gen_ha1 0755 bin bin
 f none sbin/ser 0755 bin bin
-f none sbin/serctl 0755 bin bin
 f none sbin/ser_mysql.sh 0755 bin bin
-f none sbin/gen_ha1 0755 bin bin
+f none sbin/serctl 0755 bin bin
+f none sbin/serunix 0755 bin bin
 d none lib 0755 bin bin
 d none lib/ser 2755 bin bin
 d none lib/ser/modules 2755 bin bin
@@ -15,17 +17,27 @@ f none lib/ser/modules/acc.so 0755 bin bin
 f none lib/ser/modules/auth.so 0755 bin bin
 f none lib/ser/modules/auth_db.so 0755 bin bin
 f none lib/ser/modules/auth_diameter.so 0755 bin bin
+f none lib/ser/modules/avp.so 0755 bin bin
+f none lib/ser/modules/avp_db.so 0755 bin bin
+f none lib/ser/modules/avpops.so 0755 bin bin
+f none lib/ser/modules/cpl-c.so 0755 bin bin
 f none lib/ser/modules/dbtext.so 0755 bin bin
+f none lib/ser/modules/dispatcher.so 0755 bin bin
+f none lib/ser/modules/diversion.so 0755 bin bin
 f none lib/ser/modules/domain.so 0755 bin bin
 f none lib/ser/modules/enum.so 0755 bin bin
 f none lib/ser/modules/exec.so 0755 bin bin
+f none lib/ser/modules/flatstore.so 0755 bin bin
+f none lib/ser/modules/gflags.so 0755 bin bin
 f none lib/ser/modules/group.so 0755 bin bin
 f none lib/ser/modules/jabber.so 0755 bin bin
 f none lib/ser/modules/mangler.so 0755 bin bin
 f none lib/ser/modules/maxfwd.so 0755 bin bin
+f none lib/ser/modules/mediaproxy.so 0755 bin bin
 f none lib/ser/modules/msilo.so 0755 bin bin
 f none lib/ser/modules/mysql.so 0755 bin bin
 f none lib/ser/modules/nathelper.so 0755 bin bin
+f none lib/ser/modules/options.so 0755 bin bin
 f none lib/ser/modules/pa.so 0755 bin bin
 f none lib/ser/modules/pdt.so 0755 bin bin
 f none lib/ser/modules/permissions.so 0755 bin bin
@@ -35,11 +47,13 @@ f none lib/ser/modules/registrar.so 0755 bin bin
 f none lib/ser/modules/rr.so 0755 bin bin
 f none lib/ser/modules/sl.so 0755 bin bin
 f none lib/ser/modules/sms.so 0755 bin bin
+f none lib/ser/modules/speeddial.so 0755 bin bin
 f none lib/ser/modules/textops.so 0755 bin bin
 f none lib/ser/modules/tm.so 0755 bin bin
 f none lib/ser/modules/uri.so 0755 bin bin
+f none lib/ser/modules/uri_db.so 0755 bin bin
 f none lib/ser/modules/usrloc.so 0755 bin bin
-f none lib/ser/modules/vm.so 0755 bin bin
+f none lib/ser/modules/xlog.so 0755 bin bin
 d none doc 0755 bin bin
 d none doc/ser 0755 bin bin
 f none doc/ser/README 0644 bin bin
@@ -51,16 +65,25 @@ f none doc/ser/README.acc 0644 bin bin
 f none doc/ser/README.auth 0644 bin bin
 f none doc/ser/README.auth_db 0644 bin bin
 f none doc/ser/README.auth_diameter 0644 bin bin
+f none doc/ser/README.avp 0644 bin bin
+f none doc/ser/README.avp_db 0644 bin bin
+f none doc/ser/README.avpops 0644 bin bin
+f none doc/ser/README.cpl-c 0644 bin bin
 f none doc/ser/README.dbtext  0644 bin bin
+f none doc/ser/README.dispatcher  0644 bin bin
+f none doc/ser/README.diversion  0644 bin bin
 f none doc/ser/README.domain  0644 bin bin
 f none doc/ser/README.enum    0644 bin bin
 f none doc/ser/README.exec 0644 bin bin
+f none doc/ser/README.flatstore 0644 bin bin
+f none doc/ser/README.gflags 0644 bin bin
 f none doc/ser/README.group 0644 bin bin
 f none doc/ser/README.jabber 0644 bin bin
 f none doc/ser/README.mangler 0644 bin bin
 f none doc/ser/README.maxfwd 0644 bin bin
 f none doc/ser/README.msilo 0644 bin bin
 f none doc/ser/README.nathelper 0644 bin bin
+f none doc/ser/README.options 0644 bin bin
 f none doc/ser/README.pa 0644 bin bin
 f none doc/ser/README.pdt 0644 bin bin
 f none doc/ser/README.permissions 0644 bin bin
@@ -70,11 +93,12 @@ f none doc/ser/README.registrar 0644 bin bin
 f none doc/ser/README.rr 0644 bin bin
 f none doc/ser/README.sl 0644 bin bin
 f none doc/ser/README.sms 0644 bin bin
+f none doc/ser/README.speeddial 0644 bin bin
 f none doc/ser/README.textops 0644 bin bin
 f none doc/ser/README.tm 0644 bin bin
 f none doc/ser/README.uri 0644 bin bin
+f none doc/ser/README.uri_db 0644 bin bin
 f none doc/ser/README.usrloc 0644 bin bin
-f none doc/ser/README.vm 0644 bin bin
 f none doc/ser/README.xlog 0644 bin bin
 d none man 0755 bin bin
 d none man/man8 0755 bin bin