[Pkg-voip-commits] r2104 - openser/trunk/debian
Julien Blache
jblache at costa.debian.org
Wed Jul 26 12:11:45 UTC 2006
Author: jblache
Date: 2006-07-26 12:11:43 +0000 (Wed, 26 Jul 2006)
New Revision: 2104
Modified:
openser/trunk/debian/changelog
openser/trunk/debian/control
openser/trunk/debian/rules
Log:
Official Debian builds will be non-TLS for now, auto-detect TLS sources for custom builds.
Modified: openser/trunk/debian/changelog
===================================================================
--- openser/trunk/debian/changelog 2006-07-26 08:39:42 UTC (rev 2103)
+++ openser/trunk/debian/changelog 2006-07-26 12:11:43 UTC (rev 2104)
@@ -1,11 +1,20 @@
openser (1.1.0-2) UNRELEASED; urgency=low
* NOT RELEASED YET
+ * Official Debian builds have no TLS support due to the lack of OpenSSL
+ license exception for OpenSER. Building TLS packages is supported using
+ the upstream TLS tarball with no modifications (you'll need libssl-dev).
+
* debian/openser.init:
+ Do not start OpenSER in the start target if fork=no is specified in
the config file, so as to not break the boot process.
+ * debian/rules:
+ + Detect TLS/non-TLS sources, and enable TLS build accordingly.
+ + get-orig-source will fetch the non-TLS version for the official builds.
+ * debian/control:
+ + Drop build-dependency on libssl-dev for official Debian builds.
- -- Julien BLACHE <jblache at debian.org> Wed, 26 Jul 2006 10:38:27 +0200
+ -- Julien BLACHE <jblache at debian.org> Wed, 26 Jul 2006 10:56:40 +0200
openser (1.1.0-1) unstable; urgency=low
Modified: openser/trunk/debian/control
===================================================================
--- openser/trunk/debian/control 2006-07-26 08:39:42 UTC (rev 2103)
+++ openser/trunk/debian/control 2006-07-26 12:11:43 UTC (rev 2104)
@@ -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 | libmysqlclient-dev, libexpat1-dev, libxml2-dev, libpq-dev | postgresql-dev, libradiusclient-ng-dev, libssl-dev, flex, bison, zlib1g-dev, unixodbc-dev
+Build-Depends: debhelper (>= 5), dpatch, libmysqlclient15-dev | libmysqlclient-dev, libexpat1-dev, libxml2-dev, libpq-dev | postgresql-dev, libradiusclient-ng-dev, flex, bison, zlib1g-dev, unixodbc-dev
Standards-Version: 3.7.2
Package: openser
Modified: openser/trunk/debian/rules
===================================================================
--- openser/trunk/debian/rules 2006-07-26 08:39:42 UTC (rev 2103)
+++ openser/trunk/debian/rules 2006-07-26 12:11:43 UTC (rev 2104)
@@ -7,8 +7,8 @@
UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/.dfsg$$//')
FILENAME := openser_$(UPVERSION).orig.tar.gz
-UPFILENAME := openser-$(UPVERSION)-tls_src.tar.gz
-URL := http://openser.org/pub/openser/$(UPVERSION)/src/openser-$(UPVERSION)-tls_src.tar.gz
+UPFILENAME := openser-$(UPVERSION)_src.tar.gz
+URL := http://openser.org/pub/openser/$(UPVERSION)/src/openser-$(UPVERSION)_src.tar.gz
# Uncomment this to turn on verbose mode.
# export DH_VERBOSE=1
@@ -20,6 +20,9 @@
include /usr/share/dpatch/dpatch.make
+# Is this the TLS version ?
+TLS=$(shell if test -d tls; then echo 1; else echo 0; fi)
+
# modules depending on mysql
MYSQL_MODULES = mysql
# modules depending on postgres
@@ -75,13 +78,13 @@
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="$(UNIXODBC_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/
+ CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) all skip_modules="$(EXCLUDED_MODULES)" cfg-target=/etc/openser/
+ CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) modules modules="$(MYSQL_MOD_PATH)" cfg-target=/etc/openser/
+ CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) modules modules="$(POSTGRES_MOD_PATH)" cfg-target=/etc/openser/
+ CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) modules modules="$(UNIXODBC_MOD_PATH)" cfg-target=/etc/openser/
+ 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/
touch build-stamp
@@ -92,7 +95,7 @@
rm -f build-stamp configure-stamp
# Add here commands to clean up after the build process.
- -$(MAKE) TLS=1 include_modules="$(ALL_MODULES)" proper
+ -$(MAKE) TLS=$(TLS) include_modules="$(ALL_MODULES)" proper
rm -f cfg.tab.h
rm -f utils/openserunix/openserunix.o utils/openserunix/openserunix
@@ -106,7 +109,7 @@
# 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)" \
+ CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install skip_modules="$(EXCLUDED_MODULES)" \
basedir=$(CURDIR)/debian/openser \
prefix=/usr \
cfg-prefix=$(CURDIR)/debian/openser \
@@ -116,7 +119,7 @@
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)" \
+ CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install-modules-all modules="$(MYSQL_MOD_PATH)" \
basedir=$(CURDIR)/debian/openser-mysql-module \
prefix=/usr \
cfg-prefix=$(CURDIR)/debian/openser-mysql-module \
@@ -128,7 +131,7 @@
chmod +x $(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)" \
+ CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install-modules-all modules="$(POSTGRES_MOD_PATH)" \
basedir=$(CURDIR)/debian/openser-postgres-module \
prefix=/usr \
cfg-prefix=$(CURDIR)/debian/openser-postgres-module \
@@ -140,7 +143,7 @@
chmod +x $(CURDIR)/debian/openser-postgres-module/usr/sbin/openser_postgresql
# install only the unixodbc module
- CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=1 $(MAKE) install-modules-all modules="$(UNIXODBC_MOD_PATH)" \
+ CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install-modules-all modules="$(UNIXODBC_MOD_PATH)" \
basedir=$(CURDIR)/debian/openser-unixodbc-module \
prefix=/usr \
cfg-prefix=$(CURDIR)/debian/openser-unixodbc-module \
@@ -148,7 +151,7 @@
doc-dir=share/doc/openser-unixodbc-module
#install only the jabber module
- CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=1 $(MAKE) install-modules-all modules="$(JABBER_MOD_PATH)" \
+ CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install-modules-all modules="$(JABBER_MOD_PATH)" \
basedir=$(CURDIR)/debian/openser-jabber-module \
prefix=/usr \
cfg-prefix=$(CURDIR)/debian/openser-jabber-module \
@@ -156,7 +159,7 @@
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)" \
+ CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install-modules-all modules="$(CPL_MOD_PATH)" \
basedir=$(CURDIR)/debian/openser-cpl-module \
prefix=/usr \
cfg-prefix=$(CURDIR)/debian/openser-cpl-module \
@@ -164,7 +167,7 @@
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)" \
+ CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install-modules-all modules="$(RADIUS_MOD_PATH)" \
basedir=$(CURDIR)/debian/openser-radius-modules \
prefix=/usr \
cfg-prefix=$(CURDIR)/debian/openser-radius-modules \
More information about the Pkg-voip-commits
mailing list