/[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.12 by vip-ire, Thu Aug 28 13:14:07 2008 UTC Revision 1.24 by vip-ire, Wed Mar 11 08:58:33 2009 UTC
# Line 1  Line 1 
1  # $Id: smeserver-coova-chilli.spec,v 1.11 2008/08/28 10:12:16 snetram Exp $  # $Id: smeserver-coova-chilli.spec,v 1.23 2009/03/08 22:29:46 vip-ire Exp $
2  # Authority: vip-ire  # Authority: vip-ire
3  # Name: Daniel Berteaud  # 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 6  %define release 9
10  Version: %{version}  Version: %{version}
11  Release: %{release}%{?dist}  Release: %{release}%{?dist}
12  License: GPL  License: GPL
# Line 20  Requires: e-smith-release >= 7.0 Line 20  Requires: e-smith-release >= 7.0
20  Requires: openssl  Requires: openssl
21  Requires: coova-chilli  Requires: coova-chilli
22  Requires: e-smith-radiusd >= 1.0.0-18  Requires: e-smith-radiusd >= 1.0.0-18
23    Requires: perl(NetAddr::IP)
24    
25  Patch1: smeserver-coova-chilli-0.1-bypass_auth_with_squid_fix.patch  Patch1: smeserver-coova-chilli-0.2-guest_uplink_downlink.patch
26  Patch2: smeserver-coova-chilli-0.1-expand_masq_fix.patch  Patch2: smeserver-coova-chilli-0.2-guest_access.patch
27  Patch3: smeserver-coova-chilli-0.1-firewall2db.patch  Patch3: smeserver-coova-chilli-0.2-chilli_ip.patch
28  Patch4: smeserver-coova-chilli-0.1-loginPageDir.patch  Patch4: smeserver-coova-chilli-0.2-radius_timeout.patch
29  Patch5: smeserver-coova-chilli-0.1-authTemplate.patch  Patch5: smeserver-coova-chilli-0.2-guest_access2.patch
30  Patch6: smeserver-coova-chilli-0.1-fixOUTreset.patch  Patch6: smeserver-coova-chilli-0.2-template_syntax_error.patch
31  Patch7: smeserver-coova-chilli-0.1-uamallowed.patch  Patch7: smeserver-coova-chilli-0.2-httpd_warning.patch
32  Patch8: smeserver-coova-chilli-0.1-dnsparano.patch  Patch8: smeserver-coova-chilli-0.2-tundev.patch
33  Patch9: smeserver-coova-chilli-0.1-cmdsock.patch  Patch9: smeserver-coova-chilli-0.2-dhcp_range.patch
34    Patch10: smeserver-coova-chilli-0.2-localhost_nas.patch
35    Patch11: smeserver-coova-chilli-0.2-localhost_nas2.patch
36    Patch12: smeserver-coova-chilli-0.2-squid_template_typo.patch
37    
38  %description  %description
39  This package allow you to configure a third interface  This package allow you to configure a third interface
# Line 41  they'll only have web access if they are Line 45  they'll only have web access if they are
45  This contrib will only work in server&gateway mode  This contrib will only work in server&gateway mode
46    
47  %changelog  %changelog
48  *Thu Aug 28 2008 Daniel B. <daniel@firewall-services.com> 0.1-6  * Tue Mar 10 2009 Daniel B. <daniel@firewall-services.com> 0.2-9
49    - Use allready defined localhost NAS to fixe PPTP problem [SME: 4996]
50      (thanks John K Pruder)
51    - fix a typo in squid template
52    
53    * Sun Mar 07 2009 Daniel B. <daniel@firewall-services.com> 0.2-8
54    - Add dhcpstart and dhcpstop db parameters (thanks John K Pruder)
55    
56    * Sun Mar 07 2009 Daniel B. <daniel@firewall-services.com> 0.2-7
57    - Fix tundev template [SME: 5054]
58    
59    * Thu Sep 18 2008 Daniel B. <daniel@firewall-services.com> 0.2-6
60    - Remove warning in httpd.conf file (httpd -t)
61    
62    * Mon Sep 15 2008 Daniel B. <daniel@firewall-services.com> 0.2-5
63    - Fix Syntax Error in /etc/chilli.conf template (25listen) [SME: 4559]
64    
65    * Mon Sep 08 2008 Daniel B. <daniel@firewall-services.com> 0.2-4
66    - Requires perl(NetAddr::IP)
67    
68    * Fri Sep 5 2008 Daniel B. <daniel@firewall-services.com> 0.2-3
69    - Chilli IP computed with NetAddr::IP
70    - Radius timeout set to 3 sec
71    - syntax error in radius users template fixed (for guest access)
72    
73    * Thu Sep 3 2008 Daniel B. <daniel@firewall-services.com> 0.2-2
74    - Bug fix for guest access
75    
76    * Tue Sep 2 2008 Daniel B. <daniel@firewall-services.com> 0.2-1
77    - uplink and downlink for guest account are configurable via db keys
78    
79    * Tue Sep 2 2008 Daniel B. <daniel@firewall-services.com> 0.2-0
80    - Login page is a CGI, with a server-manager login page look
81    - Guest Access can be enabled with guestAccess key (enabled/disabled)
82    - merge patchs in main package
83    
84    * Mon Sep 01 2008 Daniel B. <daniel@firewall-services.com> 0.1-8
85    - Fix uamallowed not working (since bypass_auth_with_squid_fix patch)
86    - Add WebRequests key (use of squid or direct connexions, default to direct)
87    - disable radconf in /etc/chilli/config
88    - possible to disable https (enabled by default in AllowedOutgoing)
89    - add tcp:static.sourceforge.net:80 in uamallowed so daloradius homepage is displayed correctly
90    - add radiustimeout directive so authentication errors display the standard message quickly
91    
92    * Thu Aug 28 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 0.1-7
93    - Reverted moving of default db entries to SPEC file since common practice is to store them in files
94    
95    * Thu Aug 28 2008 Daniel B. <daniel@firewall-services.com> 0.1-6
96  - split uamallowed (one per line)  - split uamallowed (one per line)
97  - Add dnsparanoia directive  - Add dnsparanoia directive
98  - correct cmdsock directive  - correct cmdsock directive
# Line 87  This contrib will only work in server&ga Line 138  This contrib will only work in server&ga
138  %patch7 -p1  %patch7 -p1
139  %patch8 -p1  %patch8 -p1
140  %patch9 -p1  %patch9 -p1
141    %patch10 -p1
142  mv root/opt/chilli.rpmnew/template/images root/opt/chilli/template  %patch11 -p1
143  rm -rf root/opt/chilli.rpmnew/  %patch12 -p1
 rm -rf root/etc/e-smith/templates-custom/  
 rm -rf root/etc/e-smith/db/configuration/defaults  
144    
145  %build  %build
146  /usr/bin/perl createlinks  /usr/bin/perl createlinks
147    
 # Initialise db fragment  
 DEFAULT=root/etc/e-smith/db/configuration/defaults/chilli  
 mkdir -p $DEFAULT  
 echo 'service'                          > $DEFAULT/type  
 echo 'disabled'                         > $DEFAULT/status  
 echo 'private'                          > $DEFAULT/access  
 echo '900'                              > $DEFAULT/defidletimeout  
 echo '7200'                             > $DEFAULT/defsessiontimeout  
 echo 'eth2'                             > $DEFAULT/dhcpif  
 echo '212.73.209.226'                   > $DEFAULT/dns1  
 echo '194.206.120.1'                    > $DEFAULT/dns2  
 echo '10.1.0.0/255.255.255.0'           > $DEFAULT/net  
 echo '3990'                             > $DEFAULT/TCPPort  
 echo 'tun0'                             > $DEFAULT/tundev  
 echo 'tcp:www.firewall-services.com:80,\  
         tcp:coova.org:80,\  
         tcp:smeserver.org:80,\  
         tcp:sourceforge.net:80'         > $DEFAULT/uamallowed  
 echo ''                                 > $DEFAULT/RedirectToChilli  
 echo ''                                 > $DEFAULT/AllowedServices  
 echo ''                                 > $DEFAULT/AllowedOutgoing  
   
   
148  %install  %install
149  /bin/rm -rf $RPM_BUILD_ROOT  /bin/rm -rf $RPM_BUILD_ROOT
150  (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)
# Line 126  echo ''                                        > $DEFAULT/AllowedOutgoing Line 152  echo ''                                        > $DEFAULT/AllowedOutgoing
152  /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \  /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
153          --file /etc/chilli/conup.sh 'attr(0750,root,root)' \          --file /etc/chilli/conup.sh 'attr(0750,root,root)' \
154          --file /etc/chilli/condown.sh 'attr(0750,root,root)' \          --file /etc/chilli/condown.sh 'attr(0750,root,root)' \
155          --file /opt/chilli/hotspotlogin-loginform.php 'config(noreplace)' \          --file /opt/chilli/cgi-bin/hotspotlogin.cgi 'attr(0750,root,www) %config(noreplace)' \
156          --file /opt/chilli/hotspotlogin-nonchilli.php 'config(noreplace)' \          --file /opt/chilli/lang/hotspotlogin.fr.pl 'config(noreplace)' \
157          --file /opt/chilli/hotspotlogin-nonssl.php 'config(noreplace)' \          --file /opt/chilli/lang/hotspotlogin.en.pl 'config(noreplace)' \
158          --file /opt/chilli/hotspotlogin.php 'config(noreplace)' \          --file /opt/chilli/css/sme.css 'config(noreplace)' \
         --file /opt/chilli/lang/en.php 'config(noreplace)' \  
         --file /opt/chilli/lang/fr.php '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)' \  
159          > %{name}-%{version}-filelist          > %{name}-%{version}-filelist
160    
161  %files -f %{name}-%{version}-filelist  %files -f %{name}-%{version}-filelist

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