/[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.26 by vip-ire, Mon May 4 14:31:30 2009 UTC
# Line 1  Line 1 
1    # $Id: smeserver-coova-chilli.spec,v 1.25 2009/03/12 14:54:34 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 12
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    
44  %description  %description
45  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 47  This package allow you to configure a th
47  a secured captive portal. Users will be redirected  a secured captive portal. Users will be redirected
48  on a logon page and they'll have to enter credentials  on a logon page and they'll have to enter credentials
49  (sme accounts) before the server allows them. By default,  (sme accounts) before the server allows them. By default,
50  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"
51    This contrib will only work in server&gateway mode
52    
53  %changelog  %changelog
54    * Thu Apr 30 2009 Daniel B. <daniel@firewall-services.com> 0.2-12
55    - Create a new user coovachilli
56    - Add support of new options uid and gid to drop privileges
57    - Enabled noc2c (prevent client to client communication)
58    - Use sudo to call conup/condown script (as chilli runs under un
59      unprivileged account now)
60    - Add smeserver-remoteuseraccess as a dependency (for sudoers metadata templates)
61    - move templates2expand in creatlinks script
62    
63    * Wed Mar 13 2009 Daniel B. <daniel@firewall-services.com> 0.2-11
64    - Automatically allow uamallowed entries in the firewall (no need to
65      explicitly allow it agin in AllowOutgoing)
66    
67    * Thu Mar 12 2009 Daniel B. <daniel@firewall-services.com> 0.2-10
68    - Small typo correction
69    
70    * Tue Mar 10 2009 Daniel B. <daniel@firewall-services.com> 0.2-9
71    - Use allready defined localhost NAS to fixe PPTP problem [SME: 4996]
72      (thanks John K Pruder)
73    - fix a typo in squid template
74    
75    * Sun Mar 07 2009 Daniel B. <daniel@firewall-services.com> 0.2-8
76    - Add dhcpstart and dhcpstop db parameters (thanks John K Pruder)
77    
78    * Sun Mar 07 2009 Daniel B. <daniel@firewall-services.com> 0.2-7
79    - Fix tundev template [SME: 5054]
80    
81    * Thu Sep 18 2008 Daniel B. <daniel@firewall-services.com> 0.2-6
82    - Remove warning in httpd.conf file (httpd -t)
83    
84    * Mon Sep 15 2008 Daniel B. <daniel@firewall-services.com> 0.2-5
85    - Fix Syntax Error in /etc/chilli.conf template (25listen) [SME: 4559]
86    
87    * Mon Sep 08 2008 Daniel B. <daniel@firewall-services.com> 0.2-4
88    - Requires perl(NetAddr::IP)
89    
90    * Fri Sep 5 2008 Daniel B. <daniel@firewall-services.com> 0.2-3
91    - Chilli IP computed with NetAddr::IP
92    - Radius timeout set to 3 sec
93    - syntax error in radius users template fixed (for guest access)
94    
95    * Thu Sep 3 2008 Daniel B. <daniel@firewall-services.com> 0.2-2
96    - Bug fix for guest access
97    
98    * Tue Sep 2 2008 Daniel B. <daniel@firewall-services.com> 0.2-1
99    - uplink and downlink for guest account are configurable via db keys
100    
101    * Tue Sep 2 2008 Daniel B. <daniel@firewall-services.com> 0.2-0
102    - Login page is a CGI, with a server-manager login page look
103    - Guest Access can be enabled with guestAccess key (enabled/disabled)
104    - merge patchs in main package
105    
106    * Mon Sep 01 2008 Daniel B. <daniel@firewall-services.com> 0.1-8
107    - Fix uamallowed not working (since bypass_auth_with_squid_fix patch)
108    - Add WebRequests key (use of squid or direct connexions, default to direct)
109    - disable radconf in /etc/chilli/config
110    - possible to disable https (enabled by default in AllowedOutgoing)
111    - add tcp:static.sourceforge.net:80 in uamallowed so daloradius homepage is displayed correctly
112    - add radiustimeout directive so authentication errors display the standard message quickly
113    
114    * Thu Aug 28 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 0.1-7
115    - Reverted moving of default db entries to SPEC file since common practice is to store them in files
116    
117    * Thu Aug 28 2008 Daniel B. <daniel@firewall-services.com> 0.1-6
118    - split uamallowed (one per line)
119    - Add dnsparanoia directive
120    - correct cmdsock directive
121    - initialise default configuration db in the spec file
122    
123    * Thu Aug 28 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 0.1-5
124    - Remove the reset of $OUT from the template
125    
126    * Thu Aug 28 2008 Daniel B. <daniel@firewall-services.com> 0.1-4
127    - Add template to enable auth module unix (replace the template-custom)
128    - Copy images to /opt/chilli/template before removing .rpmnew directory
129    - Correct dependency (e-smith-radiusd not esmith-radiusd)
130    
131    * Wed Aug 27 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 0.1-3
132    - Split requirements to one per line
133    - Removed .rpmnew directory from package
134    - Removed the need for templates-custom as package now requires e-smith-radiusd >= 1.0.0-18
135    
136  * Tue Aug 26 2008 Daniel B. <daniel@firewall-services.com>  * Tue Aug 26 2008 Daniel B. <daniel@firewall-services.com>
137  - [0.1-2]  - [0.1-2]
138  - Most firewall customizations (for incomming and forwarded traffic from  - Most firewall customizations (for incomming and forwarded traffic from
139    chilli network only) can be set through db commands (Patch3)    chilli network only) can be set through db commands (Patch3)
140  - Outgoing DNS is allowed only for the two DNS servers configured  - Outgoing DNS is allowed only for the two DNS servers configured
141  - Clean spec file, adn put php files in /opt/chilli (Patch4)  - Clean spec file, and put php files in /opt/chilli (Patch4)
   
142    
143  * Tue Apr 15 2008 Daniel Berteaud <daniel@firewall-services.com>  * Tue Apr 15 2008 Daniel Berteaud <daniel@firewall-services.com>
144  - [0.1-1]  - [0.1-1]
# Line 51  they'll only have web access if they are Line 155  they'll only have web access if they are
155  %patch2 -p1  %patch2 -p1
156  %patch3 -p1  %patch3 -p1
157  %patch4 -p1  %patch4 -p1
158    %patch5 -p1
159    %patch6 -p1
160    %patch7 -p1
161    %patch8 -p1
162    %patch9 -p1
163    %patch10 -p1
164    %patch11 -p1
165    %patch12 -p1
166    %patch13 -p1
167    %patch14 -p1
168    %patch15 -p1
169    %patch16 -p1
170    %patch17 -p1
171    
172  %build  %build
173  /usr/bin/perl createlinks  /usr/bin/perl createlinks
# Line 60  they'll only have web access if they are Line 177  they'll only have web access if they are
177  (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)
178  /bin/rm -f %{name}-%{version}-filelist  /bin/rm -f %{name}-%{version}-filelist
179  /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \  /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
180          --file /etc/chilli/conup.sh 'attr(0750,root,root)' \          --file /etc/chilli/conup.sh 'attr(755,root,root)' \
181          --file /etc/chilli/condown.sh 'attr(0750,root,root)' \          --file /etc/chilli/condown.sh 'attr(750,root,root)' \
182          --file /opt/chilli/hotspotlogin-loginform.php 'config(noreplace)' \          --file /etc/chilli/call_conup.sh 'attr(755,root,root)' \
183          --file /opt/chilli/hotspotlogin-nonchilli.php 'config(noreplace)' \          --file /etc/chilli/call_condown.sh 'attr(755,root,root)' \
184          --file /opt/chilli/hotspotlogin-nonssl.php 'config(noreplace)' \          --file /opt/chilli/cgi-bin/hotspotlogin.cgi 'attr(0750,root,www) %config(noreplace)' \
185          --file /opt/chilli/hotspotlogin.php 'config(noreplace)' \          --file /opt/chilli/lang/hotspotlogin.fr.pl 'config(noreplace)' \
186          --file /opt/chilli/lang/en.php 'config(noreplace)' \          --file /opt/chilli/lang/hotspotlogin.en.pl 'config(noreplace)' \
187          --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)' \  
188          > %{name}-%{version}-filelist          > %{name}-%{version}-filelist
189    
190  %files -f %{name}-%{version}-filelist  %files -f %{name}-%{version}-filelist
# Line 81  they'll only have web access if they are Line 194  they'll only have web access if they are
194  rm -rf $RPM_BUILD_ROOT  rm -rf $RPM_BUILD_ROOT
195    
196  %pre  %pre
197    if ! /usr/bin/id coovachilli &>/dev/null; then
198            /usr/sbin/useradd -c 'Coova Chilli User' -s /sbin/nologin -r -d /etc/chilli coovachilli &>/dev/null || \
199                    %logmsg "Unexpected error adding user \"coovachilli\". Abort installation."
200    fi
201    
202    
 %post  
   
203  %preun  %preun
204    
205  if [ $1 == 0 ]; then  if [ $1 == 0 ]; then
206          /sbin/e-smith/db configuration setprop chilli status disabled          /sbin/e-smith/db configuration setprop chilli status disabled
207          /etc/rc.d/init.d/chilli stop > /dev/null 2>&1          /etc/rc.d/init.d/chilli stop >& /dev/null || :
         true  
208  fi  fi
209    
 %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