[Pkg-voip-commits] r3179 - in openser/trunk/debian: . patches
Julien Blache
jblache at alioth.debian.org
Sat Feb 24 17:05:50 CET 2007
Author: jblache
Date: 2007-02-24 17:05:50 +0100 (Sat, 24 Feb 2007)
New Revision: 3179
Removed:
openser/trunk/debian/patches/01_sourced_scripts.dpatch
openser/trunk/debian/patches/02_openser.cfg.dpatch
openser/trunk/debian/patches/12_fail_on_build_failure.dpatch
Modified:
openser/trunk/debian/changelog
openser/trunk/debian/control
openser/trunk/debian/openser.examples
openser/trunk/debian/patches/00list
openser/trunk/debian/patches/10_no_lib64_on_64_bits.dpatch
openser/trunk/debian/patches/11_always_smp.dpatch
openser/trunk/debian/patches/22_OpenPKG-SA-2006.042.dpatch
openser/trunk/debian/rules
Log:
Packaging for OpenSER 1.2.0, to be released soon.
Modified: openser/trunk/debian/changelog
===================================================================
--- openser/trunk/debian/changelog 2007-02-24 11:55:35 UTC (rev 3178)
+++ openser/trunk/debian/changelog 2007-02-24 16:05:50 UTC (rev 3179)
@@ -1,8 +1,14 @@
-openser (1.1.1-2) UNRELEASED; urgency=low
+openser (1.2.0-1) UNRELEASED; urgency=low
- * NOT RELEASED YET
+ * NOT YET RELEASED: OpenSER 1.2.0 test build.
+ * debian/patches/01_sourced_scripts.dpatch:
+ + Removed; merged upstream.
+ * debian/patches/02_openser.cfg.dpatch:
+ + Removed; no longer needed.
+ * debian/patches/12_fail_on_build_failure.dpatch:
+ + Removed; merged upstream.
- -- Julien BLACHE <jblache at debian.org> Fri, 26 Jan 2007 17:11:22 +0100
+ -- Julien BLACHE <jblache at debian.org> Sat, 24 Feb 2007 16:31:22 +0100
openser (1.1.1-1) unstable; urgency=low
Modified: openser/trunk/debian/control
===================================================================
--- openser/trunk/debian/control 2007-02-24 11:55:35 UTC (rev 3178)
+++ openser/trunk/debian/control 2007-02-24 16:05:50 UTC (rev 3179)
@@ -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
+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
Standards-Version: 3.7.2
XS-Vcs-Svn: svn://svn.debian.org/pkg-voip/
XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/
@@ -11,7 +11,7 @@
Package: openser
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
-Suggests: openser-mysql-module, openser-postgres-module, openser-unixodbc-module, openser-jabber-module, openser-cpl-module, openser-radius-modules
+Suggests: openser-mysql-module, openser-postgres-module, openser-unixodbc-module, openser-jabber-module, openser-cpl-module, openser-radius-modules, openser-presence-modules, openser-xmlrpc-module
Description: very fast and configurable SIP proxy
OpenSER is a very fast and flexible SIP (RFC3261)
proxy server. Written entirely in C, OpenSER can handle thousands calls
@@ -104,3 +104,26 @@
per second even on low-budget hardware.
.
This package provides the unixODBC database driver for OpenSER.
+
+Package: openser-presence-modules
+Architecture: any
+Depends: ${shlibs:Depends}, openser (= ${Source-Version})
+Description: SIMPLE presence modules 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 several OpenSER modules for implementing presence
+ server and presence user agent for RICH presence, registrar-based presence,
+ external triggered presence and XCAP support.
+
+Package: openser-xmlrpc-module
+Architecture: any
+Depends: ${shlibs:Depends}, openser (= ${Source-Version})
+Description: XMLRPC support for Managemen Interface in 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 XMLRPC transport implementation for the Management
+ Interface in OpenSER.
Modified: openser/trunk/debian/openser.examples
===================================================================
--- openser/trunk/debian/openser.examples 2007-02-24 11:55:35 UTC (rev 3178)
+++ openser/trunk/debian/openser.examples 2007-02-24 16:05:50 UTC (rev 3179)
@@ -1,12 +1,16 @@
examples/acc.cfg
examples/ctd.sh
+examples/exec_s3.cfg
+examples/exec_s4.cfg
examples/exec_s5.cfg
+examples/flag_reply.cfg
+examples/fork.cfg
examples/logging.cfg
examples/msilo.cfg
-examples/fork.cfg
+examples/nathelper.cfg
examples/pstn.cfg
examples/redirect.cfg
examples/replicate.cfg
examples/serial_183.cfg
-examples/nathelper.cfg
-examples/flag_reply.cfg
+examples/web_im
+
Modified: openser/trunk/debian/patches/00list
===================================================================
--- openser/trunk/debian/patches/00list 2007-02-24 11:55:35 UTC (rev 3178)
+++ openser/trunk/debian/patches/00list 2007-02-24 16:05:50 UTC (rev 3179)
@@ -1,7 +1,4 @@
-01_sourced_scripts
-02_openser.cfg
10_no_lib64_on_64_bits
11_always_smp
-12_fail_on_build_failure
22_OpenPKG-SA-2006.042
Deleted: openser/trunk/debian/patches/01_sourced_scripts.dpatch
===================================================================
--- openser/trunk/debian/patches/01_sourced_scripts.dpatch 2007-02-24 11:55:35 UTC (rev 3178)
+++ openser/trunk/debian/patches/01_sourced_scripts.dpatch 2007-02-24 16:05:50 UTC (rev 3179)
@@ -1,64 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_sourced_scripts.dpatch by <jblache at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Remove the shebang line from openserctl.* scripts which aren't meant
-## DP: for direct execution (sourced by openserctl)
-
- at DPATCH@
-diff -urNad openser-1.1.0~/scripts/openserctl.base openser-1.1.0/scripts/openserctl.base
---- openser-1.1.0~/scripts/openserctl.base 2006-07-04 19:49:58.000000000 +0200
-+++ openser-1.1.0/scripts/openserctl.base 2006-07-12 14:24:41.880689270 +0200
-@@ -1,4 +1,3 @@
--#!/bin/sh
- #
- # $Id: openserctl.base,v 1.1 2006/07/04 17:49:58 miconda Exp $
- #
-diff -urNad openser-1.1.0~/scripts/openserctl.ctlbase openser-1.1.0/scripts/openserctl.ctlbase
---- openser-1.1.0~/scripts/openserctl.ctlbase 2006-07-04 19:49:58.000000000 +0200
-+++ openser-1.1.0/scripts/openserctl.ctlbase 2006-07-12 14:24:39.197440379 +0200
-@@ -1,4 +1,3 @@
--#!/bin/sh
- #
- # $Id: openserctl.ctlbase,v 1.1 2006/07/04 17:49:58 miconda Exp $
- #
-diff -urNad openser-1.1.0~/scripts/openserctl.fifo openser-1.1.0/scripts/openserctl.fifo
---- openser-1.1.0~/scripts/openserctl.fifo 2006-07-04 19:49:58.000000000 +0200
-+++ openser-1.1.0/scripts/openserctl.fifo 2006-07-12 14:24:36.382179242 +0200
-@@ -1,4 +1,3 @@
--#!/bin/sh
- #
- # $Id: openserctl.fifo,v 1.1 2006/07/04 17:49:58 miconda Exp $
- #
-diff -urNad openser-1.1.0~/scripts/openserctl.mysql openser-1.1.0/scripts/openserctl.mysql
---- openser-1.1.0~/scripts/openserctl.mysql 2006-07-04 19:49:58.000000000 +0200
-+++ openser-1.1.0/scripts/openserctl.mysql 2006-07-12 14:24:25.445164760 +0200
-@@ -1,4 +1,3 @@
--#!/bin/sh
- #
- # $Id: openserctl.mysql,v 1.1 2006/07/04 17:49:58 miconda Exp $
- #
-diff -urNad openser-1.1.0~/scripts/openserctl.pgsql openser-1.1.0/scripts/openserctl.pgsql
---- openser-1.1.0~/scripts/openserctl.pgsql 2006-07-04 19:49:58.000000000 +0200
-+++ openser-1.1.0/scripts/openserctl.pgsql 2006-07-12 14:24:07.066460035 +0200
-@@ -1,4 +1,3 @@
--#!/bin/sh
- #
- # $Id: openserctl.pgsql,v 1.1 2006/07/04 17:49:58 miconda Exp $
- #
-diff -urNad openser-1.1.0~/scripts/openserctl.sqlbase openser-1.1.0/scripts/openserctl.sqlbase
---- openser-1.1.0~/scripts/openserctl.sqlbase 2006-07-04 19:49:59.000000000 +0200
-+++ openser-1.1.0/scripts/openserctl.sqlbase 2006-07-12 14:24:02.376024976 +0200
-@@ -1,4 +1,3 @@
--#!/bin/sh
- #
- # $Id: openserctl.sqlbase,v 1.1 2006/07/04 17:49:59 miconda Exp $
- #
-diff -urNad openser-1.1.0~/scripts/openserctl.unixsock openser-1.1.0/scripts/openserctl.unixsock
---- openser-1.1.0~/scripts/openserctl.unixsock 2006-07-04 19:49:59.000000000 +0200
-+++ openser-1.1.0/scripts/openserctl.unixsock 2006-07-12 14:23:59.847790472 +0200
-@@ -1,4 +1,3 @@
--#!/bin/sh
- #
- # $Id: openserctl.unixsock,v 1.1 2006/07/04 17:49:59 miconda Exp $
- #
Deleted: openser/trunk/debian/patches/02_openser.cfg.dpatch
===================================================================
--- openser/trunk/debian/patches/02_openser.cfg.dpatch 2007-02-24 11:55:35 UTC (rev 3178)
+++ openser/trunk/debian/patches/02_openser.cfg.dpatch 2007-02-24 16:05:50 UTC (rev 3179)
@@ -1,27 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_openser.cfg.dpatch by <jblache at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Remove C-style commented fork-no, otherwise the default config
-## DP: file will trigger the test for fork=no in the initscript.
-
- at DPATCH@
-diff -urNad openser-1.1.0~/etc/openser.cfg openser-1.1.0/etc/openser.cfg
---- openser-1.1.0~/etc/openser.cfg 2006-02-15 19:23:46.000000000 +0100
-+++ openser-1.1.0/etc/openser.cfg 2006-09-08 14:37:46.165753127 +0200
-@@ -7,13 +7,8 @@
- # ----------- global configuration parameters ------------------------
-
- debug=3 # debug level (cmd line: -dddddddddd)
--fork=yes
--log_stderror=no # (cmd line: -E)
--
--/* Uncomment these lines to enter debugging mode
--fork=no
--log_stderror=yes
--*/
-+fork=yes # Set to no to enter debugging mode
-+log_stderror=no # (cmd line: -E) Set to yes to enter debugging mode
-
- check_via=no # (cmd. line: -v)
- dns=no # (cmd. line: -r)
Modified: openser/trunk/debian/patches/10_no_lib64_on_64_bits.dpatch
===================================================================
--- openser/trunk/debian/patches/10_no_lib64_on_64_bits.dpatch 2007-02-24 11:55:35 UTC (rev 3178)
+++ openser/trunk/debian/patches/10_no_lib64_on_64_bits.dpatch 2007-02-24 16:05:50 UTC (rev 3179)
@@ -5,10 +5,10 @@
## DP: Debian uses /usr/lib even for 64bit architectures.
@DPATCH@
-diff -urNad openser-1.1.0~/Makefile.defs openser-1.1.0/Makefile.defs
---- openser-1.1.0~/Makefile.defs 2006-07-12 14:03:28.000000000 +0200
-+++ openser-1.1.0/Makefile.defs 2006-07-12 14:04:54.573861646 +0200
-@@ -115,14 +115,12 @@
+diff -urNad openser-1.2.0~/Makefile.defs openser-1.2.0/Makefile.defs
+--- openser-1.2.0~/Makefile.defs 2007-02-24 12:35:45.000000000 +0100
++++ openser-1.2.0/Makefile.defs 2007-02-24 16:26:45.886854110 +0100
+@@ -123,14 +123,12 @@
bin-dir = sbin/
ARCH_B= $(shell echo $(ARCH) | sed -e 's/.*64.*/64b/')
Modified: openser/trunk/debian/patches/11_always_smp.dpatch
===================================================================
--- openser/trunk/debian/patches/11_always_smp.dpatch 2007-02-24 11:55:35 UTC (rev 3178)
+++ openser/trunk/debian/patches/11_always_smp.dpatch 2007-02-24 16:05:50 UTC (rev 3179)
@@ -5,10 +5,10 @@
## DP: Always build for SMP.
@DPATCH@
-diff -urNad openser-1.1.0~/Makefile.defs openser-1.1.0/Makefile.defs
---- openser-1.1.0~/Makefile.defs 2006-07-12 14:32:06.141906366 +0200
-+++ openser-1.1.0/Makefile.defs 2006-07-12 14:32:43.037330136 +0200
-@@ -77,12 +77,7 @@
+diff -urNad openser-1.2.0~/Makefile.defs openser-1.2.0/Makefile.defs
+--- openser-1.2.0~/Makefile.defs 2007-02-24 16:28:43.152825070 +0100
++++ openser-1.2.0/Makefile.defs 2007-02-24 16:28:46.123102964 +0100
+@@ -82,12 +82,7 @@
endif
endif
Deleted: openser/trunk/debian/patches/12_fail_on_build_failure.dpatch
===================================================================
--- openser/trunk/debian/patches/12_fail_on_build_failure.dpatch 2007-02-24 11:55:35 UTC (rev 3178)
+++ openser/trunk/debian/patches/12_fail_on_build_failure.dpatch 2007-02-24 16:05:50 UTC (rev 3179)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 12_fail_on_build_failure.dpatch by <jblache at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fail the build if a module fails to build.
-
- at DPATCH@
-diff -urNad openser-1.1.0~/Makefile openser-1.1.0/Makefile
---- openser-1.1.0~/Makefile 2006-07-10 19:57:20.000000000 +0200
-+++ openser-1.1.0/Makefile 2006-10-02 20:50:15.410352624 +0200
-@@ -149,7 +149,7 @@
-
- .PHONY: modules
- modules:
-- - at for r in $(modules) "" ; do \
-+ @set -e; for r in $(modules) "" ; do \
- if [ -n "$$r" ]; then \
- echo "" ; \
- echo "" ; \
Modified: openser/trunk/debian/patches/22_OpenPKG-SA-2006.042.dpatch
===================================================================
--- openser/trunk/debian/patches/22_OpenPKG-SA-2006.042.dpatch 2007-02-24 11:55:35 UTC (rev 3178)
+++ openser/trunk/debian/patches/22_OpenPKG-SA-2006.042.dpatch 2007-02-24 16:05:50 UTC (rev 3179)
@@ -5,10 +5,10 @@
## DP: Security fix for OpenPKG-SA-2006.042
@DPATCH@
-diff -urNad openser-1.1.0~/modules/permissions/parse_config.c openser-1.1.0/modules/permissions/parse_config.c
---- openser-1.1.0~/modules/permissions/parse_config.c 2005-06-13 18:47:43.000000000 +0200
-+++ openser-1.1.0/modules/permissions/parse_config.c 2006-12-26 22:11:53.681528074 +0100
-@@ -111,8 +111,11 @@
+diff -urNad openser-1.2.0~/modules/permissions/parse_config.c openser-1.2.0/modules/permissions/parse_config.c
+--- openser-1.2.0~/modules/permissions/parse_config.c 2007-01-12 15:23:41.000000000 +0100
++++ openser-1.2.0/modules/permissions/parse_config.c 2007-02-24 16:32:13.901543118 +0100
+@@ -114,8 +114,11 @@
except = strstr(str, " EXCEPT ");
if (except) {
/* exception found */
@@ -22,7 +22,7 @@
/* except+8 points to the exception */
if (parse_expression_list(except+8, e_exceptions)) {
/* error */
-@@ -121,7 +124,8 @@
+@@ -124,7 +127,8 @@
}
} else {
/* no exception */
@@ -31,4 +31,4 @@
+ str2[sizeof(str2)-1] = '\0';
*e_exceptions = NULL;
}
-
+
Modified: openser/trunk/debian/rules
===================================================================
--- openser/trunk/debian/rules 2007-02-24 11:55:35 UTC (rev 3178)
+++ openser/trunk/debian/rules 2007-02-24 16:05:50 UTC (rev 3179)
@@ -33,16 +33,20 @@
# modules depending on unixODBC
UNIXODBC_MODULES=unixodbc
# jabber related modules
-JABBER_MODULES = jabber
+JABBER_MODULES = jabber xmpp
# cpl related modules
CPL_MODULES = cpl-c
# module depending on radiusclient
RADIUS_MODULES = avp_radius auth_radius group_radius uri_radius
+# presence related modules
+PRESENCE_MODULES = presence pua pua_mi pua_usrloc
+# XMLRPC module
+XMLRPC_MODULES = mi_xmlrpc
-ALL_MODULES = $(MYSQL_MODULES) $(POSTGRES_MODULES) $(UNIXODBC_MODULES) $(JABBER_MODULES) $(CPL_MODULES) $(RADIUS_MODULES)
+ALL_MODULES = $(MYSQL_MODULES) $(POSTGRES_MODULES) $(UNIXODBC_MODULES) $(JABBER_MODULES) $(CPL_MODULES) $(RADIUS_MODULES) $(PRESENCE_MODULES) $(XMLRPC_MODULES)
# modules not in the "main" package or unstable modules
-EXCLUDED_MODULES = $(ALL_MODULES) pa
+EXCLUDED_MODULES = $(ALL_MODULES) pa osp
# the same but with path prepended (needed for modules="...")
MYSQL_MOD_PATH=$(addprefix modules/, $(MYSQL_MODULES))
@@ -51,6 +55,8 @@
JABBER_MOD_PATH=$(addprefix modules/, $(JABBER_MODULES))
CPL_MOD_PATH=$(addprefix modules/, $(CPL_MODULES))
RADIUS_MOD_PATH=$(addprefix modules/, $(RADIUS_MODULES))
+PRESENCE_MOD_PATH=$(addprefix modules/, $(PRESENCE_MODULES))
+XMLRPC_MOD_PATH=$(addprefix modules/, $(XMLRPC_MODULES))
ifeq (cc, $(CC))
CC = gcc
@@ -92,6 +98,8 @@
CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) modules modules="$(JABBER_MOD_PATH)" cfg-target=/etc/openser/
CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) modules modules="$(CPL_MOD_PATH)" cfg-target=/etc/openser/
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/
touch build-stamp
@@ -184,7 +192,23 @@
mkdir -p $(CURDIR)/debian/openser-radius-modules/etc/openser/
mv $(CURDIR)/debian/openser/etc/openser/dictionary.radius $(CURDIR)/debian/openser-radius-modules/etc/openser/
+ # install only the presence modules
+ CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install-modules-all modules="$(PRESENCE_MOD_PATH)" \
+ basedir=$(CURDIR)/debian/openser-presence-modules \
+ prefix=/usr \
+ cfg-prefix=$(CURDIR)/debian/openser-presence-modules \
+ cfg-target=/etc/openser/ \
+ doc-dir=share/doc/openser-presence-modules
+ # install only the xmlrpc module
+ CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install-modules-all modules="$(XMLRPC_MOD_PATH)" \
+ basedir=$(CURDIR)/debian/openser-xmlrpc-module \
+ prefix=/usr \
+ cfg-prefix=$(CURDIR)/debian/openser-xmlrpc-module \
+ cfg-target=/etc/openser/ \
+ doc-dir=share/doc/openser-xmlrpc-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
More information about the Pkg-voip-commits
mailing list