ser 0.8.10 release

- update ver. no in Makefile
- modified debian, rh & suse
(build a separate jabber module due to expat dependency)
- modified sun package (added some missing files)

Warning: I did a little rpm/*.spec cleanup (e.g make install installs all the
binaries a.s.o).  RH stuff works, Suse not tested.

Makefile.defs

@@ -7,7 +7,7 @@
 #version number
 VERSION = 0
 PATCHLEVEL = 8
-SUBLEVEL =   10-pre5
+SUBLEVEL =   10
 EXTRAVERSION = 
 
 RELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)

debian/changelog

@@ -8,8 +8,9 @@ ser (0.8.10) unstable; urgency=low
 
   * modules updates (sms, jabber)
 
- -- Andrei Pelinescu-Onciul <[email protected]>  Mon, 4 Nov 2002
- 18:20:18 +0200
+  * the jabber module is in a separate package now (it depends on libexpat)
+
+ -- Andrei Pelinescu-Onciul <[email protected]>  Tue, 4 Nov 2002 17:23:37 +0200
 
 ser (0.8.9) unstable; urgency=low
 

debian/control

@@ -2,13 +2,13 @@ Source: ser
 Section: net
 Priority: optional
 Maintainer: Andrei Pelinescu-Onciul <[email protected]>
-Build-Depends: debhelper (>> 3.0.0), libmysqlclient-dev, fakeroot
+Build-Depends: debhelper (>> 3.0.0), libmysqlclient-dev, libexpat1-dev, fakeroot
 Standards-Version: 3.5.2
 
 Package: ser
 Architecture: any
 Depends: ${shlibs:Depends}
-Suggests: ser-mysql-module
+Suggests: ser-mysql-module, ser-jabber-module
 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
@@ -28,3 +28,10 @@ Description: contains the mysql database connectivity module
  depend upon mysql. This module will enable you to use the digest
  authentication module or persistent user location entries.
 
+Package: ser-jabber-module
+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 libexpat. This module will enable you to use ser to translate
+  sip messages into jabber messages.

debian/rules

@@ -34,8 +34,9 @@ build-stamp: configure-stamp
 	dh_testdir
 
 	# Add here commands to compile the package.
-	$(MAKE) all  exclude_modules=mysql cfg-target=/etc/ser/
+	$(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/
 	#/usr/bin/docbook-to-man debian/ser.sgml > ser.1
 
 	touch build-stamp
@@ -57,7 +58,7 @@ install: build
 	dh_installdirs
 
 	# Add here commands to install the package into debian/ser
-	$(MAKE) install  exclude_modules=mysql \
+	$(MAKE) install  exclude_modules="mysql jabber" \
 		basedir=$(CURDIR)/debian/ser \
 		prefix=/usr \
 		cfg-prefix=$(CURDIR)/debian/ser \
@@ -68,6 +69,12 @@ install: build
 		prefix=/usr \
 		cfg-prefix=$(CURDIR)/debian/ser-mysql-module \
 		cfg-target=/etc/ser/
+	#install only the jabber module
+	$(MAKE) install-modules modules=modules/jabber  \
+		basedir=$(CURDIR)/debian/ser-jabber-module \
+		prefix=/usr \
+		cfg-prefix=$(CURDIR)/debian/ser-jabber-module \
+		cfg-target=/etc/ser/
 	#dh_movefiles
 
 

rpm/ser.spec

@@ -1,7 +1,7 @@
 %define name    ser
 %define ver     0.8.10
 %define rel     1
-%define exclude CVS pike radius_acc radius_auth snmp
+%define exclude CVS radius_acc radius_auth snmp mysql jabber
 
 Summary:      SIP Express Router, very fast and flexible SIP Proxy
 Name:         %name
@@ -33,20 +33,29 @@ Module, Registrar and User Location.
 Summary:  MySQL connectivity for the SIP Express Router.
 Group:    System Environment/Daemons
 Requires: ser
+BuildPrereq:  mysql-devel
 
 %description mysql
 The ser-mysql package contains MySQL database connectivity that you
 need to use digest authentication module or persistent user location
 entries.
 
+%package  jabber
+Summary:  sip jabber message translation support for the SIP Express Router.
+Group:    System Environment/Daemons
+Requires: ser
+BuildPrereq:  expat-devel
+
+%description jabber
+The ser-jabber package contains a sip to jabber message translator.
+
 %prep
 %setup
 
 %build
 make all exclude_modules="%exclude" cfg-target=/%{_sysconfdir}/ser/
-make modules modules=modules/mysql cfg-target=/%{_sysconfdir}/ser/
-cd utils/gen_ha1
-make
+make modules modules=modules/mysql  cfg-target=/%{_sysconfdir}/ser/
+make modules modules=modules/jabber cfg-target=/%{_sysconfdir}/ser/
 
 
 %install
@@ -72,25 +81,18 @@ make install-modules modules=modules/mysql \
 	    doc-dir=ser/ \
 	    cfg-target=/%{_sysconfdir}/ser/ \
 	    modules-target=/%{_libdir}/ser/modules/ 
+make install-modules modules=modules/jabber \
+	    modules-prefix=$RPM_BUILD_ROOT/%{_libdir}/ser \
+	    modules-dir=modules/ \
+	    doc-prefix=$RPM_BUILD_ROOT/%{_docdir} \
+	    doc-dir=ser/ \
+	    cfg-target=/%{_sysconfdir}/ser/ \
+	    modules-target=/%{_libdir}/ser/modules/ 
 
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d
 install -m755 $RPM_SOURCE_DIR/ser.init \
               $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/ser
 
-mkdir -p $RPM_BUILD_ROOT/%{_bindir}
-
-install -m755 utils/gen_ha1/gen_ha1 \
-	      $RPM_BUILD_ROOT/%{_bindir}/gen_ha1
-
-install -m755 scripts/harv_ser.sh \
-	      $RPM_BUILD_ROOT/%{_sbindir}/harv_ser.sh
-
-install -m755 scripts/sc \
-	      $RPM_BUILD_ROOT/%{_sbindir}/serctl
-
-install -m755 scripts/ser_mysql.sh \
-	      $RPM_BUILD_ROOT/%{_sbindir}/ser_mysql.sh
-
 
 %clean
 rm -rf "$RPM_BUILD_ROOT"
@@ -119,8 +121,9 @@ fi
 %{_libdir}/ser/modules/auth.so
 %{_libdir}/ser/modules/exec.so
 %{_libdir}/ser/modules/im.so
-%{_libdir}/ser/modules/jabber.so
 %{_libdir}/ser/modules/maxfwd.so
+%{_libdir}/ser/modules/msilo.so
+%{_libdir}/ser/modules/pike.so
 %{_libdir}/ser/modules/print.so
 %{_libdir}/ser/modules/registrar.so
 %{_libdir}/ser/modules/rr.so
@@ -130,10 +133,9 @@ fi
 %{_libdir}/ser/modules/tm.so
 %{_libdir}/ser/modules/usrloc.so
 
-%{_sbindir}/harv_ser.sh
 %{_sbindir}/ser
 %{_sbindir}/serctl
-%{_bindir}/*
+%{_sbindir}/gen_ha1
 
 %{_mandir}/man5/*
 %{_mandir}/man8/*
@@ -145,8 +147,17 @@ fi
 %{_libdir}/ser/modules/mysql.so
 %{_sbindir}/ser_mysql.sh
 
+%files jabber
+%defattr(-,root,root)
+
+%{_libdir}/ser/modules/jabber.so
 
 %changelog
+* Tue Nov 12 2002 Andrei Pelinescu - Onciul <[email protected]>
+- added a separate rpm for the jabber modules
+- moved all the binaries to sbin
+- removed obsolete installs (make install installs everything now)
+
 * Fri Oct  4 2002 Jiri Kuthan <[email protected]>
 - exec module introduced
 

rpm/ser.spec.SuSE

@@ -1,8 +1,7 @@
 %define name    ser
 %define ver     0.8.10
 %define rel     1
-%define exclude CVS pike radius_acc radius_auth snmp
-
+%define exclude CVS radius_acc radius_auth snmp mysql jabber
 Summary:      SIP Express Router, very fast and flexible SIP Proxy
 Name:         %name
 Version:      %ver
@@ -40,17 +39,23 @@ The ser-mysql package contains MySQL database connectivity that you
 need to use digest authentication module or persistent user location
 entries.
 
+%package  jabber
+Summary:  sip jabber message translation support for the SIP Express Router.
+Group:    System Environment/Daemons
+Requires: ser
+BuildPrereq:  expat-devel
+
+%description jabber
+The ser-jabber package contains a sip to jabber message translator.
+
+
 %prep
 %setup
 
 %build
-make all cfg-target=/%{_sysconfdir}/ser/ exclude_modules="%exclude"
-cp modules/mysql/Makefile modules/mysql/Makefile.orig
-sed -e "s/\#-L\/usr\/lib\/mysql/-L\/usr\/lib\/mysql/g" modules/mysql/Makefile.orig > modules/mysql/Makefile
-make modules modules=modules/mysql cfg-target=/%{_sysconfdir}/ser/
-cd utils/gen_ha1
-make
-
+make all exclude_modules="%exclude" cfg-target=/%{_sysconfdir}/ser/
+make modules modules=modules/mysql  cfg-target=/%{_sysconfdir}/ser/
+make modules modules=modules/jabber cfg-target=/%{_sysconfdir}/ser/
 
 %install
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT"
@@ -69,32 +74,24 @@ make install cfg-prefix=$RPM_BUILD_ROOT/%{_sysconfdir} \
 		 modules-target=/%{_libdir}/ser/modules/ \
 	     exclude_modules="%exclude"
 make install-modules modules=modules/mysql \
-	     modules-prefix=$RPM_BUILD_ROOT/%{_libdir}/ser \
-	     modules-dir=modules/ \
-	     doc-prefix=$RPM_BUILD_ROOT/%{_docdir} \
-	     doc-dir=ser/ \
-	     cfg-target=/%{_sysconfdir}/ser/ \
-	     modules-target=/%{_libdir}/ser/modules/
+           modules-prefix=$RPM_BUILD_ROOT/%{_libdir}/ser \
+           modules-dir=modules/ \
+           doc-prefix=$RPM_BUILD_ROOT/%{_docdir} \
+           doc-dir=ser/ \
+           cfg-target=/%{_sysconfdir}/ser/ \
+           modules-target=/%{_libdir}/ser/modules/
+make install-modules modules=modules/jabber \
+           modules-prefix=$RPM_BUILD_ROOT/%{_libdir}/ser \
+           modules-dir=modules/ \
+           doc-prefix=$RPM_BUILD_ROOT/%{_docdir} \
+           doc-dir=ser/ \
+           cfg-target=/%{_sysconfdir}/ser/ \
+           modules-target=/%{_libdir}/ser/modules/
 
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/init.d
 install -m755 $RPM_SOURCE_DIR/ser.init.SuSE \
               $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/ser
 
-mkdir -p $RPM_BUILD_ROOT/%{_bindir}
-
-install -m755 utils/gen_ha1/gen_ha1 \
-	      $RPM_BUILD_ROOT/%{_bindir}/gen_ha1
-
-install -m755 scripts/harv_ser.sh \
-	      $RPM_BUILD_ROOT/%{_sbindir}/harv_ser.sh
-
-install -m755 scripts/sc \
-	      $RPM_BUILD_ROOT/%{_sbindir}/serctl
-
-install -m755 scripts/ser_mysql.sh \
-	      $RPM_BUILD_ROOT/%{_sbindir}/ser_mysql.sh
-
-
 %clean
 rm -rf "$RPM_BUILD_ROOT"
 
@@ -121,9 +118,11 @@ sbin/insserv etc/init.d/
 %dir %{_libdir}/ser/modules
 %{_libdir}/ser/modules/acc.so
 %{_libdir}/ser/modules/auth.so
+%{_libdir}/ser/modules/exec.so
 %{_libdir}/ser/modules/im.so
-%{_libdir}/ser/modules/jabber.so
 %{_libdir}/ser/modules/maxfwd.so
+%{_libdir}/ser/modules/msilo.so
+%{_libdir}/ser/modules/pike.so
 %{_libdir}/ser/modules/print.so
 %{_libdir}/ser/modules/registrar.so
 %{_libdir}/ser/modules/rr.so
@@ -133,10 +132,9 @@ sbin/insserv etc/init.d/
 %{_libdir}/ser/modules/tm.so
 %{_libdir}/ser/modules/usrloc.so
 
-%{_sbindir}/harv_ser.sh
 %{_sbindir}/ser
 %{_sbindir}/serctl
-%{_bindir}/*
++%{_sbindir}/gen_ha1
 
 %{_mandir}/man5/*
 %{_mandir}/man8/*
@@ -148,8 +146,17 @@ sbin/insserv etc/init.d/
 %{_libdir}/ser/modules/mysql.so
 %{_sbindir}/ser_mysql.sh
 
++%files jabber
++%defattr(-,root,root)
++%{_libdir}/ser/modules/jabber.so
+
 
 %changelog
+* Tue Nov 12 2002 Andrei Pelinescu - Onciul <[email protected]>
+- added a separate rpm for the jabber modules
+- moved all the binaries to sbin
+- removed obsolete installs (make install installs everything now)
+
 * Mon Oct 28 2002 Nils Ohlmeier <[email protected]>
 - Added mysql and mysql-devel to the Req for the ser-mysql rpm.
 

solaris/prototype

@@ -5,6 +5,9 @@ d none etc/ser 0755 bin bin
 e none etc/ser/ser.cfg 0644 bin bin
 d none sbin 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
 d none lib 0755 bin bin
 d none lib/ser 2755 bin bin
 d none lib/ser/modules 2755 bin bin
@@ -15,6 +18,7 @@ f none lib/ser/modules/im.so 0755 bin bin
 f none lib/ser/modules/jabber.so 0755 bin bin
 f none lib/ser/modules/maxfwd.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/pike.so 0755 bin bin
 f none lib/ser/modules/print.so 0755 bin bin
 f none lib/ser/modules/registrar.so 0755 bin bin
@@ -24,12 +28,30 @@ f none lib/ser/modules/sms.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/usrloc.so 0755 bin bin
-d none share 0755 bin bin
-d none share/doc 0755 bin bin
-d none share/doc/ser 0755 bin bin
-f none share/doc/ser/README 0644 bin bin
-d none share/man 0755 bin bin
-d none share/man/man8 0755 bin bin
-f none share/man/man8/ser.8 0644 bin bin
-d none share/man/man5 0755 bin bin
-f none share/man/man5/ser.cfg.5 0644 bin bin
+d none doc 0755 bin bin
+d none doc/ser 0755 bin bin
+f none doc/ser/README 0644 bin bin
+f none doc/ser/README.cfg 0644 bin bin
+f none doc/ser/INSTALL 0644 bin bin
+f none doc/ser/README-MODULES 0644 bin bin
+f none doc/ser/AUTHORS 0644 bin bin
+f none doc/ser/README.acc 0644 bin bin
+f none doc/ser/README.auth 0644 bin bin
+f none doc/ser/README.exec 0644 bin bin
+f none doc/ser/README.im 0644 bin bin
+f none doc/ser/README.jabber 0644 bin bin
+f none doc/ser/README.maxfwd 0644 bin bin
+f none doc/ser/README.pike 0644 bin bin
+f none doc/ser/README.print 0644 bin bin
+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.textops 0644 bin bin
+f none doc/ser/README.tm 0644 bin bin
+f none doc/ser/README.usrloc 0644 bin bin
+d none man 0755 bin bin
+d none man/man8 0755 bin bin
+f none man/man8/ser.8 0644 bin bin
+d none man/man5 0755 bin bin
+f none man/man5/ser.cfg.5 0644 bin bin