working on packaging; also fixed some path issues in configure.in & Makefile.in

14 files changed, 1423 insertions, 11 deletions

diff --git a/packaging/Fedora/filter-requires-samba.sh b/packaging/Fedora/filter-requires-samba.sh
new file mode 100755
index 00000000000..1ba10a0ee3d
--- /dev/null
+++ b/packaging/Fedora/filter-requires-samba.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+/usr/lib/rpm/perl.req $* | grep -v "Net::LDAP"
diff --git a/packaging/Fedora/makerpms.sh.tmpl b/packaging/Fedora/makerpms.sh.tmpl
new file mode 100644
index 00000000000..46ef4b63537
--- /dev/null
+++ b/packaging/Fedora/makerpms.sh.tmpl
@@ -0,0 +1,67 @@
+#!/bin/sh
+# Copyright (C) John H Terpstra 1998-2002
+#               Gerald (Jerry) Carter 2003
+
+# The following allows environment variables to override the target directories
+#   the alternative is to have a file in your home directory calles .rpmmacros
+#   containing the following:
+#   %_topdir  /home/mylogin/redhat
+#
+# Note: Under this directory rpm expects to find the same directories that are under the
+#   /usr/src/redhat directory
+#
+
+SPECDIR=`rpm --eval %_specdir`
+SRCDIR=`rpm --eval %_sourcedir`
+
+# At this point the SPECDIR and SRCDIR vaiables must have a value!
+
+USERID=`id -u`
+GRPID=`id -g`
+VERSION='PVERSION'
+SPECFILE="samba.spec"
+RPMVER=`rpm --version | awk '{print $3}'`
+RPM="rpmbuild"
+
+##
+## Check the RPM version (paranoid)
+##
+case $RPMVER in
+    4*)
+       echo "Supported RPM version [$RPMVER]"
+       ;;
+    *)
+       echo "Unknown RPM version: `rpm --version`"
+       exit 1
+       ;;
+esac
+
+( cd ../../source; if [ -f Makefile ]; then make distclean; fi )
+( cd ../../.. ; chown -R ${USERID}.${GRPID} samba-${VERSION} )
+
+( cd ../../.. ; tar --exclude=CVS -cf - samba-${VERSION}/. | bzip2 > ${SRCDIR}/samba-${VERSION}.tar.bz2 )
+
+##
+## copy additional source files
+##
+for file in samba.pamd samba.sysconfig samba.spec \
+	smb.init swat.desktop filter-requires-samba.sh \
+	samba.log samba.xinetd smbprint winbind.init
+do
+	cp -p $file ${SRCDIR}
+
+done
+
+chmod 755 ${SRCDIR}/filter-requires-samba.sh
+
+cp -p ${SPECFILE} ${SPECDIR}
+
+##
+## Build
+##
+echo Getting Ready to build release package
+cd ${SPECDIR}
+${RPM} -ba --clean --rmsource $SPECFILE
+
+echo Done.
+
diff --git a/packaging/Fedora/samba.log b/packaging/Fedora/samba.log
new file mode 100644
index 00000000000..04106239fb1
--- /dev/null
+++ b/packaging/Fedora/samba.log
@@ -0,0 +1,9 @@
+/var/log/samba/*.log {
+    notifempty
+    missingok
+    sharedscripts
+    copytruncate
+    postrotate
+	/bin/kill -HUP `cat /var/run/smbd.pid /var/run/nmbd.pid /var/run/winbindd.pid 2> /dev/null` 2> /dev/null || true
+    endscript
+}
diff --git a/packaging/Fedora/samba.pamd b/packaging/Fedora/samba.pamd
new file mode 100644
index 00000000000..d8a27ff08f9
--- /dev/null
+++ b/packaging/Fedora/samba.pamd
@@ -0,0 +1,2 @@
+auth	required	/lib/security/pam_stack.so service=system-auth
+account	required	/lib/security/pam_stack.so service=system-auth
diff --git a/packaging/Fedora/samba.spec.tmpl b/packaging/Fedora/samba.spec.tmpl
new file mode 100644
index 00000000000..51e68dfea2d
--- /dev/null
+++ b/packaging/Fedora/samba.spec.tmpl
@@ -0,0 +1,978 @@
+%define initdir %{_sysconfdir}/rc.d/init.d
+%define auth %(test -f /etc/pam.d/system-auth && echo /etc/pam.d/system-auth || echo)
+
+Summary: The Samba SMB server.
+Name: samba
+Version: PVERSION
+Release: PRELEASE
+License: GNU GPL Version 2
+Group: System Environment/Daemons
+URL: http://www.samba.org/
+
+Source: ftp://www.samba.org/pub/samba/%{name}-%{version}.tar.bz2
+
+# Red Hat specific replacement-files
+Source1: samba.log
+Source2: samba.xinetd
+Source3: swat.desktop
+Source4: samba.sysconfig
+Source5: smb.init
+Source6: samba.pamd
+Source7: smbprint
+Source8: winbind.init
+
+# Don't depend on Net::LDAP
+Source999: filter-requires-samba.sh
+
+# generic patches
+
+Requires: pam >= 0.64 %{auth} samba-common = %{version} 
+Requires: logrotate >= 3.4 initscripts >= 5.54-1 
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+Prereq: /sbin/chkconfig /bin/mktemp /usr/bin/killall
+Prereq: fileutils sed /etc/init.d 
+BuildRequires: pam-devel, readline-devel, ncurses-devel, fileutils, libacl-devel, openldap-devel, krb5-devel
+
+
+# Working around perl dependency problem from docs
+%define __perl_requires %{SOURCE999}
+
+%description
+Samba is the protocol by which a lot of PC-related machines share
+files, printers, and other information (such as lists of available
+files and printers). The Windows NT, OS/2, and Linux operating systems
+support this natively, and add-on packages can enable the same thing
+for DOS, Windows, VMS, UNIX of all kinds, MVS, and more. This package
+provides an SMB server that can be used to provide network services to
+SMB (sometimes called "Lan Manager") clients. Samba uses NetBIOS over
+TCP/IP (NetBT) protocols and does NOT need the NetBEUI (Microsoft Raw
+NetBIOS frame) protocol.
+
+%package client
+Summary: Samba (SMB) client programs.
+Group: Applications/System
+Requires: samba-common = %{version}
+Obsoletes: smbfs
+
+%description client
+The samba-client package provides some SMB clients to compliment the
+built-in SMB filesystem in Linux. These clients allow access of SMB
+shares and printing to SMB printers.
+
+%package common
+Summary: Files used by both Samba servers and clients.
+Group: Applications/System
+
+%description common
+Samba-common provides files necessary for both the server and client
+packages of Samba.
+
+%package swat
+Summary: The Samba SMB server configuration program.
+Group: Applications/System
+Requires: samba = %{version} xinetd
+
+%description swat
+The samba-swat package includes the new SWAT (Samba Web Administration
+Tool), for remotely managing Samba's smb.conf file using your favorite
+Web browser.
+
+%prep
+%setup -q
+
+# copy Red Hat specific scripts
+cp %{SOURCE5} packaging/Fedora/
+cp %{SOURCE6} packaging/Fedora/
+cp %{SOURCE7} packaging/Fedora/
+cp %{SOURCE8} packaging/Fedora/winbind.init
+
+%build
+
+cd source
+%ifarch i386 sparc
+RPM_OPT_FLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64"
+%endif
+%ifarch ia64
+libtoolize --copy --force     # get it to recognize IA-64
+autoheader                                               
+autoconf
+EXTRA="-D_LARGEFILE64_SOURCE"
+%endif
+
+## run autogen if missing the configure script
+if [ ! -f "configure" ]; then
+        ./autogen.sh
+fi
+
+CFLAGS="$RPM_OPT_FLAGS" ./configure \
+	--prefix=%{_prefix} \
+	--localstatedir=/var \
+	--sysconfdir=/etc \
+	--with-privatedir=%{_sysconfdir}/samba \
+	--with-fhs \
+	--with-quotas \
+	--with-smbmount \
+	--with-pam \
+	--with-pam_smbpass \
+	--with-syslog \
+	--with-utmp \
+	--with-sambabook=%{_datadir}/swat/using_samba \
+	--with-swatdir=%{_datadir}/swat \
+	--with-libsmbclient \
+	--with-acl-support 
+make showlayout
+make proto
+make %{?_smp_mflags} all nsswitch/libnss_wins.so debug2html 
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+mkdir -p $RPM_BUILD_ROOT/sbin
+mkdir -p $RPM_BUILD_ROOT/usr/{sbin,bin}
+mkdir -p $RPM_BUILD_ROOT/%{initdir}
+mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/{pam.d,logrotate.d}
+mkdir -p $RPM_BUILD_ROOT/var/{log,spool,lib}/samba
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/swat/using_samba
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/samba/codepages 
+
+cd source
+
+make DESTDIR=$RPM_BUILD_ROOT \
+	install
+
+cd ..
+
+# Install other stuff
+install -m644 packaging/RedHat/smb.conf $RPM_BUILD_ROOT%{_sysconfdir}/samba/smb.conf
+install -m755 source/script/mksmbpasswd.sh $RPM_BUILD_ROOT%{_bindir}
+install -m644 packaging/RedHat/smbusers $RPM_BUILD_ROOT/etc/samba/smbusers
+install -m755 packaging/RedHat/smbprint $RPM_BUILD_ROOT%{_bindir}
+install -m755 packaging/RedHat/smb.init $RPM_BUILD_ROOT%{initdir}/smb
+install -m755 packaging/RedHat/winbind.init $RPM_BUILD_ROOT%{initdir}/winbind
+ln -s ../..%{initdir}/smb  $RPM_BUILD_ROOT%{_sbindir}/samba
+install -m644 packaging/RedHat/samba.pamd.stack $RPM_BUILD_ROOT/etc/pam.d/samba
+install -m644 $RPM_SOURCE_DIR/samba.log $RPM_BUILD_ROOT/etc/logrotate.d/samba
+ln -s ../usr/bin/smbmount $RPM_BUILD_ROOT/sbin/mount.smb
+## mount.smbfs is installed by Samba's Makefile
+## ln -s ../usr/bin/smbmount $RPM_BUILD_ROOT/sbin/mount.smbfs
+echo 127.0.0.1 localhost > $RPM_BUILD_ROOT%{_sysconfdir}/samba/lmhosts
+
+# pam_smbpass
+mkdir -p $RPM_BUILD_ROOT/%{_lib}/security
+mv source/bin/pam_smbpass.so $RPM_BUILD_ROOT/%{_lib}/security/pam_smbpass.so
+
+# winbind
+mkdir -p $RPM_BUILD_ROOT/%{_lib}/security
+install -m 755 source/nsswitch/pam_winbind.so $RPM_BUILD_ROOT/%{_lib}/security/pam_winbind.so
+mkdir -p $RPM_BUILD_ROOT%{_libdir}
+install -m 755 source/nsswitch/libnss_winbind.so $RPM_BUILD_ROOT/%{_lib}/libnss_winbind.so
+ln -sf /%{_lib}/libnss_winbind.so  $RPM_BUILD_ROOT%{_libdir}/libnss_winbind.so.2
+install -m 755 source/nsswitch/libnss_wins.so $RPM_BUILD_ROOT/%{_lib}/libnss_wins.so
+ln -sf /%{_lib}/libnss_wins.so  $RPM_BUILD_ROOT%{_libdir}/libnss_wins.so.2
+
+# libsmbclient
+
+# make install puts libsmbclient.so in the wrong place on x86_64
+rm -f $RPM_BUILD_ROOT/usr/lib || true
+mkdir -p $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_includedir}
+install -m 644 source/bin/libsmbclient.so $RPM_BUILD_ROOT%{_libdir}/libsmbclient.so
+install -m 644 source/bin/libsmbclient.a $RPM_BUILD_ROOT%{_libdir}/libsmbclient.a
+install -m 644 source/include/libsmbclient.h $RPM_BUILD_ROOT%{_includedir}
+
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d
+install -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/swat
+
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
+install -m644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/samba
+
+##
+## Clean out man pages for tools not installed here
+##
+rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/editreg.1*
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/log2pcap.1*
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/smbsh.1*
+rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/mount.cifs.8*
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post
+/sbin/chkconfig --add smb
+
+%preun
+if [ $1 = 0 ] ; then
+    /sbin/chkconfig --del smb
+    rm -rf /var/log/samba/* /var/cache/samba/*
+    /sbin/service smb stop >/dev/null 2>&1
+fi
+exit 0
+
+%postun
+if [ "$1" -ge "1" ]; then
+	%{initdir}/smb condrestart >/dev/null 2>&1
+fi	
+
+%post common
+/sbin/chkconfig --add winbind
+/sbin/ldconfig
+
+%preun common
+if [ $1 = 0 ] ; then
+    /sbin/chkconfig --del winbind
+    /sbin/service winbind stop >/dev/null 2>&1
+fi
+exit 0
+
+%postun common -p /sbin/ldconfig
+
+%triggerpostun -- samba < 1.9.18p7
+if [ $1 != 0 ]; then
+    /sbin/chkconfig --add smb
+fi
+
+%triggerpostun -- samba < 2.0.5a-3
+if [ $1 != 0 ]; then
+    [ ! -d /var/lock/samba ] && mkdir -m 0755 /var/lock/samba
+    [ ! -d /var/spool/samba ] && mkdir -m 1777 /var/spool/samba
+    chmod 644 /etc/services
+    [ -f /etc/inetd.conf ] && chmod 644 /etc/inetd.conf
+fi
+
+%files
+%defattr(-,root,root)
+%doc README COPYING Manifest 
+%doc WHATSNEW.txt Roadmap
+%doc docs
+%doc examples/autofs examples/LDAP examples/libsmbclient examples/misc examples/printer-accounting
+%doc examples/printing
+
+%attr(755,root,root) /%{_lib}/security/pam_smbpass.so
+%{_sbindir}/smbd
+%{_sbindir}/nmbd
+# %{_bindir}/make_unicodemap
+%{_bindir}/mksmbpasswd.sh
+%{_bindir}/smbcontrol
+%{_bindir}/smbstatus
+# %{_bindir}/smbadduser
+%{_bindir}/tdbbackup
+%config(noreplace) %{_sysconfdir}/sysconfig/samba
+%config(noreplace) %{_sysconfdir}/samba/smbusers
+%attr(755,root,root) %config %{initdir}/smb
+%config(noreplace) %{_sysconfdir}/logrotate.d/samba
+%config(noreplace) %{_sysconfdir}/pam.d/samba
+# %{_mandir}/man1/make_unicodemap.1*
+%{_mandir}/man1/smbcontrol.1*
+%{_mandir}/man1/smbstatus.1*
+%{_mandir}/man5/smbpasswd.5*
+%{_mandir}/man7/samba.7*
+%{_mandir}/man7/Samba.7*
+%{_mandir}/man8/nmbd.8*
+%{_mandir}/man8/pdbedit.8*
+%{_mandir}/man8/smbd.8*
+%{_mandir}/man8/tdbbackup.8*
+#%{_mandir}/ja/man1/smbstatus.1*
+#%{_mandir}/ja/man5/smbpasswd.5*
+#%{_mandir}/ja/man7/samba.7*
+#%{_mandir}/ja/man8/smbd.8*
+#%{_mandir}/ja/man8/nmbd.8*
+%{_libdir}/samba/vfs
+
+%attr(0700,root,root) %dir /var/log/samba
+%attr(1777,root,root) %dir /var/spool/samba
+
+%files swat
+%defattr(-,root,root)
+%config(noreplace) %{_sysconfdir}/xinetd.d/swat
+%{_datadir}/swat
+%{_sbindir}/swat
+%{_mandir}/man8/swat.8*
+#%{_mandir}/ja/man8/swat.8*
+%attr(755,root,root) %{_libdir}/samba/*.msg
+
+%files client
+%defattr(-,root,root)
+/sbin/mount.smb
+/sbin/mount.smbfs
+%{_libdir}/samba/lowcase.dat
+%{_libdir}/samba/upcase.dat
+%{_libdir}/samba/valid.dat
+%{_bindir}/rpcclient
+%{_bindir}/smbcacls
+%{_bindir}/smbmount
+%{_bindir}/smbmnt
+%{_bindir}/smbumount
+%{_bindir}/findsmb
+%{_mandir}/man8/smbmnt.8*
+%{_mandir}/man8/smbmount.8*
+%{_mandir}/man8/smbumount.8*
+%{_mandir}/man8/smbspool.8*
+%{_bindir}/nmblookup
+%{_bindir}/smbclient
+%{_bindir}/smbprint
+%{_bindir}/smbspool
+%{_bindir}/smbtar
+%{_bindir}/net
+%{_bindir}/smbtree
+%{_mandir}/man1/findsmb.1*
+%{_mandir}/man1/nmblookup.1*
+%{_mandir}/man1/rpcclient.1*
+%{_mandir}/man1/smbcacls.1*
+%{_mandir}/man1/smbclient.1*
+%{_mandir}/man1/smbtar.1*
+%{_mandir}/man1/smbtree.1*
+%{_mandir}/man8/net.8*
+#%{_mandir}/ja/man1/smbtar.1*
+#%{_mandir}/ja/man1/smbclient.1*
+#%{_mandir}/ja/man1/nmblookup.1*
+
+%files common
+%defattr(-,root,root)
+/%{_lib}/libnss_wins.so.*
+/%{_lib}/libnss_winbind.so.*
+/%{_lib}/security/pam_winbind.so
+%{_libdir}/libsmbclient.a
+%{_libdir}/libsmbclient.so
+%{_libdir}/samba/charset/CP*.so
+%{_includedir}/libsmbclient.h
+%{_bindir}/testparm
+%{_bindir}/testprns
+%{_bindir}/smbpasswd
+# %{_bindir}/make_printerdef
+%{_bindir}/wbinfo
+# %{_bindir}/editreg
+%{_bindir}/ntlm_auth
+%{_bindir}/pdbedit
+%{_bindir}/profiles
+%{_bindir}/smbcquotas
+#%{_bindir}/vfstest
+%{_sbindir}/winbindd
+%dir /var/cache/samba
+%attr(750,root,root) %dir /var/cache/samba/winbindd_privileged
+%config(noreplace) %{_sysconfdir}/samba/smb.conf
+%config(noreplace) %{_sysconfdir}/samba/lmhosts
+%dir %{_datadir}/samba
+%dir %{_datadir}/samba/codepages
+%dir %{_sysconfdir}/samba
+%{initdir}/winbind
+# %{_datadir}/samba/codepages/*
+# %{_mandir}/man1/make_smbcodepage.1*
+%{_mandir}/man1/ntlm_auth.1*
+%{_mandir}/man1/profiles.1*
+%{_mandir}/man1/smbcquotas.1*
+%{_mandir}/man1/testparm.1*
+%{_mandir}/man1/testprns.1*
+%{_mandir}/man5/smb.conf.5*
+%{_mandir}/man5/lmhosts.5*
+%{_mandir}/man8/smbpasswd.8*
+%{_mandir}/man1/wbinfo.1*
+%{_mandir}/man8/winbindd.8*
+%{_mandir}/man1/vfstest.1*
+
+# #%lang(ja) %{_mandir}/ja/man1/make_smbcodepage.1*
+#%lang(ja) %{_mandir}/ja/man1/testparm.1*
+#%lang(ja) %{_mandir}/ja/man1/testprns.1*
+#%lang(ja) %{_mandir}/ja/man5/smb.conf.5*
+#%lang(ja) %{_mandir}/ja/man5/lmhosts.5*
+#%lang(ja) %{_mandir}/ja/man8/smbpasswd.8*
+
+%changelog
+* Thu Sep 25 2003 Jay Fenlason <fenlason@redhat.com> 3.0.0-15
+- New 3.0.0 final release
+- merge nmbd-netbiosname and testparm patches from 3E branch
+- updated the -logfiles patch to work against 3.0.0
+- updated the pie patch
+- update the VERSION file during build
+- use make -j if avaliable
+- merge the winbindd_privileged change from 3E
+- merge the "rm /usr/lib" patch that allows Samba to build on 64-bit
+  platforms despite the broken Makefile
+
+* Mon Aug 18 2003 Jay Fenlason <fenlason@redhat.com>
+- Merge from samba-3E-branch after samba-3.0.0rc1 was released
+
+* Wed Jul 23 2003 Jay Fenlason <fenlason@redhat.com> 3.0.0-3beta3
+- Merge from 3.0.0-2beta3.3E
+- (Correct log file names (#100981).)
+- (Fix pidfile directory in samab.log)
+- (Remove obsolete samba-3.0.0beta2.tar.bz2.md5 file)
+- (Move libsmbclient to the -common package (#99449))
+
+* Tue Jun 22 2003 Nalin Dahyabhai <nalin@redhat.com> 2.2.8a-4
+- rebuild
+
+* Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
+* Wed May 28 2003 Jay Fenlason <fenlason@redhat.com> 2.2.8a-2
+- add libsmbclient.so for gnome-vfs-extras
+- Edit specfile to specify /var/run for pid files
+- Move /tmp/.winbindd/socket to /var/run/winbindd/socket
+
+* Wed May 14 2003 Florian La Roche <Florian.LaRoche@redhat.de>
+- add proper ldconfig calls
+
+* Thu Apr 24 2003 Jay Fenlason <fenlason@redhat.com> 2.2.8a-1
+- upgrade to 2.2.8a
+- remove old .md5 files
+- add "pid directory = /var/run" to the smb.conf file.  Fixes #88495
+- Patch from jra@dp.samba.org to fix a delete-on-close regression
+
+* Mon Mar 24 2003 Jay Fenlason <fenlason@redhat.com> 2.2.8-0
+- Upgrade to 2.2.8
+- removed commented out patches.
+- removed old patches and .md5 files from the repository.
+- remove duplicate /sbin/chkconfig --del winbind which causes
+  warnings when removing samba.
+- Fixed minor bug in smbprint that causes it to fail when called with
+  more than 10 parameters: the accounting file (and spool directory
+  derived from it) were being set wrong due to missing {}.  This closes
+  bug #86473.
+- updated smb.conf patch, includes new defaults to close bug #84822.
+
+* Mon Feb 24 2003 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
+* Thu Feb 20 2003 Jonathan Blandford <jrb@redhat.com> 2.2.7a-5
+- remove swat.desktop file
+
+* Thu Feb 20 2003 Nalin Dahyabhai <nalin@redhat.com> 2.2.7a-4
+- relink libnss_wins.so with SHLD="%{__cc} -lnsl" to force libnss_wins.so to
+  link with libnsl, avoiding unresolved symbol errors on functions in libnsl
+
+* Mon Feb 10 2003 Jay Fenlason <fenlason@redhat.com> 2.2.7a-3
+- edited spec file to put .so files in the correct directories
+  on 64-bit platforms that have 32-bit compatability issues
+  (sparc64, x86_64, etc).  This fixes bugzilla #83782.
+- Added samba-2.2.7a-error.patch from twaugh.  This fixes
+  bugzilla #82454.
+
+* Wed Jan 22 2003 Tim Powers <timp@redhat.com>
+- rebuilt
+
+* Thu Jan  9 2003 Jay Fenlason <fenlason@redhat.com> 2.2.7a-1
+- Update to 2.2.7a
+- Change default printing system to CUPS
+- Turn on pam_smbpass
+- Turn on msdfs
+
+* Sat Jan  4 2003 Jeff Johnson <jbj@redhat.com> 2.2.7-5
+- use internal dep generator.
+
+* Sat Dec 14 2002 Tim Powers <timp@redhat.com> 2.2.7-4
+- don't use rpms internal dep generator
+
+* Mon Dec 02 2002 Elliot Lee <sopwith@redhat.com> 2.2.7-3
+- Fix missing doc files.
+- Fix multilib issues
+
+* Wed Nov 20 2002 Bill Nottingham <notting@redhat.com> 2.2.7-2
+- update to 2.2.7
+- add patch for LFS in smbclient (<tcallawa@redhat.com>)
+
+* Wed Aug 28 2002 Trond Eivind Glomsrød <teg@redhat.com> 2.2.5-10
+- logrotate fixes (#65007)
+
+* Mon Aug 26 2002 Trond Eivind Glomsrød <teg@redhat.com> 2.2.5-9
+- /usr/lib was used in place of %%{_libdir} in three locations (#72554)
+
+* Mon Aug  5 2002 Trond Eivind Glomsrød <teg@redhat.com> 2.2.5-8
+- Initscript fix (#70720)
+
+* Fri Jul 26 2002 Trond Eivind Glomsrød <teg@redhat.com> 2.2.5-7
+- Enable VFS support and compile the "recycling" module (#69796)
+- more selective includes of the examples dir 
+
+* Tue Jul 23 2002 Trond Eivind Glomsrød <teg@redhat.com> 2.2.5-6
+- Fix the lpq parser for better handling of LPRng systems (#69352)
+
+* Tue Jul 23 2002 Trond Eivind Glomsrød <teg@redhat.com> 2.2.5-5
+- desktop file fixes (#69505)
+
+* Wed Jun 26 2002 Trond Eivind Glomsrød <teg@redhat.com> 2.2.5-4
+- Enable ACLs
+
+* Tue Jun 25 2002 Trond Eivind Glomsrød <teg@redhat.com> 2.2.5-3
+- Make it not depend on Net::LDAP - those are doc files and examples
+
+* Fri Jun 21 2002 Tim Powers <timp@redhat.com>
+- automated rebuild
+
+* Thu Jun 20 2002 Trond Eivind Glomsrød <teg@redhat.com> 2.2.5-1
+- 2.2.5
+
+* Fri Jun 14 2002 Trond Eivind Glomsrød <teg@redhat.com> 2.2.4-5
+- Move the post/preun of winbind into the -common subpackage, 
+  where the script is (#66128)
+
+* Tue Jun  4 2002 Trond Eivind Glomsrød <teg@redhat.com> 2.2.4-4
+- Fix pidfile locations so it runs properly again (2.2.4 
+  added a new directtive - #65007)
+
+* Thu May 23 2002 Tim Powers <timp@redhat.com>
+- automated rebuild
+
+* Tue May 14 2002 Trond Eivind Glomsrød <teg@redhat.com> 2.2.4-2
+- Fix #64804
+
+* Thu May  9 2002 Trond Eivind Glomsrød <teg@redhat.com> 2.2.4-1
+- 2.2.4
+- Removed some zero-length and CVS internal files
+- Make it build
+
+* Wed Apr 10 2002 Trond Eivind Glomsrød <teg@redhat.com> 2.2.3a-6
+- Don't use /etc/samba.d in smbadduser, it should be /etc/samba
+
+* Thu Apr  4 2002 Trond Eivind Glomsrød <teg@redhat.com> 2.2.3a-5
+- Add libsmbclient.a w/headerfile for KDE (#62202)
+
+* Tue Mar 26 2002 Trond Eivind Glomsrød <teg@redhat.com> 2.2.3a-4
+- Make the logrotate script look the correct place for the pid files 
+
+* Thu Mar 14 2002 Nalin Dahyabhai <nalin@redhat.com> 2.2.3a-3
+- include interfaces.o in pam_smbpass.so, which needs symbols from interfaces.o
+  (patch posted to samba-list by Ilia Chipitsine)
+
+* Thu Feb 21 2002 Trond Eivind Glomsrød <teg@redhat.com> 2.2.3a-2
+- Rebuild
+
+* Thu Feb  7 2002 Trond Eivind Glomsrød <teg@redhat.com> 2.2.3a-1
+- 2.2.3a
+
+* Mon Feb  4 2002 Trond Eivind Glomsrød <teg@redhat.com> 2.2.3-1
+- 2.2.3
+
+* Thu Nov 29 2001 Trond Eivind Glomsrød <teg@redhat.com> 2.2.2-8
+- New pam configuration file for samba
+
+* Tue Nov 27 2001 Trond Eivind Glomsrød <teg@redhat.com> 2.2.2-7
+- Enable PAM session controll and password sync
+
+* Tue Nov 13 2001 Trond Eivind Glomsrød <teg@redhat.com> 2.2.2-6
+- Move winbind files to samba-common. Add separate initscript for
+  winbind 
+- Fixes for winbind - protect global variables with mutex, use
+  more secure getenv
+
+* Thu Nov  8 2001 Trond Eivind Glomsrød <teg@redhat.com> 2.2.2-5
+- Teach smbadduser about "getent passwd" 
+- Fix more pid-file references
+- Add (conditional) winbindd startup to the initscript, configured in
+  /etc/sysconfig/samba
+
+* Wed Nov  7 2001 Trond Eivind Glomsrød <teg@redhat.com> 2.2.2-4
+- Fix pid-file reference in logrotate script
+- include pam and nss modules for winbind
+
+* Mon Nov  5 2001 Trond Eivind Glomsrød <teg@redhat.com> 2.2.2-3
+- Add "--with-utmp" to configure options (#55372)
+- Include winbind, pam_smbpass.so, rpcclient and smbcacls
+- start using /var/cache/samba, we need to keep state and there is
+  more than just locks involved
+
+* Sat Nov 03 2001 Florian La Roche <Florian.LaRoche@redhat.de> 2.2.2-2
+- add "reload" to the usage string in the startup script
+
+* Mon Oct 15 2001 Trond Eivind Glomsrød <teg@redhat.com> 2.2.2-1
+- 2.2.2
+
+* Tue Sep 18 2001 Trond Eivind Glomsrød <teg@redhat.com> 2.2.1a-5
+- Add patch from Jeremy Allison to fix IA64 alignment problems (#51497)
+
+* Mon Aug 13 2001 Trond Eivind Glomsrød <teg@redhat.com>
+- Don't include smbpasswd in samba, it's in samba-common (#51598)
+- Add a disabled "obey pam restrictions" statement - it's not
+  active, as we use encrypted passwords, but if the admin turns
+  encrypted passwords off the choice is available. (#31351)
+
+* Wed Aug  8 2001 Trond Eivind Glomsrød <teg@redhat.com>
+- Use /var/cache/samba instead of /var/lock/samba 
+- Remove "domain controller" keyword from smb.conf, it's 
+  deprecated (from #13704)
+- Sync some examples with smb.conf.default
+- Fix password synchronization (#16987)
+
+* Fri Jul 20 2001 Trond Eivind Glomsrød <teg@redhat.com>
+- Tweaks of BuildRequires (#49581)
+
+* Wed Jul 11 2001 Trond Eivind Glomsrød <teg@redhat.com>
+- 2.2.1a bugfix release
+
+* Tue Jul 10 2001 Trond Eivind Glomsrød <teg@redhat.com>
+- 2.2.1, which should work better for XP
+
+* Sat Jun 23 2001 Trond Eivind Glomsrød <teg@redhat.com>
+- 2.2.0a security fix
+- Mark lograte and pam configuration files as noreplace
+
+* Fri Jun 22 2001 Trond Eivind Glomsrød <teg@redhat.com>
+- Add the /etc/samba directory to samba-common
+
+* Thu Jun 21 2001 Trond Eivind Glomsrød <teg@redhat.com>
+- Add improvements to the smb.conf as suggested in #16931
+
+* Tue Jun 19 2001 Trond Eivind Glomsrød <teg@redhat.com>
+  (these changes are from the non-head version)
+- Don't include /usr/sbin/samba, it's the same as the initscript
+- unset TMPDIR, as samba can't write into a TMPDIR owned 
+  by root (#41193)
+- Add pidfile: lines for smbd and nmbd and a config: line
+  in the initscript  (#15343)
+- don't use make -j
+- explicitly include /usr/share/samba, not just the files in it
+
+* Tue Jun 19 2001 Bill Nottingham <notting@redhat.com>
+- mount.smb/mount.smbfs go in /sbin, *not* %%{_sbindir}
+
+* Fri Jun  8 2001 Preston Brown <pbrown@redhat.com>
+- enable encypted passwords by default
+
+* Thu Jun  7 2001 Helge Deller <hdeller@redhat.de> 
+- build as 2.2.0-1 release
+- skip the documentation-directories docbook, manpages and yodldocs
+- don't include *.sgml documentation in package
+- moved codepage-directory to /usr/share/samba/codepages
+- make it compile with glibc-2.2.3-10 and kernel-headers-2.4.2-2   
+
+* Mon May 21 2001 Helge Deller <hdeller@redhat.de> 
+- updated to samba 2.2.0
+- moved codepages to %{_datadir}/samba/codepages
+- use all available CPUs for building rpm packages
+- use %{_xxx} defines at most places in spec-file
+- "License:" replaces "Copyright:"
+- dropped excludearch sparc
+- de-activated japanese patches 100 and 200 for now 
+  (they need to be fixed and tested wth 2.2.0)
+- separated swat.desktop file from spec-file and added
+  german translations
+- moved /etc/sysconfig/samba to a separate source-file
+- use htmlview instead of direct call to netscape in 
+  swat.desktop-file
+
+* Mon May  7 2001 Bill Nottingham <notting@redhat.com>
+- device-remove security fix again (<tridge@samba.org>)
+
+* Fri Apr 20 2001 Bill Nottingham <notting@redhat.com>
+- fix tempfile security problems, officially (<tridge@samba.org>)
+- update to 2.0.8
+
+* Sun Apr  8 2001 Bill Nottingham <notting@redhat.com>
+- turn of SSL, kerberos
+
+* Thu Apr  5 2001 Bill Nottingham <notting@redhat.com>
+- fix tempfile security problems (patch from <Marcus.Meissner@caldera.de>)
+
+* Thu Mar 29 2001 Bill Nottingham <notting@redhat.com>
+- fix quota support, and quotas with the 2.4 kernel (#31362, #33915)
+
+* Mon Mar 26 2001 Nalin Dahyabhai <nalin@redhat.com>
+- tweak the PAM code some more to try to do a setcred() after initgroups()
+- pull in all of the optflags on i386 and sparc
+- don't explicitly enable Kerberos support -- it's only used for password
+  checking, and if PAM is enabled it's a no-op anyway
+
+* Mon Mar  5 2001 Tim Waugh <twaugh@redhat.com>
+- exit successfully from preun script (bug #30644).
+
+* Fri Mar  2 2001 Nalin Dahyabhai <nalin@redhat.com>
+- rebuild in new environment
+
+* Wed Feb 14 2001 Bill Nottingham <notting@redhat.com>
+- updated japanese stuff (#27683)
+
+* Fri Feb  9 2001 Bill Nottingham <notting@redhat.com>
+- fix trigger (#26859)
+
+* Wed Feb  7 2001 Bill Nottingham <notting@redhat.com>
+- add i18n support, japanese patch (#26253)
+
+* Wed Feb  7 2001 Trond Eivind Glomsrød <teg@redhat.com>
+- i18n improvements in initscript (#26537)
+
+* Wed Jan 31 2001 Bill Nottingham <notting@redhat.com>
+- put smbpasswd in samba-common (#25429)
+
+* Wed Jan 24 2001 Bill Nottingham <notting@redhat.com>
+- new i18n stuff
+
+* Sun Jan 21 2001 Bill Nottingham <notting@redhat.com>
+- rebuild
+
+* Thu Jan 18 2001 Bill Nottingham <notting@redhat.com>
+- i18n-ize initscript
+- add a sysconfig file for daemon options (#23550)
+- clarify smbpasswd man page (#23370)
+- build with LFS support (#22388)
+- avoid extraneous pam error messages (#10666)
+- add Urban Widmark's bug fixes for smbmount (#19623)
+- fix setgid directory modes (#11911)
+- split swat into subpackage (#19706)
+
+* Wed Oct 25 2000 Nalin Dahyabhai <nalin@redhat.com>
+- set a default CA certificate path in smb.conf (#19010)
+- require openssl >= 0.9.5a-20 to make sure we have a ca-bundle.crt file
+
+* Mon Oct 16 2000 Bill Nottingham <notting@redhat.com>
+- fix swat only_from line (#18726, others)
+- fix attempt to write outside buildroot on install (#17943)
+
+* Mon Aug 14 2000 Bill Nottingham <notting@redhat.com>
+- add smbspool back in (#15827)
+- fix absolute symlinks (#16125)
+
+* Sun Aug 6 2000 Philipp Knirsch <pknirsch@redhat.com>
+- bugfix for smbadduser script (#15148)
+
+* Mon Jul 31 2000 Matt Wilson <msw@redhat.com>
+- patch configure.ing (patch11) to disable cups test
+- turn off swat by default
+
+* Fri Jul 28 2000 Bill Nottingham <notting@redhat.com>
+- fix condrestart stuff
+
+* Fri Jul 21 2000 Bill Nottingham <notting@redhat.com>
+- add copytruncate to logrotate file (#14360)
+- fix init script (#13708)
+
+* Sat Jul 15 2000 Bill Nottingham <notting@redhat.com>
+- move initscript back
+- remove 'Using Samba' book from %%doc 
+- move stuff to /etc/samba (#13708)
+- default configuration tweaks (#13704)
+- some logrotate tweaks
+
+* Wed Jul 12 2000 Prospector <bugzilla@redhat.com>
+- automatic rebuild
+
+* Tue Jul 11 2000 Bill Nottingham <notting@redhat.com>
+- fix logrotate script (#13698)
+
+* Thu Jul  6 2000 Bill Nottingham <notting@redhat.com>
+- fix initscripts req (prereq /etc/init.d)
+
+* Wed Jul 5 2000 Than Ngo <than@redhat.de>
+- add initdir macro to handle the initscript directory
+- add a new macro to handle /etc/pam.d/system-auth
+
+* Thu Jun 29 2000 Nalin Dahyabhai <nalin@redhat.com>
+- enable Kerberos 5 and SSL support
+- patch for duplicate profile.h headers
+
+* Thu Jun 29 2000 Bill Nottingham <notting@redhat.com>
+- fix init script
+
+* Tue Jun 27 2000 Bill Nottingham <notting@redhat.com>
+- rename samba logs (#11606)
+
+* Mon Jun 26 2000 Bill Nottingham <notting@redhat.com>
+- initscript munging
+
+* Fri Jun 16 2000 Bill Nottingham <notting@redhat.com>
+- configure the swat stuff usefully
+- re-integrate some specfile tweaks that got lost somewhere
+
+* Thu Jun 15 2000 Bill Nottingham <notting@redhat.com>
+- rebuild to get rid of cups dependency
+
+* Wed Jun 14 2000 Nalin Dahyabhai <nalin@redhat.com>
+- tweak logrotate configurations to use the PID file in /var/lock/samba
+
+* Sun Jun 11 2000 Bill Nottingham <notting@redhat.com>
+- rebuild in new environment
+
+* Thu Jun  1 2000 Nalin Dahyabhai <nalin@redhat.com>
+- change PAM setup to use system-auth
+
+* Mon May  8 2000 Bill Nottingham <notting@redhat.com>
+- fixes for ia64
+
+* Sat May  6 2000 Bill Nottingham <notting@redhat.com>
+- switch to %%configure
+
+* Wed Apr 26 2000 Nils Philippsen <nils@redhat.de>
+- version 2.0.7
+
+* Sun Mar 26 2000 Florian La Roche <Florian.LaRoche@redhat.com>
+- simplify preun
+
+* Thu Mar 16 2000 Bill Nottingham <notting@redhat.com>
+- fix yp_get_default_domain in autoconf
+- only link against readline for smbclient
+- fix log rotation (#9909)
+
+* Fri Feb 25 2000 Bill Nottingham <notting@redhat.com>
+- fix trigger, again.
+
+* Mon Feb  7 2000 Bill Nottingham <notting@redhat.com>
+- fix trigger.
+
+* Fri Feb  4 2000 Bill Nottingham <notting@redhat.com>
+- turn on quota support
+
+* Mon Jan 31 2000 Cristian Gafton <gafton@redhat.com>
+- rebuild to fox dependencies
+- man pages are compressed
+
+* Fri Jan 21 2000 Bill Nottingham <notting@redhat.com>
+- munge post scripts slightly
+
+* Wed Jan 19 2000 Bill Nottingham <notting@redhat.com>
+- turn on mmap again. Wheee.
+- ship smbmount on alpha
+
+* Mon Dec  6 1999 Bill Nottingham <notting@redhat.com>
+- turn off mmap. ;)
+
+* Wed Dec  1 1999 Bill Nottingham <notting@redhat.com>
+- change /var/log/samba to 0700
+- turn on mmap support
+
+* Thu Nov 11 1999 Bill Nottingham <notting@redhat.com>
+- update to 2.0.6
+
+* Fri Oct 29 1999 Bill Nottingham <notting@redhat.com>
+- add a %defattr for -common
+
+* Tue Oct  5 1999 Bill Nottingham <notting@redhat.com>
+- shift some files into -client
+- remove /home/samba from package.
+
+* Tue Sep 28 1999 Bill Nottingham <notting@redhat.com>
+- initscript oopsie. killproc <name> -HUP, not other way around.
+
+* Sat Sep 26 1999 Bill Nottingham <notting@redhat.com>
+- script cleanups. Again.
+
+* Wed Sep 22 1999 Bill Nottingham <notting@redhat.com>
+- add a patch to fix dropped reconnection attempts
+
+* Mon Sep  6 1999 Jeff Johnson <jbj@redhat.com>
+- use cp rather than mv to preserve /etc/services perms (#4938 et al).
+- use mktemp to generate /etc/tmp.XXXXXX file name.
+- add prereqs on sed/mktemp/killall (need to move killall to /bin).
+- fix trigger syntax (i.e. "samba < 1.9.18p7" not "samba < samba-1.9.18p7")
+
+* Mon Aug 30 1999 Bill Nottingham <notting@redhat.com>
+- sed "s|nawk|gawk|" /usr/bin/convert_smbpasswd
+
+* Sat Aug 21 1999 Bill Nottingham <notting@redhat.com>
+- fix typo in mount.smb
+
+* Fri Aug 20 1999 Bill Nottingham <notting@redhat.com>
+- add a %trigger to work around (sort of) broken scripts in
+  previous releases
+
+* Mon Aug 16 1999 Bill Nottingham <notting@redhat.com>
+- initscript munging
+
+* Mon Aug  9 1999 Bill Nottingham <notting@redhat.com>
+- add domain parsing to mount.smb
+
+* Fri Aug  6 1999 Bill Nottingham <notting@redhat.com>
+- add a -common package, shuffle files around.
+
+* Fri Jul 23 1999 Bill Nottingham <notting@redhat.com>
+- add a chmod in %postun so /etc/services & inetd.conf don't become unreadable
+
+* Wed Jul 21 1999 Bill Nottingham <notting@redhat.com>
+- update to 2.0.5
+- fix mount.smb - smbmount options changed again.........
+- fix postun. oops.
+- update some stuff from the samba team's spec file.
+
+* Fri Jun 18 1999 Bill Nottingham <notting@redhat.com>
+- split off clients into separate package
+- don't run samba by default
+
+* Mon Jun 14 1999 Bill Nottingham <notting@redhat.com>
+- fix one problem with mount.smb script
+- fix smbpasswd on sparc with a really ugly kludge
+
+* Thu Jun 10 1999 Dale Lovelace <dale@redhat.com>
+- fixed logrotate script
+
+* Tue May 25 1999 Bill Nottingham <notting@redhat.com>
+- turn of 64-bit locking on 32-bit platforms
+
+* Thu May 20 1999 Bill Nottingham <notting@redhat.com>
+- so many releases, so little time
+- explicitly uncomment 'printing = bsd' in sample config
+
+* Tue May 18 1999 Bill Nottingham <notting@redhat.com>
+- update to 2.0.4a
+- fix mount.smb arg ordering
+
+* Fri Apr 16 1999 Bill Nottingham <notting@redhat.com>
+- go back to stop/start for restart (-HUP didn't work in testing)
+
+* Fri Mar 26 1999 Bill Nottingham <notting@redhat.com>
+- add a mount.smb to make smb mounting a little easier.
+- smb filesystems apparently don't work on alpha. Oops.
+
+* Thu Mar 25 1999 Bill Nottingham <notting@redhat.com>
+- always create codepages
+
+* Tue Mar 23 1999 Bill Nottingham <notting@redhat.com>
+- logrotate changes
+
+* Sun Mar 21 1999 Cristian Gafton <gafton@redhat.com> 
+- auto rebuild in the new build environment (release 3)
+
+* Fri Mar 19 1999 Preston Brown <pbrown@redhat.com>
+- updated init script to use graceful restart (not stop/start)
+
+* Tue Mar  9 1999 Bill Nottingham <notting@redhat.com>
+- update to 2.0.3
+
+* Thu Feb 18 1999 Bill Nottingham <notting@redhat.com>
+- update to 2.0.2
+
+* Mon Feb 15 1999 Bill Nottingham <notting@redhat.com>
+- swat swat
+
+* Tue Feb  9 1999 Bill Nottingham <notting@redhat.com>
+- fix bash2 breakage in post script
+
+* Fri Feb  5 1999 Bill Nottingham <notting@redhat.com>
+- update to 2.0.0
+
+* Mon Oct 12 1998 Cristian Gafton <gafton@redhat.com>
+- make sure all binaries are stripped
+
+* Thu Sep 17 1998 Jeff Johnson <jbj@redhat.com>
+- update to 1.9.18p10.
+- fix %triggerpostun.
+
+* Tue Jul 07 1998 Erik Troan <ewt@redhat.com>
+- updated postun triggerscript to check $0
+- clear /etc/codepages from %preun instead of %postun
+
+* Mon Jun 08 1998 Erik Troan <ewt@redhat.com>
+- made the %postun script a tad less agressive; no reason to remove
+  the logs or lock file (after all, if the lock file is still there,
+  samba is still running)
+- the %postun and %preun should only exectute if this is the final
+  removal
+- migrated %triggerpostun from Red Hat's samba package to work around
+  packaging problems in some Red Hat samba releases
+
+* Sun Apr 26 1998 John H Terpstra <jht@samba.anu.edu.au>
+- minor tidy up in preparation for release of 1.9.18p5
+- added findsmb utility from SGI package
+
+* Wed Mar 18 1998 John H Terpstra <jht@samba.anu.edu.au>
+- Updated version and codepage info.
+- Release to test name resolve order
+
+* Sat Jan 24 1998 John H Terpstra <jht@samba.anu.edu.au>
+- Many optimisations (some suggested by Manoj Kasichainula <manojk@io.com>
+- Use of chkconfig in place of individual symlinks to /etc/rc.d/init/smb
+- Compounded make line
+- Updated smb.init restart mechanism
+- Use compound mkdir -p line instead of individual calls to mkdir
+- Fixed smb.conf file path for log files
+- Fixed smb.conf file path for incoming smb print spool directory
+- Added a number of options to smb.conf file
+- Added smbadduser command (missed from all previous RPMs) - Doooh!
+- Added smbuser file and smb.conf file updates for username map
+
diff --git a/packaging/Fedora/samba.sysconfig b/packaging/Fedora/samba.sysconfig
new file mode 100644
index 00000000000..944b72fcc28
--- /dev/null
+++ b/packaging/Fedora/samba.sysconfig
@@ -0,0 +1,6 @@
+# Options to smbd
+SMBDOPTIONS="-D"
+# Options to nmbd
+NMBDOPTIONS="-D"
+# Options for winbindd
+WINBINDOPTIONS=""
diff --git a/packaging/Fedora/samba.xinetd b/packaging/Fedora/samba.xinetd
new file mode 100644
index 00000000000..8b62348dde3
--- /dev/null
+++ b/packaging/Fedora/samba.xinetd
@@ -0,0 +1,15 @@
+# default: off
+# description: SWAT is the Samba Web Admin Tool. Use swat \
+#	       to configure your Samba server. To use SWAT, \
+#	       connect to port 901 with your favorite web browser.
+service swat
+{
+	port		= 901
+	socket_type	= stream
+	wait 		= no
+	only_from 	= 127.0.0.1
+	user		= root
+	server		= /usr/sbin/swat
+	log_on_failure	+= USERID
+	disable		= yes
+}
diff --git a/packaging/Fedora/smb.init b/packaging/Fedora/smb.init
new file mode 100644
index 00000000000..fca823a0642
--- /dev/null
+++ b/packaging/Fedora/smb.init
@@ -0,0 +1,117 @@
+#!/bin/sh
+#
+# chkconfig: - 91 35
+# description: Starts and stops the Samba smbd and nmbd daemons \
+#	       used to provide SMB network services.
+#
+# pidfile: /var/run/samba/smbd.pid
+# pidfile: /var/run/samba/nmbd.pid
+# config:  /etc/samba/smb.conf
+
+
+# Source function library.
+if [ -f /etc/init.d/functions ] ; then
+  . /etc/init.d/functions
+elif [ -f /etc/rc.d/init.d/functions ] ; then
+  . /etc/rc.d/init.d/functions
+else
+  exit 0
+fi
+
+# Avoid using root's TMPDIR
+unset TMPDIR
+
+# Source networking configuration.
+. /etc/sysconfig/network
+
+if [ -f /etc/sysconfig/samba ]; then
+   . /etc/sysconfig/samba
+fi
+
+# Check that networking is up.
+[ ${NETWORKING} = "no" ] && exit 0
+
+# Check that smb.conf exists.
+[ -f /etc/samba/smb.conf ] || exit 0
+
+# Check that we can write to it... so non-root users stop here
+[ -w /etc/samba/smb.conf ] || exit 0
+
+
+RETVAL=0
+
+
+start() {
+        KIND="SMB"
+	echo -n $"Starting $KIND services: "
+	daemon smbd $SMBDOPTIONS
+	RETVAL=$?
+	echo
+        KIND="NMB"
+	echo -n $"Starting $KIND services: "
+	daemon nmbd $NMBDOPTIONS
+	RETVAL2=$?
+	echo
+	[ $RETVAL -eq 0 -a $RETVAL2 -eq 0 ] && touch /var/lock/subsys/smb || \
+	   RETVAL=1
+	return $RETVAL
+}	
+
+stop() {
+        KIND="SMB"
+	echo -n $"Shutting down $KIND services: "
+	killproc smbd
+	RETVAL=$?
+	echo
+	KIND="NMB"
+	echo -n $"Shutting down $KIND services: "
+	killproc nmbd
+	RETVAL2=$?
+	[ $RETVAL -eq 0 -a $RETVAL2 -eq 0 ] && rm -f /var/lock/subsys/smb
+	echo ""
+	return $RETVAL
+}	
+
+restart() {
+	stop
+	start
+}	
+
+reload() {
+        echo -n $"Reloading smb.conf file: "
+	killproc smbd -HUP
+	RETVAL=$?
+	echo
+	return $RETVAL
+}	
+
+rhstatus() {
+	status smbd
+	status nmbd
+}	
+
+case "$1" in
+  start)
+  	start
+	;;
+  stop)
+  	stop
+	;;
+  restart)
+  	restart
+	;;
+  reload)
+  	reload
+	;;
+  status)
+  	rhstatus
+	;;
+  condrestart)
+  	[ -f /var/lock/subsys/smb ] && restart || :
+	;;
+  *)
+	echo $"Usage: $0 {start|stop|restart|reload|status|condrestart}"
+	exit 1
+esac
+
+exit $?
diff --git a/packaging/Fedora/smbprint b/packaging/Fedora/smbprint
new file mode 100644
index 00000000000..1c3959d49b5
--- /dev/null
+++ b/packaging/Fedora/smbprint
@@ -0,0 +1,84 @@
+#!/bin/sh
+# This script is an input filter for printcap printing on a unix machine. It
+# uses the smbclient program to print the file to the specified smb-based 
+# server and service.
+# For example you could have a printcap entry like this
+#
+# smb:lp=/dev/null:sd=/usr/spool/smb:sh:if=/usr/local/samba/smbprint
+#
+# which would create a unix printer called "smb" that will print via this 
+# script. You will need to create the spool directory /usr/spool/smb with
+# appropriate permissions and ownerships for your system.
+
+# Set these to the server and service you wish to print to 
+# In this example I have a WfWg PC called "lapland" that has a printer 
+# exported called "printer" with no password.
+
+#
+# Script further altered by hamiltom@ecnz.co.nz (Michael Hamilton)
+# so that the server, service, and password can be read from 
+# a /usr/var/spool/lpd/PRINTNAME/.config file.
+#
+# In order for this to work the /etc/printcap entry must include an 
+# accounting file (af=...):
+#
+#   cdcolour:\
+#	:cm=CD IBM Colorjet on 6th:\
+#	:sd=/var/spool/lpd/cdcolour:\
+#	:af=/var/spool/lpd/cdcolour/acct:\
+#	:if=/usr/local/etc/smbprint:\
+#	:mx=0:\
+#	:lp=/dev/null:
+#
+# The /usr/var/spool/lpd/PRINTNAME/.config file should contain:
+#   share=PC_SERVER
+#   user="user"
+#   password="password"
+#
+# Please, do not modify the order in the file.
+# Example:
+#   share=\\server\deskjet
+#   user="fred"
+#   password=""
+
+#
+# The last parameter to the filter is the accounting file name.
+#   Extract the directory name from the file name.
+#   Concat this with /.config to get the config file.
+#
+eval acct_file=\${$#}
+spool_dir=`dirname $acct_file` 
+config_file=$spool_dir/.config
+
+# Should read the following variables set in the config file:
+#   share
+#   hostip
+#   user
+#   password
+
+eval `cat $config_file`
+
+share=`echo $share | sed "s/[\]/\//g"`
+
+if [ "$user" != "" ]; then
+   usercmd="-U"
+else
+   usercmd=""
+fi
+
+if [ "$workgroup" != "" ]; then
+   workgroupcmd="-W"
+else
+   workgroupcmd=""
+fi
+
+if [ "$translate" = "yes" ]; then
+ command="translate ; print -"
+else
+ command="print -"
+fi
+#echo $share $password $translate $x_command > /tmp/smbprint.log
+
+cat | /usr/bin/smbclient "$share" "$password" -E ${hostip:+-I} \
+     $hostip -N -P $usercmd "$user" $workgroupcmd "$workgroup" \
+     -c "$command" 2>/dev/null
diff --git a/packaging/Fedora/swat.desktop b/packaging/Fedora/swat.desktop
new file mode 100644
index 00000000000..0d7b4b5c48c
--- /dev/null
+++ b/packaging/Fedora/swat.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Samba Configuration
+Name[de]=Samba Konfiguration
+Type=Application
+Comment=Configure Samba with a web based interface
+Exec=htmlview http://127.0.0.1:901/
+Terminal=false
+Categories=X-Red-Hat-Extra;Application;System;X-Red-Hat-ServerConfig;
diff --git a/packaging/Fedora/winbind.init b/packaging/Fedora/winbind.init
new file mode 100644
index 00000000000..ced81135b27
--- /dev/null
+++ b/packaging/Fedora/winbind.init
@@ -0,0 +1,100 @@
+#!/bin/sh
+#
+# chkconfig: - 91 35
+# description: Starts and stops the Samba winbind daemon
+#	       #
+# pidfile: /var/cache/samba/winbind.pid
+# config:  /etc/samba/smb.conf
+
+
+# Source function library.
+if [ -f /etc/init.d/functions ] ; then
+  . /etc/init.d/functions
+elif [ -f /etc/rc.d/init.d/functions ] ; then
+  . /etc/rc.d/init.d/functions
+else
+  exit 0
+fi
+
+# Avoid using root's TMPDIR
+unset TMPDIR
+
+# Source networking configuration.
+. /etc/sysconfig/network
+
+if [ -f /etc/sysconfig/samba ]; then
+   . /etc/sysconfig/samba
+fi
+
+# Check that networking is up.
+[ ${NETWORKING} = "no" ] && exit 0
+
+# Check that smb.conf exists.
+[ -f /etc/samba/smb.conf ] || exit 0
+
+RETVAL=0
+
+
+start() {
+        KIND="Winbind"
+	echo -n $"Starting $KIND services: "
+	daemon winbindd "$WINBINDOPTIONS"
+	RETVAL=$?
+	echo
+	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/winbindd || RETVAL=1
+	return $RETVAL
+}	
+
+stop() {
+        echo
+	KIND="Winbind"
+	echo -n $"Shutting down $KIND services: "
+	killproc winbindd
+	RETVAL=$?
+	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/winbindd
+	echo ""
+	return $RETVAL
+}	
+
+restart() {
+	stop
+	start
+}	
+
+reload() {
+        echo -n $"Reloading smb.conf file: "
+	killproc winbindd -HUP
+	RETVAL=$?
+	echo
+	return $RETVAL
+}	
+
+rhstatus() {
+	status winbindd
+}	
+
+case "$1" in
+  start)
+  	start
+	;;
+  stop)
+  	stop
+	;;
+  restart)
+  	restart
+	;;
+  reload)
+  	reload
+	;;
+  status)
+  	rhstatus
+	;;
+  condrestart)
+  	[ -f /var/lock/subsys/winbindd ] && restart || :
+	;;
+  *)
+	echo $"Usage: $0 {start|stop|restart|reload|status|condrestart}"
+	exit 1
+esac
+
+exit $?
diff --git a/source/Makefile.in b/source/Makefile.in
index a660718c37a..63dfeeec5f0 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -9,7 +9,6 @@
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-mandir=@mandir@
 
 LIBS=@LIBS@
 CC=@CC@
@@ -1310,12 +1309,16 @@ installman: installdirs
 
 showlayout: 
 	@echo "Samba will be installed into:"
-	@echo "  basedir: $(BASEDIR)"
-	@echo "  bindir:  $(BINDIR)"
-	@echo "  sbindir: $(SBINDIR)"
-	@echo "  libdir:  $(LIBDIR)"
-	@echo "  vardir:  $(VARDIR)"
-	@echo "  mandir:  $(MANDIR)"
+	@echo "  basedir:     $(BASEDIR)"
+	@echo "  bindir:      $(BINDIR)"
+	@echo "  sbindir:     $(SBINDIR)"
+	@echo "  libdir:      $(LIBDIR)"
+	@echo "  vardir:      $(VARDIR)"
+	@echo "  mandir:      $(MANDIR)"
+	@echo "  privatedir:  $(PRIVATE_DIR)"
+	@echo "  configdir:   $(CONFIGDIR)"
+	@echo "  lockdir:     $(LOCKDIR)"
+	@echo "  piddir:      $(PIDDIR)"
 
 
 uninstall: uninstallman uninstallbin uninstallscripts uninstallmodules
diff --git a/source/configure.in b/source/configure.in
index 5c4580f14ac..b5b5a7609f5 100644
--- a/source/configure.in
+++ b/source/configure.in
@@ -17,8 +17,9 @@ AC_PREFIX_DEFAULT(/usr/local/samba)
 AC_ARG_WITH(fhs, 
 [  --with-fhs              Use FHS-compliant paths (default=no)],
     configdir="${sysconfdir}/samba"
-    lockdir="\${VARDIR}/cache/samba"
-    piddir="\${VARDIR}/run/samba"
+    lockdir="\${VARDIR}/lib/samba"
+    piddir="\${VARDIR}/run"
+    mandir="\${prefix}/share/man"
     logfilebase="\${VARDIR}/log/samba"
     privatedir="\${CONFIGDIR}/private"
     libdir="\${prefix}/lib/samba"
@@ -27,6 +28,7 @@ AC_ARG_WITH(fhs,
     logfilebase="\${VARDIR}"
     lockdir="\${VARDIR}/locks"
     piddir="\${VARDIR}/locks"
+    mandir="\${prefix}/man"
     privatedir="\${prefix}/private"
     swatdir="\${prefix}/swat")
 
@@ -79,6 +81,23 @@ AC_ARG_WITH(piddir,
   esac])
 
 #################################################
+# set pid directory location
+AC_ARG_WITH(piddir,
+[  --with-mandir=DIR       Where to put man pages ($ac_default_prefix/man)],
+[ case "$withval" in
+  yes|no)
+  #
+  # Just in case anybody calls it without argument
+  #
+    AC_MSG_WARN([--with-mandir called without argument - will use default])
+  ;;
+  * )
+    piddir="$withval"
+    ;;
+  esac])
+
+
+#################################################
 # set SWAT directory location
 AC_ARG_WITH(swatdir,
 [  --with-swatdir=DIR      Where to put SWAT files ($ac_default_prefix/swat)],
@@ -148,6 +167,7 @@ done
 AC_SUBST(configdir)
 AC_SUBST(lockdir)
 AC_SUBST(piddir)
+AC_SUBST(mandir)
 AC_SUBST(logfilebase)
 AC_SUBST(privatedir)
 AC_SUBST(swatdir)
diff --git a/source/nsswitch/winbindd_group.c b/source/nsswitch/winbindd_group.c
index fba427536c8..1c5d6acf514 100644
--- a/source/nsswitch/winbindd_group.c
+++ b/source/nsswitch/winbindd_group.c
@@ -691,8 +691,8 @@ enum winbindd_result winbindd_getgrent(struct winbindd_cli_state *state)
 			goto tryagain;
 		}
 
-		DEBUG(10, ("got gid %lu for group %x\n", (unsigned long)group_gid,
-			   name_list[ent->sam_entry_index].rid));
+		DEBUG(10, ("got gid %lu for group %lu\n", (unsigned long)group_gid,
+			   (unsigned long)name_list[ent->sam_entry_index].rid));
 		
 		/* Fill in group entry */