/[smecontribs]/rpms/smeserver-coova-chilli/contribs7/smeserver-coova-chilli.spec
ViewVC logotype

Diff of /rpms/smeserver-coova-chilli/contribs7/smeserver-coova-chilli.spec

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

Revision 1.3 by vip-ire, Wed Aug 27 11:36:18 2008 UTC Revision 1.28 by vip-ire, Fri May 29 07:25:10 2009 UTC
# Line 1  Line 1 
1    # $Id: smeserver-coova-chilli.spec,v 1.27 2009/05/26 13:46:19 vip-ire Exp $
2    # Authority: vip-ire
3    # Name: Daniel Berteaud
4    
5  Summary: Coova-Chilli, a captive portal based on ChilliSpot configured for SME server  Summary: Coova-Chilli, a captive portal based on ChilliSpot configured for SME server
6  %define name smeserver-coova-chilli  %define name smeserver-coova-chilli
7  Name: %{name}  Name: %{name}
8  %define version 0.1  %define version 0.2
9  %define release 2.el4.sme  %define release 14
10  Version: %{version}  Version: %{version}
11  Release: %{release}  Release: %{release}%{?dist}
12  Copyright: GPL  License: GPL
13  Group: Networking/Remote access  Group: Networking/Remote access
14  Source: %{name}-%{version}.tar.gz  Source: %{name}-%{version}.tar.gz
15  URL: http://sme.firewall-services.com  URL: http://sme.firewall-services.com
 Packager: Daniel Berteaud <daniel@firewall-services.com>  
