Browse code

ser 0.8.10 release

- update ver. no in Makefile
- modified debian, rh & suse
(build a separate jabber module due to expat dependency)
- modified sun package (added some missing files)

Warning: I did a little rpm/*.spec cleanup (e.g make install installs all the
binaries a.s.o). RH stuff works, Suse not tested.

Andrei Pelinescu-Onciul authored on 12/11/2002 17:21:28
Showing 7 changed files
... ...
@@ -7,7 +7,7 @@
7 7
 #version number
8 8
 VERSION = 0
9 9
 PATCHLEVEL = 8
10
-SUBLEVEL =   10-pre5
10
+SUBLEVEL =   10
11 11
 EXTRAVERSION = 
12 12
 
13 13
 RELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
... ...
@@ -8,8 +8,9 @@ ser (0.8.10) unstable; urgency=low
8 8
 
9 9
   * modules updates (sms, jabber)
10 10
 
11
- -- Andrei Pelinescu-Onciul <pelinescu-onciul@fokus.gmd.de>  Mon, 4 Nov 2002
12
- 18:20:18 +0200
11
+  * the jabber module is in a separate package now (it depends on libexpat)
12
+
13
+ -- Andrei Pelinescu-Onciul <pelinescu-onciul@fokus.gmd.de>  Tue, 4 Nov 2002 17:23:37 +0200
13 14
 
14 15
 ser (0.8.9) unstable; urgency=low
15 16
 
... ...
@@ -2,13 +2,13 @@ Source: ser
2 2
 Section: net
3 3
 Priority: optional
4 4
 Maintainer: Andrei Pelinescu-Onciul <pelinescu-onciul@fokus.gmd.de>
5
-Build-Depends: debhelper (>> 3.0.0), libmysqlclient-dev, fakeroot
5
+Build-Depends: debhelper (>> 3.0.0), libmysqlclient-dev, libexpat1-dev, fakeroot
6 6
 Standards-Version: 3.5.2
7 7
 
8 8
 Package: ser
9 9
 Architecture: any
10 10
 Depends: ${shlibs:Depends}
11
-Suggests: ser-mysql-module
11
+Suggests: ser-mysql-module, ser-jabber-module
12 12
 Description: Sip Express Router, very fast and configurable SIP proxy
13 13
  ser or SIP Express Router is a very fast and flexible SIP (RFC3621)
14 14
  proxy server. Written entirely in C, ser can handle thousands calls
... ...
@@ -28,3 +28,10 @@ Description: contains the mysql database connectivity module
28 28
  depend upon mysql. This module will enable you to use the digest
29 29
  authentication module or persistent user location entries.
30 30
 
31
+Package: ser-jabber-module
32
+Architecture: any
33
+Depends: ${shlibs:Depends}, ser (= ${Source-Version})
34
+Description: contains the jabber module (sip-jabber message translation)
35
+ This has been split out of the main ser package, so that ser will not
36
+ depend upon libexpat. This module will enable you to use ser to translate
37
+  sip messages into jabber messages.
... ...
@@ -34,8 +34,9 @@ build-stamp: configure-stamp
34 34
 	dh_testdir
35 35
 
36 36
 	# Add here commands to compile the package.
37
-	$(MAKE) all  exclude_modules=mysql cfg-target=/etc/ser/
37
+	$(MAKE) all  exclude_modules="mysql jabber" cfg-target=/etc/ser/
38 38
 	$(MAKE) modules modules=modules/mysql cfg-target=/etc/ser/
39
+	$(MAKE) modules modules=modules/jabber cfg-target=/etc/ser/
39 40
 	#/usr/bin/docbook-to-man debian/ser.sgml > ser.1
40 41
 
41 42
 	touch build-stamp
... ...
@@ -57,7 +58,7 @@ install: build
57 58
 	dh_installdirs
58 59
 
59 60
 	# Add here commands to install the package into debian/ser
60
-	$(MAKE) install  exclude_modules=mysql \
61
+	$(MAKE) install  exclude_modules="mysql jabber" \
61 62
 		basedir=$(CURDIR)/debian/ser \
62 63
 		prefix=/usr \
63 64
 		cfg-prefix=$(CURDIR)/debian/ser \
... ...
@@ -68,6 +69,12 @@ install: build
68 69
 		prefix=/usr \
69 70
 		cfg-prefix=$(CURDIR)/debian/ser-mysql-module \
70 71
 		cfg-target=/etc/ser/
72
+	#install only the jabber module
73
+	$(MAKE) install-modules modules=modules/jabber  \
74
+		basedir=$(CURDIR)/debian/ser-jabber-module \
75
+		prefix=/usr \
76
+		cfg-prefix=$(CURDIR)/debian/ser-jabber-module \
77
+		cfg-target=/etc/ser/
71 78
 	#dh_movefiles
72 79
 
73 80
 
... ...
@@ -1,7 +1,7 @@
1 1
 %define name    ser
2 2
 %define ver     0.8.10
3 3
 %define rel     1
4
-%define exclude CVS pike radius_acc radius_auth snmp
4
+%define exclude CVS radius_acc radius_auth snmp mysql jabber
5 5
 
6 6
 Summary:      SIP Express Router, very fast and flexible SIP Proxy
7 7
 Name:         %name
... ...
@@ -33,20 +33,29 @@ Module, Registrar and User Location.
33 33
 Summary:  MySQL connectivity for the SIP Express Router.
34 34
 Group:    System Environment/Daemons
35 35
 Requires: ser
36
+BuildPrereq:  mysql-devel
36 37
 
37 38
 %description mysql
38 39
 The ser-mysql package contains MySQL database connectivity that you
39 40
 need to use digest authentication module or persistent user location
40 41
 entries.
41 42
 
43
+%package  jabber
44
+Summary:  sip jabber message translation support for the SIP Express Router.
45
+Group:    System Environment/Daemons
46
+Requires: ser
47
+BuildPrereq:  expat-devel
48
+
49
+%description jabber
50
+The ser-jabber package contains a sip to jabber message translator.
51
+
42 52
 %prep
43 53
 %setup
44 54
 
45 55
 %build
46 56
 make all exclude_modules="%exclude" cfg-target=/%{_sysconfdir}/ser/
47
-make modules modules=modules/mysql cfg-target=/%{_sysconfdir}/ser/
48
-cd utils/gen_ha1
49
-make
57
+make modules modules=modules/mysql  cfg-target=/%{_sysconfdir}/ser/
58
+make modules modules=modules/jabber cfg-target=/%{_sysconfdir}/ser/
50 59
 
51 60
 
52 61
 %install
... ...
@@ -72,25 +81,18 @@ make install-modules modules=modules/mysql \
72 81
 	    doc-dir=ser/ \
73 82
 	    cfg-target=/%{_sysconfdir}/ser/ \
74 83
 	    modules-target=/%{_libdir}/ser/modules/ 
84
+make install-modules modules=modules/jabber \
85
+	    modules-prefix=$RPM_BUILD_ROOT/%{_libdir}/ser \
86
+	    modules-dir=modules/ \
87
+	    doc-prefix=$RPM_BUILD_ROOT/%{_docdir} \
88
+	    doc-dir=ser/ \
89
+	    cfg-target=/%{_sysconfdir}/ser/ \
90
+	    modules-target=/%{_libdir}/ser/modules/ 
75 91
 
76 92
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d
77 93
 install -m755 $RPM_SOURCE_DIR/ser.init \
78 94
               $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/ser
79 95
 
80
-mkdir -p $RPM_BUILD_ROOT/%{_bindir}
81
-
82
-install -m755 utils/gen_ha1/gen_ha1 \
83
-	      $RPM_BUILD_ROOT/%{_bindir}/gen_ha1
84
-
85
-install -m755 scripts/harv_ser.sh \
86
-	      $RPM_BUILD_ROOT/%{_sbindir}/harv_ser.sh
87
-
88
-install -m755 scripts/sc \
89
-	      $RPM_BUILD_ROOT/%{_sbindir}/serctl
90
-
91
-install -m755 scripts/ser_mysql.sh \
92
-	      $RPM_BUILD_ROOT/%{_sbindir}/ser_mysql.sh
93
-
94 96
 
95 97
 %clean
96 98
 rm -rf "$RPM_BUILD_ROOT"
... ...
@@ -119,8 +121,9 @@ fi
119 121
 %{_libdir}/ser/modules/auth.so
120 122
 %{_libdir}/ser/modules/exec.so
121 123
 %{_libdir}/ser/modules/im.so
122
-%{_libdir}/ser/modules/jabber.so
123 124
 %{_libdir}/ser/modules/maxfwd.so
125
+%{_libdir}/ser/modules/msilo.so
126
+%{_libdir}/ser/modules/pike.so
124 127
 %{_libdir}/ser/modules/print.so
125 128
 %{_libdir}/ser/modules/registrar.so
126 129
 %{_libdir}/ser/modules/rr.so
... ...
@@ -130,10 +133,9 @@ fi
130 133
 %{_libdir}/ser/modules/tm.so
131 134
 %{_libdir}/ser/modules/usrloc.so
132 135
 
133
-%{_sbindir}/harv_ser.sh
134 136
 %{_sbindir}/ser
135 137
 %{_sbindir}/serctl
136
-%{_bindir}/*
138
+%{_sbindir}/gen_ha1
137 139
 
138 140
 %{_mandir}/man5/*
139 141
 %{_mandir}/man8/*
... ...
@@ -145,8 +147,17 @@ fi
145 147
 %{_libdir}/ser/modules/mysql.so
146 148
 %{_sbindir}/ser_mysql.sh
147 149
 
150
+%files jabber
151
+%defattr(-,root,root)
152
+
153
+%{_libdir}/ser/modules/jabber.so
148 154
 
149 155
 %changelog
156
+* Tue Nov 12 2002 Andrei Pelinescu - Onciul <pelinescu-onciul@fokus.gmd.de>
157
+- added a separate rpm for the jabber modules
158
+- moved all the binaries to sbin
159
+- removed obsolete installs (make install installs everything now)
160
+
150 161
 * Fri Oct  4 2002 Jiri Kuthan <jiri@iptel.org>
151 162
 - exec module introduced
152 163
 
... ...
@@ -1,8 +1,7 @@
1 1
 %define name    ser
2 2
 %define ver     0.8.10
3 3
 %define rel     1
4
-%define exclude CVS pike radius_acc radius_auth snmp
5
-
4
+%define exclude CVS radius_acc radius_auth snmp mysql jabber
6 5
 Summary:      SIP Express Router, very fast and flexible SIP Proxy
7 6
 Name:         %name
8 7
 Version:      %ver
... ...
@@ -40,17 +39,23 @@ The ser-mysql package contains MySQL database connectivity that you
40 39
 need to use digest authentication module or persistent user location
41 40
 entries.
42 41
 
42
+%package  jabber
43
+Summary:  sip jabber message translation support for the SIP Express Router.
44
+Group:    System Environment/Daemons
45
+Requires: ser
46
+BuildPrereq:  expat-devel
47
+
48
+%description jabber
49
+The ser-jabber package contains a sip to jabber message translator.
50
+
51
+
43 52
 %prep
44 53
 %setup
45 54
 
46 55
 %build
47
-make all cfg-target=/%{_sysconfdir}/ser/ exclude_modules="%exclude"
48
-cp modules/mysql/Makefile modules/mysql/Makefile.orig
49
-sed -e "s/\#-L\/usr\/lib\/mysql/-L\/usr\/lib\/mysql/g" modules/mysql/Makefile.orig > modules/mysql/Makefile
50
-make modules modules=modules/mysql cfg-target=/%{_sysconfdir}/ser/
51
-cd utils/gen_ha1
52
-make
53
-
56
+make all exclude_modules="%exclude" cfg-target=/%{_sysconfdir}/ser/
57
+make modules modules=modules/mysql  cfg-target=/%{_sysconfdir}/ser/
58
+make modules modules=modules/jabber cfg-target=/%{_sysconfdir}/ser/
54 59
 
55 60
 %install
56 61
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT"
... ...
@@ -69,32 +74,24 @@ make install cfg-prefix=$RPM_BUILD_ROOT/%{_sysconfdir} \
69 74
 		 modules-target=/%{_libdir}/ser/modules/ \
70 75
 	     exclude_modules="%exclude"
71 76
 make install-modules modules=modules/mysql \
72
-	     modules-prefix=$RPM_BUILD_ROOT/%{_libdir}/ser \
73
-	     modules-dir=modules/ \
74
-	     doc-prefix=$RPM_BUILD_ROOT/%{_docdir} \
75
-	     doc-dir=ser/ \
76
-	     cfg-target=/%{_sysconfdir}/ser/ \
77
-	     modules-target=/%{_libdir}/ser/modules/
77
+           modules-prefix=$RPM_BUILD_ROOT/%{_libdir}/ser \
78
+           modules-dir=modules/ \
79
+           doc-prefix=$RPM_BUILD_ROOT/%{_docdir} \
80
+           doc-dir=ser/ \
81
+           cfg-target=/%{_sysconfdir}/ser/ \
82
+           modules-target=/%{_libdir}/ser/modules/
83
+make install-modules modules=modules/jabber \
84
+           modules-prefix=$RPM_BUILD_ROOT/%{_libdir}/ser \
85
+           modules-dir=modules/ \
86
+           doc-prefix=$RPM_BUILD_ROOT/%{_docdir} \
87
+           doc-dir=ser/ \
88
+           cfg-target=/%{_sysconfdir}/ser/ \
89
+           modules-target=/%{_libdir}/ser/modules/
78 90
 
79 91
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/init.d
80 92
 install -m755 $RPM_SOURCE_DIR/ser.init.SuSE \
81 93
               $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/ser
82 94
 
83
-mkdir -p $RPM_BUILD_ROOT/%{_bindir}
84
-
85
-install -m755 utils/gen_ha1/gen_ha1 \
86
-	      $RPM_BUILD_ROOT/%{_bindir}/gen_ha1
87
-
88
-install -m755 scripts/harv_ser.sh \
89
-	      $RPM_BUILD_ROOT/%{_sbindir}/harv_ser.sh
90
-
91
-install -m755 scripts/sc \
92
-	      $RPM_BUILD_ROOT/%{_sbindir}/serctl
93
-
94
-install -m755 scripts/ser_mysql.sh \
95
-	      $RPM_BUILD_ROOT/%{_sbindir}/ser_mysql.sh
96
-
97
-
98 95
 %clean
99 96
 rm -rf "$RPM_BUILD_ROOT"
100 97
 
... ...
@@ -121,9 +118,11 @@ sbin/insserv etc/init.d/
121 118
 %dir %{_libdir}/ser/modules
122 119
 %{_libdir}/ser/modules/acc.so
123 120
 %{_libdir}/ser/modules/auth.so
121
+%{_libdir}/ser/modules/exec.so
124 122
 %{_libdir}/ser/modules/im.so
125
-%{_libdir}/ser/modules/jabber.so
126 123
 %{_libdir}/ser/modules/maxfwd.so
124
+%{_libdir}/ser/modules/msilo.so
125
+%{_libdir}/ser/modules/pike.so
127 126
 %{_libdir}/ser/modules/print.so
128 127
 %{_libdir}/ser/modules/registrar.so
129 128
 %{_libdir}/ser/modules/rr.so
... ...
@@ -133,10 +132,9 @@ sbin/insserv etc/init.d/
133 132
 %{_libdir}/ser/modules/tm.so
134 133
 %{_libdir}/ser/modules/usrloc.so
135 134
 
136
-%{_sbindir}/harv_ser.sh
137 135
 %{_sbindir}/ser
138 136
 %{_sbindir}/serctl
139
-%{_bindir}/*
137
++%{_sbindir}/gen_ha1
140 138
 
141 139
 %{_mandir}/man5/*
142 140
 %{_mandir}/man8/*
... ...
@@ -148,8 +146,17 @@ sbin/insserv etc/init.d/
148 146
 %{_libdir}/ser/modules/mysql.so
149 147
 %{_sbindir}/ser_mysql.sh
150 148
 
149
++%files jabber
150
++%defattr(-,root,root)
151
++%{_libdir}/ser/modules/jabber.so
152
+
151 153
 
152 154
 %changelog
155
+* Tue Nov 12 2002 Andrei Pelinescu - Onciul <pelinescu-onciul@fokus.gmd.de>
156
+- added a separate rpm for the jabber modules
157
+- moved all the binaries to sbin
158
+- removed obsolete installs (make install installs everything now)
159
+
153 160
 * Mon Oct 28 2002 Nils Ohlmeier <ohlmeier@fokus.fhg.de>
154 161
 - Added mysql and mysql-devel to the Req for the ser-mysql rpm.
155 162
 
... ...
@@ -5,6 +5,9 @@ d none etc/ser 0755 bin bin
5 5
 e none etc/ser/ser.cfg 0644 bin bin
6 6
 d none sbin 0755 bin bin
7 7
 f none sbin/ser 0755 bin bin
8
+f none sbin/serctl 0755 bin bin
9
+f none sbin/ser_mysql.sh 0755 bin bin
10
+f none sbin/gen_ha1 0755 bin bin
8 11
 d none lib 0755 bin bin
9 12
 d none lib/ser 2755 bin bin
10 13
 d none lib/ser/modules 2755 bin bin
... ...
@@ -15,6 +18,7 @@ f none lib/ser/modules/im.so 0755 bin bin
15 18
 f none lib/ser/modules/jabber.so 0755 bin bin
16 19
 f none lib/ser/modules/maxfwd.so 0755 bin bin
17 20
 f none lib/ser/modules/msilo.so 0755 bin bin
21
+f none lib/ser/modules/mysql.so 0755 bin bin
18 22
 f none lib/ser/modules/pike.so 0755 bin bin
19 23
 f none lib/ser/modules/print.so 0755 bin bin
20 24
 f none lib/ser/modules/registrar.so 0755 bin bin
... ...
@@ -24,12 +28,30 @@ f none lib/ser/modules/sms.so 0755 bin bin
24 28
 f none lib/ser/modules/textops.so 0755 bin bin
25 29
 f none lib/ser/modules/tm.so 0755 bin bin
26 30
 f none lib/ser/modules/usrloc.so 0755 bin bin
27
-d none share 0755 bin bin
28
-d none share/doc 0755 bin bin
29
-d none share/doc/ser 0755 bin bin
30
-f none share/doc/ser/README 0644 bin bin
31
-d none share/man 0755 bin bin
32
-d none share/man/man8 0755 bin bin
33
-f none share/man/man8/ser.8 0644 bin bin
34
-d none share/man/man5 0755 bin bin
35
-f none share/man/man5/ser.cfg.5 0644 bin bin
31
+d none doc 0755 bin bin
32
+d none doc/ser 0755 bin bin
33
+f none doc/ser/README 0644 bin bin
34
+f none doc/ser/README.cfg 0644 bin bin
35
+f none doc/ser/INSTALL 0644 bin bin
36
+f none doc/ser/README-MODULES 0644 bin bin
37
+f none doc/ser/AUTHORS 0644 bin bin
38
+f none doc/ser/README.acc 0644 bin bin
39
+f none doc/ser/README.auth 0644 bin bin
40
+f none doc/ser/README.exec 0644 bin bin
41
+f none doc/ser/README.im 0644 bin bin
42
+f none doc/ser/README.jabber 0644 bin bin
43
+f none doc/ser/README.maxfwd 0644 bin bin
44
+f none doc/ser/README.pike 0644 bin bin
45
+f none doc/ser/README.print 0644 bin bin
46
+f none doc/ser/README.registrar 0644 bin bin
47
+f none doc/ser/README.rr 0644 bin bin
48
+f none doc/ser/README.sl 0644 bin bin
49
+f none doc/ser/README.sms 0644 bin bin
50
+f none doc/ser/README.textops 0644 bin bin
51
+f none doc/ser/README.tm 0644 bin bin
52
+f none doc/ser/README.usrloc 0644 bin bin
53
+d none man 0755 bin bin
54
+d none man/man8 0755 bin bin
55
+f none man/man8/ser.8 0644 bin bin
56
+d none man/man5 0755 bin bin
57
+f none man/man5/ser.cfg.5 0644 bin bin