Browse code

- packaging updates (all) (ver. no, *bsd dependencies, suse conflict [please check] a.s.o) - F_MALLOC to Makefile.defs (no malloc debugging); xlog built by default - ver. no 0.8.11rc6

Andrei Pelinescu-Onciul authored on 27/08/2003 16:08:45
Showing 15 changed files
... ...
@@ -36,7 +36,7 @@ skip_modules?=
36 36
 
37 37
 # if not set on the cmd. line or the env, exclude this modules:
38 38
 exclude_modules?= 			cpl cpl-c ext extcmd mangler pdt \
39
-							postgres snmp xlog  \
39
+							postgres snmp \
40 40
 							im radius_acc radius_auth \
41 41
 							jabber mysql \
42 42
 							auth_radius group_radius uri_radius 
... ...
@@ -40,7 +40,7 @@ export makefile_defs
40 40
 VERSION = 0
41 41
 PATCHLEVEL = 8
42 42
 SUBLEVEL =   11
43
-EXTRAVERSION = rc5
43
+EXTRAVERSION = rc6
44 44
 
45 45
 RELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
46 46
 OS = $(shell uname -s | sed -e s/SunOS/solaris/ | tr "[A-Z]" "[a-z]")
... ...
@@ -268,7 +268,8 @@ DEFS+= $(extra_defs) \
268 268
 	 -DUSE_IPV6 \
269 269
 	 -DUSE_TCP \
270 270
 	 -DDISABLE_NAGLE \
271
-	 -DDBG_QM_MALLOC \
271
+	 -DF_MALLOC \
272
+	 # -DDBG_QM_MALLOC \
272 273
 	 #-DF_MALLOC \
273 274
 	 #-DNO_DEBUG \
274 275
 	 #-DNO_LOG
... ...
@@ -1,3 +1,9 @@
1
+ser (0.8.11) unstable; urgency=low
2
+
3
+  * new upstream release
4
+
5
+ -- Andrei Pelinescu-Onciul <pelinescu-onciul@fokus.fraunhofer.de>  Wed, 27 Aug 2003 14:53:24 +0200
6
+
1 7
 ser (0.8.11-pre34) unstable; urgency=low
2 8
 
3 9
   * minor bugfixes
... ...
@@ -9,9 +9,9 @@
9 9
 
10 10
 
11 11
 PORTNAME= ser
12
-PORTVERSION= 0.8.11pre29
12
+PORTVERSION= 0.8.11
13 13
 CATEGORIES= net
14
-MASTER_SITES= ftp://ftp.berlios.de/pub/ser/0.8.11pre29/src/
14
+MASTER_SITES= ftp://ftp.berlios.de/pub/ser/0.8.11/src/
15 15
 
16 16
 MAINTAINER= pelinescu-onciul@fokus.fraunhofer.de
17 17
 
... ...
@@ -25,6 +25,15 @@ USE_GMAKE= yes
25 25
 DISTNAME= ${PORTNAME}-${PORTVERSION}_src
26 26
 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
27 27
 
28
+# build by default mysql and jabber
29
+MAKE_ENV='include_modules="mysql jabber"'
30
+
31
+# depends on mysql and libexpat because of the above modules
32
+BUILD_DEPENDS= ${LOCALBASE}/include/expat.h:${PORTSDIR}/textproc/expat \
33
+               ${LOCALBASE}/include/mysql/mysql.h:${PORTSDIR}/databases/mysql322-client
34
+LIB_DEPENDS=   expat:${PORTSDIR}/textproc/expat \
35
+               mysqlclient.6:${PORTSDIR}/databases/mysql322-client
36
+
28 37
 pre-fetch:
29 38
 	@echo "DEBUG: distfile=${DISTFILE}, distname=${DISTNAME}, w=${WRKSRC}"
30 39
 
... ...
@@ -1 +1 @@
1
-MD5 (ser-0.8.11pre29_src.tar.gz) = 070509795c5be4fe684dbfc36d42780a
1
+MD5 (ser-0.8.11_src.tar.gz) = 070509795c5be4fe684dbfc36d42780a
... ...
@@ -10,9 +10,9 @@
10 10
 COMMENT= "SIP Express Router"
