/[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.15 by slords, Thu Sep 4 13:56:36 2008 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.14 2008/09/01 12:18:32 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 2
10  Version: %{version}  Version: %{version}
11  Release: %{release}%{?dist}  Release: %{release}%{?dist}
12  License: GPL  License: GPL
# Line 21  Requires: openssl Line 21  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    
24  Patch1: smeserver-coova-chilli-0.1-bypass_auth_with_squid_fix.patch  Patch1: smeserver-coova-chilli-0.2-guest_uplink_downlink.patch
25  Patch2: smeserver-coova-chilli-0.1-expand_masq_fix.patch  Patch2: smeserver-coova-chilli-0.2-guest_access.patch
 Patch3: smeserver-coova-chilli-0.1-firewall2db.patch  
 Patch4: smeserver-coova-chilli-0.1-loginPageDir.patch  
 Patch5: smeserver-coova-chilli-0.1-authTemplate.patch  
 Patch6: smeserver-coova-chilli-0.1-fixOUTreset.patch  
 Patch7: smeserver-coova-chilli-0.1-uamallowed.patch  
 Patch8: smeserver-coova-chilli-0.1-dnsparano.patch  
 Patch9: smeserver-coova-chilli-0.1-cmdsock.patch  
26    
27  %description  %description
28  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 34  they'll only have web access if they are
34  This contrib will only work in server&gateway mode  This contrib will only work in server&gateway mode
35    
36  %changelog  %changelog
37  *Thu Aug 28 2008 Daniel B. <daniel@firewall-services.com> 0.1-6  * Thu Sep 3 2008 Daniel B. <daniel@firewall-services.com> 0.2-2
38    - Bug with for guest access
39    
40    * Tue Sep 2 2008 Daniel B. <daniel@firewall-services.com> 0.2-1
41    - uplink and downlink for guest account are configurable via db keys
42    
43    * Tue Sep 2 2008 Daniel B. <daniel@firewall-services.com> 0.2-0
44    - Login page is a CGI, with a server-manager login page look
45    - Guest Access can be enabled with guestAccess key (enabled/isabled)
46    - merge patchs in main package
47    
48    * Mon Sep 01 2008 Daniel B. <daniel@firewall-services.com> 0.1-8
49    - Fix uamallowed not working (since bypass_auth_with_squid_fix patch)
50    - Add WebRequests key (use of squid or direct connexions, default to direct)
51    - disable radconf in /etc/chilli/config
52    - possible to disable https (enabled by default in AllowedOutgoing)
53    - add tcp:static.sourceforge.net:80 in uamallowed so daloradius homepage is displayed correctly
54    - add radiustimeout directive so authentication errors display the standard message quickly
55    
56    * Thu Aug 28 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 0.1-7
57    - Reverted moving of default db entries to SPEC file since common practice is to store them in files
58    
59    * Thu Aug 28 2008 Daniel B. <daniel@firewall-services.com> 0.1-6
60  - split uamallowed (one per line)  - split uamallowed (one per line)
61  - Add dnsparanoia directive  - Add dnsparanoia directive
62  - correct cmdsock directive  - correct cmdsock directive
# Line 80  This contrib will only work in server&ga Line 95  This contrib will only work in server&ga
95  %setup  %setup
96  %patch1 -p1  %patch1 -p1
97  %patch2 -p1  %patch2 -p1
98  %patch3 -p1  
99  %patch4 -p1  find root/ -type f -name *~ -exec rm -f {} \;
 %patch5 -p1  
 %patch6 -p1  
 %patch7 -p1  
 %patch8 -p1  
 %patch9 -p1  
   
 mv root/opt/chilli.rpmnew/template/images root/opt/chilli/template  
 rm -rf root/opt/chilli.rpmnew/  
 rm -rf root/etc/e-smith/templates-custom/  
 rm -rf root/etc/e-smith/db/configuration/defaults  
100    
101  %build  %build
102  /usr/bin/perl createlinks  /usr/bin/perl createlinks
103    
 # 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  
   
   
104  %install  %install
105  /bin/rm -rf $RPM_BUILD_ROOT  /bin/rm -rf $RPM_BUILD_ROOT
106  (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 108  echo ''                                        > $DEFAULT/AllowedOutgoing
108  /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \  /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
109          --file /etc/chilli/conup.sh 'attr(0750,root,root)' \          --file /etc/chilli/conup.sh 'attr(0750,root,root)' \
110          --file /etc/chilli/condown.sh 'attr(0750,root,root)' \          --file /etc/chilli/condown.sh 'attr(0750,root,root)' \
111          --file /opt/chilli/hotspotlogin-loginform.php 'config(noreplace)' \          --file /opt/chilli/cgi-bin/hotspotlogin.cgi 'attr(0750,root,www) %config(noreplace)' \
112          --file /opt/chilli/hotspotlogin-nonchilli.php 'config(noreplace)' \          --file /opt/chilli/lang/hotspotlogin.fr.pl 'config(noreplace)' \
113          --file /opt/chilli/hotspotlogin-nonssl.php 'config(noreplace)' \          --file /opt/chilli/lang/hotspotlogin.en.pl 'config(noreplace)' \
114          --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)' \  
115          > %{name}-%{version}-filelist          > %{name}-%{version}-filelist
116    
117  %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