Browse code

-updated the rpm spec: radius modules, new makefile vars a.s.o (not tested yet)

Andrei Pelinescu-Onciul authored on 01/06/2003 09:42:40
Showing 2 changed files
... ...
@@ -1,7 +1,14 @@
1 1
 %define name    ser
2
-%define ver     0.8.10
3
-%define rel     2
4
-%define exclude CVS radius_acc radius_auth snmp mysql jabber
2
+%define ver     0.8.11pre29
3
+%define rel     0
4
+
5
+%define EXCLUDED_MODULES	mysql jabber auth_radius group_radius uri_radius \
6
+							postgress snmp cpl cpl-c ext extcmd mangler pdt
7
+%define MYSQL_MODULES		mysql
8
+%define JABBER_MODULES		jabber
9
+%define RADIUS_MODULES		auth_radius group_radius uri_radius
10
+%define RADIUS_MOD_PATH		modules/auth_radius modules/group_radius \
11
+							modules/uri_radius
5 12
 
6 13
 Summary:      SIP Express Router, very fast and flexible SIP Proxy
7 14
 Name:         %name
... ...
@@ -49,45 +56,49 @@ BuildPrereq:  expat-devel
49 56
 %description jabber
50 57
 The ser-jabber package contains a sip to jabber message translator.
51 58
 
59
+%package  radius
60
+Summary:  ser radius authentication, group and uri check modules.
61
+Group:    System Environment/Daemons
62
+Requires: ser
63
+BuildPrereq:  libradius1-dev
64
+
65
+%description radius
66
+The ser-radius package contains modules for radius authentication, group
67
+ membership and uri checking.
68
+
52 69
 %prep
53 70
 %setup
54 71
 
55 72
 %build
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/
73
+make all skip_modules="%EXCLUDED_MODULES"      cfg-target=/%{_sysconfdir}/ser/
74
+make modules modules="modules/%MYSQL_MODULES"  cfg-target=/%{_sysconfdir}/ser/
75
+make modules modules="modules/%JABBER_MODULES" cfg-target=/%{_sysconfdir}/ser/
76
+make modules modules="%RADIUS_MOD_PATH"        cfg-target=/%{_sysconfdir}/ser/
59 77
 
60 78
 
61 79
 %install
62 80
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT"
63 81
 
64
-make install cfg-prefix=$RPM_BUILD_ROOT/%{_sysconfdir} \
65
-             cfg-dir=ser/ \
66
-	     bin-prefix=$RPM_BUILD_ROOT/%{_sbindir} \
67
-	     bin-dir="" \
68
-	     modules-prefix=$RPM_BUILD_ROOT/%{_libdir}/ser \
69
-	     modules-dir=modules/ \
70
-	     doc-prefix=$RPM_BUILD_ROOT/%{_docdir} \
71
-	     doc-dir=ser/ \
72
-	     man-prefix=$RPM_BUILD_ROOT/%{_mandir} \
73
-	     man-dir="" \
74
-	     cfg-target=/%{_sysconfdir}/ser/ \
75
-	     modules-target=/%{_libdir}/ser/modules/ \
76
-	     exclude_modules="%exclude"
77
-make install-modules modules=modules/mysql \
78
-	    modules-prefix=$RPM_BUILD_ROOT/%{_libdir}/ser \
79
-	    modules-dir=modules/ \
80
-	    doc-prefix=$RPM_BUILD_ROOT/%{_docdir} \
81
-	    doc-dir=ser/ \
82
-	    cfg-target=/%{_sysconfdir}/ser/ \
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/ 
82
+make install skip_modules="%EXCLUDED_MODULES" \
83
+		basedir=$RPM_BUILD_ROOT \
84
+		prefix=/usr \
85
+		cfg-prefix=$RPM_BUILD_ROOT/%{_sysconfdir} \
86
+		cfg-target=/%{_sysconfdir}/ser/ 
87
+make install-modules modules="modules/%MYSQL_MODULES" \
88
+		basedir=$RPM_BUILD_ROOT \
89
+		prefix=/usr \
90
+		cfg-prefix=$RPM_BUILD_ROOT/%{_sysconfdir} \
91
+		cfg-target=/%{_sysconfdir}/ser/ 
92
+make install-modules modules="modules/%JABBER_MODULES" \
93
+		basedir=$RPM_BUILD_ROOT \
94
+		prefix=/usr \
95
+		cfg-prefix=$RPM_BUILD_ROOT/%{_sysconfdir} \
96
+		cfg-target=/%{_sysconfdir}/ser/ 
97
+make install-modules modules="%RADIUS_MOD_PATH" \
98
+		basedir=$RPM_BUILD_ROOT \
99
+		prefix=/usr \
100
+		cfg-prefix=$RPM_BUILD_ROOT/%{_sysconfdir} \
101
+		cfg-target=/%{_sysconfdir}/ser/ 
91 102
 
