[Pkg-voip-commits] r1987 - in openser/trunk: . debian debian/patches
Julien Blache
jblache at costa.debian.org
Fri Jun 30 20:32:51 UTC 2006
Author: jblache
Date: 2006-06-30 20:32:50 +0000 (Fri, 30 Jun 2006)
New Revision: 1987
Added:
openser/trunk/debian/
openser/trunk/debian/changelog
openser/trunk/debian/compat
openser/trunk/debian/control
openser/trunk/debian/copyright
openser/trunk/debian/openser.README.Debian
openser/trunk/debian/openser.default
openser/trunk/debian/openser.examples
openser/trunk/debian/openser.init
openser/trunk/debian/openser.postinst
openser/trunk/debian/patches/
openser/trunk/debian/patches/00list
openser/trunk/debian/patches/01_ungentooize.dpatch
openser/trunk/debian/patches/02_postgres_module_build.dpatch
openser/trunk/debian/rules
Log:
Load newtrunk into openser/trunk.
Added: openser/trunk/debian/changelog
===================================================================
--- openser/trunk/debian/changelog 2006-06-30 20:31:57 UTC (rev 1986)
+++ openser/trunk/debian/changelog 2006-06-30 20:32:50 UTC (rev 1987)
@@ -0,0 +1,70 @@
+openser (1.0.1-1) unstable; urgency=low
+
+ * Packaging sanitized.
+ * Remove everything debconf-related; setting up an HA cluster is an
+ advanced use of OpenSER which cannot be handled through debconf anyway.
+ * debian/control:
+ + Remove all -tls- packages.
+ + Add missing build-depends: zlib1g-dev, flex, bison.
+ + Build-Depend on libradiusclient-ng-dev, libmysqlclient15-dev.
+ + Packages descriptions rewritten.
+ + Add an openser-dbg package.
+ * debian/rules:
+ + Remove everything related to -tls- packages.
+ + Build with -g -Wall -O2
+ * debian/patches/01_ungetooize.dpatch:
+ + Added; Do not override CFLAGS if set in the environment. Allows building
+ at a rational optimisation level, and passing extra CFLAGS for debugging.
+ * debian/patches/02_postgres_module_build.dpatch:
+ + Added; Remove unneeded architecture restriction for the PostgreSQL module
+ build.
+
+ -- Julien BLACHE <jblache at debian.org> Fri, 30 Jun 2006 22:22:11 +0200
+
+openser (1.0.1-0) unstable; urgency=low
+
+ * OpenSER v1.0.1 Release.
+
+ -- Daniel-Constantin Mierla <daniel at voice-system.ro> Mon, 27 Feb 2006 19:23:00 +0200
+
+openser (1.0.0-2) unstable; urgency=low
+
+ * Create a sequence file for use if the radius accounting is enabled,
+ which is guaranteed to be writable by openser no matter what user
+ and group is running as. If radius accounting is used, this can be
+ added in your clients.conf that is used by openser as:
+ seqfile /var/run/openser/openser_radius.seq
+ * Fixed wording in the master_node template description
+
+ -- Dan Pascu <dan at ag-projects.com> Fri, 03 Feb 2006 20:20:24 +0200
+
+openser (1.0.0-1) unstable; urgency=low
+
+ * Added support for debconf. A number of things can now be configured
+ when installing the package: if to start on boot, the ammount of
+ memory the openser server will use and if to dump core files when
+ the server crashes.
+ * Added support for storing startup options in /etc/default/openser.
+ This file is used by /etc/init.d/openser to setup various startup
+ options which no longer need to be modified in the startup script
+ itself.
+ * Fixed issue with not adding dependency on libradius-ng
+ * Fixed issue with the debian postinst scripts which resulted in the
+ openser system user not being created for the openser-tls package
+ * Fixed issue with some debhelper entries being added twice in the
+ openser postrm and prerm scripts
+ * Fixed issue with the openser system user not having his home
+ directory removed on purge
+ * Fixed a number of typos in the Suggests and Conflicts directives
+ in the debian control file
+ * Up to date with recent bugfixes from upstream
+
+ -- Dan Pascu <dan at ag-projects.com> Thu, 02 Feb 2006 12:47:41 +0200
+
+openser (1.0.0-0) unstable; urgency=low
+
+ * First Public Release.
+
+ -- Daniel-Constantin Mierla <daniel at voice-system.ro> Tue, 07 Jun 2005 18:23:19 +0200
+
+
Added: openser/trunk/debian/compat
===================================================================
--- openser/trunk/debian/compat 2006-06-30 20:31:57 UTC (rev 1986)
+++ openser/trunk/debian/compat 2006-06-30 20:32:50 UTC (rev 1987)
@@ -0,0 +1 @@
+5
Added: openser/trunk/debian/control
===================================================================
--- openser/trunk/debian/control 2006-06-30 20:31:57 UTC (rev 1986)
+++ openser/trunk/debian/control 2006-06-30 20:32:50 UTC (rev 1987)
@@ -0,0 +1,106 @@
+Source: openser
+Section: net
+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 | libmysqlclient-dev, libexpat1-dev, libxml2-dev, libpq-dev | postgresql-dev, libradiusclient-ng-dev, libssl-dev, flex, bison, zlib1g-dev
+Standards-Version: 3.7.2
+
+Package: openser
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
+Suggests: openser-mysql-module, openser-postgres-module, openser-jabber-module, openser-cpl-module, openser-radius-modules
+Conflicts: openser-mysql-module (<< ${Source-Version}), openser-postgres-module (<< ${Source-Version}), openser-jabber-module (<< ${Source-Version}), openser-cpl-module (<< ${Source-Version}), openser-radius-modules (<< ${Source-Version})
+Description: Open SIP Express Router, very fast and configurable SIP proxy
+ OpenSER, or Open SIP Express Router, is a very fast and flexible SIP (RFC3621)
+ proxy server. Written entirely in C, OpenSER can handle thousands calls
+ per second even on low-budget hardware.
+ .
+ C Shell-like scripting language provides full control over the server's
+ behaviour. Its modular architecture allows only required functionality to be
+ loaded.
+ .
+ Among others, 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.
+ .
+ This package contains the main OpenSER binary along with the principal modules
+ and support binaries.
+
+Package: openser-dbg
+Architecture: any
+Depends: openser (= ${Source-Version})
+Suggests: openser-mysql-module, openser-postgres-module, openser-jabber-module, openser-cpl-module, openser-radius-modules
+Conflicts: openser (<< ${Source-Version}), openser-mysql-module (<< ${Source-Version}), openser-postgres-module (<< ${Source-Version}), openser-jabber-module (<< ${Source-Version}), openser-cpl-module (<< ${Source-Version}), openser-radius-modules (<< ${Source-Version})
+Description: Open SIP Express Router, very fast and configurable SIP proxy [debug symbols]
+ OpenSER, or Open SIP Express Router, is a very fast and flexible SIP (RFC3621)
+ proxy server. Written entirely in C, OpenSER can handle thousands calls
+ per second even on low-budget hardware.
+ .
+ C Shell-like scripting language provides full control over the server's
+ behaviour. Its modular architecture allows only required functionality to be
+ loaded.
+ .
+ Among others, 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.
+ .
+ This package contains the debugging symbols for the OpenSER binaries and
+ modules. You only need to install it if you need to debug OpenSER.
+
+Package: openser-mysql-module
+Architecture: any
+Depends: ${shlibs:Depends}, openser (= ${Source-Version}), mysql-client
+Description: MySQL database connectivity module for openser
+ OpenSER, or Open SIP Express Router, is a very fast and flexible SIP (RFC3621)
+ proxy server. Written entirely in C, OpenSER can handle thousands calls
+ per second even on low-budget hardware.
+ .
+ This package provides digest authentication and persistent user location
+ entries using a MySQL database.
+
+Package: openser-postgres-module
+Architecture: any
+Depends: ${shlibs:Depends}, openser (= ${Source-Version}), postgresql-client
+Description: PostgreSQL database connectivity module for openser
+ OpenSER, or Open SIP Express Router, is a very fast and flexible SIP (RFC3621)
+ proxy server. Written entirely in C, OpenSER can handle thousands calls
+ per second even on low-budget hardware.
+ .
+ This package provides digest authentication and persistent user location
+ entries using a PostgreSQL database.
+
+Package: openser-jabber-module
+Architecture: any
+Depends: ${shlibs:Depends}, openser (= ${Source-Version})
+Description: Jabber module (sip-jabber message translation) for openser
+ OpenSER, or Open SIP Express Router, is a very fast and flexible SIP (RFC3621)
+ proxy server. Written entirely in C, OpenSER can handle thousands calls
+ per second even on low-budget hardware.
+ .
+ This package provides the SIP to Jabber translator module for OpenSER.
+
+Package: openser-cpl-module
+Architecture: any
+Depends: ${shlibs:Depends}, openser (= ${Source-Version})
+Description: CPL module (CPL interpreter engine) for openser
+ OpenSER, or Open SIP Express Router, is a very fast and flexible SIP (RFC3621)
+ proxy server. Written entirely in C, OpenSER can handle thousands calls
+ per second even on low-budget hardware.
+ .
+ This package provides a CPL (Call Processing Language) interpreter for
+ OpenSER, turning OpenSER into a CPL server (storage and interpreter).
+
+Package: openser-radius-modules
+Architecture: any
+Depends: ${shlibs:Depends}, openser (= ${Source-Version})
+Description: radius modules for openser
+ OpenSER, or Open SIP Express Router, is a very fast and flexible SIP (RFC3621)
+ proxy server. Written entirely in C, OpenSER can handle thousands calls
+ per second even on low-budget hardware.
+ .
+ This package provides a set of Radius modules for OpenSER, for
+ authentication, group membership and messages URIs checking against a
+ Radius Server.
Added: openser/trunk/debian/copyright
===================================================================
--- openser/trunk/debian/copyright 2006-06-30 20:31:57 UTC (rev 1986)
+++ openser/trunk/debian/copyright 2006-06-30 20:32:50 UTC (rev 1987)
@@ -0,0 +1,20 @@
+This package was debianized by Andrei Pelinescu-Onciul
+<pelinescu-onciul at fokus.fraunhofer.de> on Tue, 16 Jul 2002 15:41:31 +0200.
+
+It was downloaded from http://openser.org/.
+
+Upstream Authors: Andrei Pelinescu-Onciul
+<pelinescu-onciul at fokus.fraunhofer.de>, Bogdan-Andrei Iancu
+<bogdan at voice-system.ro>, Daniel-Constantin Mierla <daniel at voice-system.ro>,
+Jan Janak <jan at iptel.org>, Jiri Kuthan <jiri at iptel.org>, Juha Heinanen,
+Maxim Sobolev, Miklos Tirpak, Nils Ohlmeier, Ramona-Elena Modroiu,
+Raphael Coeffic, Ricardo Baratto, Stelios Sidiroglou-Douskos
+(see AUTHORS file for details)
+
+This software is copyright (c) 2002-2003 by FhG Fokus
+
+You are free to distribute this software under the terms of
+the GNU General Public License.
+
+On Debian systems, the complete text of the GNU General Public
+License can be found in the file `/usr/share/common-licenses/GPL.
Added: openser/trunk/debian/openser.README.Debian
===================================================================
--- openser/trunk/debian/openser.README.Debian 2006-06-30 20:31:57 UTC (rev 1986)
+++ openser/trunk/debian/openser.README.Debian 2006-06-30 20:32:50 UTC (rev 1987)
@@ -0,0 +1,22 @@
+OpenSER for Debian
+------------------
+
+To setup OpenSER, you need to:
+ - configure OpenSER properly to suit your needs
+ - edit /etc/default/openser, adjust the MEMORY parameter and set
+ RUN_OPENSER to "yes"
+
+If you are building an HA cluster using heartbeat or similar, you'll want
+to disable the init script by running:
+
+ update-rc.d remove
+
+so that OpenSER will not be launched at system startup. You still need
+to set RUN_OPENSER to "yes" if you want to use the /etc/init.d/openser init
+script.
+
+Set the DUMP_CORE parameter in /etc/default/openser to "yes" if you want to
+get a core dump in case OpenSER crashes. The debug symbols for OpenSER are
+provided by the openser-dbg package.
+
+-- Julien BLACHE <jblache at debian.org>, Fri, 30 Jun 2006 21:28:43 +0200
Added: openser/trunk/debian/openser.default
===================================================================
--- openser/trunk/debian/openser.default 2006-06-30 20:31:57 UTC (rev 1986)
+++ openser/trunk/debian/openser.default 2006-06-30 20:32:50 UTC (rev 1987)
@@ -0,0 +1,29 @@
+#
+# OpenSER startup options
+#
+
+# Set to yes to enable openser, once configured properly.
+RUN_OPENSER=no
+
+# User to run as
+USER=openser
+
+# Group to run as
+GROUP=openser
+
+# Amount of memory to allocate for the running OpenSER server (in Mb)
+MEMORY=64
+
+# Enable the server to leave a core file when it crashes.
+# Set this to 'yes' to enable OpenSER to leave a core file when it crashes
+# or 'no' to disable this feature. This option is case sensitive and only
+# accepts 'yes' and 'no' and only in lowercase letters.
+#
+# Please note that when this is enabled, the USER and GROUP options above
+# will be ignored and the root user/group will be used instead. This is
+# because only then OpenSER will be able to leave a core file.
+# If someone knows how this can be made to work even when the server runs as
+# user openser, please let us know. Tests show that if only as much as the
+# group is set to openser, while the user is root for the running server,
+# it will still refuse to write the core file.
+DUMP_CORE=no
Added: openser/trunk/debian/openser.examples
===================================================================
--- openser/trunk/debian/openser.examples 2006-06-30 20:31:57 UTC (rev 1986)
+++ openser/trunk/debian/openser.examples 2006-06-30 20:32:50 UTC (rev 1987)
@@ -0,0 +1,12 @@
+examples/acc.cfg
+examples/ctd.sh
+examples/exec_s5.cfg
+examples/logging.cfg
+examples/msilo.cfg
+examples/fork.cfg
+examples/pstn.cfg
+examples/redirect.cfg
+examples/replicate.cfg
+examples/serial_183.cfg
+examples/nathelper.cfg
+examples/flag_reply.cfg
Added: openser/trunk/debian/openser.init
===================================================================
--- openser/trunk/debian/openser.init 2006-06-30 20:31:57 UTC (rev 1986)
+++ openser/trunk/debian/openser.init 2006-06-30 20:32:50 UTC (rev 1987)
@@ -0,0 +1,124 @@
+#! /bin/sh
+#
+# skeleton example file to build /etc/init.d/ scripts.
+# This file should be used to construct scripts for /etc/init.d.
+#
+# Written by Miquel van Smoorenburg <miquels at cistron.nl>.
+# Modified for Debian GNU/Linux
+# by Ian Murdock <imurdock at gnu.ai.mit.edu>.
+#
+# Version: @(#)skeleton 1.8 03-Mar-1998 miquels at cistron.nl
+#
+# adapted for openser by Daniel-Constantin Mierla <daniel at voice-system.ro>
+# $Id: openser.init,v 1.1.1.1.4.3 2006/02/02 16:01:58 dan_pascu Exp $
+
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/usr/sbin/openser
+NAME=openser
+DESC=openser
+HOMEDIR=/var/run/openser
+PIDFILE=$HOMEDIR/$NAME.pid
+DEFAULTS=/etc/default/openser
+RUN_OPENSER=no
+
+check_openser_config ()
+{
+ # Check if openser configuration is valid before starting the server
+ set +e
+ out=$($DAEMON -c > /dev/null 2>&1)
+ retcode=$?
+ set -e
+ if [ "$retcode" != '0' ]; then
+ echo "Not starting $DESC: invalid configuration file!"
+ exit 1
+ fi
+}
+
+create_radius_seqfile ()
+{
+ # Create a radius sequence file to be used by the radius client if
+ # radius accounting is enabled. This is needed to avoid any issue
+ # with the file not being writable if openser first starts as user
+ # root because DUMP_CORE is enabled and creates this file as user
+ # root and then later it switches back to user openser and cannot
+ # write to the file. If the file exists before openser starts, it
+ # won't change it's ownership and will be writable for both root
+ # and openser, no matter what options are chosen at install time
+ RADIUS_SEQ_FILE=/var/run/openser/openser_radius.seq
+ if [ -d /var/run/openser ]; then
+ chown ${USER}:${GROUP} /var/run/openser
+
+ if [ ! -f $RADIUS_SEQ_FILE ]; then
+ touch $RADIUS_SEQ_FILE
+ fi
+
+ chown ${USER}:${GROUP} $RADIUS_SEQ_FILE
+ chmod 660 $RADIUS_SEQ_FILE
+ fi
+}
+
+test -f $DAEMON || exit 0
+
+# Load startup options if available
+if [ -f $DEFAULTS ]; then
+ . $DEFAULTS || true
+fi
+
+if [ "$RUN_OPENSER" != "yes" ]; then
+ echo "OpenSER not yet configured. Edit /etc/default/openser first."
+ exit 0
+fi
+
+set -e
+
+MEMORY=$((`echo $MEMORY | sed -e 's/[^0-9]//g'`))
+[ -z "$USER" ] && USER=openser
+[ -z "$GROUP" ] && GROUP=openser
+[ $MEMORY -le 0 ] && MEMORY=32
+
+if test "$DUMP_CORE" = "yes" ; then
+ # Ignore USER and GROUP in this case and use root,
+ # else it won't write the core file.
+ OPTIONS="-P $PIDFILE -m $MEMORY -u root -g root -w $HOMEDIR"
+ ulimit -c unlimited
+else
+ OPTIONS="-P $PIDFILE -m $MEMORY -u $USER -g $GROUP"
+fi
+
+case "$1" in
+ start)
+ check_openser_config
+ create_radius_seqfile
+
+ echo -n "Starting $DESC: $NAME"
+ start-stop-daemon --start --quiet --pidfile $PIDFILE \
+ --exec $DAEMON -- $OPTIONS || echo -n " already running"
+ echo "."
+ ;;
+ stop)
+ echo -n "Stopping $DESC: $NAME"
+ start-stop-daemon --oknodo --stop --quiet --pidfile $PIDFILE \
+ --exec $DAEMON
+ echo "."
+ ;;
+ restart|force-reload)
+ check_openser_config
+ create_radius_seqfile
+
+ echo -n "Restarting $DESC: $NAME"
+ start-stop-daemon --oknodo --stop --quiet --pidfile \
+ $PIDFILE --exec $DAEMON
+ sleep 1
+ start-stop-daemon --start --quiet --pidfile \
+ $PIDFILE --exec $DAEMON -- $OPTIONS
+ echo "."
+ ;;
+ *)
+ N=/etc/init.d/$NAME
+ echo "Usage: $N {start|stop|restart|force-reload}" >&2
+ exit 1
+ ;;
+esac
+
+exit 0
Added: openser/trunk/debian/openser.postinst
===================================================================
--- openser/trunk/debian/openser.postinst 2006-06-30 20:31:57 UTC (rev 1986)
+++ openser/trunk/debian/openser.postinst 2006-06-30 20:32:50 UTC (rev 1987)
@@ -0,0 +1,48 @@
+#! /bin/sh
+#
+# $Id: openser.postinst,v 1.1.2.4 2006/02/03 18:28:19 dan_pascu Exp $
+
+PKG=openser
+DEFAULTS=/etc/default/openser
+HOMEDIR=/var/run/openser
+
+set -e
+
+# summary of how this script can be called:
+# * <postinst> `configure' <most-recently-configured-version>
+# * <old-postinst> `abort-upgrade' <new version>
+# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+# <new-version>
+# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+# <failed-install-package> <version> `removing'
+# <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+#
+# quoting from the policy:
+# Any necessary prompting should almost always be confined to the
+# post-installation script, and should be protected with a conditional
+# so that unnecessary prompting doesn't happen if a package's
+# installation fails and the `postinst' is called with `abort-upgrade',
+# `abort-remove' or `abort-deconfigure'.
+
+case "$1" in
+ configure)
+ adduser --quiet --system --group --disabled-password \
+ --shell /bin/false --gecos "Open SIP Express Router" \
+ --home $HOMEDIR openser || true
+
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+#DEBHELPER#
+
Added: openser/trunk/debian/patches/00list
===================================================================
--- openser/trunk/debian/patches/00list 2006-06-30 20:31:57 UTC (rev 1986)
+++ openser/trunk/debian/patches/00list 2006-06-30 20:32:50 UTC (rev 1987)
@@ -0,0 +1,3 @@
+01_ungentooize
+02_postgres_module_build
+
Added: openser/trunk/debian/patches/01_ungentooize.dpatch
===================================================================
--- openser/trunk/debian/patches/01_ungentooize.dpatch 2006-06-30 20:31:57 UTC (rev 1986)
+++ openser/trunk/debian/patches/01_ungentooize.dpatch 2006-06-30 20:32:50 UTC (rev 1987)
@@ -0,0 +1,209 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_ungentooize.dpatch by <jblache at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Ungentooize the build system.
+## DP: Do not modify CFLAGS if they're already set, this avoids building with -O9 -funroll-loops
+## DP: and other funny and useless options. (hint: the optimization level stops at -O3 in gcc)
+
+ at DPATCH@
+diff -urNad openser-1.0.1/Makefile.defs /tmp/dpep.Deo9Fq/openser-1.0.1/Makefile.defs
+--- openser-1.0.1/Makefile.defs 2006-06-27 16:55:49.761532422 +0200
++++ /tmp/dpep.Deo9Fq/openser-1.0.1/Makefile.defs 2006-06-27 16:55:52.053040545 +0200
+@@ -390,7 +390,7 @@
+ else echo "as" ; \
+ fi\
+ fi)
+-
++
+ LDTYPE=$(shell if $(LDPATH) -V 1>/dev/null 2>/dev/null; then \
+ if $(LDPATH) -V 2>&1|grep GNU >/dev/null; \
+ then echo gnu; \
+@@ -471,8 +471,10 @@
+ found_lock_method=yes
+ endif
+
+-CFLAGS=
++CFLAGS=$(shell echo "$${CFLAGS}")
+ LDFLAGS=
++
++ifeq (,$(CFLAGS))
+ # setting CFLAGS
+ ifeq ($(mode), release)
+ #if i386
+@@ -507,7 +509,7 @@
+ ifeq ($(CC_SHORTVER), 2.9x) #older gcc version (2.9[1-5])
+ $(warning Old gcc detected ($(CC_SHORTVER)), use gcc >= 3.1 \
+ for better results)
+-
++
+ CFLAGS+=-m486 \
+ -malign-loops=4
+ else
+@@ -567,7 +569,7 @@
+ ifeq ($(CC_SHORTVER), 2.9x) #older gcc version (2.9[1-5])
+ $(warning Old gcc detected ($(CC_SHORTVER)), use gcc >= 3.1 \
+ for better results)
+-
++
+ CFLAGS+=-m486 \
+ -malign-loops=4
+ else
+@@ -646,12 +648,12 @@
+ #really old version
+ $(warning You are using an old and unsupported gcc \
+ version ($(CC_SHORTVER)), compile at your own risk!)
+-
++
+ CFLAGS+= -mv8
+ ifeq ($(ASTYPE), solaris)
+ CFLAGS+= -Wa,-xarch=v8plus
+ endif
+-
++
+ endif #CC_SHORTVER, 2.9x
+ endif #CC_SHORTVER, 3.0
+ endif #CC_SHORTVER, 3.4
+@@ -693,18 +695,18 @@
+ ifeq ($(CC_SHORTVER), 2.9x) #older gcc version (2.9[1-5])
+ $(warning Old gcc detected ($(CC_SHORTVER)), use gcc 3.0.x \
+ for better results)
+-
++
+ CFLAGS+=
+ else
+ #really old version
+ $(warning You are using an old and unsupported gcc \
+ version ($(CC_SHORTVER)), compile at your own risk!)
+-
++
+ endif # CC_SHORTVER, 2.9x
+ endif # CC_SHORTVER, 3.0
+ endif # CC_SHORTVER, 3.4
+ endif # CC_SHORTVER, 4.x
+-
++
+ else # CC_NAME, gcc
+ #other compilers
+ $(error Unsupported compiler ($(CC):$(CC_NAME)), try gcc)
+@@ -735,18 +737,18 @@
+ ifeq ($(CC_SHORTVER), 2.9x) #older gcc version (2.9[1-5])
+ $(warning Old gcc detected ($(CC_SHORTVER)), use gcc 3.0.x \
+ for better results)
+-
++
+ CFLAGS+=-mcpu=r3000
+ else
+ #really old version
+ $(warning You are using an old and unsupported gcc \
+ version ($(CC_SHORTVER)), compile at your own risk!)
+-
++
+ endif # CC_SHORTVER, 2.9x
+ endif # CC_SHORTVER, 3.0
+ endif # CC_SHORTVER, 3.4
+ endif # CC_SHORTVER, 4.x
+-
++
+ else # CC_NAME, gcc
+ #other compilers
+ $(error Unsupported compiler ($(CC):$(CC_NAME)), try gcc)
+@@ -780,19 +782,18 @@
+ #really old version
+ $(warning You are using an old and unsupported gcc \
+ version ($(CC_SHORTVER)), compile at your own risk!)
+-
++
+ endif # CC_SHORTVER, 2.9x
+ endif # CC_SHORTVER, 3.0
+ endif # CC_SHORTVER, 3.4
+ endif # CC_SHORTVER, 4.x
+-
++
+ else # CC_NAME, gcc
+ #other compilers
+ $(error Unsupported compiler ($(CC):$(CC_NAME)), try gcc)
+ endif #CC_NAME, gcc
+ endif #ARCH, mips2
+
+-
+ #if alpha
+ ifeq ($(ARCH), alpha)
+ # if gcc
+@@ -819,12 +820,12 @@
+ #really old version
+ $(warning You are using an old and unsupported gcc \
+ version ($(CC_SHORTVER)), compile at your own risk!)
+-
++
+ endif # CC_SHORTVER, 2.9x
+ endif # CC_SHORTVER, 3.0
+ endif # CC_SHORTVER, 3.4
+ endif # CC_SHORTVER, 4.x
+-
++
+ else # CC_NAME, gcc
+ #other compilers
+ $(error Unsupported compiler ($(CC):$(CC_NAME)), try gcc)
+@@ -859,12 +860,12 @@
+ #really old version
+ $(warning You are using an old and unsupported gcc \
+ version ($(CC_SHORTVER)), compile at your own risk!)
+-
++
+ endif # CC_SHORTVER, 2.9x
+ endif # CC_SHORTVER, 3.0
+ endif # CC_SHORTVER, 3.4
+ endif # CC_SHORTVER, 4.x
+-
++
+ else # CC_NAME, gcc
+ #other compilers
+ $(error Unsupported compiler ($(CC):$(CC_NAME)), try gcc)
+@@ -898,18 +899,19 @@
+ #really old version
+ $(warning You are using an old and unsupported gcc \
+ version ($(CC_SHORTVER)), compile at your own risk!)
+-
++
+ endif # CC_SHORTVER, 2.9x
+ endif # CC_SHORTVER, 3.0
+ endif # CC_SHORTVER, 3.4
+ endif # CC_SHORTVER, 4.x
+-
++
+ else # CC_NAME, gcc
+ #other compilers
+ $(error Unsupported compiler ($(CC):$(CC_NAME)), try gcc)
+ endif #CC_NAME, gcc
+ endif #ARCH, ppc
+
++endif # CFLAGS not set
+
+ CFLAGS+= $(CC_EXTRA_OPTS)
+
+@@ -946,7 +948,7 @@
+ # -andrei
+ else #mode,release
+ ifeq ($(CC_NAME), gcc)
+- CFLAGS=-g -Wcast-align $(PROFILE)
++ CFLAGS += -g -Wcast-align $(PROFILE)
+ ifeq ($(ARCH), sparc64)
+ CFLAGS+= -mcpu=ultrasparc
+ endif
+@@ -1075,13 +1077,13 @@
+ OPENBSD_IS_AOUT:=no
+ endif
+ endif
+-
++
+ ifeq ($(OPENBSD_IS_AOUT), yes)
+ DEFS+=-DDLSYM_PREFIX='"_"'
+ LDFLAGS= # openbsd ld doesn't like -O2 or -E
+ endif
+ endif # if opensd
+-
++
+ ifeq ($(OS), netbsd)
+ DEFS+=-DHAVE_SOCKADDR_SA_LEN -DHAVE_GETHOSTBYNAME2 \
+ -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_CONNECT_ECONNRESET_BUG
Property changes on: openser/trunk/debian/patches/01_ungentooize.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: openser/trunk/debian/patches/02_postgres_module_build.dpatch
===================================================================
--- openser/trunk/debian/patches/02_postgres_module_build.dpatch 2006-06-30 20:31:57 UTC (rev 1986)
+++ openser/trunk/debian/patches/02_postgres_module_build.dpatch 2006-06-30 20:32:50 UTC (rev 1987)
@@ -0,0 +1,27 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_postgres_module_build.dpatch by <jblache at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Remove unneeded architecture restriction for the PostgreSQL module.
+
+ at DPATCH@
+diff -urNad openser-1.0.1~/modules/postgres/aug_sysdep.h openser-1.0.1/modules/postgres/aug_sysdep.h
+--- openser-1.0.1~/modules/postgres/aug_sysdep.h 2006-06-30 22:20:04.000000000 +0200
++++ openser-1.0.1/modules/postgres/aug_sysdep.h 2006-06-30 22:20:40.398817984 +0200
+@@ -190,15 +190,12 @@
+ #define AUG_NO_PTHREADS
+ #endif
+
+-#if defined(__i386)
+-
+ #if defined(__GNUC__)
+-#define AUG_CONFIGURATION "Linux x86 with GCC"
++#define AUG_CONFIGURATION "Linux with GCC"
+ #endif
+
+ typedef unsigned int augUInt32;
+
+-#endif /* i386 */
+ #endif /* linux */
+
+ /*
Property changes on: openser/trunk/debian/patches/02_postgres_module_build.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: openser/trunk/debian/rules
===================================================================
--- openser/trunk/debian/rules 2006-06-30 20:31:57 UTC (rev 1986)
+++ openser/trunk/debian/rules 2006-06-30 20:32:50 UTC (rev 1987)
@@ -0,0 +1,186 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+# export DH_VERBOSE=1
+
+# This is the debhelper compatibility version to use.
+# export DH_COMPAT=4
+
+# Include dpatch rules
+include /usr/share/dpatch/dpatch.make
+
+
+# modules depending on mysql
+MYSQL_MODULES = mysql
+# modules depending on postgres
+POSTGRES_MODULES = postgres
+# jabber related modules
+JABBER_MODULES = jabber
+# cpl related modules
+CPL_MODULES = cpl-c
+# module depending on radiusclient
+RADIUS_MODULES = auth_radius group_radius uri_radius
+
+ALL_MODULES = $(MYSQL_MODULES) $(POSTGRES_MODULES) $(JABBER_MODULES) $(CPL_MODULES) $(RADIUS_MODULES)
+
+# modules not in the "main" package or unstable modules
+EXCLUDED_MODULES = $(ALL_MODULES) pa
+
+# the same but with path prepended (needed for modules="...")
+MYSQL_MOD_PATH=$(addprefix modules/, $(MYSQL_MODULES))
+POSTGRES_MOD_PATH=$(addprefix modules/, $(POSTGRES_MODULES))
+JABBER_MOD_PATH=$(addprefix modules/, $(JABBER_MODULES))
+CPL_MOD_PATH=$(addprefix modules/, $(CPL_MODULES))
+RADIUS_MOD_PATH=$(addprefix modules/, $(RADIUS_MODULES))
+
+ifeq (cc, $(CC))
+CC = gcc
+endif
+
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
+endif
+
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+ INSTALL_PROGRAM += -s
+endif
+
+configure: configure-stamp
+configure-stamp:
+ dh_testdir
+ # Add here commands to configure the package.
+
+ touch configure-stamp
+
+
+build: build-stamp
+build-stamp: patch-stamp configure-stamp
+ dh_testdir
+
+ # Add here commands to compile the package.
+ CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=1 $(MAKE) all skip_modules="$(EXCLUDED_MODULES)" cfg-target=/etc/openser/
+ CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=1 $(MAKE) modules modules="$(MYSQL_MOD_PATH)" cfg-target=/etc/openser/
+ CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=1 $(MAKE) modules modules="$(POSTGRES_MOD_PATH)" cfg-target=/etc/openser/
+ CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=1 $(MAKE) modules modules="$(JABBER_MOD_PATH)" cfg-target=/etc/openser/
+ CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=1 $(MAKE) modules modules="$(CPL_MOD_PATH)" cfg-target=/etc/openser/
+ CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=1 $(MAKE) modules modules="$(RADIUS_MOD_PATH)" cfg-target=/etc/openser/
+
+ touch build-stamp
+
+clean: real-clean unpatch
+real-clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp configure-stamp
+
+ # Add here commands to clean up after the build process.
+ -$(MAKE) TLS=1 include_modules="$(ALL_MODULES)" proper
+ rm -f cfg.tab.h utils/gen_ha1/*.d utils/openserunix/*.d
+
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+ # Add here commands to install the package into debian/openser
+ # openser base package
+ CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=1 $(MAKE) install skip_modules="$(EXCLUDED_MODULES)" \
+ basedir=$(CURDIR)/debian/openser \
+ prefix=/usr \
+ cfg-prefix=$(CURDIR)/debian/openser \
+ cfg-target=/etc/openser/
+
+ find $(CURDIR)/debian/openser/etc/openser -type f -exec chmod -x {} \;
+ sed -i -e "s/^PATH//" $(CURDIR)/debian/openser/usr/sbin/openserctl
+
+ # install only the mysql module
+ CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=1 $(MAKE) install-modules-all modules="$(MYSQL_MOD_PATH)" \
+ basedir=$(CURDIR)/debian/openser-mysql-module \
+ prefix=/usr \
+ cfg-prefix=$(CURDIR)/debian/openser-mysql-module \
+ cfg-target=/etc/openser/ \
+ doc-dir=share/doc/openser-mysql-module
+
+ mkdir -p $(CURDIR)/debian/openser-mysql-module/usr/sbin
+ mv $(CURDIR)/debian/openser/usr/sbin/openser_mysql.sh $(CURDIR)/debian/openser-mysql-module/usr/sbin/openser_mysql
+ sed -i -e "s/^PATH//" $(CURDIR)/debian/openser-mysql-module/usr/sbin/openser_mysql
+
+ # install only the postgres module
+ CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=1 $(MAKE) install-modules-all modules="$(POSTGRES_MOD_PATH)" \
+ basedir=$(CURDIR)/debian/openser-postgres-module \
+ prefix=/usr \
+ cfg-prefix=$(CURDIR)/debian/openser-postgres-module \
+ cfg-target=/etc/openser/ \
+ doc-dir=share/doc/openser-postgres-module
+
+ mkdir -p $(CURDIR)/debian/openser-postgres-module/usr/sbin
+ mv $(CURDIR)/debian/openser/usr/sbin/openser_postgresql.sh $(CURDIR)/debian/openser-postgres-module/usr/sbin/openser_postgresql
+ sed -i -e "s/^PATH//" $(CURDIR)/debian/openser-postgres-module/usr/sbin/openser_postgresql
+
+ #install only the jabber module
+ CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=1 $(MAKE) install-modules-all modules="$(JABBER_MOD_PATH)" \
+ basedir=$(CURDIR)/debian/openser-jabber-module \
+ prefix=/usr \
+ cfg-prefix=$(CURDIR)/debian/openser-jabber-module \
+ cfg-target=/etc/openser/ \
+ doc-dir=share/doc/openser-jabber-module
+
+ #install only the cpl module
+ CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=1 $(MAKE) install-modules-all modules="$(CPL_MOD_PATH)" \
+ basedir=$(CURDIR)/debian/openser-cpl-module \
+ prefix=/usr \
+ cfg-prefix=$(CURDIR)/debian/openser-cpl-module \
+ cfg-target=/etc/openser/ \
+ doc-dir=share/doc/openser-cpl-module
+
+ #install only the radius modules
+ CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=1 $(MAKE) install-modules-all modules="$(RADIUS_MOD_PATH)" \
+ basedir=$(CURDIR)/debian/openser-radius-modules \
+ prefix=/usr \
+ cfg-prefix=$(CURDIR)/debian/openser-radius-modules \
+ cfg-target=/etc/openser/ \
+ doc-dir=share/doc/openser-radius-modules
+
+ mkdir -p $(CURDIR)/debian/openser-radius-modules/etc/openser/
+ mv $(CURDIR)/debian/openser/etc/openser/dictionary.radius $(CURDIR)/debian/openser-radius-modules/etc/openser/
+
+# This single target is used to build all the packages, all at once, or
+# one at a time. So keep in mind: any options passed to commands here will
+# affect _all_ packages. Anything you want to only affect one package
+# should be put in another target, such as the install target.
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+ dh_installdocs
+ dh_installexamples
+# dh_installlogrotate
+ dh_installinit -popenser -- defaults 23
+ dh_installcron
+ dh_installman
+ dh_installinfo
+ dh_installchangelogs
+ dh_link
+ dh_strip --dbg-package=openser-dbg
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+# Build architecture-independent packages using the common target
+binary-indep: build install
+# We have nothing to do by default.
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure patch unpatch real-clean
Property changes on: openser/trunk/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
More information about the Pkg-voip-commits
mailing list