e-smith-samba/sme7/e-smith-samba-1.14.0-vfs_rework.patch

diff -Nur -x '*.orig' -x '*.rej' e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/00usedb mezzanine_patched_e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/00usedb
--- e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/00usedb        2002-03-12 15:19:39.000000000 -0700
+++ mezzanine_patched_e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/00usedb      2007-01-06 14:40:34.000000000 -0700
@@ -1,3 +1,5 @@
 {
     use esmith::db;
+
+    $vfs = ();
 }
diff -Nur -x '*.orig' -x '*.rej' e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/10recyclebin mezzanine_patched_e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/10recyclebin
--- e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/10recyclebin   1969-12-31 17:00:00.000000000 -0700
+++ mezzanine_patched_e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/10recyclebin 2007-01-06 14:38:19.000000000 -0700
@@ -0,0 +1,11 @@
+{
+    $OUT = "";
+    return unless (($smb{'RecycleBin'} || 'disabled') eq 'enabled');
+
+    $vfs->{recycle}->{versions} = ($smb{'KeepVersions'} || 'disabled') eq 'enabled' ?  "True" : "False";
+    $vfs->{recycle}->{repository} = "Recycle Bin";
+    $vfs->{recycle}->{keeptree} = "True";
+    $vfs->{recycle}->{touch} = "True";
+    $vfs->{recycle}->{exclude} = "*.tmp|*.temp|*.o|*.obj|~\$*";
+    $vfs->{recycle}->{exclude_dir} = "/tmp|/temp|/cache";
+}
diff -Nur -x '*.orig' -x '*.rej' e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/10shadowcopy mezzanine_patched_e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/10shadowcopy
--- e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/10shadowcopy   1969-12-31 17:00:00.000000000 -0700
+++ mezzanine_patched_e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/10shadowcopy 2007-01-06 14:39:54.000000000 -0700
@@ -0,0 +1,4 @@
+{
+    $vfs->{shadow_copy} = () if (($smb{'ShadowCopy'} || 'disabled') eq 'enabled');
+    $OUT = "";
+}
diff -Nur -x '*.orig' -x '*.rej' e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/50homesRecycleBin mezzanine_patched_e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/50homesRecycleBin
--- e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/50homesRecycleBin      2006-03-16 00:01:15.000000000 -0700
+++ mezzanine_patched_e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/50homesRecycleBin    1969-12-31 17:00:00.000000000 -0700
@@ -1,18 +0,0 @@
-{
-    $OUT = "";
-    my $bin = $smb{'RecycleBin'} || 'disabled';
-    return unless $bin eq 'enabled';
-
-    my $keep_versions = $smb{'KeepVersions'} || 'disabled';
-    $keep_versions = ($keep_versions eq 'enabled') ? 'True' : 'False';
-
-    $OUT .= "vfs objects = recycle:repository recycle:keeptree " .
-       "recycle:versions recycle:touch recycle:exclude " .
-       "recycle:exclude_dir\n" .
-       "  recycle:repository=Recycle Bin\n" .
-       "  recycle:keeptree=True\n" .
-       "  recycle:versions=$keep_versions\n" .
-       "  recycle:touch=True\n" .
-       "  recycle:exclude=*.tmp|*.temp|*.o|*.obj|~\$*\n" .
-       "  recycle:exclude_dir=/tmp|/temp|/cache\n";
-}
diff -Nur -x '*.orig' -x '*.rej' e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/50homesVFS mezzanine_patched_e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/50homesVFS
--- e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/50homesVFS     1969-12-31 17:00:00.000000000 -0700
+++ mezzanine_patched_e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/50homesVFS   2007-01-06 14:39:33.000000000 -0700
@@ -0,0 +1,10 @@
+{
+    return "" unless scalar keys %$vfs;
+
+    $OUT = "vfs objects = " . (join " ", keys %$vfs) . "\n";
+    foreach $mod (keys %$vfs) {
+       foreach $opt (keys %{$vfs->{$mod}}) {
+           $OUT .= "  $mod:$opt=$vfs->{$mod}->{$opt}\n";
+       }
+    }
+}
diff -Nur -x '*.orig' -x '*.rej' e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/ibays/00Setup mezzanine_patched_e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/ibays/00Setup
--- e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/ibays/00Setup  2006-03-16 00:01:15.000000000 -0700
+++ mezzanine_patched_e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/ibays/00Setup        2007-01-06 14:32:46.000000000 -0700
@@ -6,4 +6,6 @@
     $key = $ibay->key;
     $OUT .= "\n[$key]\n";
     $OUT .= "comment = " . $ibay->prop('Name');
