Ver código fonte

-added deb ser postgres package

Andrei Pelinescu-Onciul 20 anos atrás
pai
commit
2ee5787636
3 arquivos alterados com 27 adições e 4 exclusões
  1. 3 2
      debian/changelog
  2. 10 2
      debian/control
  3. 14 0
      debian/rules

+ 3 - 2
debian/changelog

@@ -1,8 +1,9 @@
 ser (0.9.3) unstable; urgency=low
 ser (0.9.3) unstable; urgency=low
 
 
   * new upstream release 
   * new upstream release 
-  * added ser-cpl-module and  ser-pa-module
-  * ser-radius-module depends now on libradiusclient-ng2 
+  * added ser-cpl-module, ser-pa-module, ser-postgres-module,
+    ser-acc-db-module and ser-acc-radius-module
+  * ser-radius-modules depend now on libradiusclient-ng2 
     (not in official Debian archives)
     (not in official Debian archives)
 
 
  -- Andrei Pelinescu-Onciul <[email protected]>  Thu, 23 Jun 2005 16:43:35 +0200
  -- Andrei Pelinescu-Onciul <[email protected]>  Thu, 23 Jun 2005 16:43:35 +0200

+ 10 - 2
debian/control

@@ -2,14 +2,14 @@ Source: ser
 Section: net
 Section: net
 Priority: optional
 Priority: optional
 Maintainer: Andrei Pelinescu-Onciul <[email protected]>
 Maintainer: Andrei Pelinescu-Onciul <[email protected]>
-Build-Depends: debhelper (>= 4), libmysqlclient-dev, libexpat1-dev, libradiusclient-ng-dev, libxml2-dev
+Build-Depends: debhelper (>= 4), libmysqlclient-dev, libexpat1-dev, libradius-ng-dev, libxml2-dev, libpq-dev
 Standards-Version: 3.5.2
 Standards-Version: 3.5.2
 
 
 Package: ser
 Package: ser
 Architecture: any
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
 Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
 Suggests: ser-mysql-module, ser-jabber-module, ser-cpl-module, ser-pa-module, ser-radius-modules
 Suggests: ser-mysql-module, ser-jabber-module, ser-cpl-module, ser-pa-module, ser-radius-modules
-Conflicts: ser-mysql-module (<< ${Source-Version}), ser-jabber-module (<< ${Source-Version}), ser-radius-modules (<< ${Source-Version}), ser-cpl-module (<< ${Source-Version}), ser-pa-module (<< ${Source-Version}), ser-acc-db-module (<< ${Source-Version}), ser-acc-radius-module (<< ${Source-Version})
+Conflicts: ser-mysql-module (<< ${Source-Version}), ser-jabber-module (<< ${Source-Version}), ser-radius-modules (<< ${Source-Version}), ser-cpl-module (<< ${Source-Version}), ser-pa-module (<< ${Source-Version}), ser-postgres-module (<< ${Source-Version}), ser-acc-db-module (<< ${Source-Version}), ser-acc-radius-module (<< ${Source-Version})
 Description: Sip Express Router, very fast and configurable SIP proxy
 Description: Sip Express Router, very fast and configurable SIP proxy
  ser or SIP Express Router is a very fast and flexible SIP (RFC3621)
  ser or SIP Express Router is a very fast and flexible SIP (RFC3621)
  proxy server. Written entirely in C, ser can handle thousands calls
  proxy server. Written entirely in C, ser can handle thousands calls
@@ -59,6 +59,14 @@ Description: contains the ser radius modules
  depend upon libradius1. This modules will enable you to authenticate, 
  depend upon libradius1. This modules will enable you to authenticate, 
  do group membership checking or check the messages uris using radius.
  do group membership checking or check the messages uris using radius.
 
 
+Package: ser-postgres-module
+Architecture: any
+Depends: ${shlibs:Depends}, ser (= ${Source-Version})
+Description: contains the postgres database connectivity module
+ This has been split out of the main ser package, so that ser will not
+ depend upon libbpq. This module will enable you to use the digest
+ authentication module or persistent user location entries.
+
 Package: ser-acc-db-module
 Package: ser-acc-db-module
 Architecture: any
 Architecture: any
 Depends: ${shlibs:Depends}, ser (= ${Source-Version})
 Depends: ${shlibs:Depends}, ser (= ${Source-Version})

