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

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

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

-Revision 1.24 by vip-ire,
Wed Mar 11 08:58:33 2009 UTC
+Revision 1.28 by vip-ire,
Fri May 29 07:25:10 2009 UTC
 Line 1
- # $Id: smeserver-coova-chilli.spec,v 1.23 2009/03/08 22:29:46 vip-ire Exp $
+ # $Id: smeserver-coova-chilli.spec,v 1.27 2009/05/26 13:46:19 vip-ire Exp $
  # Authority: vip-ire
  # Name: Daniel Berteaud
 Line 6 
 Summary: Coova-Chilli, a captive portal
  %define name smeserver-coova-chilli
  Name: %{name}
  %define version 0.2
- %define release 9
+ %define release 14
  Version: %{version}
  Release: %{release}%{?dist}
  License: GPL
 Line 18 
 BuildArchitectures: noarch
  BuildRequires: e-smith-devtools
  Requires: e-smith-release >= 7.0
  Requires: openssl
- Requires: coova-chilli
+ Requires: coova-chilli >= 1.0.13
  Requires: e-smith-radiusd >= 1.0.0-18
  Requires: perl(NetAddr::IP)
+ Requires: smeserver-remoteuseraccess
  Patch1: smeserver-coova-chilli-0.2-guest_uplink_downlink.patch
  Patch2: smeserver-coova-chilli-0.2-guest_access.patch
-Line 34 
 Patch9: smeserver-coova-chilli-0.2-dhcp_
+Line 35 
 Patch9: smeserver-coova-chilli-0.2-dhcp_
  Patch10: smeserver-coova-chilli-0.2-localhost_nas.patch
  Patch11: smeserver-coova-chilli-0.2-localhost_nas2.patch
  Patch12: smeserver-coova-chilli-0.2-squid_template_typo.patch
+ Patch13: smeserver-coova-chilli-0.2-typo.patch
+ Patch14: smeserver-coova-chilli-0.2-allow_uamallowed.patch
+ Patch15: smeserver-coova-chilli-0.2-drop_privileges.patch
+ Patch16: smeserver-coova-chilli-0.2-use_sudo.patch
+ Patch17: smeserver-coova-chilli-0.2-templates2expand_in_createlinks.patch
+ Patch18: smeserver-coova-chilli-0.2-db_noc2c.patch
+ Patch19: smeserver-coova-chilli-0.2-remove_space.patch
  %description
  This package allow you to configure a third interface
-Line 45 
 they'll only have web access if they are
+Line 53 
 they'll only have web access if they are
  This contrib will only work in server&gateway mode
  %changelog
+ * Thu May 28 2009 Daniel B. <daniel@firewall-services.com> 0.2-14
+ - Remove space in hotspot-config.pl template
+ * Tue May 26 2009 Daniel B. <daniel@firewall-services.com> 0.2-13
+ - Add noc2c key (allow to disable the option, but default to enabled)
+ * Thu Apr 30 2009 Daniel B. <daniel@firewall-services.com> 0.2-12
+ - Create a new user coovachilli
+ - Add support of new options uid and gid to drop privileges
+ - Enabled noc2c (prevent client to client communication)
+ - Use sudo to call conup/condown script (as chilli runs under un
+   unprivileged account now)
+ - Add smeserver-remoteuseraccess as a dependency (for sudoers metadata templates)
+ - move templates2expand in creatlinks script
+ * Wed Mar 13 2009 Daniel B. <daniel@firewall-services.com> 0.2-11
+ - Automatically allow uamallowed entries in the firewall (no need to
+   explicitly allow it agin in AllowOutgoing)
+ * Thu Mar 12 2009 Daniel B. <daniel@firewall-services.com> 0.2-10
+ - Small typo correction
  * Tue Mar 10 2009 Daniel B. <daniel@firewall-services.com> 0.2-9
  - Use allready defined localhost NAS to fixe PPTP problem [SME: 4996]
    (thanks John K Pruder)
-Line 141 
 This contrib will only work in server&ga
+Line 171 
 This contrib will only work in server&ga
  %patch10 -p1
  %patch11 -p1
  %patch12 -p1
+ %patch13 -p1
+ %patch14 -p1
+ %patch15 -p1
+ %patch16 -p1
+ %patch17 -p1
+ %patch18 -p1
+ %patch19 -p1
  %build
  /usr/bin/perl createlinks
-Line 150 
 This contrib will only work in server&ga
+Line 187 
 This contrib will only work in server&ga
  (cd root   ; /usr/bin/find . -depth -print | /bin/cpio -dump $RPM_BUILD_ROOT)
  /bin/rm -f %{name}-%{version}-filelist
  /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
-         --file /etc/chilli/conup.sh 'attr(0750,root,root)' \
+         --file /etc/chilli/conup.sh 'attr(755,root,root)' \
-         --file /etc/chilli/condown.sh 'attr(0750,root,root)' \
+         --file /etc/chilli/condown.sh 'attr(750,root,root)' \
+         --file /etc/chilli/call_conup.sh 'attr(755,root,root)' \
+         --file /etc/chilli/call_condown.sh 'attr(755,root,root)' \
          --file /opt/chilli/cgi-bin/hotspotlogin.cgi 'attr(0750,root,www) %config(noreplace)' \
          --file /opt/chilli/lang/hotspotlogin.fr.pl 'config(noreplace)' \
          --file /opt/chilli/lang/hotspotlogin.en.pl 'config(noreplace)' \
-Line 164 
 This contrib will only work in server&ga
+Line 203 
 This contrib will only work in server&ga
  %clean
  rm -rf $RPM_BUILD_ROOT
+ %pre
+ if ! /usr/bin/id coovachilli &>/dev/null; then
+         /usr/sbin/useradd -c 'Coova Chilli User' -s /sbin/nologin -r -d /etc/chilli coovachilli &>/dev/null || \
+                 %logmsg "Unexpected error adding user \"coovachilli\". Abort installation."
+ fi
  %preun
  if [ $1 == 0 ]; then

 Legend:



Removed lines/characters
 


Changed lines/characters


 
Added lines/characters
 Legend:



Removed lines/characters
 


Changed lines/characters


 
Added lines/characters
-Removed lines/characters
+Added lines/characters

admin@koozali.org	ViewVC Help
Powered by ViewVC 1.2.1