92 103
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d
93 104
 install -m755 $RPM_SOURCE_DIR/ser.init \
... ...
@@ -126,10 +137,17 @@ fi
126 137
 %dir %{_libdir}/ser/modules
127 138
 %{_libdir}/ser/modules/acc.so
128 139
 %{_libdir}/ser/modules/auth.so
140
+%{_libdir}/ser/modules/auth_db.so
141
+%{_libdir}/ser/modules/dbtext.so
142
+%{_libdir}/ser/modules/domain.so
143
+%{_libdir}/ser/modules/enum.so
129 144
 %{_libdir}/ser/modules/exec.so
130
-%{_libdir}/ser/modules/im.so
145
+%{_libdir}/ser/modules/group.so
131 146
 %{_libdir}/ser/modules/maxfwd.so
132 147
 %{_libdir}/ser/modules/msilo.so
148
+%{_libdir}/ser/modules/nathelper.so
149
+%{_libdir}/ser/modules/pa.so
150
+%{_libdir}/ser/modules/permissions.so
133 151
 %{_libdir}/ser/modules/pike.so
134 152
 %{_libdir}/ser/modules/print.so
135 153
 %{_libdir}/ser/modules/registrar.so
... ...
@@ -138,7 +156,9 @@ fi
138 156
 %{_libdir}/ser/modules/sms.so
139 157
 %{_libdir}/ser/modules/textops.so
140 158
 %{_libdir}/ser/modules/tm.so
159
+%{_libdir}/ser/modules/uri.so
141 160
 %{_libdir}/ser/modules/usrloc.so
161
+%{_libdir}/ser/modules/vm.so
142 162
 
143 163
 %{_sbindir}/ser
144 164
 %{_sbindir}/serctl
... ...
@@ -161,7 +181,24 @@ fi
161 181
 
162 182
 %{_libdir}/ser/modules/jabber.so
163 183
 
184
+%files radius
185
+%defattr(-,root,root)
186
+
187
+%{_libdir}/ser/modules/auth_radius.so
188
+%{_libdir}/ser/modules/group_radius.so
189
+%{_libdir}/ser/modules/uri_radius.so
190
+* Tue Nov 12 2002 Andrei Pelinescu - Onciul <pelinescu-onciul@fokus.gmd.de>
191
+- added a separate rpm for the jabber modules
192
+- moved all the binaries to sbin
193
+- removed obsolete installs (make install installs everything now)
194
+
195
+
164 196
 %changelog
197
+
198
+* Sun Jun 1 2003 Andrei Pelinescu - Onciul <pelinescu-onciul@fokus.fraunhofer.de>
199
+- added a separate rpm for the radius modules
200
+- updated to the new makefile variables (removed lots of unnecessary stuff)
201
+
165 202
 * Thu Nov 14 2002 Jan Janak <J.Janak@sh.cvut.cz>
166 203
 - Installing harv_ser.sh again
