[Pkg-voip-commits] r3213 - openser/trunk/debian

Thu Mar 8 18:28:35 CET 2007

Author: jblache
Date: 2007-03-08 17:28:35 +0000 (Thu, 08 Mar 2007)
New Revision: 3213

Modified:
   openser/trunk/debian/changelog
   openser/trunk/debian/control
   openser/trunk/debian/rules
Log:
Fix typos, missing bits.

Add snmpstats module, use the TLS tarball.


Modified: openser/trunk/debian/changelog
===================================================================

--- openser/trunk/debian/changelog	2007-03-08 17:13:01 UTC (rev 3212)
+++ openser/trunk/debian/changelog	2007-03-08 17:28:35 UTC (rev 3213)
@@ -1,6 +1,15 @@
 openser (1.2.0-1) UNRELEASED; urgency=low
 
   * NOT YET RELEASED: OpenSER 1.2.0 test build.
+
+  * Source: use the OpenSER TLS tarball
+
+  * debian/control:
+    + New packages: openser-presence-modules, openser-xmlrpc-module, openser-snmpstats-module.
+    + Build-Depends: libxmlrpc-c3-dev, libsnmp9-dev.
+  * debian/rules:
+    + Always build the non-TLS flavour for Debian builds.
+    + Add the new modules.
   * debian/patches/01_sourced_scripts.dpatch:
     + Removed; merged upstream.
   * debian/patches/02_openser.cfg.dpatch:
@@ -10,7 +19,7 @@
   * debian/patches/22_OpenPKG-SA-2006.042.dpatch:
     + Removed; fixed upstream (different fix).
 
- -- Julien BLACHE <jblache at debian.org>  Sat,  3 Mar 2007 11:55:01 +0100
+ -- Julien BLACHE <jblache at debian.org>  Thu,  8 Mar 2007 18:22:37 +0100
 
 openser (1.1.1-1) unstable; urgency=low
 

Modified: openser/trunk/debian/control
===================================================================
--- openser/trunk/debian/control	2007-03-08 17:13:01 UTC (rev 3212)
+++ openser/trunk/debian/control	2007-03-08 17:28:35 UTC (rev 3213)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian VoIP Maintainers <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Julien BLACHE <jblache at debian.org>
-Build-Depends: debhelper (>= 5), dpatch, libmysqlclient15-dev, libexpat1-dev, libxml2-dev, libpq-dev, libradiusclient-ng-dev, flex, bison, zlib1g-dev, unixodbc-dev, libxmlrpc-c3-dev
+Build-Depends: debhelper (>= 5), dpatch, libmysqlclient15-dev, libexpat1-dev, libxml2-dev, libpq-dev, libradiusclient-ng-dev, flex, bison, zlib1g-dev, unixodbc-dev, libxmlrpc-c3-dev, libsnmp9-dev
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/pkg-voip/
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/
@@ -120,10 +120,21 @@
 Package: openser-xmlrpc-module
 Architecture: any
 Depends: ${shlibs:Depends}, openser (= ${Source-Version})
-Description: XMLRPC support for Managemen Interface in OpenSER
+Description: XMLRPC support for OpenSER's Management Interface
  OpenSER is a very fast and flexible SIP (RFC3261)
  proxy server. Written entirely in C, OpenSER can handle thousands calls
  per second even on low-budget hardware.
  .
- This package provides the XMLRPC transport implementation for the Management
- Interface in OpenSER.
+ This package provides the XMLRPC transport implementation for OpenSER's
+ Management Interface.
+
+Package: openser-snmpstats-module
+Architecture: any
+Depends: ${shlibs:Depends}, openser (= ${Source-Version}), snmpd
+Description: SNMP AgentX subagent module for OpenSER
+ OpenSER is a very fast and flexible SIP (RFC3261)
+ proxy server. Written entirely in C, OpenSER can handle thousands calls
+ per second even on low-budget hardware.
+ .
+ This package provides the snmpstats module for OpenSER. This module acts
+ as an AgentX subagent which connects to a master agent.

Modified: openser/trunk/debian/rules
===================================================================
--- openser/trunk/debian/rules	2007-03-08 17:13:01 UTC (rev 3212)
+++ openser/trunk/debian/rules	2007-03-08 17:28:35 UTC (rev 3213)
@@ -6,15 +6,16 @@
 
 ALL_PACKAGES = openser openser-mysql-module openser-postgres-module \
 	openser-jabber-module openser-cpl-module openser-radius-modules \