11 11
 
12 12
 PORTNAME= ser
13
-PORTVERSION= 0.8.11pre29
13
+PORTVERSION= 0.8.11
14 14
 CATEGORIES= net
15
-MASTER_SITES= ftp://ftp.berlios.de/pub/ser/0.8.11pre29/src/
15
+MASTER_SITES= ftp://ftp.berlios.de/pub/ser/0.8.11/src/
16 16
 
17 17
 MAINTAINER= pelinescu-onciul@fokus.fraunhofer.de
18 18
 
... ...
@@ -27,6 +27,13 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}
27 27
 DISTFILES= ${DISTNAME}_src.tar.gz
28 28
 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
29 29
 
30
+# build by default mysql and jabber
31
+MAKE_ENV='include_modules="mysql jabber"'
32
+
33
+# depends on expat and mysqlclient because of the above modules
34
+DEPENDS= expat-[0-9]*:../../textproc/expat \
35
+         mysql-client>=3.23.35:../../databases/mysql-client
36
+
30 37
 #.include "/usr/pkgsrc/mk/bsd.prefs.mk"
31 38
 
32 39
 pre-fetch:
... ...
@@ -1 +1 @@
1
-MD5 (ser-0.8.11pre29_src.tar.gz) = 070509795c5be4fe684dbfc36d42780a
1
+MD5 (ser-0.8.11_src.tar.gz) = 070509795c5be4fe684dbfc36d42780a
... ...
@@ -10,9 +10,9 @@
10 10
 COMMENT= "SIP Express Router"
11 11
 
12 12
 PORTNAME= ser
13
-PORTVERSION= 0.8.11pre29
13
+PORTVERSION= 0.8.11
14 14
 CATEGORIES= net
15
-MASTER_SITES= ftp://ftp.berlios.de/pub/ser/0.8.11pre29/src/
15
+MASTER_SITES= ftp://ftp.berlios.de/pub/ser/0.8.11/src/
16 16
 
17 17
 MAINTAINER= pelinescu-onciul@fokus.fraunhofer.de
18 18
 
... ...
@@ -29,6 +29,17 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}
29 29
 DISTFILES= ${DISTNAME}_src.tar.gz
30 30
 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
31 31
 
32
+# build by default mysql and jabber
33
+MAKE_ENV='include_modules="mysql jabber"'
34
+
35
+# depends on mysql and libexpat because of the above modules
36
+BUILD_DEPENDS= :expat-1.*:textproc/expat \
37
+               :mysql-client-3.23.*:databases/mysql
38
+LIB_DEPENDS=   expat.2:expat-1.*:textproc/expat \
39
+               lib/mysql/mysqlclient.10:mysql-client-3.23.*:databases/mysql
40
+
41
+
42
+
32 43
 pre-fetch:
33 44
 	@echo "DEBUG: distfile=${DISTFILE}, distname=${DISTNAME}, w=${WRKSRC}"
34 45
 
... ...
@@ -1 +1 @@
1
-MD5 (ser-0.8.11pre29_src.tar.gz) = 070509795c5be4fe684dbfc36d42780a
1
+MD5 (ser-0.8.11_src.tar.gz) = 070509795c5be4fe684dbfc36d42780a
... ...
@@ -11,8 +11,10 @@ lib/ser/modules/domain.so
11 11
 lib/ser/modules/enum.so
12 12
 lib/ser/modules/exec.so
13 13
 lib/ser/modules/group.so
14
+lib/ser/modules/jabber.so
14 15
 lib/ser/modules/maxfwd.so
15 16
 lib/ser/modules/msilo.so
17
+lib/ser/modules/mysql.so
16 18
 lib/ser/modules/nathelper.so
17 19
 lib/ser/modules/pa.so
18 20
 lib/ser/modules/permissions.so
