--- rpms/smeserver-shared-folders/contribs9/smeserver-shared-folders.spec	2013/11/11 15:29:46	1.4
+++ rpms/smeserver-shared-folders/contribs9/smeserver-shared-folders.spec	2014/12/18 08:37:34	1.11
@@ -1,115 +1,22 @@
-# $Id: smeserver-shared-folders.spec,v 1.3 2013/11/11 15:06:23 unnilennium Exp $
+# $Id: smeserver-shared-folders.spec,v 1.10 2014/06/23 17:26:29 vip-ire Exp $
 # Authority: vip-ire
 # Name: Daniel Berteaud
 
 Summary: sme server shared folders module
 %define name smeserver-shared-folders
 Name: %{name}
-%define version 0.1
-%define release 83
+%define version 0.3
+%define release 6
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
-Source: %{name}-%{version}.tar.gz
-
-Patch0: smeserver-shared-folders-0.1-maxShareNameLength.patch
-Patch1: smeserver-shared-folders-0.1-add_acl_in_fstab.patch
-Patch2: smeserver-shared-folders-0.1-locale-2009-05-05.patch
-Patch3: smeserver-shared-folders-0.1-optimize_permissions.patch
-Patch4: smeserver-shared-folders-0.1-extended_access.patch
-Patch5: smeserver-shared-folders-0.1-keep_versions_in_panel.patch
-Patch6: smeserver-shared-folders-0.1-locale_extended_access.patch
-Patch7: smeserver-shared-folders-0.1-locale_add_description.patch
-Patch8: smeserver-shared-folders-0.1-remove_desc.patch
-Patch9: smeserver-shared-folders-0.1-http_skip_wrong_values.patch
-Patch10: smeserver-shared-folders-0.1-locale-2009-05-20.patch
-Patch11: smeserver-shared-folders-0.1-locale-2009-05-21.patch
-Patch12: smeserver-shared-folders-0.1-smb_template_begin.patch
-Patch13: smeserver-shared-folders-0.1-locale_en_2009-05-21.patch
-Patch14: smeserver-shared-folders-0.1-locale-2009-05-25.patch
-Patch15: smeserver-shared-folders-0.1-external_ssl_as_local.patch
-Patch16: smeserver-shared-folders-0.1-locale-2009-06-15.patch
-Patch17: smeserver-shared-folders-0.1-locale-2009-07-22.patch
-Patch18: smeserver-shared-folders-0.1-locale-2009-08-24.patch
-Patch19: smeserver-shared-folders-0.1-locale-2009-09-28.patch
-Patch20: smeserver-shared-folders-0.1-locale-2009-10-20.patch
-Patch21: smeserver-shared-folders-0.1-locale-2009-10-21.patch
-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
-Patch90: smeserver-shared-folders-0.1-hide_and_non_removable.patch
-Patch91: smeserver-shared-folders-0.1-enc_shares_user_acl.patch
-Patch92: smeserver-shared-folders-0.1-locale-2012-10-11.patch
-Patch93: smeserver-shared-folders-0.1-share_name_starting_with_a_num.patch
-Patch94: smeserver-shared-folders-0.1-name_ending_with_dollar.patch
-Patch95: smeserver-shared-folders-0.1-enhanced_audit.patch
-Patch96: smeserver-shared-folders-0.1-locale-2013-07-14.patch
+Source: %{name}-%{version}.tar.xz
+Patch0: smeserver-shared-folders-0.3-remove_fstab_expand_on_post_upgrade.patch
+Patch1: smeserver-shared-folders-0.3-dump_acl_and_xattr_for_manual_perm.patch
+Patch2: smeserver-shared-folders-0.3-fix_missing_cr_in_smb_template.patch
+Patch3: smeserver-shared-folders-0.3-fix_auth_basic.patch
+Patch4: smeserver-shared-folders-0.3-handle_ext4.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
@@ -128,9 +35,33 @@ This module allows you to create network
 with more flexibility than ibays as it supports ACLs
 
 %changelog
-* Mon Nov 11 2013 JP Pialasse  <tests@pialasse.com> 0.1-83.sme
-- first import to SME9 contribs
-- fix patch tag 
+* Thu Dec 18 2014 Daniel Berteaud <daniel@firewall-services.com> 0.3-6.sme
+- Handle ext4 [SME: 8730]
+
+* Mon Jun 23 2014 Daniel Berteaud <daniel@firewall-services.com> 0.3-5.sme
+- Fix basic auth on EL6
+
+* Mon Jan 13 2014 Daniel Berteaud <daniel@firewall-services.com> 0.3-4.sme
+- Add a missing CR in smb.conf templates
+
+* Mon Nov 25 2013 Daniel Berteaud <daniel@firewall-services.com> 0.3-3.sme
+- Dump ACL and extended attributes in /home/e-smith/db/shares if
+  ManualPermissions is set
+
+* Tue Nov 12 2013 Daniel Berteaud <daniel@firewall-services.com> 0.3-2.sme
+- Remove expand link for fstab in post-upgrade
+
+* Mon Nov 11 2013 Daniel Berteaud <daniel@firewall-services.com> 0.3-1.sme
+- Rebuild for SME9
+
+* Tue Oct 29 2013 Daniel Berteaud <daniel@firewall-services.com> 0.1-83.sme
+- apply locale 2013-10-29 patch
+
+* Tue Oct 22 2013 Daniel Berteaud <daniel@firewall-services.com> 0.1-82.sme
+- Rename ajaxplorer to pydio
+
+* Thu Oct 17 2013 Daniel Berteaud <daniel@firewall-services.com> 0.1-81.sme
+- Add NT ACL support
 
 * Sun Jul 14 2013 JP Pialasse <tests@pialasse.com> 0.1-80.sme
 - apply locale 2013-07-14 patch
@@ -419,104 +350,11 @@ with more flexibility than ibays as it s
 
 %prep
 %setup
-
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%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
-%patch90 -p1
-%patch91 -p1
-%patch92 -p1
-%patch93 -p1
-%patch94 -p1
-%patch95 -p1
-%patch96 -p1
 
 %pre
 /usr/sbin/useradd -c "Rsyncd User" \
@@ -530,6 +368,7 @@ mkdir -p root/etc/e-smith/web/{common,fu
 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
+mkdir -p root/home/e-smith/db/shares
 
 perl createlinks
 
@@ -542,6 +381,7 @@ rm -rf $RPM_BUILD_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)' \
+    --dir /home/e-smith/db/shares 'attr(0750,root,root)' \
     > %{name}-%{version}-%{release}-filelist
 echo "%doc COPYING"          >> %{name}-%{version}-%{release}-filelist