--- rpms/smeserver-shared-folders/contribs7/smeserver-shared-folders.spec 2010/03/03 04:03:23 1.18 +++ rpms/smeserver-shared-folders/contribs7/smeserver-shared-folders.spec 2012/08/23 19:31:40 1.77 @@ -1,4 +1,4 @@ -# $Id: smeserver-shared-folders.spec,v 1.17 2009/11/17 22:15:23 vip-ire Exp $ +# $Id: smeserver-shared-folders.spec,v 1.76 2012/07/20 06:37:04 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 16 +%define release 74 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -38,15 +38,80 @@ Patch21: smeserver-shared-folders-0.1-lo Patch22: smeserver-shared-folders-0.1-locale-2009-10-27.patch Patch23: smeserver-shared-folders-0.1-locale-2009-11-17.patch Patch24: smeserver-shared-folders-0.1-locale-2010-03-02.patch - +Patch25: smeserver-shared-folders-0.1-manual_permissions.patch +Patch26: smeserver-shared-folders-0.1-dynamic_exec_cgi.patch +Patch27: smeserver-shared-folders-0.1-locale-2010-03-25.patch +Patch28: smeserver-shared-folders-0.1-locale-2010-03-26.patch +Patch29: smeserver-shared-folders-0.1-locale-2010-05-23.patch +Patch30: smeserver-shared-folders-0.1-en-us_typo.patch +Patch31: smeserver-shared-folders-0.1-locale-2010-07-05.patch +Patch32: smeserver-shared-folders-0.1-locale-2010-07-19.patch +Patch33: smeserver-shared-folders-0.1-fix_permissions_on_group_delete.patch +Patch34: smeserver-shared-folders-0.1-locale-2010-10-20.patch +Patch35: smeserver-shared-folders-0.1-fix_exclude_separator.patch +Patch36: smeserver-shared-folders-0.1-enhance_recylce_bin.patch +Patch37: smeserver-shared-folders-0.1-webdav_support.patch +Patch38: smeserver-shared-folders-0.1-purge_recycle.patch +Patch39: smeserver-shared-folders-0.1-locale-2010-11-30.patch +Patch40: smeserver-shared-folders-0.1-fix_purge_script.patch +Patch41: smeserver-shared-folders-0.1-prop_alias_on_primary.patch +Patch42: smeserver-shared-folders-0.1-print_group_table_with_manual_perms.patch +Patch43: smeserver-shared-folders-0.1-update_manual_perms_warning.patch +Patch44: smeserver-shared-folders-0.1-fix_warning_in_httpd_template.patch +Patch45: smeserver-shared-folders-0.1-fix_www_access.patch +Patch46: smeserver-shared-folders-0.1-php_allow_url_fopen.patch +Patch47: smeserver-shared-folders-0.1-locale-2011-01-03.patch +Patch48: smeserver-shared-folders-0.1-fix_files_starting_with_dash.patch +Patch49: smeserver-shared-folders-0.1-dedup_writers.patch +Patch50: smeserver-shared-folders-0.1-expand_and_restart_http_on_group_mod.patch +Patch51: smeserver-shared-folders-0.1-fix_recycle_purge_script.patch +Patch52: smeserver-shared-folders-0.1-locale-2011-04-27.patch +Patch53: smeserver-shared-folders-0.1-encfs.patch +Patch54: smeserver-shared-folders-0.1-locale-2011-05-16.patch +Patch55: smeserver-shared-folders-0.1-add_missing_inactivity_entry.patch +Patch56: smeserver-shared-folders-0.1-locale-2011-05-17.patch +Patch57: smeserver-shared-folders-0.1-dont_check_pass_if_enc_is_off.patch +Patch58: smeserver-shared-folders-0.1-ro_on_top_dir.patch +Patch59: smeserver-shared-folders-0.1-add_ajaxplorer_support.patch +Patch60: smeserver-shared-folders-0.1-samba_audit.patch +Patch61: smeserver-shared-folders-0.1-make_encfs_optional.patch +Patch62: smeserver-shared-folders-0.1-locale-2011-07-05.patch +Patch63: smeserver-shared-folders-0.1-fix_unencrypted_shares_modify.patch +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 +Patch82: smeserver-shared-folders-0.1-webdav_access_when_no_auth_required.patch +Patch83: smeserver-shared-folders-0.1-locale-2012-03-20.patch +Patch84: smeserver-shared-folders-0.1-mod_perm_after_create.patch +Patch85: smeserver-shared-folders-0.1-name_and_desc_on_perm_form.patch +Patch86: smeserver-shared-folders-0.1-stop_disabling_unix_in_share_scope.patch +Patch87: smeserver-shared-folders-0.1-set_www_user_acls.patch +Patch88: smeserver-shared-folders-0.1-locale-2012-07-20.patch +Patch89: smeserver-shared-folders-0.1-ftp_access.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch Requires: e-smith-base >= 4.13.15-76 Requires: perl(CGI::FormMagick) Requires: e-smith-formmagick >= 1.4.0-12 - +Requires: smeserver-mod_dav Requires: acl + BuildRequires: perl BuildRequires: e-smith-devtools >= 1.11.0-03 @@ -56,6 +121,203 @@ This module allows you to create network with more flexibility than ibays as it supports ACLs %changelog +* Thu Aug 23 2012 Daniel Berteaud 0.1-74.sme +- Enable FTP access + +* Fri Jul 20 2012 Daniel Berteaud 0.1-73.sme +- Apply locale 2012-07-20 patch + +* Tue Jun 19 2012 Daniel Berteaud 0.1-72.sme +- Explicitly set www acl so web access works even when only individual users + have ACLs + +* Fri May 18 2012 Daniel Berteaud 0.1-71.sme +- Don't disable unix extension in share scope + +* Fri Apr 20 2012 Daniel Berteaud 0.1-70.sme +- Display permission form after creation +- Display share name and desc in permission form + +* Tue Mar 20 2012 SME Translation Server 0.1-69.el6 +- apply locale 2012-03-20 patch + +* Sun Mar 11 2012 Daniel Berteaud 0.1-68.sme +- Enable webdav even when no auth is required + (but auth will still be required for write operations) + +* 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 + +* Mon Jul 18 2011 Daniel Berteaud 0.1-53.sme +- Fix encrypted share list + +* Wed Jul 13 2011 Daniel Berteaud 0.1-52.sme +- Fix panel when ajaxplorer is not installed + +* Fri Jul 08 2011 Daniel Berteaud 0.1-51.sme +- Fix modification of unencrypted shares + +* Tue Jul 05 2011 Daniel Berteaud 0.1-50.sme +- Apply locale 2011-07-05 patch + +* Tue Jul 05 2011 Daniel Berteaud 0.1-49.sme +- Make encryption support optional +- Sanitize password field in userpanelEncfs +- Prevent deletion of mounted, encrypted shares + +* Wed Jun 29 2011 Daniel Berteaud 0.1-48.sme +- Enable samba auditing + +* Tue Jun 28 2011 Daniel Berteaud 0.1-47.sme +- Fix Ajaxplorer fields on share creation + +* Tue Jun 28 2011 Daniel Berteaud 0.1-46.sme +- Change the way ajaxplorer is integrated (add a new config section) + +* Mon Jun 27 2011 Daniel Berteaud 0.1-45.sme +- Add support for ajaxplorer + +* Wed Jun 22 2011 Daniel Berteaud 0.1-44.sme +- Set read only permissions on top dir of each share + +* Tue Jun 14 2011 Daniel Berteaud 0.1-43.sme +- Don't check password field if encryption is disabled + +* Tue May 17 2011 Daniel Berteaud 0.1-42.sme +- Add missing INACTIVITY entry in locale +- Apply locale 2011-05-17 patch + +* Mon May 16 2011 Daniel Berteaud 0.1-41.sme +- apply locale 2011-05-16 patch + +* Fri May 06 2011 Daniel Berteaud 0.1-40.sme +- Support encryption using EncFS + +* Wed Apr 27 2011 SME Translation Server 0.1-39.sme +- apply locale 2011-04-27 patch + +* Tue Apr 05 2011 Daniel Berteaud 0.1-38.sme +- Fix removing empty directories in recycles + +* Wed Mar 30 2011 Daniel Berteaud 0.1-37.sme +- expand httpd.conf and restart apache on group-modify + +* Tue Mar 29 2011 Daniel Berteaud 0.1-36.sme +- Deduplicate writer user list in apache configuration +- Always grant web access to user admin + +* Tue Jan 25 2011 Daniel Berteaud 0.1-35.sme +- Fix setting ACLs on files starting with a dash [SME: 6500] + +* Mon Jan 03 2011 Daniel Berteaud 0.1-34.sme +- Apply locale 2011-01-03 patch + +* Mon Jan 03 2011 Daniel Berteaud 0.1-33.sme +- New prop PHPAllowUrlFopen + +* Wed Dec 15 2010 Daniel Berteaud 0.1-32.sme +- Print the group table when ManualPermissions is enabled +- Fix a warning in httpd.conf templates +- Use www as group owner of the root dir if httpAccess is enabled + +* Fri Dec 10 2010 Daniel Berteaud 0.1-31.sme +- Add new prop AliasOnPrimary to toggle alias on the system domain + +* Thu Dec 2 2010 Daniel Berteaud 0.1-30.sme +- Fix purge script + +* Tue Nov 30 2010 Daniel Berteaud 0.1-29.sme +- apply locale 2010-11-30 patch + +* Tue Nov 30 2010 Shad L. Lords 0.1-28.sme +- Fix orig file removal the correct way + +* Mon Nov 29 2010 Daniel B. 0.1-27.sme +- Remove .orig file + +* Wed Nov 26 2010 Daniel B. 0.1-26.sme +- Add webdav support +- add recycle purge support (with configurable retention time) + +* Thu Nov 25 2010 Daniel B. 0.1-25.sme +- Fix excludes separator for samba recyle bin [SME: 6379] +- Recycle bin directory can be configured (RecycleBinDir prop) +- Create the recyle bin directory if enabled +- Fix defaults ACL on dir (fix issues with recycle bin) + +* Wed Oct 20 2010 Daniel B. 0.1-24.sme +- Fix permission on group delete +- apply local 2010-10-20 patch + +* Mon Jul 19 2010 Daniel B. 0.1-23.sme +- apply locale 2010-07-19 patch + +* Tue Jul 06 2010 Daniel B. 0.1-22.sme +- correct typos in en-us locale [SME: 6103] +- apply locale 2010-07-06 patch + +* Sun May 23 2010 SME Translation Server 0.1-21.sme +- apply locale 2010-05-23 patch + +* Thu Mar 26 2010 Daniel B. 0.1-20.sme +- apply locale 2010-03-26 patch (fix navigation-conf) + +* Thu Mar 25 2010 Daniel B. 0.1-19.sme +- apply locale 2010-03-25 patch + +* Mon Mar 15 2010 Daniel B. 0.1-18.sme +- really apply manual_permissions patch + +* Mon Mar 08 2010 Daniel B. 0.1-17.sme +- Add an option to allow manual permissions (ManualPermissions) +- remove unused .orig file +- Exec CGI in cgi-bin directories + * Tue Mar 02 2010 SME Translation Server 0.1-16.sme - apply locale 2010-03-02 patch @@ -105,7 +367,7 @@ with more flexibility than ibays as it s - present the keepversion option of the recylcebin in the panel - changes in db keys - remove some descriptions in the panel -- optimization in share-modiffy to limit the time needed +- optimization in share-modify to limit the time needed to reset permissions * Tue May 05 2009 Daniel B. [0.1-1] @@ -152,8 +414,76 @@ with more flexibility than ibays as it s %patch22 -p1 %patch23 -p1 %patch24 -p1 +%patch25 -p1 +%patch26 -p1 +%patch27 -p1 +%patch28 -p1 +%patch29 -p1 +%patch30 -p1 +%patch31 -p1 +%patch32 -p1 +%patch33 -p1 +%patch34 -p1 +%patch35 -p1 +%patch36 -p1 +%patch37 -p1 +%patch38 -p1 +%patch39 -p1 +%patch40 -p1 +%patch41 -p1 +%patch42 -p1 +%patch43 -p1 +%patch44 -p1 +%patch45 -p1 +%patch46 -p1 +%patch47 -p1 +%patch48 -p1 +%patch49 -p1 +%patch50 -p1 +%patch51 -p1 +%patch52 -p1 +%patch53 -p1 +%patch54 -p1 +%patch55 -p1 +%patch56 -p1 +%patch57 -p1 +%patch58 -p1 +%patch59 -p1 +%patch60 -p1 +%patch61 -p1 +%patch62 -p1 +%patch63 -p1 +%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 +%patch82 -p1 +%patch83 -p1 +%patch84 -p1 +%patch85 -p1 +%patch86 -p1 +%patch87 -p1 +%patch88 -p1 +%patch89 -p1 %pre +/usr/sbin/useradd -c "Rsyncd User" \ + -s /sbin/nologin -r -d /dev/null rsync 2> /dev/null || : + %post %build @@ -161,6 +491,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 @@ -168,6 +499,11 @@ perl createlinks rm -rf $RPM_BUILD_ROOT (cd root ; find . -depth -print | cpio -dump $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