19 21
deleted file mode 100644
... ...
@@ -1,225 +0,0 @@
1
-%define name    ser
2
-%define ver     0.8.11pre29
3
-%define rel     1
4
-
5
-%define EXCLUDED_MODULES	mysql jabber auth_radius group_radius uri_radius postgress snmp cpl cpl-c ext extcmd mangler pdt
6
-%define MYSQL_MODULES		mysql
7
-%define JABBER_MODULES		jabber
8
-%define RADIUS_MODULES		auth_radius group_radius uri_radius
9
-%define RADIUS_MOD_PATH		modules/auth_radius modules/group_radius modules/uri_radius
10
-
11
-Summary:      SIP Express Router, very fast and flexible SIP Proxy
12
-Name:         %name
13
-Version:      %ver
14
-Release:      %rel
15
-Packager:     Jan Janak <jan@iptel.org>
16
-Copyright:    GPL
17
-Group:        System Environment/Daemons
18
-Source:       http://iptel.org/ser/stable/%{name}-%{ver}_src.tar.gz
19
-Source2:      ser.init
20
-URL:          http://iptel.org/ser
21
-Vendor:       FhG Fokus
22
-BuildRoot:    /var/tmp/%{name}-%{ver}-root
23
-BuildPrereq:  make flex bison
24
-
25
-
26
-%description
27
-Ser or SIP Express Router is a very fast and flexible SIP (RFC3621)
28
-proxy server. Written entirely in C, ser can handle thousands calls
29
-per second even on low-budget hardware. A C Shell like scripting language
30
-provides full control over the server's behaviour. It's modular
31
-architecture allows only required functionality to be loaded.
32
-Currently the following modules are available: digest authentication,
33
-CPL scripts, instant messaging, MySQL support, a presence agent, radius
34
-authentication, record routing, an SMS gateway, a jabber gateway, a 
35
-transaction module, registrar and user location.
36
-
37
-%package  mysql
38
-Summary:  MySQL connectivity for the SIP Express Router.
39
-Group:    System Environment/Daemons
40
-Requires: ser
41
-BuildPrereq:  mysql-devel zlib-devel
42
-
43
-%description mysql
44
-The ser-mysql package contains MySQL database connectivity that you
45
-need to use digest authentication module or persistent user location
46
-entries.
47
-
48
-%package  jabber
49
-Summary:  sip jabber message translation support for the SIP Express Router.
50
-Group:    System Environment/Daemons
51
-Requires: ser
52
-BuildPrereq:  expat-devel
53
-
54
-%description jabber
55
-The ser-jabber package contains a sip to jabber message translator.
56
-
57
-%package  radius
58
-Summary:  ser radius authentication, group and uri check modules.
59
-Group:    System Environment/Daemons
60
-Requires: ser
61
-BuildPrereq:  radiusclient-devel
62
-
63
-%description radius
64
-The ser-radius package contains modules for radius authentication, group
65
- membership and uri checking.
66
-
67
-%prep
68
-%setup
69
-
70
-%build
71
-make all skip_modules="%EXCLUDED_MODULES"      cfg-target=/%{_sysconfdir}/ser/
72
-make modules modules="modules/%MYSQL_MODULES"  cfg-target=/%{_sysconfdir}/ser/
73
-make modules modules="modules/%JABBER_MODULES" cfg-target=/%{_sysconfdir}/ser/
74
-make modules modules="%RADIUS_MOD_PATH"        cfg-target=/%{_sysconfdir}/ser/
75
-
76
-
77
-%install
78
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT"
79
-
80
-make install skip_modules="%EXCLUDED_MODULES" \
81
-		basedir=$RPM_BUILD_ROOT \
82
-		prefix=/usr \
83
-		cfg-prefix=$RPM_BUILD_ROOT \
84
-		cfg-target=/%{_sysconfdir}/ser/ 
85
-make install-modules modules="modules/%MYSQL_MODULES" \
86
-		basedir=$RPM_BUILD_ROOT \
87
-		prefix=/usr \
88
-		cfg-prefix=$RPM_BUILD_ROOT \
89
-		cfg-target=/%{_sysconfdir}/ser/ 
90
-make install-modules modules="modules/%JABBER_MODULES" \
91
-		basedir=$RPM_BUILD_ROOT \
92
-		prefix=/usr \
93
-		cfg-prefix=$RPM_BUILD_ROOT \
94
-		cfg-target=/%{_sysconfdir}/ser/ 
95
-make install-modules modules="%RADIUS_MOD_PATH" \
96
-		basedir=$RPM_BUILD_ROOT \
97
-		prefix=/usr \
98
-		cfg-prefix=$RPM_BUILD_ROOT \
99
-		cfg-target=/%{_sysconfdir}/ser/ 
100
-
101
-mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d
102
-install -m755 $RPM_SOURCE_DIR/ser.init \
103
-              $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/ser
104
-
105
-
106
-mkdir -p $RPM_BUILD_ROOT/%{_bindir}
107
-install -m755 scripts/harv_ser.sh \
108
-              $RPM_BUILD_ROOT/%{_bindir}/harv_ser.sh
109
-
110
-mv $RPM_BUILD_ROOT/%{_sbindir}/gen_ha1 $RPM_BUILD_ROOT/%{_bindir}
111
-
112
-
113
-%clean
114
-rm -rf "$RPM_BUILD_ROOT"
115
-
116
-%post
117
-/sbin/chkconfig --add ser
118
-
119
-%preun
120
-if [ $1 = 0 ]; then
121
-    /sbin/service ser stop > /dev/null 2>&1
122
-    /sbin/chkconfig --del ser
123
-fi
124
-
125
-
126
-%files
127
-%defattr(-,root,root)
128
-%doc README
129
-
130
-%dir %{_sysconfdir}/ser
131
-%config(noreplace) %{_sysconfdir}/ser/*
132
-%config %{_sysconfdir}/rc.d/init.d/*
133
-
134
-%dir %{_libdir}/ser
135
-%dir %{_libdir}/ser/modules
136
-%{_libdir}/ser/modules/acc.so
137
-%{_libdir}/ser/modules/auth.so
138
-%{_libdir}/ser/modules/auth_db.so
139
-%{_libdir}/ser/modules/dbtext.so
140
-%{_libdir}/ser/modules/domain.so
141
-%{_libdir}/ser/modules/enum.so
142
-%{_libdir}/ser/modules/exec.so
143
-%{_libdir}/ser/modules/group.so
144
-%{_libdir}/ser/modules/maxfwd.so
145
-%{_libdir}/ser/modules/msilo.so
146
-%{_libdir}/ser/modules/nathelper.so
147
-%{_libdir}/ser/modules/pa.so
148
-%{_libdir}/ser/modules/permissions.so
149
-%{_libdir}/ser/modules/pike.so
150
-%{_libdir}/ser/modules/print.so
151
-%{_libdir}/ser/modules/registrar.so
152
-%{_libdir}/ser/modules/rr.so
153
-%{_libdir}/ser/modules/sl.so
154
-%{_libdir}/ser/modules/sms.so
155
-%{_libdir}/ser/modules/textops.so
156
-%{_libdir}/ser/modules/tm.so
157
-%{_libdir}/ser/modules/uri.so
158
-%{_libdir}/ser/modules/usrloc.so
159
-%{_libdir}/ser/modules/vm.so
160
-
161
-%{_sbindir}/ser
162
-%{_sbindir}/serctl
163
-
164
-%{_bindir}/harv_ser.sh
165
-%{_bindir}/gen_ha1
166
-
167
-%{_mandir}/man5/*
168
-%{_mandir}/man8/*
169
-
170
-
171
-%files mysql
172
-%defattr(-,root,root)
173
-
174
-%{_libdir}/ser/modules/mysql.so
175
-%{_sbindir}/ser_mysql.sh
176
-
177
-%files jabber
178
-%defattr(-,root,root)
179
-
180
-%{_libdir}/ser/modules/jabber.so
181
-
182
-%files radius
183
-%defattr(-,root,root)
184
-
185
-%{_libdir}/ser/modules/auth_radius.so
186
-%{_libdir}/ser/modules/group_radius.so
187
-%{_libdir}/ser/modules/uri_radius.so
188
-
189
-
190
-%changelog
191
-
192
-* Sun Jun 1 2003 Andrei Pelinescu - Onciul <pelinescu-onciul@fokus.fraunhofer.de>
193
-- added a separate rpm for the radius modules
194
-- updated to the new makefile variables (removed lots of unnecessary stuff)
195
-
196
-* Thu Nov 14 2002 Jan Janak <J.Janak@sh.cvut.cz>
197
-- Installing harv_ser.sh again
198
-- quick hack to move gen_ha1 to bin directory instead of sbin (should
199
-  be done from the Makefile next time)
200
-
201
-* Tue Nov 12 2002 Andrei Pelinescu - Onciul <pelinescu-onciul@fokus.gmd.de>
202
-- added a separate rpm for the jabber modules
203
-- moved all the binaries to sbin
204
-- removed obsolete installs (make install installs everything now)
205
-
206
-* Fri Oct 25 2002 Jan Janak <J.Janak@sh.cvut.cz>
207
-- Minor description fixes
208
-
209
-* Fri Oct  4 2002 Jiri Kuthan <jiri@iptel.org>
210
-- exec module introduced
211
-
212
-* Wed Sep 25 2002 Andrei Pelinescu - Onciul  <pelinescu-onciul@fokus.gmd.de>
213
-- modified make install & make: added cfg-target & modules-target
214
-
215
-* Sun Sep 08 2002 Jan Janak <J.Janak@sh.cvut.cz>
216
-- Created subpackage containing mysql connectivity support.
217
-
218
-* Mon Sep 02 2002 Jan Janak <J.Janak@sh.cvut.cz>
219
-- gen_ha1 utility added, scripts added.
220
-
221
-* Tue Aug 28 2002 Jan Janak <J.Janak@sh.cvut.cz>
222
-- Finished the first version of the spec file.
223
-
224
-* Sun Aug 12 2002 Jan Janak <J.Janak@sh.cvut.cz>
225
-- First version of the spec file.
... ...
@@ -1,5 +1,5 @@
1 1
 %define name    ser
2
-%define ver     0.8.11pre30
2
+%define ver     0.8.11
3 3
 %define rel     0
4 4
 
5 5
 %define EXCLUDED_MODULES	mysql jabber auth_radius group_radius uri_radius postgress snmp cpl cpl-c ext extcmd mangler pdt
... ...
@@ -114,11 +114,6 @@ install -m755 $RPM_SOURCE_DIR/ser.init \
114 114
               $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/ser
115 115
 
116 116
 
117
-mkdir -p $RPM_BUILD_ROOT/%{_bindir}
118
-install -m755 scripts/harv_ser.sh \
119
-              $RPM_BUILD_ROOT/%{_bindir}/harv_ser.sh
120
-
121
-mv $RPM_BUILD_ROOT/%{_sbindir}/gen_ha1 $RPM_BUILD_ROOT/%{_bindir}
122 117
 
123 118
 
124 119
 %clean
... ...
@@ -201,8 +196,7 @@ fi
201 196
 %{_sbindir}/ser
202 197
 %{_sbindir}/serctl
203 198
 
204
-%{_bindir}/harv_ser.sh
205
-%{_bindir}/gen_ha1
199
+%{_sbindir}/gen_ha1
206 200
 
207 201
 %{_mandir}/man5/*
208 202
 %{_mandir}/man8/*
... ...
@@ -233,6 +227,11 @@ fi
233 227
 
234 228
 %changelog
235 229
 
230
+* Wed Aug 27 2003 Andrei Pelinescu - Onciul <pelinescu-onciul@fokus.fraunhofer.de>
231
+- changed vesion to 0.8.11
232
+- gen_ha1 isn now left in _sbindir
233
+- removed harv_ser.sh
234
+
236 235
 * Fri Jun 6 2003 Andrei Pelinescu - Onciul <pelinescu-onciul@fokus.fraunhofer.de>
237 236
 - added Conflicts:, changed vesion to 0.8.11pre30
238 237
 
... ...
@@ -1,6 +1,6 @@
1 1
 %define name    ser
2
-%define ver     0.8.11pre29
3
-%define rel     1
2
+%define ver     0.8.11
3
+%define rel     0
4 4
 
5 5
 %define EXCLUDED_MODULES	mysql jabber auth_radius group_radius uri_radius postgress snmp cpl cpl-c ext extcmd mangler pdt
6 6
 %define MYSQL_MODULES		mysql
... ...
@@ -20,6 +20,7 @@ Source2:      ser.init.SuSE
20 20
 URL:          http://www.iptel.org/ser
21 21
 Vendor:       FhG Fokus
22 22
 BuildRoot:    /var/tmp/%{name}-%{ver}-root
23
+Conflicts:    ser-mysql < %ver, ser-jabber < %ver, ser-radius < %ver
23 24
 BuildPrereq:  make flex bison 
24 25
 
25 26
 
... ...
@@ -177,6 +178,12 @@ sbin/insserv etc/init.d/
177 178
 
178 179
 %changelog
179 180
 
181
+* Wed Aug 27 2003 Andrei Pelinescu - Onciul <pelinescu-onciul@fokus.fraunhofer.de>
182
+- changed vesion to 0.8.11
183
+- gen_ha1 isn now left in _sbindir
184
+- removed harv_ser.sh
185
+- added Conflicts
186
+
180 187
 * Mon Jun 2 2003 Andrei Pelinescu - Onciul <pelinescu-onciul@fokus.fraunhofer.de>
181 188
 - added a separate rpm for the radius modules
182 189
 - updated to the new makefile variables (removed lots of unnecessary stuff)
... ...
@@ -1,6 +1,6 @@
1 1
 PKG=IPTELser
2 2
 ARCH=sparc
3
-VERSION=0.8.11pre29
3
+VERSION=0.8.11
4 4
 CATEGORY=application
5 5
 EMAIL=pelinescu-onciul@fokus.fraunhofer.de
6 6
 NAME= ser or SIP Express Router is a very fast and flexible SIP proxy server
... ...
@@ -69,6 +69,55 @@ usrloc            o  o  o  o  o  o  o  o  o
69 69
 vm                o  o  o  o  o  o  o  o  o
70 70
 
71 71
 
72
+25.08.03
73
+module_name       1  2  3  4  5  6  7  8  9
74
+standard:
75
+core              o  o  o        o  o  o  o
76
+acc               o  o  o        o  o  o  o
77
+auth              o  o  o        o  o  o  o
78
+auth_db           o  o  o        o  o  o  o
79
+dbtext            o  o  o        o  o  o  o
80
+domain            o  o  o        o  o  o  o
81
+enum              o  o  o        o  o  o  o
82
+exec              o  o  o        o  o  o  o
83
+group             o  o  o        o  o  o  o
84
+maxfwd            o  o  o        o  o  o  o
85
+msilo             o  o  o        o  o  o  o
86
+nathelper         o  o  o        o  o  o  o
87
+pa                o  o  o        o  o  o  o
88
+persmissions      o  o  o        o  o  o  o
89
+pike              o  o  o        o  o  o  o
90
+print             o  o  o        o  o  o  o
91
+registrar         o  o  o        o  o  o  o
92
+rr                o  o  o        o  o  o  o
93
+sl                o  o  o        o  o  o  o
94
+sms               o  o  o        o  o  o  o
95
+textops           o  o  o        o  o  o  o
96
+tm                o  o  o        o  o  o  o
97
+uri               o  o  o        o  o  o  o
98
+usrloc            o  o  o        o  o  o  o
99
+vm                o  o  o        o  o  o  o
100
+xlog              o  o  o        o  o  o  o
101
+
102
+
103
+extra:
104
+auth_radius       w  o  o        I  I  I  I
105
+cpl             P o  o  o        o  o  o  o
106
+cpl-c           D I  I  I        I  I  I  I
107
+ext               o  o  o        o  o  o  o
108
+extcmd            o  o  o        o  o  o  o
109
+group_radius      w  o  o        I  I  I  I
110
+jabber            o  o  o        o  o  o  o
111
+mangler           o  o  o        o  o  o  o
112
+mysql             o  o  o        o  o  o  o
113
+pdt               o  o  o        o  o  o  o
114
+postgress         I  I  I        I  I  I  I
115
+uri_radius        w  o  o        I  I  I  I
116
+
117
+dead:
118
+snmp
119
+
120
+
72 121
 [*] - w/o radius & mysql
73 122
 [+] - -I warning (bad cpp?)
74 123