167 204
 - quick hack to move gen_ha1 to bin directory instead of sbin (should
... ...
@@ -3,11 +3,12 @@
3 3
 1 linux-i386/gcc2.95
4 4
 2 linux-i386/gcc3.3
5 5
 3 linux-i386/icc
6
-4 freebsd-i386/gcc
7
-5 openbsd-i386/gcc
8
-6 netbsd-ultrasparc/gcc
9
-7 solaris/gcc
10
-8 solaris/sun cc
6
+4 freebsd_4.5-i386/gcc
7
+5 freebsd_5.0-i386/gcc3.2
8
+6 openbsd_3.1-i386/gcc
9
+7 netbsd_1.6-ultrasparc/gcc
10
+8 solaris_8.0-ultrasparc/gcc
11
+9 solaris_8.0-ultrasparc/sun cc 5.3
11 12
 
12 13
 W - warnings
13 14
 E - errors
... ...
@@ -27,45 +28,45 @@ checked:
27 28
 5 - 2003-05-26
28 29
 
29 30
 
30
-module_name       1  2  3  4  5  6  7  8
31
-core                 o  o  o  o  o  o  o
32
-acc               o  I  I  I  o* I  I  I
33
-auth              o  o  o  o  o  o  o  o
34
-auth_db           o  o  o  o  o  o  o  o
35
-auth_radius       o  I  I  I  I  I  I  I
36
-cpl             P o  o  o  o  o  o  o  o
37
-cpl-c           D I  I  I  I  I  I  I  I
38
-dbtext            o  o  o  o  o  o  o  o
39
-domain            o  o  o  o  o  o  o  o
40
-enum              o  o  o  o  o  o  o  o
41
-exec              o  o  o  o  o  o  o  o
42
-ext               o  o  o  o  o  o  o  o
43
-extcmd            o  o  o  o  o  o  o  o
44
-group             o  o  o  o  o  o  o  o
45
-group_radius      W  I  I  I  I  I  I  I
46
-jabber            o  o  o  o  o  o  W+ W
47
-mangler           o  o  o  o  o  o  o  o
48
-maxfwd            o  o  o  o  o  o  o  o
49
-msilo             o  o  o  o  o  o  o  o
50
-mysql             o  o  o  o  o  o  o  o
51
-nathelper         o  o  o  o  o  o  o  o
52
-pa                o  o  o  o  o  o  o  o
53
-pdt               o  o  o  o  o  o  o  o
54
-persmissions      o  o  o  o  o  o  o  o
55
-pike              o  o  o  o  o  o  o  o
56
-postgress         I  I  I  I  I  I  I  I
57
-print             o  o  o  o  o  o  o  o
58
-registrar         o  o  o  o  o  o  o  o
59
-rr                o  o  o  o  o  o  o  o
60
-sl                o  o  o  o  o  o  o  o
61
-sms               o  o  o  o  o  o  o  o
62
-snmp      D       I  I  I  I  I  I  I  I
63
-textops           o  o  o  o  o  o  o  o
64
-tm                o  o  o  o  o  o  o  o
65
-uri               o  o  o  o  o  o  o  o
66
-uri_radius        o  I  I  I  I  I  I  I
67
-usrloc            o  o  o  o  o  o  o  o
68
-vm                o  o  o  o  o  o  o  o
31
+module_name       1  2  3  4  5  6  7  8  9
32
+core                 o  o  o  o  o  o  o  o
33
+acc               o  I  I  I  o* o* I  I  I
34
+auth              o  o  o  o  o  o  o  o  o
35
+auth_db           o  o  o  o  o  o  o  o  o
36
+auth_radius       o  I  I  I  I  I  I  I  I
37
+cpl             P o  o  o  o  o  o  o  o  o
38
+cpl-c           D I  I  I  I  I  I  I  I  I
39
+dbtext            o  o  o  o  o  o  o  o  o
40
+domain            o  o  o  o  o  o  o  o  o
41
+enum              o  o  o  o  o  o  o  o  o
42
+exec              o  o  o  o  o  o  o  o  o
43
+ext               o  o  o  o  o  o  o  o  o
44
+extcmd            o  o  o  o  o  o  o  o  o
45
+group             o  o  o  o  o  o  o  o  o
46
+group_radius      W  I  I  I  I  I  I  I  I
47
+jabber            o  o  o  o  o  o  o  W+ W
48
+mangler           o  o  o  o  o  o  o  o  o
49
+maxfwd            o  o  o  o  o  o  o  o  o
50
+msilo             o  o  o  o  o  o  o  o  o
51
+mysql             o  o  o  o  I  o  o  o  o
52
+nathelper         o  o  o  o  o  o  o  o  o
53
+pa                o  o  o  o  o  o  o  o  o
54
+pdt               o  o  o  o  o  o  o  o  o
55
+persmissions      o  o  o  o  o  o  o  o  o
56
+pike              o  o  o  o  o  o  o  o  o
57
+postgress         I  I  I  I  I  I  I  I  I
58
+print             o  o  o  o  o  o  o  o  o
59
+registrar         o  o  o  o  o  o  o  o  o
60
+rr                o  o  o  o  o  o  o  o  o
61
+sl                o  o  o  o  o  o  o  o  o
62
+sms               o  o  o  o  o  o  o  o  o
63
+snmp      D       I  I  I  I  I  I  I  I  I
64
+textops           o  o  o  o  o  o  o  o  o
65
+tm                o  o  o  o  o  o  o  o  o
66
+uri               o  o  o  o  o  o  o  o  o
67
+uri_radius        o  I  I  I  I  I  I  I  I
68
+usrloc            o  o  o  o  o  o  o  o  o
69
+vm                o  o  o  o  o  o  o  o  o
69 70
 
70 71
 
71 72
 [*] - w/o radius & mysql