16  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
17  BuildArchitectures: noarch  BuildArchitectures: noarch
18  Requires: e-smith-release >= 7.0 openssl coova-chilli  BuildRequires: e-smith-devtools
19    Requires: e-smith-release >= 7.0
20  Patch1: smeserver-coova-chilli-0.1-bypass_auth_with_squid_fix.patch  Requires: openssl
21  Patch2: smeserver-coova-chilli-0.1-expand_masq_fix.patch  Requires: coova-chilli >= 1.0.13
22  Patch3: smeserver-coova-chilli-0.1-firewall2db.patch  Requires: e-smith-radiusd >= 1.0.0-18
23  Patch4: smeserver-coova-chilli-0.1-loginPageDir.patch  Requires: perl(NetAddr::IP)
24    Requires: smeserver-remoteuseraccess
25    
26    Patch1: smeserver-coova-chilli-0.2-guest_uplink_downlink.patch
27    Patch2: smeserver-coova-chilli-0.2-guest_access.patch
28    Patch3: smeserver-coova-chilli-0.2-chilli_ip.patch
29    Patch4: smeserver-coova-chilli-0.2-radius_timeout.patch
30    Patch5: smeserver-coova-chilli-0.2-guest_access2.patch
31    Patch6: smeserver-coova-chilli-0.2-template_syntax_error.patch
32    Patch7: smeserver-coova-chilli-0.2-httpd_warning.patch
33    Patch8: smeserver-coova-chilli-0.2-tundev.patch
34    Patch9: smeserver-coova-chilli-0.2-dhcp_range.patch
35    Patch10: smeserver-coova-chilli-0.2-localhost_nas.patch
36    Patch11: smeserver-coova-chilli-0.2-localhost_nas2.patch
37    Patch12: smeserver-coova-chilli-0.2-squid_template_typo.patch
38    Patch13: smeserver-coova-chilli-0.2-typo.patch
39    Patch14: smeserver-coova-chilli-0.2-allow_uamallowed.patch
40    Patch15: smeserver-coova-chilli-0.2-drop_privileges.patch
41    Patch16: smeserver-coova-chilli-0.2-use_sudo.patch
42    Patch17: smeserver-coova-chilli-0.2-templates2expand_in_createlinks.patch
43    Patch18: smeserver-coova-chilli-0.2-db_noc2c.patch
44    Patch19: smeserver-coova-chilli-0.2-remove_space.patch
45    
46  %description  %description
47  This package allow you to configure a third interface  This package allow you to configure a third interface
# Line 25  This package allow you to configure a th Line 49  This package allow you to configure a th
49  a secured captive portal. Users will be redirected  a secured captive portal. Users will be redirected
50  on a logon page and they'll have to enter credentials  on a logon page and they'll have to enter credentials
51  (sme accounts) before the server allows them. By default,  (sme accounts) before the server allows them. By default,
52  they'll only have web access if they are members of the group "chilli"  they'll only have web access if they are members of the group "chilli"
53    This contrib will only work in server&gateway mode
54    
55  %changelog  %changelog
56    * Thu May 28 2009 Daniel B. <daniel@firewall-services.com> 0.2-14
57    - Remove space in hotspot-config.pl template
58    
59    * Tue May 26 2009 Daniel B. <daniel@firewall-services.com> 0.2-13
60    - Add noc2c key (allow to disable the option, but default to enabled)
61    
62    * Thu Apr 30 2009 Daniel B. <daniel@firewall-services.com> 0.2-12
63    - Create a new user coovachilli
64    - Add support of new options uid and gid to drop privileges
65    - Enabled noc2c (prevent client to client communication)
66    - Use sudo to call conup/condown script (as chilli runs under un
67      unprivileged account now)
68    - Add smeserver-remoteuseraccess as a dependency (for sudoers metadata templates)
69    - move templates2expand in creatlinks script
70    
71    * Wed Mar 13 2009 Daniel B. <daniel@firewall-services.com> 0.2-11
72    - Automatically allow uamallowed entries in the firewall (no need to
73      explicitly allow it agin in AllowOutgoing)
74    
75    * Thu Mar 12 2009 Daniel B. <daniel@firewall-services.com> 0.2-10
76    - Small typo correction
77    
78    * Tue Mar 10 2009 Daniel B. <daniel@firewall-services.com> 0.2-9
79    - Use allready defined localhost NAS to fixe PPTP problem [SME: 4996]
80      (thanks John K Pruder)
81    - fix a typo in squid template
82    
83    * Sun Mar 07 2009 Daniel B. <daniel@firewall-services.com> 0.2-8
84    - Add dhcpstart and dhcpstop db parameters (thanks John K Pruder)
85    
86    * Sun Mar 07 2009 Daniel B. <daniel@firewall-services.com> 0.2-7
87    - Fix tundev template [SME: 5054]
88    
89    * Thu Sep 18 2008 Daniel B. <daniel@firewall-services.com> 0.2-6
90    - Remove warning in httpd.conf file (httpd -t)
91    
92    * Mon Sep 15 2008 Daniel B. <daniel@firewall-services.com> 0.2-5
93    - Fix Syntax Error in /etc/chilli.conf template (25listen) [SME: 4559]
94    
95    * Mon Sep 08 2008 Daniel B. <daniel@firewall-services.com> 0.2-4
96    - Requires perl(NetAddr::IP)
97    
98    * Fri Sep 5 2008 Daniel B. <daniel@firewall-services.com> 0.2-3
99    - Chilli IP computed with NetAddr::IP
100    - Radius timeout set to 3 sec
101    - syntax error in radius users template fixed (for guest access)
102    
103    * Thu Sep 3 2008 Daniel B. <daniel@firewall-services.com> 0.2-2
104    - Bug fix for guest access
105    
106    * Tue Sep 2 2008 Daniel B. <daniel@firewall-services.com> 0.2-1
107    - uplink and downlink for guest account are configurable via db keys
108    
109    * Tue Sep 2 2008 Daniel B. <daniel@firewall-services.com> 0.2-0
110    - Login page is a CGI, with a server-manager login page look
111    - Guest Access can be enabled with guestAccess key (enabled/disabled)
112    - merge patchs in main package
113    
114    * Mon Sep 01 2008 Daniel B. <daniel@firewall-services.com> 0.1-8
115    - Fix uamallowed not working (since bypass_auth_with_squid_fix patch)
116    - Add WebRequests key (use of squid or direct connexions, default to direct)
117    - disable radconf in /etc/chilli/config
118    - possible to disable https (enabled by default in AllowedOutgoing)
119    - add tcp:static.sourceforge.net:80 in uamallowed so daloradius homepage is displayed correctly
120    - add radiustimeout directive so authentication errors display the standard message quickly
121    
122    * Thu Aug 28 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 0.1-7
123    - Reverted moving of default db entries to SPEC file since common practice is to store them in files
124    
125    * Thu Aug 28 2008 Daniel B. <daniel@firewall-services.com> 0.1-6
126    - split uamallowed (one per line)
127    - Add dnsparanoia directive
128    - correct cmdsock directive
129    - initialise default configuration db in the spec file
130    
131    * Thu Aug 28 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 0.1-5
132    - Remove the reset of $OUT from the template
133    
134    * Thu Aug 28 2008 Daniel B. <daniel@firewall-services.com> 0.1-4
135    - Add template to enable auth module unix (replace the template-custom)
136    - Copy images to /opt/chilli/template before removing .rpmnew directory
137    - Correct dependency (e-smith-radiusd not esmith-radiusd)
138    
139    * Wed Aug 27 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 0.1-3
140    - Split requirements to one per line
141    - Removed .rpmnew directory from package
142    - Removed the need for templates-custom as package now requires e-smith-radiusd >= 1.0.0-18
143    
144  * Tue Aug 26 2008 Daniel B. <daniel@firewall-services.com>  * Tue Aug 26 2008 Daniel B. <daniel@firewall-services.com>
145  - [0.1-2]  - [0.1-2]
146  - Most firewall customizations (for incomming and forwarded traffic from  - Most firewall customizations (for incomming and forwarded traffic from
147    chilli network only) can be set through db commands (Patch3)    chilli network only) can be set through db commands (Patch3)
148  - Outgoing DNS is allowed only for the two DNS servers configured  - Outgoing DNS is allowed only for the two DNS servers configured
149  - Clean spec file, adn put php files in /opt/chilli (Patch4)  - Clean spec file, and put php files in /opt/chilli (Patch4)
   