+ 14 - 0
debian/rules

@@ -42,6 +42,8 @@ RADIUS_MODULES=auth_radius group_radius uri_radius avp_radius
 CPL_MODULES=cpl-c
 CPL_MODULES=cpl-c
 # pa related modules
 # pa related modules
 PA_MODULES=pa
 PA_MODULES=pa
+# postgres modules
+POSTGRES_MODULES=postgres
 # acc module
 # acc module
 ACC_MODULE=acc
 ACC_MODULE=acc
 
 
@@ -51,6 +53,7 @@ JABBER_MOD_PATH=$(addprefix modules/, $(JABBER_MODULES))
 RADIUS_MOD_PATH=$(addprefix modules/, $(RADIUS_MODULES))
 RADIUS_MOD_PATH=$(addprefix modules/, $(RADIUS_MODULES))
 CPL_MOD_PATH=$(addprefix modules/, $(CPL_MODULES))
 CPL_MOD_PATH=$(addprefix modules/, $(CPL_MODULES))
 PA_MOD_PATH=$(addprefix modules/, $(PA_MODULES))
 PA_MOD_PATH=$(addprefix modules/, $(PA_MODULES))
+POSTGRES_MOD_PATH=$(addprefix modules/, $(POSTGRES_MODULES))
 ACC_MOD_PATH=$(addprefix modules/, $(ACC_MODULE))
 ACC_MOD_PATH=$(addprefix modules/, $(ACC_MODULE))
 
 
 
 
@@ -83,6 +86,10 @@ build-stamp: configure-stamp
 	$(MAKE) modules modules="$(RADIUS_MOD_PATH)" cfg-target=/etc/ser/
 	$(MAKE) modules modules="$(RADIUS_MOD_PATH)" cfg-target=/etc/ser/
 	$(MAKE) modules modules="$(CPL_MOD_PATH)" cfg-target=/etc/ser/
 	$(MAKE) modules modules="$(CPL_MOD_PATH)" cfg-target=/etc/ser/
 	$(MAKE) modules modules="$(PA_MOD_PATH)" cfg-target=/etc/ser/
 	$(MAKE) modules modules="$(PA_MOD_PATH)" cfg-target=/etc/ser/
+	# postgres will generate lots of warnings
+	$(MAKE) modules modules="$(POSTGRES_MOD_PATH)" cfg-target=/etc/ser/
+	# acc-db & acc-radius are compiled on install, because they share
+	#  the same source tree with acc
 	#/usr/bin/docbook-to-man debian/ser.sgml > ser.1
 	#/usr/bin/docbook-to-man debian/ser.sgml > ser.1
 
 
 	touch build-stamp
 	touch build-stamp
@@ -146,6 +153,13 @@ install: build
 		cfg-prefix=$(CURDIR)/debian/ser-pa-module \
 		cfg-prefix=$(CURDIR)/debian/ser-pa-module \
 		cfg-target=/etc/ser/ \
 		cfg-target=/etc/ser/ \
 		doc-dir=share/doc/ser-pa-module
 		doc-dir=share/doc/ser-pa-module
+	#install only the postgres module
+	$(MAKE) install-modules-all modules="$(POSTGRES_MOD_PATH)"  \
+		basedir=$(CURDIR)/debian/ser-postgres-module \
+		prefix=/usr \
+		cfg-prefix=$(CURDIR)/debian/ser-postgres-module \
+		cfg-target=/etc/ser/ \
+		doc-dir=share/doc/ser-postgres-module
 	# Ugly hacks to make 2 new versions from acc: ac_db & acc_radius
 	# Ugly hacks to make 2 new versions from acc: ac_db & acc_radius
 	#install only the acc db version module
 	#install only the acc db version module
 	cd $(ACC_MOD_PATH); $(MAKE) proper; cd ../..; \
 	cd $(ACC_MOD_PATH); $(MAKE) proper; cd ../..; \