+
+    $ibay_vfs = ();
 }
diff -Nur -x '*.orig' -x '*.rej' e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/ibays/10recyclebin mezzanine_patched_e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/ibays/10recyclebin
--- e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/ibays/10recyclebin     2006-03-16 00:01:15.000000000 -0700
+++ mezzanine_patched_e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/ibays/10recyclebin   2007-01-06 14:34:45.000000000 -0700
@@ -1,14 +1,11 @@
 {
-    return "# Recycle Bin disabled" unless (($ibay->prop('RecycleBin') || 'disabled') eq 'enabled');
+    $OUT = "";
+    return unless (($ibay->prop('RecycleBin') || 'disabled') eq 'enabled');
 
-    $OUT .= "vfs object = recycle:repository recycle:keeptree ";
-    $OUT .= "recycle:versions recycle:touch recycle:exclude recycle:exclude_dir\n";
-    $OUT .= "  recycle:repository=Recycle Bin\n";
-    $OUT .= "  recycle:keeptree=True\n";
-    $OUT .= "  recycle:versions=";
-    $OUT .= (($ibay->prop('KeepVersions') || 'disabled') eq 'enabled') ?
-               "True\n" : "False\n";
-    $OUT .= "  recycle:touch=True\n";
-    $OUT .= "  recycle:exclude=*.tmp|*.temp|*.o|*.obj|~\$*\n";
-    $OUT .= "  recycle:exclude_dir=/tmp|/temp|/cache";
-}
+    $ibay_vfs->{recycle}->{versions} = ($ibay->prop('KeepVersions') || 'disabled') eq 'enabled' ?  "True" : "False";
+    $ibay_vfs->{recycle}->{repository} = "Recycle Bin";
+    $ibay_vfs->{recycle}->{keeptree} = "True";
+    $ibay_vfs->{recycle}->{touch} = "True";
+    $ibay_vfs->{recycle}->{exclude} = "*.tmp|*.temp|*.o|*.obj|~\$*";
+    $ibay_vfs->{recycle}->{exclude_dir} = "/tmp|/temp|/cache";
+}
diff -Nur -x '*.orig' -x '*.rej' e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/ibays/10shadowcopy mezzanine_patched_e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/ibays/10shadowcopy
--- e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/ibays/10shadowcopy     1969-12-31 17:00:00.000000000 -0700
+++ mezzanine_patched_e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/ibays/10shadowcopy   2007-01-06 14:34:48.000000000 -0700
@@ -0,0 +1,4 @@
+{
+    $ibay_vfs->{shadow_copy} = () if (($ibay->prop('ShadowCopy') || 'disabled') eq 'enabled');
+    $OUT = "";
+}
diff -Nur -x '*.orig' -x '*.rej' e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/ibays/90vfs mezzanine_patched_e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/ibays/90vfs
--- e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/ibays/90vfs    1969-12-31 17:00:00.000000000 -0700
+++ mezzanine_patched_e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/ibays/90vfs  2007-01-06 14:34:51.000000000 -0700
@@ -0,0 +1,10 @@
+{
+    return "" unless scalar keys %$ibay_vfs;
+
+    $OUT = "vfs objects = " . (join " ", keys %$ibay_vfs) . "\n";
+    foreach $mod (keys %$ibay_vfs) {
+       foreach $opt (keys %{$ibay_vfs->{$mod}}) {
+           $OUT .= "  $mod:$opt=$ibay_vfs->{$mod}->{$opt}\n";
+       }
+    }
+}
1	diff -Nur -x '.orig' -x '.rej' e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/00usedb mezzanine_patched_e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/00usedb
2	--- e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/00usedb 2002-03-12 15:19:39.000000000 -0700
3	+++ mezzanine_patched_e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/00usedb 2007-01-06 14:40:34.000000000 -0700
4	@@ -1,3 +1,5 @@
5	{
6	use esmith::db;
7	+
8	+ $vfs = ();
9	}
10	diff -Nur -x '.orig' -x '.rej' e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/10recyclebin mezzanine_patched_e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/10recyclebin
11	--- e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/10recyclebin 1969-12-31 17:00:00.000000000 -0700
12	+++ mezzanine_patched_e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/10recyclebin 2007-01-06 14:38:19.000000000 -0700
13	@@ -0,0 +1,11 @@
14	+{
15	+ $OUT = "";
16	+ return unless (($smb{'RecycleBin'} \|\| 'disabled') eq 'enabled');
17	+
18	+ $vfs->{recycle}->{versions} = ($smb{'KeepVersions'} \|\| 'disabled') eq 'enabled' ? "True" : "False";
19	+ $vfs->{recycle}->{repository} = "Recycle Bin";
20	+ $vfs->{recycle}->{keeptree} = "True";
21	+ $vfs->{recycle}->{touch} = "True";
22	+ $vfs->{recycle}->{exclude} = ".tmp\|.temp\|.o\|.obj\|~\$*";
23	+ $vfs->{recycle}->{exclude_dir} = "/tmp\|/temp\|/cache";
24	+}
25	diff -Nur -x '.orig' -x '.rej' e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/10shadowcopy mezzanine_patched_e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/10shadowcopy
26	--- e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/10shadowcopy 1969-12-31 17:00:00.000000000 -0700
27	+++ mezzanine_patched_e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/10shadowcopy 2007-01-06 14:39:54.000000000 -0700
28	@@ -0,0 +1,4 @@
29	+{
30	+ $vfs->{shadow_copy} = () if (($smb{'ShadowCopy'} \|\| 'disabled') eq 'enabled');
31	+ $OUT = "";
32	+}
33	diff -Nur -x '.orig' -x '.rej' e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/50homesRecycleBin mezzanine_patched_e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/50homesRecycleBin
34	--- e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/50homesRecycleBin 2006-03-16 00:01:15.000000000 -0700
35	+++ mezzanine_patched_e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/50homesRecycleBin 1969-12-31 17:00:00.000000000 -0700
36	@@ -1,18 +0,0 @@
37	-{
38	- $OUT = "";
39	- my $bin = $smb{'RecycleBin'} \|\| 'disabled';
40	- return unless $bin eq 'enabled';
41	-
42	- my $keep_versions = $smb{'KeepVersions'} \|\| 'disabled';
43	- $keep_versions = ($keep_versions eq 'enabled') ? 'True' : 'False';
44	-
45	- $OUT .= "vfs objects = recycle:repository recycle:keeptree " .
46	- "recycle:versions recycle:touch recycle:exclude " .
47	- "recycle:exclude_dir\n" .
48	- " recycle:repository=Recycle Bin\n" .
49	- " recycle:keeptree=True\n" .
50	- " recycle:versions=$keep_versions\n" .
51	- " recycle:touch=True\n" .
52	- " recycle:exclude=.tmp\|.temp\|.o\|.obj\|~\$*\n" .
53	- " recycle:exclude_dir=/tmp\|/temp\|/cache\n";
54	-}
55	diff -Nur -x '.orig' -x '.rej' e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/50homesVFS mezzanine_patched_e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/50homesVFS
56	--- e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/50homesVFS 1969-12-31 17:00:00.000000000 -0700
57	+++ mezzanine_patched_e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/50homesVFS 2007-01-06 14:39:33.000000000 -0700
58	@@ -0,0 +1,10 @@
59	+{
60	+ return "" unless scalar keys %$vfs;
61	+
62	+ $OUT = "vfs objects = " . (join " ", keys %$vfs) . "\n";
63	+ foreach $mod (keys %$vfs) {
64	+ foreach $opt (keys %{$vfs->{$mod}}) {
65	+ $OUT .= " $mod:$opt=$vfs->{$mod}->{$opt}\n";
66	+ }
67	+ }
68	+}
69	diff -Nur -x '.orig' -x '.rej' e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/ibays/00Setup mezzanine_patched_e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/ibays/00Setup
70	--- e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/ibays/00Setup 2006-03-16 00:01:15.000000000 -0700
71	+++ mezzanine_patched_e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/ibays/00Setup 2007-01-06 14:32:46.000000000 -0700
72	@@ -6,4 +6,6 @@
73	$key = $ibay->key;
74	$OUT .= "\n[$key]\n";
75	$OUT .= "comment = " . $ibay->prop('Name');
76	+
77	+ $ibay_vfs = ();
78	}
79	diff -Nur -x '.orig' -x '.rej' e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/ibays/10recyclebin mezzanine_patched_e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/ibays/10recyclebin
80	--- e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/ibays/10recyclebin 2006-03-16 00:01:15.000000000 -0700
81	+++ mezzanine_patched_e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/ibays/10recyclebin 2007-01-06 14:34:45.000000000 -0700
82	@@ -1,14 +1,11 @@
83	{
84	- return "# Recycle Bin disabled" unless (($ibay->prop('RecycleBin') \|\| 'disabled') eq 'enabled');
85	+ $OUT = "";
86	+ return unless (($ibay->prop('RecycleBin') \|\| 'disabled') eq 'enabled');
87
88	- $OUT .= "vfs object = recycle:repository recycle:keeptree ";
89	- $OUT .= "recycle:versions recycle:touch recycle:exclude recycle:exclude_dir\n";
90	- $OUT .= " recycle:repository=Recycle Bin\n";
91	- $OUT .= " recycle:keeptree=True\n";
92	- $OUT .= " recycle:versions=";
93	- $OUT .= (($ibay->prop('KeepVersions') \|\| 'disabled') eq 'enabled') ?
94	- "True\n" : "False\n";
95	- $OUT .= " recycle:touch=True\n";
96	- $OUT .= " recycle:exclude=.tmp\|.temp\|.o\|.obj\|~\$*\n";
97	- $OUT .= " recycle:exclude_dir=/tmp\|/temp\|/cache";
98	-}
99	+ $ibay_vfs->{recycle}->{versions} = ($ibay->prop('KeepVersions') \|\| 'disabled') eq 'enabled' ? "True" : "False";
100	+ $ibay_vfs->{recycle}->{repository} = "Recycle Bin";
101	+ $ibay_vfs->{recycle}->{keeptree} = "True";
102	+ $ibay_vfs->{recycle}->{touch} = "True";
103	+ $ibay_vfs->{recycle}->{exclude} = ".tmp\|.temp\|.o\|.obj\|~\$*";
104	+ $ibay_vfs->{recycle}->{exclude_dir} = "/tmp\|/temp\|/cache";
105	+}
106	diff -Nur -x '.orig' -x '.rej' e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/ibays/10shadowcopy mezzanine_patched_e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/ibays/10shadowcopy
107	--- e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/ibays/10shadowcopy 1969-12-31 17:00:00.000000000 -0700
108	+++ mezzanine_patched_e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/ibays/10shadowcopy 2007-01-06 14:34:48.000000000 -0700
109	@@ -0,0 +1,4 @@
110	+{
111	+ $ibay_vfs->{shadow_copy} = () if (($ibay->prop('ShadowCopy') \|\| 'disabled') eq 'enabled');
112	+ $OUT = "";
113	+}
114	diff -Nur -x '.orig' -x '.rej' e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/ibays/90vfs mezzanine_patched_e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/ibays/90vfs
115	--- e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/ibays/90vfs 1969-12-31 17:00:00.000000000 -0700
116	+++ mezzanine_patched_e-smith-samba-1.14.0/root/etc/e-smith/templates/etc/smb.conf/ibays/90vfs 2007-01-06 14:34:51.000000000 -0700
117	@@ -0,0 +1,10 @@
118	+{
119	+ return "" unless scalar keys %$ibay_vfs;
120	+
121	+ $OUT = "vfs objects = " . (join " ", keys %$ibay_vfs) . "\n";
122	+ foreach $mod (keys %$ibay_vfs) {
123	+ foreach $opt (keys %{$ibay_vfs->{$mod}}) {
124	+ $OUT .= " $mod:$opt=$ibay_vfs->{$mod}->{$opt}\n";
125	+ }
126	+ }
127	+}