[Pkg-voip-commits] r7837 - in /opensips/trunk/debian: changelog control opensips.README.Debian rules

alerios at alioth.debian.org alerios at alioth.debian.org
Tue Dec 1 02:50:41 UTC 2009


Author: alerios
Date: Tue Dec  1 02:50:40 2009
New Revision: 7837

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7837
Log:
* Don't build identity module because of GPL/OpenSSL incompatibility.

Modified:
    opensips/trunk/debian/changelog
    opensips/trunk/debian/control
    opensips/trunk/debian/opensips.README.Debian
    opensips/trunk/debian/rules

Modified: opensips/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/opensips/trunk/debian/changelog?rev=7837&op=diff
==============================================================================
--- opensips/trunk/debian/changelog (original)
+++ opensips/trunk/debian/changelog Tue Dec  1 02:50:40 2009
@@ -3,30 +3,6 @@
   * NOT RELEASED YET
 
   [ Alejandro Rios ]
-  * Initial version after fork from openser (Closes: #556131).
-  * Add myself to uploaders.
-  * Build-depend on python-all-dev and python-support.
-  * Add ${misc:Depends} to binary packages (thanks lintian)
-  * Upgrade to Standards-Version 3.8.3 (no change needed)
-  * Added README.source
-  * Depend on python.
-  * Depend on some perl modules to use osipsconsole.
-  * Remove INSTALL from package.
-  * Added osipsconsole.8 man page.
-  * Some changes from upstream .deb (Bogdan Iancu):
-    * Fixed debian/control descriptions and dependencies.
-    * Build missing modules on debian/rules
-    * lib64 and SMP dpatches replaced by debian/rules variable.
-  * Removed python build-dependency.
-  * Created bdb_recover.8 and opensipsdbctl.8 man pages.
-  * Force shipping of upstream changelog on debian/rules.
-  * Fix debian/rules install targets for dbhttp, console and b2bua modules. 
-
-  [ Kilian Krause ]
-  * debian/control: 
-    - Add ${python:Depends} to have correct depends on python
-    - Fix Section: debug for opensips-dbg
-  * Don't create /var/run/opensips in package as adduser will already do that
-    in postinst.
-
+  * Initial release after fork from openser (Closes: #556131).
+ 
  -- Alejandro Rios P. <alerios at debian.org>  Fri, 13 Nov 2009 12:42:35 -0500

Modified: opensips/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/opensips/trunk/debian/control?rev=7837&op=diff
==============================================================================
--- opensips/trunk/debian/control (original)
+++ opensips/trunk/debian/control Tue Dec  1 02:50:40 2009
@@ -11,6 +11,7 @@
 
 Package: opensips
 Architecture: any
+# Depend on python since dbtext support needs it.
 Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, python
 Suggests: opensips-mysql-module, opensips-postgres-module, opensips-unixodbc-module, opensips-jabber-module, opensips-cpl-module, opensips-radius-modules, opensips-presence-modules, opensips-xmlrpc-module, opensips-perl-modules, opensips-snmpstats-module, opensips-xmpp-module, opensips-carrierroute-module, opensips-berkeley-module, opensips-ldap-modules, opensips-geoip-module, opensips-regex-module, opensips-identity-module, opensips-b2bua-module, opensips-dbhttp-module, opensips-console
 Description: very fast and configurable SIP server
@@ -275,6 +276,7 @@
 
 Package: opensips-console
 Architecture: any
+# Depend on python since dbtext support needs it.
 Depends: ${shlibs:Depends}, opensips (= ${binary:Version}),${misc:Depends}, libfrontier-rpc-perl, libnet-ip-perl, libberkeleydb-perl, libdbi-perl, libterm-readline-gnu-perl, python
 Suggests: opensips-mysql-module, opensips-postgres-module, opensips-unixodbc-module, opensips-xmlrpc-module, opensips-berkeley-module, libdbd-mysql-perl, libdbd-pg-perl 
 Description: Console utility for provisioning OpenSIPS

Modified: opensips/trunk/debian/opensips.README.Debian
URL: http://svn.debian.org/wsvn/pkg-voip/opensips/trunk/debian/opensips.README.Debian?rev=7837&op=diff
==============================================================================
--- opensips/trunk/debian/opensips.README.Debian (original)
+++ opensips/trunk/debian/opensips.README.Debian Tue Dec  1 02:50:40 2009
@@ -33,6 +33,21 @@
 An opensips-osp-module package will be built alongside all the other OpenSIPS
 packages.
 
+* IDENTITY module
+------------
+
+Due to the same license incompatibility, it's equally impossible to ship the
+IDENTITY module.
+
+However, once again, if you need the IDENTITY module, it's easy to get it:
+ - apt-get build-dep opensips
+ - apt-get install libssl-dev fakeroot build-essential
+ - apt-get source opensips
+ - edit opensips-.../debian/rules and set IDENTITY to 1
+ - run dpkg-buildpackage -rfakeroot
+
+An opensips-identity-module package will be built alongside all the other OpenSIPS
+packages.
 
 * init script check for fork=no
 -------------------------------

Modified: opensips/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/opensips/trunk/debian/rules?rev=7837&op=diff
==============================================================================
--- opensips/trunk/debian/rules (original)
+++ opensips/trunk/debian/rules Tue Dec  1 02:50:40 2009
@@ -36,11 +36,22 @@
 # Disabled by default due to license issues, set to non-void to enable
 OSP=
 
+# Do we want to build the IDENTITY module ?
+# Disabled by default due to license issues, set to non-void to enable
+IDENTITY=
+
 ifeq (,$(OSP))
 	DH_OPTIONS = -Nopensips-osp-module
 else
 	ALL_PACKAGES += opensips-osp-module
 endif
+
+ifeq (,$(IDENTITY))
+	DH_OPTIONS = -Nopensips-identity-module
+else
+	ALL_PACKAGES += opensips-identity-module
+endif
+
 
 export DH_OPTIONS
 
@@ -165,7 +176,9 @@
 endif
 	CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) modules modules="$(GEOIP_MOD_PATH)" cfg-target=/etc/opensips/
 	CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) modules modules="$(REGEX_MOD_PATH)" cfg-target=/etc/opensips/
+ifneq (,$(IDENTITY))
 	CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) modules modules="$(IDENTITY_MOD_PATH)" cfg-target=/etc/opensips/
+endif
 	CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) modules modules="$(B2BUA_MOD_PATH)" cfg-target=/etc/opensips/
 	CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) modules modules="$(DBHTTP_MOD_PATH)" cfg-target=/etc/opensips/
 
@@ -351,6 +364,7 @@
 		cfg-target=/etc/opensips/ \
 		doc-dir=share/doc/opensips-regex-module
 
+ifneq (,$(IDENTITY))
 	# install only the identity modules
 	CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) install-modules-all modules="$(IDENTITY_MOD_PATH)"  \
 		basedir=$(CURDIR)/debian/opensips-identity-module \
@@ -358,6 +372,7 @@
 		cfg-prefix=$(CURDIR)/debian/opensips-identity-module \
 		cfg-target=/etc/opensips/ \
 		doc-dir=share/doc/opensips-identity-module
+endif
 
 	# install only the b2bua modules
 	CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) install-modules-all modules="$(B2BUA_MOD_PATH)"  \




More information about the Pkg-voip-commits mailing list