150    
151  * Tue Apr 15 2008 Daniel Berteaud <daniel@firewall-services.com>  * Tue Apr 15 2008 Daniel Berteaud <daniel@firewall-services.com>
152  - [0.1-1]  - [0.1-1]
# Line 51  they'll only have web access if they are Line 163  they'll only have web access if they are
163  %patch2 -p1  %patch2 -p1
164  %patch3 -p1  %patch3 -p1
165  %patch4 -p1  %patch4 -p1
166    %patch5 -p1
167    %patch6 -p1
168    %patch7 -p1
169    %patch8 -p1
170    %patch9 -p1
171    %patch10 -p1
172    %patch11 -p1
173    %patch12 -p1
174    %patch13 -p1
175    %patch14 -p1
176    %patch15 -p1
177    %patch16 -p1
178    %patch17 -p1
179    %patch18 -p1
180    %patch19 -p1
181    
182  %build  %build
183  /usr/bin/perl createlinks  /usr/bin/perl createlinks
# Line 60  they'll only have web access if they are Line 187  they'll only have web access if they are
187  (cd root   ; /usr/bin/find . -depth -print | /bin/cpio -dump $RPM_BUILD_ROOT)  (cd root   ; /usr/bin/find . -depth -print | /bin/cpio -dump $RPM_BUILD_ROOT)
188  /bin/rm -f %{name}-%{version}-filelist  /bin/rm -f %{name}-%{version}-filelist
189  /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \  /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
190          --file /etc/chilli/conup.sh 'attr(0750,root,root)' \          --file /etc/chilli/conup.sh 'attr(755,root,root)' \
191          --file /etc/chilli/condown.sh 'attr(0750,root,root)' \          --file /etc/chilli/condown.sh 'attr(750,root,root)' \
192          --file /opt/chilli/hotspotlogin-loginform.php 'config(noreplace)' \          --file /etc/chilli/call_conup.sh 'attr(755,root,root)' \
193          --file /opt/chilli/hotspotlogin-nonchilli.php 'config(noreplace)' \          --file /etc/chilli/call_condown.sh 'attr(755,root,root)' \
194          --file /opt/chilli/hotspotlogin-nonssl.php 'config(noreplace)' \          --file /opt/chilli/cgi-bin/hotspotlogin.cgi 'attr(0750,root,www) %config(noreplace)' \
195          --file /opt/chilli/hotspotlogin.php 'config(noreplace)' \          --file /opt/chilli/lang/hotspotlogin.fr.pl 'config(noreplace)' \
196          --file /opt/chilli/lang/en.php 'config(noreplace)' \          --file /opt/chilli/lang/hotspotlogin.en.pl 'config(noreplace)' \
197          --file /opt/chilli/lang/fr.php 'config(noreplace)' \          --file /opt/chilli/css/sme.css 'config(noreplace)' \
         --file /opt/chilli/lang/main.php 'config(noreplace)' \  
         --file /opt/chilli/template/loggingin.php 'config(noreplace)' \  
         --file /opt/chilli/template/loginform-footer.php 'config(noreplace)' \  
         --file /opt/chilli/template/loginform-header.php 'config(noreplace)' \  
198          > %{name}-%{version}-filelist          > %{name}-%{version}-filelist
199    
200  %files -f %{name}-%{version}-filelist  %files -f %{name}-%{version}-filelist
# Line 81  they'll only have web access if they are Line 204  they'll only have web access if they are
204  rm -rf $RPM_BUILD_ROOT  rm -rf $RPM_BUILD_ROOT
205    
206  %pre  %pre
207    if ! /usr/bin/id coovachilli &>/dev/null; then
208            /usr/sbin/useradd -c 'Coova Chilli User' -s /sbin/nologin -r -d /etc/chilli coovachilli &>/dev/null || \
209                    %logmsg "Unexpected error adding user \"coovachilli\". Abort installation."
210    fi
211    
212    
 %post  
   
213  %preun  %preun
214    
215  if [ $1 == 0 ]; then  if [ $1 == 0 ]; then
216          /sbin/e-smith/db configuration setprop chilli status disabled          /sbin/e-smith/db configuration setprop chilli status disabled
217          /etc/rc.d/init.d/chilli stop > /dev/null 2>&1          /etc/rc.d/init.d/chilli stop >& /dev/null || :
         true  
218  fi  fi
219    
 %postun  
   


Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed