/[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.1 by slords, Tue Apr 15 15:04:56 2008 UTC Revision 1.12 by vip-ire, Thu Aug 28 13:14:07 2008 UTC
# Line 1  Line 1 
1  # $Id$  # $Id: smeserver-coova-chilli.spec,v 1.11 2008/08/28 10:12:16 snetram Exp $
2  # Authority: vip-ire  # Authority: vip-ire
3  # Name: Daniel Berteaud  # Name: Daniel Berteaud
4    
# Line 6  Summary: Coova-Chilli, a captive portal Line 6  Summary: Coova-Chilli, a captive portal
6  %define name smeserver-coova-chilli  %define name smeserver-coova-chilli
7  Name: %{name}  Name: %{name}
8  %define version 0.1  %define version 0.1
9  %define release 1  %define release 6
10  Version: %{version}  Version: %{version}
11  Release: %{release}%{?dist}  Release: %{release}%{?dist}
12  License: GPL  License: GPL
13  Group: Networking/Remote access  Group: Networking/Remote access
14  Source: %{name}-%{version}.tar.gz  Source: %{name}-%{version}.tar.gz
 Patch1: smeserver-coova-chilli-0.1-bypass_auth_with_squid_fix.patch  
 Patch2: smeserver-coova-chilli-0.1-expand_masq_fix.patch  
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  BuildRequires: e-smith-devtools >= 1.13.1-03  Requires: e-smith-release >= 7.0
20    Requires: openssl
21    Requires: coova-chilli
22    Requires: e-smith-radiusd >= 1.0.0-18
23    
24    Patch1: smeserver-coova-chilli-0.1-bypass_auth_with_squid_fix.patch
25    Patch2: smeserver-coova-chilli-0.1-expand_masq_fix.patch
26    Patch3: smeserver-coova-chilli-0.1-firewall2db.patch
27    Patch4: smeserver-coova-chilli-0.1-loginPageDir.patch
28    Patch5: smeserver-coova-chilli-0.1-authTemplate.patch
29    Patch6: smeserver-coova-chilli-0.1-fixOUTreset.patch
30    Patch7: smeserver-coova-chilli-0.1-uamallowed.patch
31    Patch8: smeserver-coova-chilli-0.1-dnsparano.patch
32    Patch9: smeserver-coova-chilli-0.1-cmdsock.patch
33    
34  %description  %description
35  This package allow you to configure a third interface  This package allow you to configure a third interface
# Line 27  This package allow you to configure a th Line 37  This package allow you to configure a th
37  a secured captive portal. Users will be redirected  a secured captive portal. Users will be redirected
38  on a logon page and they'll have to enter credentials  on a logon page and they'll have to enter credentials
39  (sme accounts) before the server allows them. By default,  (sme accounts) before the server allows them. By default,
40  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"
41    This contrib will only work in server&gateway mode
42    
43  %changelog  %changelog
44    *Thu Aug 28 2008 Daniel B. <daniel@firewall-services.com> 0.1-6
45    - split uamallowed (one per line)
46    - Add dnsparanoia directive
47    - correct cmdsock directive
48    - initialise default configuration db in the spec file
49    
50    * Thu Aug 28 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 0.1-5
51    - Remove the reset of $OUT from the template
52    
53    * Thu Aug 28 2008 Daniel B. <daniel@firewall-services.com> 0.1-4
54    - Add template to enable auth module unix (replace the template-custom)
55    - Copy images to /opt/chilli/template before removing .rpmnew directory
56    - Correct dependency (e-smith-radiusd not esmith-radiusd)
57    
58    * Wed Aug 27 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 0.1-3
59    - Split requirements to one per line
60    - Removed .rpmnew directory from package
61    - Removed the need for templates-custom as package now requires e-smith-radiusd >= 1.0.0-18
62    
63    * Tue Aug 26 2008 Daniel B. <daniel@firewall-services.com>
64    - [0.1-2]
65    - Most firewall customizations (for incomming and forwarded traffic from
66      chilli network only) can be set through db commands (Patch3)
67    - Outgoing DNS is allowed only for the two DNS servers configured
68    - Clean spec file, and put php files in /opt/chilli (Patch4)
69    
70  * Tue Apr 15 2008 Daniel Berteaud <daniel@firewall-services.com>  * Tue Apr 15 2008 Daniel Berteaud <daniel@firewall-services.com>
71  - [0.1-1]  - [0.1-1]
72  - security fixe: auth bypass with squid (patch1)  - security fixe: auth bypass with squid (patch1)
# Line 43  they'll only have web access if they are Line 80  they'll only have web access if they are
80  %setup  %setup
81  %patch1 -p1  %patch1 -p1
82  %patch2 -p1  %patch2 -p1
83    %patch3 -p1
84    %patch4 -p1
85    %patch5 -p1
86    %patch6 -p1
87    %patch7 -p1
88    %patch8 -p1
89    %patch9 -p1
90    
91    mv root/opt/chilli.rpmnew/template/images root/opt/chilli/template
92    rm -rf root/opt/chilli.rpmnew/
93    rm -rf root/etc/e-smith/templates-custom/
94    rm -rf root/etc/e-smith/db/configuration/defaults
95    
96  %build  %build
97  /usr/bin/perl createlinks  /usr/bin/perl createlinks
98    
99    # Initialise db fragment
100    DEFAULT=root/etc/e-smith/db/configuration/defaults/chilli
101    mkdir -p $DEFAULT
102    echo 'service'                          > $DEFAULT/type
103    echo 'disabled'                         > $DEFAULT/status
104    echo 'private'                          > $DEFAULT/access
105    echo '900'                              > $DEFAULT/defidletimeout
106    echo '7200'                             > $DEFAULT/defsessiontimeout
107    echo 'eth2'                             > $DEFAULT/dhcpif
108    echo '212.73.209.226'                   > $DEFAULT/dns1
109    echo '194.206.120.1'                    > $DEFAULT/dns2
110    echo '10.1.0.0/255.255.255.0'           > $DEFAULT/net
111    echo '3990'                             > $DEFAULT/TCPPort
112    echo 'tun0'                             > $DEFAULT/tundev
113    echo 'tcp:www.firewall-services.com:80,\
114            tcp:coova.org:80,\
115            tcp:smeserver.org:80,\
116            tcp:sourceforge.net:80'         > $DEFAULT/uamallowed
117    echo ''                                 > $DEFAULT/RedirectToChilli
118    echo ''                                 > $DEFAULT/AllowedServices
119    echo ''                                 > $DEFAULT/AllowedOutgoing
120    
121    
122  %install  %install
123  /bin/rm -rf $RPM_BUILD_ROOT  /bin/rm -rf $RPM_BUILD_ROOT
124  (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 54  they'll only have web access if they are Line 126  they'll only have web access if they are
126  /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \  /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
127          --file /etc/chilli/conup.sh 'attr(0750,root,root)' \          --file /etc/chilli/conup.sh 'attr(0750,root,root)' \
128          --file /etc/chilli/condown.sh 'attr(0750,root,root)' \          --file /etc/chilli/condown.sh 'attr(0750,root,root)' \
129            --file /opt/chilli/hotspotlogin-loginform.php 'config(noreplace)' \
130            --file /opt/chilli/hotspotlogin-nonchilli.php 'config(noreplace)' \
131            --file /opt/chilli/hotspotlogin-nonssl.php 'config(noreplace)' \
132            --file /opt/chilli/hotspotlogin.php 'config(noreplace)' \
133            --file /opt/chilli/lang/en.php 'config(noreplace)' \
134            --file /opt/chilli/lang/fr.php 'config(noreplace)' \
135            --file /opt/chilli/lang/main.php 'config(noreplace)' \
136            --file /opt/chilli/template/loggingin.php 'config(noreplace)' \
137            --file /opt/chilli/template/loginform-footer.php 'config(noreplace)' \
138            --file /opt/chilli/template/loginform-header.php 'config(noreplace)' \
139          > %{name}-%{version}-filelist          > %{name}-%{version}-filelist
140    
141  %files -f %{name}-%{version}-filelist  %files -f %{name}-%{version}-filelist
# Line 62  they'll only have web access if they are Line 144  they'll only have web access if they are
144  %clean  %clean
145  rm -rf $RPM_BUILD_ROOT  rm -rf $RPM_BUILD_ROOT
146    
 %post  
 if [ ! -e /opt/chilli ]; then  
         /bin/cp -a /opt/chilli.rpmnew /opt/chilli  
 fi  
   
147  %preun  %preun
148    
149  if [ $1 == 0 ]; then  if [ $1 == 0 ]; then
150          /sbin/e-smith/db configuration setprop chilli status disabled          /sbin/e-smith/db configuration setprop chilli status disabled
151          /sbin/e-smith/signal-event chilli-update          /etc/rc.d/init.d/chilli stop >& /dev/null || :
152  fi  fi
153    

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