sync'ing up for 3.0alpha20 release

(This used to be commit 4456d5edd9207674d03bf503e8b245e5dc1ca8d8)

1 files changed, 9 insertions, 10 deletions

diff --git a/packaging/Caldera/OpenLinux/samba3.spec.tmpl b/packaging/Caldera/OpenLinux/samba3.spec.tmpl
index 701dd35073..43e60a2ac0 100644
--- a/packaging/Caldera/OpenLinux/samba3.spec.tmpl
+++ b/packaging/Caldera/OpenLinux/samba3.spec.tmpl
@@ -244,25 +244,23 @@ CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s" ./configure \
 	--with-netatalk \
 	--with-smbwrapper \
 	--with-libsmbclient \
+	--with-acl-support \
 	--with-sambabook=$(DESTDIR)/usr/share/swat/using_samba
 
 # Temp disabled - add later - JHT
 #	--with-pam_smbpass \
 #	--with-nisplus-home \
-#	--with-acl-support \
 
 make all nsswitch/libnss_wins.so nsswitch/libnss_winbind.so torture nsswitch/pam_winbind.so everything
 (cd tdb; make tdbdump tdbtest tdbtorture tdbtool)
 
-#cd ../examples/VFS
+cd ../examples/VFS
 #CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s" ./configure \
 #        --prefix='$(DESTDIR)/usr' \
 #        --localstatedir='$(DESTDIR)/var' \
 #        --libdir='$(DESTDIR)%{EtcSamba}' \
 #        --sbindir='$(DESTDIR)/usr/sbin'
-#make
-#cd block
-#make
+make
 
 %Install
 %{mkDESTDIR}
@@ -296,7 +294,7 @@ do
 	install -m 755 source/bin/$i $DESTDIR/usr/bin
 done
 # Next install /usr/sbin progs
-for i in talloctort samsync locktest locktest2 masktest msgtest smbtorture
+for i in talloctort locktest locktest2 masktest msgtest smbtorture
 do
 	install -m 755 source/bin/$i $DESTDIR/usr/sbin
 done
@@ -304,11 +302,12 @@ for i in tdbdump tdbtest tdbtorture tdbtool
 do
 	install -m 755 source/tdb/$i $DESTDIR/usr/sbin
 done
+
 # Add VFS Modules
-#for i in audit.so recycle.so block/block.so
-#do
-#	install -m755 $i $DESTDIR/lib/samba
-#done
+for i in audit.so recycle.so netatalk.so skel.so
+do
+	install -m755 examples/VFS/$i $DESTDIR/lib/samba
+done
 
 #mv $DESTDIR/usr/bin/{make,add,conv}* $DESTDIR/usr/sbin