-	openser-unixodbc-module
+	openser-unixodbc-module openser-presence-modules openser-xmlrpc-module \
+	openser-snmpstats-module
 
 DEBVERSION:=$(shell head -n 1 debian/changelog \
                     | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
 UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/.dfsg$$//')
 
 FILENAME := openser_$(UPVERSION).orig.tar.gz
-UPFILENAME := openser-$(UPVERSION)-notls_src.tar.gz
-URL := http://openser.org/pub/openser/$(UPVERSION)/src/openser-$(UPVERSION)-notls_src.tar.gz
+UPFILENAME := openser-$(UPVERSION)-tls_src.tar.gz
+URL := http://openser.org/pub/openser/$(UPVERSION)/src/openser-$(UPVERSION)-tls_src.tar.gz
 
 # Uncomment this to turn on verbose mode.
 # export DH_VERBOSE=1
@@ -23,8 +24,9 @@
 include /usr/share/dpatch/dpatch.make
 
 
-# Is this the TLS version ?
-TLS=$(shell test -d tls && echo 1)
+# Do we want the TLS version ?
+# Disabled by default due to license issues, set to non-void to enable
+TLS=
 
 # modules depending on mysql
 MYSQL_MODULES = mysql
@@ -42,8 +44,10 @@
 PRESENCE_MODULES = presence pua pua_mi pua_usrloc
 # XMLRPC module
 XMLRPC_MODULES = mi_xmlrpc
+# SNMPstats module
+SNMP_MODULES = snmpstats
 
-ALL_MODULES = $(MYSQL_MODULES) $(POSTGRES_MODULES) $(UNIXODBC_MODULES) $(JABBER_MODULES) $(CPL_MODULES) $(RADIUS_MODULES) $(PRESENCE_MODULES) $(XMLRPC_MODULES)
+ALL_MODULES = $(MYSQL_MODULES) $(POSTGRES_MODULES) $(UNIXODBC_MODULES) $(JABBER_MODULES) $(CPL_MODULES) $(RADIUS_MODULES) $(PRESENCE_MODULES) $(XMLRPC_MODULES) $(SNMP_MODULES)
 
 # modules not in the "main" package or unstable modules
 EXCLUDED_MODULES = $(ALL_MODULES) pa osp
@@ -57,7 +61,9 @@
 RADIUS_MOD_PATH=$(addprefix modules/, $(RADIUS_MODULES))
 PRESENCE_MOD_PATH=$(addprefix modules/, $(PRESENCE_MODULES))
 XMLRPC_MOD_PATH=$(addprefix modules/, $(XMLRPC_MODULES))
+SNMP_MOD_PATH=$(addprefix modules/, $(SNMP_MODULES))
 
+
 ifeq (cc, $(CC))
 	CC = gcc
 endif
@@ -100,6 +106,7 @@
 	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) modules modules="$(RADIUS_MOD_PATH)" cfg-target=/etc/openser/
 	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) modules modules="$(PRESENCE_MOD_PATH)" cfg-target=/etc/openser/
 	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) modules modules="$(XMLRPC_MOD_PATH)" cfg-target=/etc/openser/
+	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) modules modules="$(SNMP_MOD_PATH)" cfg-target=/etc/openser/
 
 	touch build-stamp
 
@@ -208,7 +215,15 @@
 		cfg-target=/etc/openser/ \
 		doc-dir=share/doc/openser-xmlrpc-module
 
+	# install only the snmpstats module
+	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install-modules-all modules="$(SNMP_MOD_PATH)"  \
+		basedir=$(CURDIR)/debian/openser-snmpstats-module \
+		prefix=/usr \
+		cfg-prefix=$(CURDIR)/debian/openser-snmpstats-module \
+		cfg-target=/etc/openser/ \
+		doc-dir=share/doc/openser-snmpstats-module
 
+
 	# the modules packages all ship an empty /usr/sbin directory, let's clean that up
 	for p in $(ALL_PACKAGES); \
 		do rmdir --ignore-fail-on-non-empty $(CURDIR)/debian/$$p/usr/sbin; done


