--- rpms/smeserver-shared-folders/contribs7/smeserver-shared-folders.spec 2011/08/04 10:51:40 1.57 +++ rpms/smeserver-shared-folders/contribs7/smeserver-shared-folders.spec 2012/03/01 21:44:31 1.70 @@ -1,4 +1,4 @@ -# $Id: smeserver-shared-folders.spec,v 1.56 2011/07/18 11:46:47 vip-ire Exp $ +# $Id: smeserver-shared-folders.spec,v 1.69 2012/02/18 20:38:39 vip-ire Exp $ # Authority: vip-ire # Name: Daniel Berteaud @@ -6,7 +6,7 @@ Summary: sme server shared folders modul %define name smeserver-shared-folders Name: %{name} %define version 0.1 -%define release 54 +%define release 67 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -80,6 +80,21 @@ Patch63: smeserver-shared-folders-0.1-fi Patch64: smeserver-shared-folders-0.1-fix_when_ajaxplorer_is_not_installed.patch Patch65: smeserver-shared-folders-0.1-fix_encrypted_share_list.patch Patch66: smeserver-shared-folders-0.1-dont_check_passwd_if_encrypt_disabled.patch +Patch67: smeserver-shared-folders-0.1-fix_creation_without_encfs.patch +Patch68: smeserver-shared-folders-0.1-locale-2011-10-18.patch +Patch69: smeserver-shared-folders-0.1-enable_followsymlinks_if_allowoverride_all.patch +Patch70: smeserver-shared-folders-0.1-recursive_setfacl.patch +Patch71: smeserver-shared-folders-0.1-samba_wide_links.patch +Patch72: smeserver-shared-folders-0.1-setfacl_physical.patch +Patch73: smeserver-shared-folders-0.1-fix_ajaxplorer_field_display.patch +Patch74: smeserver-shared-folders-0.1-hide_trash_if_disabled.patch +Patch75: smeserver-shared-folders-0.1-users_acl.patch +Patch76: smeserver-shared-folders-0.1-fixe_users_locale.patch +Patch77: smeserver-shared-folders-0.1-http_remove_ro_from_rw.patch +Patch78: smeserver-shared-folders-0.1-http_template_cleanup.patch +Patch79: smeserver-shared-folders-0.1-fix_root_users_acl.patch +Patch80: smeserver-shared-folders-0.1-locale-2012-02-18.patch +Patch81: smeserver-shared-folders-0.1-rsyncd.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch @@ -98,6 +113,51 @@ This module allows you to create network with more flexibility than ibays as it supports ACLs %changelog +* Thu Mar 01 2012 Daniel Berteaud 0.1-67.sme +- Add rsyncd support + +* Sat Feb 18 2012 Daniel Berteaud 0.1-66.sme +- Fix bg locale + +* Sat Feb 18 2012 Daniel Berteaud 0.1-65.sme +- Fix root ACL for users +- Apply locale 2012-02-18 patch + +* Sat Feb 18 2012 Daniel Berteaud 0.1-64.sme +- In http access, remove ro users from rw list +- templates cleanup + +* Fri Feb 17 2012 Daniel Berteaud 0.1-63.sme +- Replace fr with correct en-us locale for USERS entry + +* Mon Feb 13 2012 Daniel Berteaud 0.1-62.sme +- Code cleanup +- Move ACL configuration in a separated page +- User level ACL support + +* Thu Dec 15 2011 Daniel Berteaud 0.1-61.sme +- Hide Recycle Bin dir if recycle is disabled + +* Wed Nov 30 2011 Daniel Berteaud 0.1-60.sme +- Fix Ajaxplorer field display when the form has an error + +* Tue Nov 08 2011 Daniel Berteaud 0.1-59.sme +- Stop removing exec perm +- use --physical for setfacl (don't follow symlinks) + +* Mon Nov 07 2011 Daniel Berteaud 0.1-58.sme +- Add wide links samba option + +* Thu Nov 03 2011 Daniel Berteaud 0.1-57.sme +- Use recursive setfacl command (should greatly speedup share modification) + +* Tue Oct 18 2011 Daniel Berteaud 0.1-56.sme +- Apply locale 2011-10-18 patch +- Enable FollowSymLinks if AllowOverride is set to All + +* Thu Sep 01 2011 Daniel Berteaud 0.1-55.sme +- Fix share creation when encfs is not installed + * Thu Aug 04 2011 Daniel Berteaud 0.1-54.sme - Don't check password length when encryption is disabled @@ -364,8 +424,26 @@ with more flexibility than ibays as it s %patch64 -p1 %patch65 -p1 %patch66 -p1 +%patch67 -p1 +%patch68 -p1 +%patch69 -p1 +%patch70 -p1 +%patch71 -p1 +%patch72 -p1 +%patch73 -p1 +%patch74 -p1 +%patch75 -p1 +%patch76 -p1 +%patch77 -p1 +%patch78 -p1 +%patch79 -p1 +%patch80 -p1 +%patch81 -p1 %pre +/usr/sbin/useradd -c "Rsyncd User" \ + -s /sbin/nologin -r -d /dev/null rsync 2> /dev/null || : + %post %build @@ -373,6 +451,7 @@ with more flexibility than ibays as it s mkdir -p root/etc/e-smith/web/{common,functions} mkdir -p root/etc/e-smith/web/panels/manager/{cgi-bin,common,html} mkdir -p root/home/e-smith/files/shares +mkdir -p root/var/log/rsyncd perl createlinks @@ -382,6 +461,9 @@ rm -rf $RPM_BUILD_ROOT /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \ --file /etc/cron.daily/purge-shares-recycle 'attr(0755,root,root)' \ --file /etc/sysconfig/modules/fuse.modules 'attr(0755,root,root)' \ + --file /var/service/rsyncd/run 'attr(0755,root,root)' \ + --file /var/service/rsyncd/log/run 'attr(0755,root,root)' \ + --dir /var/log/rsyncd 'attr(0770,root,smelog)' \ > %{name}-%{version}-%{release}-filelist echo "%doc COPYING" >> %{name}-%{version}-%{release}-filelist