working on creating the 3.0 release tree
authorGerald Carter <jerry@samba.org>
Fri, 6 Jun 2003 15:09:32 +0000 (15:09 +0000)
committerGerald Carter <jerry@samba.org>
Fri, 6 Jun 2003 15:09:32 +0000 (15:09 +0000)
57 files changed:
docs/docbook/projdoc/imagefiles/10small.png [new file with mode: 0644]
docs/docbook/projdoc/imagefiles/11small.png [new file with mode: 0644]
docs/docbook/projdoc/imagefiles/12small.png [new file with mode: 0644]
docs/docbook/projdoc/imagefiles/13small.png [new file with mode: 0644]
docs/docbook/projdoc/imagefiles/14small.png [new file with mode: 0644]
docs/docbook/projdoc/imagefiles/1small.png [new file with mode: 0644]
docs/docbook/projdoc/imagefiles/2small.png [new file with mode: 0644]
docs/docbook/projdoc/imagefiles/3small.png [new file with mode: 0644]
docs/docbook/projdoc/imagefiles/4small.png [new file with mode: 0644]
docs/docbook/projdoc/imagefiles/5small.png [new file with mode: 0644]
docs/docbook/projdoc/imagefiles/6small.png [new file with mode: 0644]
docs/docbook/projdoc/imagefiles/7small.png [new file with mode: 0644]
docs/docbook/projdoc/imagefiles/8small.png [new file with mode: 0644]
docs/docbook/projdoc/imagefiles/9small.png [new file with mode: 0644]
docs/docbook/projdoc/imagefiles/a_small.png [new file with mode: 0644]
packaging/Mandrake/makerpms-cvs.sh
packaging/Mandrake/makerpms.sh.tmpl
packaging/Mandrake/samba-print-pdf.sh
packaging/Mandrake/samba2.spec.tmpl
packaging/Mandrake/smb.conf
packaging/RedHat/makerpms.sh.tmpl
packaging/RedHat/samba2.spec.tmpl
packaging/SGI/relnotes.html
packaging/SuSE/7.1/samba-2.2.0-alpha0.dif [deleted file]
packaging/SuSE/7.1/samba.pamd [deleted file]
packaging/SuSE/7.1/samba.spec [deleted file]
packaging/SuSE/README [new file with mode: 0644]
packaging/SuSE/samba-3.0.0-msdfs.diff [new file with mode: 0644]
packaging/SuSE/samba-3.0.0-net_ads.diff [new file with mode: 0644]
packaging/SuSE/samba-3.0.0-pdb.diff [new file with mode: 0644]
packaging/SuSE/samba-3.0.0-python.diff [new file with mode: 0644]
packaging/SuSE/samba-3.0.0-vscan.diff [new file with mode: 0644]
packaging/SuSE/samba-3.0.0.files.tar.bz2 [new file with mode: 0644]
packaging/SuSE/samba-vscan-0.3.1.tar.bz2 [new file with mode: 0644]
packaging/SuSE/samba3.spec [new file with mode: 0644]
testsuite/build_farm/basicsmb-domainsec.test
testsuite/build_farm/basicsmb.fns
testsuite/build_farm/runlist
testsuite/build_farm/template/basicsmb.smb.conf
testsuite/build_farm/template/basicsmb.smb.conf.domain [moved from testsuite/build_farm/basicsmb.smb.conf.domain with 100% similarity]
testsuite/build_farm/template/basicsmb.smb.conf.hostsdeny [moved from testsuite/build_farm/basicsmb.smb.conf.hostsdeny with 100% similarity]
testsuite/build_farm/template/basicsmb.smb.conf.server [moved from testsuite/build_farm/basicsmb.smb.conf.server with 100% similarity]
testsuite/build_farm/template/basicsmb.smb.conf.share [moved from testsuite/build_farm/basicsmb.smb.conf.share with 100% similarity]
testsuite/build_farm/template/basicsmb.smb.conf.user [moved from testsuite/build_farm/basicsmb.smb.conf.user with 100% similarity]
testsuite/build_farm/template/preexec
testsuite/build_farm/torture-DIR1.test [new file with mode: 0644]
testsuite/build_farm/torture-FDPASS.test
testsuite/build_farm/torture-FDSESS.test [new file with mode: 0644]
testsuite/build_farm/torture-LOCK6.test [new file with mode: 0644]
testsuite/build_farm/torture-LOCK7.test [new file with mode: 0644]
testsuite/build_farm/torture-MANGLE.test [new file with mode: 0644]
testsuite/build_farm/torture-PROPERTIES.test [new file with mode: 0644]
testsuite/build_farm/torture-TCON1.test [new file with mode: 0644]
testsuite/build_farm/torture-TCON2.test [new file with mode: 0644]
testsuite/build_farm/torture-TCONDEV.test [new file with mode: 0644]
testsuite/build_farm/torture-XCOPY.test [new file with mode: 0644]
testsuite/build_farm/torture_setup.fns

diff --git a/docs/docbook/projdoc/imagefiles/10small.png b/docs/docbook/projdoc/imagefiles/10small.png
new file mode 100644 (file)
index 0000000..56a9b0c
Binary files /dev/null and b/docs/docbook/projdoc/imagefiles/10small.png differ
diff --git a/docs/docbook/projdoc/imagefiles/11small.png b/docs/docbook/projdoc/imagefiles/11small.png
new file mode 100644 (file)
index 0000000..18f5d9e
Binary files /dev/null and b/docs/docbook/projdoc/imagefiles/11small.png differ
diff --git a/docs/docbook/projdoc/imagefiles/12small.png b/docs/docbook/projdoc/imagefiles/12small.png
new file mode 100644 (file)
index 0000000..5bdf809
Binary files /dev/null and b/docs/docbook/projdoc/imagefiles/12small.png differ
diff --git a/docs/docbook/projdoc/imagefiles/13small.png b/docs/docbook/projdoc/imagefiles/13small.png
new file mode 100644 (file)
index 0000000..536b2fc
Binary files /dev/null and b/docs/docbook/projdoc/imagefiles/13small.png differ
diff --git a/docs/docbook/projdoc/imagefiles/14small.png b/docs/docbook/projdoc/imagefiles/14small.png
new file mode 100644 (file)
index 0000000..8905424
Binary files /dev/null and b/docs/docbook/projdoc/imagefiles/14small.png differ
diff --git a/docs/docbook/projdoc/imagefiles/1small.png b/docs/docbook/projdoc/imagefiles/1small.png
new file mode 100644 (file)
index 0000000..c490516
Binary files /dev/null and b/docs/docbook/projdoc/imagefiles/1small.png differ
diff --git a/docs/docbook/projdoc/imagefiles/2small.png b/docs/docbook/projdoc/imagefiles/2small.png
new file mode 100644 (file)
index 0000000..5fd9071
Binary files /dev/null and b/docs/docbook/projdoc/imagefiles/2small.png differ
diff --git a/docs/docbook/projdoc/imagefiles/3small.png b/docs/docbook/projdoc/imagefiles/3small.png
new file mode 100644 (file)
index 0000000..22a39ba
Binary files /dev/null and b/docs/docbook/projdoc/imagefiles/3small.png differ
diff --git a/docs/docbook/projdoc/imagefiles/4small.png b/docs/docbook/projdoc/imagefiles/4small.png
new file mode 100644 (file)
index 0000000..6b7f1b1
Binary files /dev/null and b/docs/docbook/projdoc/imagefiles/4small.png differ
diff --git a/docs/docbook/projdoc/imagefiles/5small.png b/docs/docbook/projdoc/imagefiles/5small.png
new file mode 100644 (file)
index 0000000..b23e1fc
Binary files /dev/null and b/docs/docbook/projdoc/imagefiles/5small.png differ
diff --git a/docs/docbook/projdoc/imagefiles/6small.png b/docs/docbook/projdoc/imagefiles/6small.png
new file mode 100644 (file)
index 0000000..35a646d
Binary files /dev/null and b/docs/docbook/projdoc/imagefiles/6small.png differ
diff --git a/docs/docbook/projdoc/imagefiles/7small.png b/docs/docbook/projdoc/imagefiles/7small.png
new file mode 100644 (file)
index 0000000..d182677
Binary files /dev/null and b/docs/docbook/projdoc/imagefiles/7small.png differ
diff --git a/docs/docbook/projdoc/imagefiles/8small.png b/docs/docbook/projdoc/imagefiles/8small.png
new file mode 100644 (file)
index 0000000..08aca66
Binary files /dev/null and b/docs/docbook/projdoc/imagefiles/8small.png differ
diff --git a/docs/docbook/projdoc/imagefiles/9small.png b/docs/docbook/projdoc/imagefiles/9small.png
new file mode 100644 (file)
index 0000000..90c2cde
Binary files /dev/null and b/docs/docbook/projdoc/imagefiles/9small.png differ
diff --git a/docs/docbook/projdoc/imagefiles/a_small.png b/docs/docbook/projdoc/imagefiles/a_small.png
new file mode 100644 (file)
index 0000000..a6622ef
Binary files /dev/null and b/docs/docbook/projdoc/imagefiles/a_small.png differ
index 72c75b772b57120a0b484ee64e4eb4d422492bc9..08c4370b314219f69b8408ec230b27447796f216 100644 (file)
@@ -22,13 +22,16 @@ done
 #Change up three directories, rename directory to samba-$VERSION, change back
 #then run makerpms.sh
 
-(
+
 CURRENT=$(pwd)
-cd $(dirname $(dirname $(dirname $CURRENT)))
+pushd $(dirname $(dirname $(dirname $CURRENT)))
 SAMBA_DIR=$(basename $(dirname $(dirname $CURRENT)))
 mv $SAMBA_DIR samba-$VERSION
-cd samba-$VERSION/packaging/Mandrake
+pushd samba-$VERSION/source
+./autogen.sh
+popd
+pushd samba-$VERSION/packaging/Mandrake
 sh makerpms.sh $@
-cd $(dirname $(dirname $(dirname $CURRENT)))
+popd
 mv samba-$VERSION $SAMBA_DIR
-)
+popd
index ba4eff0e2b10cc21bdd830c4e6195694a176b1d8..5d06e2bbccaf33453cf1fb2acc225ac9feb565ec 100644 (file)
@@ -13,8 +13,8 @@
 #
 
 # rpm --eval should always give a correct answer for this
-SPECDIR=`rpm --eval "%{_specdir}"`
-SRCDIR=`rpm --eval "%{_sourcedir}"`
+SPECDIR=`rpm "$@" --eval "%{_specdir}"`
+SRCDIR=`rpm "$@" --eval "%{_sourcedir}"`
 
 # At this point the (SPECDIR and) SRCDIR vaiables must have a value!
 
index 07c92b484b8654dbadd72787c7517436dd685035..973bb4f90eeb10a5da05da78407d62aad11a410c 100644 (file)
@@ -5,7 +5,20 @@
 # and turn it into a PDF, informing the user of where it is when it
 # is done
 #
-# Buchan Milne <bgmilne@cae.co.za> 20020723
+# (c) Buchan Milne <bgmilne@cae.co.za> 2002 
+# License: GPLv2
+# Changelog
+# v0.0.6 20030428
+#  - Allow options passed as env. variables from print command
+#  - Inline and simplify sed (use tr) clean script
+#  - Ensure file arrives in PREFIX even if TEMP is used without provided name
+#  - Changes from Joshua M. Schmidlkofer <joshua@imr-net.com> 20030425
+#    - Debugging, adjustments, and corrections.
+#    - Stupid sed sanitizing script. [probably horribly inefficient also]. 
+#    - Temp file usage cleanup.
+# v0.0.5 20020723
+#  - Add support for preset settings
+#  - Allow passing of filename provided by client as final filename
 #
 # Arguments:
 # $1 = file (usually passed with %s from samba)
 #
 # If you want to customise any of the following configuration defaults, 
 # you can place them in the file /etc/samba/print-pdf.conf.
+# If you need to modify anything in this script, please provide me with your
+# changes, preferably in such a way that the changes are configurable.
 
 PS2PDF=ps2pdf13 
 OPTIONS="-dAutoFilterColorImages=false -sColorImageFilter=FlateEncode"
+#Values taken from arguments:
 INPUT=$1
-KEEP_PS=1
-PERMS=640
-INFILE=$(basename $INPUT)
-BASEFILE=pdf-service
 PREFIX="$2"
-NAME="$6"
 WINBASE=$(echo "$3"|sed -e 's,/,\\\\,g')
+#NAME=`echo "$6"|sed -e 's/[&/:{}\\\[<>$#@*^!?=|]/-/g;s/\]/-/g'`
+NAME=`echo "$6"|tr '[:punct:]' '[-*]'`
 
 # Source config file if it exists:
 CONFFILE=/etc/samba/print-pdf.conf
 [ -e $CONFFILE ] && . $CONFFILE
 
+#Values not taken as arguments, could be set via env. vars (?) or config file
+KEEP_PS=${KEEP_PS=0}
+PERMS=${PERMS=640}
+BASEFILE=${BASEFILE=pdf-service}
+TEMP="${TEMP=$2}"
+UMASK=${UMASK=006}
+
+#Make sure that destination directory exists
+mkdir -p "$PREFIX"
+
+INFILE=$(basename $INPUT)
+
+umask $UMASK
+
+[ -n "$NAME" ] && TEMP="$PREFIX"
+
 #make a temp file to use for the output of the PDF
-OUTPUT=`mktemp -q $2/$BASEFILE-XXXXXX`
+OUTPUT=`mktemp -q $TEMP/$BASEFILE-XXXXXX`
 if [ $? -ne 0 ]; then
-       echo "$0: Can't create temp file $2/$BASEFILE-XXXXXX, exiting..."
+       echo "$0: Can't create temp file $TEMP/$OUTPUT, exiting..."
        exit 1
 fi
-if [ "$NAME" != "" ]; then
+if [ -n "$NAME" ]; then
        FINALOUTPUT="$PREFIX/$NAME"
 else
        FINALOUTPUT="$OUTPUT"
 fi
-if [ "$7" != "" ]; then
+if [ -n "$7" ]; then
        OPTIONS="$OPTIONS -dPDFSETTINGS=/${7#pdf-}"
 else
        OPTIONS="$OPTIONS -dPDFSETTINGS=/default"
 fi
-                                                                       
+
 WIN_OUTPUT="$WINBASE\\"`basename "$FINALOUTPUT"`
+#mv "$INPUT" "$INPUT.ps";INPUT="$INPUT.ps"
 
-# create the PDF:
-$PS2PDF $OPTIONS $INPUT "$OUTPUT".pdf >/dev/null 2>&1
-mv -f "$OUTPUT".pdf "$FINALOUTPUT".pdf
+# create the pdf
+$PS2PDF $OPTIONS "$INPUT" "$OUTPUT.pdf" >/dev/null 2>&1
+mv -f "${OUTPUT}.pdf" "${FINALOUTPUT}".pdf
 
 # Generate a message to send to the user, and deal with the original file:
 MESSAGE=$(echo "Your PDF file has been created as $WIN_OUTPUT.pdf\n")
 
-if [ $KEEP_PS ];then
+
+# Cleanup
+if [ $KEEP_PS != 0 ];then
        mv -f $INPUT "${FINALOUTPUT}".ps
        MESSAGE=$(echo "$MESSAGE and your postscript file as $WIN_OUTPUT.ps")
        # Fix permissions on the generated files
-       chmod $PERMS "${FINALOUTPUT}".ps
+       chmod $PERMS "${FINALOUTPUT}".ps "${FINALOUTPUT}".pdf
 else
        rm -f $INPUT
-       chmod $PERMS "${FINALOUTPUT}".ps "${FINALOUTPUT}".pdf
        # Fix permissions on the generated files
+       chmod $PERMS "${FINALOUTPUT}".pdf
 fi
-                                                               
+                                            
 #Remove empty file from mktemp:
-[ "x$NAME" -eq "x" ] && rm -f  $OUTPUT
+rm -f  $OUTPUT
 
 # Send notification to user
 echo -e $MESSAGE|smbclient -M $4 -I $5 -U "PDF Generator" >/dev/null 2>&1
index 47f61eea64de7c5322930ac48118b791b724ba35..b679f97be142321fe6951f4abb2a9c00b3e8bc9e 100644 (file)
 # cvs should be submitted for inclusion in samba cvs.
 
 %define pkg_name       samba
-%define ver            3.0alpha22
-%define rel            2mdk
-%define vscanver       0.3.1
+%define ver            3.0alpha23
+%define rel            4mdk
+%define vscanver       0.3.2a
 %define libsmbmajor    0
 
-# Determine whether this is the system samba or not.
-%define build_system   0
-%if %build_system
-%define samba_major    %{null}
-%else
-%define samba_major    3
-%endif
-
 # Version and release replaced by samba-team at release from samba cvs
 %define pversion PVERSION
 %define prelease PRELEASE
@@ -36,6 +28,8 @@
 
 %if %have_pversion
 %define source_ver     %{pversion}
+%global        _unpackaged_files_terminate_build       0
+%global        _missing_doc_files_terminate_build      0
 %else
 %define source_ver     %{ver}
 %endif
@@ -59,6 +53,7 @@
 # We now do detection of the Mandrake release we are building on:
 #%define build_cooker %(if [ `awk '{print $3}' /etc/mandrake-release` = "Cooker" ];then echo 1; else echo 0; fi)
 #%define build_cooker %(if [[ `cat /etc/mandrake-release|grep Cooker` ]];then echo 1; else echo 0; fi)
+%define build_mdk92 %(if [ `awk '{print $4}' /etc/mandrake-release` = 9.2 ];then echo 1; else echo 0; fi)
 %define build_mdk91 %(if [ `awk '{print $4}' /etc/mandrake-release` = 9.1 ];then echo 1; else echo 0; fi)
 %define build_mdk90 %(if [ `awk '{print $4}' /etc/mandrake-release` = 9.0 ];then echo 1; else echo 0; fi)
 %define build_mdk82 %(if [ `awk '{print $4}' /etc/mandrake-release` = 8.2 ];then echo 1; else echo 0; fi)
@@ -68,6 +63,7 @@
 %define build_non_default 0
 
 # Default options
+%define build_system   0
 %define build_acl      1
 %define build_winbind  1
 %define build_wins     1
 %define build_cupspc   0
 
 # Set defaults for each version
+%if %build_mdk92
+%define build_cupspc   1
+%endif
+
 %if %build_mdk91
 %define build_cupspc   1
 %endif
 %define build_wins     0
 %endif
 
+
 # Allow commandline option overrides (borrowed from Vince's qmail srpm):
 # To use it, do rpm [-ba|--rebuild] --with 'xxx'
 # Check if the rpm was built with the defaults, otherwise we inform the user
 %define build_non_default 0
-%{?_with_acl: %{expand: %%define build_acl 1}}
+%{?_with_system: %{expand: %%define build_system 1}}
+%{?_without_system: %{expand: %%define build_system 0}}
+%{?_with_acl: %{expand: %%global build_acl 1}}
 %{?_with_acl: %{expand: %%define build_non_default 1}}
-%{?_without_acl: %{expand: %%define build_acl 0}}
+%{?_without_acl: %{expand: %%global build_acl 0}}
 %{?_without_acl: %{expand: %%define build_non_default 1}}
 %{?_with_winbind: %{expand: %%global build_winbind 1}}
 %{?_with_winbind: %{expand: %%define build_non_default 1}}
-%{?_without_winbind: %{expand: %%define build_winbind 0}}
+%{?_without_winbind: %{expand: %%global build_winbind 0}}
 %{?_without_winbind: %{expand: %%define build_non_default 1}}
 %{?_with_wins: %{expand: %%global build_wins 1}}
 %{?_with_wins: %{expand: %%define build_non_default 1}}
 %{?_with_ldap: %{expand: %%define build_non_default 1}}
 %{?_without_ldap: %{expand: %%global build_ldap 0}}
 %{?_without_ldap: %{expand: %%define build_non_default 1}}
-%{?_with_ads: %{expand: %%define build_ads 1}}
+%{?_with_ads: %{expand: %%global build_ads 1}}
 %{?_with_ads: %{expand: %%define build_non_default 1}}
-%{?_without_ads: %{expand: %%define build_ads 0}}
+%{?_without_ads: %{expand: %%global build_ads 0}}
 %{?_without_ads: %{expand: %%define build_non_default 1}}
-%{?_with_scanners: %{expand: %%define build_scanners 1}}
+%{?_with_scanners: %{expand: %%global build_scanners 1}}
 %{?_with_scanners: %{expand: %%define build_non_default 1}}
 
 # As if that weren't enough, we're going to try building with antivirus
 %endif
 %global vfsdir examples.bin/VFS
 
+#Standard texts for descriptions:
+%define message_bugzilla() %(echo -e -n "Please file bug reports for this package at Mandrake bugzilla \\n(http://qa.mandrakesoft.com) under the product name %{1}")
+%define message_system %(echo -e -n "NOTE: This is a prerelease of samba-%{samba_major}, not intended for production\\n use. Rather these packages are provided, parallel installable\\nwith samba-2.2.x, for testing purposes")
+
+
 #Workaround missing macros in 8.x:
 %{!?perl_vendorlib: %{expand: %%global perl_vendorlib %{perl_sitearch}/../}}
 
+# Determine whether this is the system samba or not.
+%if %build_system
+%define samba_major    %{nil}
+%else
+%define samba_major    3
+%endif
+
 Summary: Samba SMB server.
 Name: %{pkg_name}%{samba_major}
 
@@ -208,7 +223,7 @@ Patch4: samba-3.0-smbmount-sbin.patch.bz2
 %if !%have_pversion
 # Version specific patches: current version
 Patch101: samba-Makefile-3.0alpha21.patch.bz2
-Patch102: samba-3.0alpha22-mandrake-packaging.patch.bz2
+#Patch102: samba-3.0alpha22-mandrake-packaging.patch.bz2
 Patch110: samba-2.2.7a-fix-build.patch.bz2
 %else
 # Version specific patches: upcoming version
@@ -221,6 +236,7 @@ Requires: pam >= 0.64, samba-common = %{version}
 BuildRequires: pam-devel autoconf readline-devel
 BuildRequires: libxml2-devel
 BuildRequires: mysql-devel
+BuildRequires: autoconf2.5
 %if %build_acl
 BuildRequires: libacl-devel
 %endif
@@ -260,12 +276,12 @@ This binary release includes encrypted password support.
 
 Please read the smb.conf file and ENCRYPTION.txt in the
 docs directory for implementation details.
-
+%if %have_pversion
+%message_bugzilla samba3
+%endif 
 %if !%build_system
-NOTE: This is a prerelease of samba-%{samba_major}, not intended
-for production use. If something breaks, file a bug report.
+%message_system
 %endif
-
 %if %build_non_default
 WARNING: This RPM was built with command-line options. Please
 see README.%{name}-mandrake-rpm in the documentation for
@@ -281,7 +297,9 @@ Group: Networking/Other
 %if %build_system
 Provides: samba
 Obsoletes: samba
+Provides:  samba-server-ldap
 Obsoletes: samba-server-ldap
+Provides:  samba3-server
 Obsoletes: samba3-server
 %else
 #Provides: samba-server
@@ -306,21 +324,11 @@ This binary release includes encrypted password support.
 
 Please read the smb.conf file and ENCRYPTION.txt in the
 docs directory for implementation details.
-
-%if %build_ldap
-This package was compiled with LDAP support, which means that 
-passwords can be stored in LDAP or in smbpasswd files.
-To migrate your passwords from smbpasswd into LDAP, try
-examples/LDAP/import_smbpasswd.pl using:
-%{_datadir}/%{name}/scripts/import_smbpasswd.pl </etc/%{name}/smbpasswd
-
-Scripts for managing users in LDAP have been added to 
-%{_datadir}/%{name}/scripts, configuration is in /etc/%{name}/smbldap_conf.pm
+%if %have_pversion
+%message_bugzilla samba3-server
 %endif
-
 %if !%build_system
-NOTE: This is a prerelease of samba-%{samba_major}, not intended
-for production use. If something breaks, file a bug report.
+%message_system
 %endif
 
 %package client
@@ -329,6 +337,7 @@ Summary: Samba (SMB) client programs.
 Group: Networking/Other
 Requires: %{name}-common = %{version}
 %if %build_system
+Provides:  samba3-client
 Obsoletes: samba3-client
 Obsoletes: smbfs
 %else
@@ -339,10 +348,11 @@ Obsoletes: smbfs
 Samba-client provides some SMB clients, which complement the built-in
 SMB filesystem in Linux. These allow the accessing of SMB shares, and
 printing to SMB printers.
-
+%if %have_pversion
+%message_bugzilla samba3-client
+%endif
 %if !%build_system
-NOTE: This is a prerelease of samba-%{samba_major}, not intended
-for production use. If something breaks, file a bug report.
+%message_system
 %endif
 
 %package common
@@ -350,7 +360,9 @@ URL:        http://www.samba.org
 Summary: Files used by both Samba servers and clients.
 Group: System/Servers
 %if %build_system
+Provides:  samba-common-ldap
 Obsoletes: samba-common-ldap
+Provides:  samba3-common
 Obsoletes: samba3-common
 %else
 #Provides: samba-common
@@ -359,10 +371,11 @@ Obsoletes: samba3-common
 %description common
 Samba-common provides files necessary for both the server and client
 packages of Samba.
-
+%if %have_pversion
+%message_bugzilla samba3-common
+%endif
 %if !%build_system
-NOTE: This is a prerelease of samba-%{samba_major}, not intended
-for production use. If something breaks, file a bug report.
+%message_system
 %endif
 
 %package doc
@@ -372,6 +385,7 @@ Group: System/Servers
 Requires: %{name}-common = %{version}
 %if %build_system
 Obsoletes: samba3-doc
+Provides:  samba3-doc
 %else
 #Provides: samba-doc
 %endif
@@ -379,10 +393,11 @@ Obsoletes: samba3-doc
 %description doc
 Samba-doc provides documentation files for both the server and client
 packages of Samba.
-
+%if %have_pversion
+%message_bugzilla samba3-doc
+%endif
 %if !%build_system
-NOTE: This is a prerelease of samba-%{samba_major}, not intended
-for production use. If something breaks, file a bug report.
+%message_system
 %endif
 
 %package swat
@@ -392,7 +407,9 @@ Requires: %{name}-server = %{version}
 Requires: xinetd
 Group: System/Servers
 %if %build_system
+Provides:  samba-swat-ldap
 Obsoletes: samba-swat-ldap
+Provides:  samba3-swat
 Obsoletes: samba3-swat
 %else
 #Provides: samba-swat
@@ -407,10 +424,11 @@ your smb.conf file. Webmin uses SSL encryption by default, and
 preserves comments in configuration files, even if it does not display
 them, and is therefore the preferred method for remotely managing
 Samba.
-
+%if %have_pversion
+%message_bugzilla samba3-swat
+%endif
 %if !%build_system
-NOTE: This is a prerelease of samba-%{samba_major}, not intended
-for production use. If something breaks, file a bug report.
+%message_system
 %endif
 
 %if %build_winbind
@@ -423,10 +441,11 @@ Requires: %{name}-common = %{version}
 Provides the winbind daemon and testing tools to allow authentication 
 and group/user enumeration from a Windows or Samba domain controller.
 %endif
-
+%if %have_pversion
+%message_bugzilla samba3-winbind
+%endif
 %if !%build_system
-NOTE: This is a prerelease of samba-%{samba_major}, not intended
-for production use. If something breaks, file a bug report.
+%message_system
 %endif
 
 %if %build_wins
@@ -440,26 +459,32 @@ PreReq: glibc
 Provides the libnss_wins shared library which resolves NetBIOS names to 
 IP addresses.
 %endif
-
+%if %have_pversion
+%message_bugzilla nss_wins3
+%endif
 %if !%build_system
-NOTE: This is a prerelease of samba-%{samba_major}, not intended
-for production use. If something breaks, file a bug report.
+%message_system
 %endif
 
+%if %{?_without_debug:0}%{!?_without_debug:1}
 %package debug
 URL:   http://www.samba.org
 Summary: Debugging and benchmarking tools for samba
 Group: System/Servers
 Requires: %{name}-common = %{version}
-%if %build_system
+%endif
+%if %build_system && %{?_without_debug:0}%{!?_without_debug:1}
+Provides:  samba3-debug
 Obsoletes: samba3-debug
 %else
 Provides: samba-debug
 %endif
+%if %{?_without_debug:0}%{!?_without_debug:1}
 
 %description debug
 This package provides tools for benchmarking samba, and debugging
 the correct operation of tools against smb servers.
+%endif
 
 %if %build_system
 %package -n libsmbclient%{libsmbmajor}
@@ -472,11 +497,9 @@ Provides:  libsmbclient
 This package contains the SMB client library, part of the samba
 suite of networking software, allowing other software to access
 SMB shares.
-
 %endif
-%if !%build_system
-NOTE: This is a prerelease of samba-%{samba_major}, not intended
-for production use. If something breaks, file a bug report.
+%if %have_pversion && %build_system
+%message_bugzilla libsmbclient%{libsmbmajor}
 %endif
 
 %if %build_system
@@ -487,14 +510,12 @@ Group:            System/Libraries
 Provides:      libsmbclient-devel
 
 %description -n libsmbclient%{libsmbmajor}-devel
-This package contains the development files for the SMB client 
-library, part of the samba suite of networking software, allowing 
+This package contains the development files for the SMB client
+library, part of the samba suite of networking software, allowing
 the development of other software to access SMB shares.
-
 %endif
-%if !%build_system
-NOTE: This is a prerelease of samba-%{samba_major}, not intended
-for production use. If something breaks, file a bug report.
+%if %have_pversion && %build_system
+%message_bugzilla libsmbclient%{libsmbmajor}-devel
 %endif
 
 %package passdb-mysql
@@ -506,10 +527,11 @@ Group:            System/Libraries
 The passdb-mysql package for samba provides a password database
 backend allowing samba to store account details in a MySQL
 database
-
+%if %have_pversion
+%message_bugzilla samba3-passdb-mysql
+%endif
 %if !%build_system
-NOTE: This is a prerelease of samba-%{samba_major}, not intended
-for production use. If something breaks, file a bug report.
+%message_system
 %endif
 
 %package passdb-xml
@@ -520,10 +542,11 @@ Group:            System/Libraries
 %description passdb-xml
 The passdb-xml package for samba provides a password database
 backend allowing samba to store account details in XML files.
-
+%if %have_pversion
+%message_bugzilla samba3-passdb-xml
+%endif
 %if !%build_system
-NOTE: This is a prerelease of samba-%{samba_major}, not intended
-for production use. If something breaks, file a bug report.
+%message_system
 %endif
 
 #Antivirus packages:
@@ -612,6 +635,43 @@ Trend antivirus software (which must be installed to use this).
 %endif
 
 %prep
+
+# Allow users to query build options with --with options:
+#%define opt_status(%1)        %(echo %{1})
+#%( [ -d %{1} ]||mkdir -p %{1}; [ -w %{1} ] && echo %{1})
+%if %{?_with_options:1}%{!?_with_options:0}
+%define opt_status(%{1})       %(if [ %{1} -eq 1 ];then echo enabled;else echo disabled;fi)
+#exit 1
+%{error: }
+%{error:Build options available are:}
+%{error:--with[out] system   Build as the system samba package [or as samba3]}
+%{error:--with[out] acl      Build with support for file ACLs          - %opt_status %build_acl}
+%{error:--with[out] winbind  Build with Winbind support                - %opt_status %build_winbind}
+%{error:--with[out] wins     Build with WINS name resolution support   - %opt_status %build_wins}
+%{error:--with[out] ldap     Build with legacy (samba2) LDAP support   - %opt_status %build_ldap}
+%{error:--with[out] ads      Build with Active Directory support       - %opt_status %build_ads}
+%{error:--with[out] scanners Enable on-access virus scanners           - %opt_status %build_scanners}
+%{error: }
+%else
+%{error: }
+%{error: This rpm has build options available, use --with options to see them}
+%{error: }
+%endif
+
+%if %{?_with_options:1}%{!?_with_options:0} && %build_scanners
+%{error:--with scanners enables fprot,mks,openav,sophos and trend by default}
+%{error: }
+%{error:To enable others (requires development libraries for the scanner):}
+%{error:--with kaspersky     Enable on-access scanning with Kaspersky  - %opt_status %build_kaspersky}
+%{error: }
+%endif
+
+%if %{?_with_options:1}%{!?_with_options:0}
+clear
+exit 1
+%endif
+
+
 # Build a summary of how this RPM was built:
 %if %build_acl
 RPM_EXTRA_OPTIONS="$RPM_EXTRA_OPTIONS --with acl"
@@ -632,7 +692,7 @@ RPM_EXTRA_OPTIONS="$RPM_EXTRA_OPTIONS --without wins"
 RPM_EXTRA_OPTIONS="$RPM_EXTRA_OPTIONS --with ldap"
 %else
 RPM_EXTRA_OPTIONS="$RPM_EXTRA_OPTIONS --without ldap"
-%endif 
+%endif
 %if %build_ads
 RPM_EXTRA_OPTIONS="$RPM_EXTRA_OPTIONS --with ads"
 %else
@@ -646,7 +706,7 @@ echo "This rpm was built with non-default options, thus, to build ">%{SOURCE7}
 echo "an identical rpm, you need to supply the following options">>%{SOURCE7}
 echo "at build time: $RPM_EXTRA_OPTIONS">>%{SOURCE7}
 echo -e "\n%{name}-%{version}-%{release}\n">>%{SOURCE7}
-%else 
+%else
 echo "This rpm was built with default options">%{SOURCE7}
 echo -e "\n%{name}-%{version}-%{release}\n">>%{SOURCE7}
 %endif
@@ -667,7 +727,7 @@ echo "Applying patches for current version: %{ver}"
 (cd source
 %patch101
 )
-%patch102 -p1 -b .mdk
+#%patch102 -p1 -b .mdk
 %patch110 -p1
 %else
 # Version specific patches: upcoming version
@@ -680,7 +740,7 @@ echo "Appling patches which should only be applied to prereleases"
 %endif
 
 # Fix quota compilation in glibc>2.3
-%if %build_mdk91
+%if %build_mdk91 || %build_mdk92
 #grep "<linux/quota.h>" source/smbd/quotas.c >/dev/null && \
 perl -pi -e 's@<linux/quota.h>@<sys/quota.h>@' source/smbd/quotas.c
 %endif
@@ -747,9 +807,7 @@ CFLAGS="$RPM_OPT_FLAGS"
 %endif
                --disable-mysqltest \
                --program-suffix=%{samba_major} 
-#                --with-pam_smbpass \
 #              --with-manpages-langs=en,ja,pl  \
-#              --with-ldap=no          \
 #%if !%build_system
 #                --with-smbwrapper \
 #%endif                
@@ -759,11 +817,12 @@ CFLAGS="$RPM_OPT_FLAGS"
 # For some reason passdb/pdb_xml.c doesn't like the flags below ...
 # and the samba team doesn't always make proto before release ...
 make proto_exists
-make passdb/pdb_xml.o torture
+#make passdb/pdb_xml.o torture
 # torture target broken in alpha22 (only on 9.0?)
-make CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" \
-       all libsmbclient debug2html smbfilter wins modules
-#      all libsmbclient debug2html smbfilter wins torture modules
+#make CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" \
+#      all libsmbclient smbfilter wins modules %{!?_without_debug: torture debug2html}
+%make  all libsmbclient smbfilter wins modules %{!?_without_debug: torture debug2html}
+#%make all libsmbclient debug2html smbfilter wins torture modules
 # Build VFS modules (experimental)
 #cd ../%vfsdir
 #_configure    --prefix=%{prefix} \
@@ -787,7 +846,10 @@ echo "Building fprot"
 %endif
 %if %build_kaspersky
 echo "Building Kaspersky"
-(cd %{vfsdir}/%{vscandir}/kaspersky;make)
+(cd %{vfsdir}/%{vscandir}/kavp
+    perl -p -i -e "s|/usr/local/|/usr/|g" Makefile.KAV4
+    make -f Makefile.KAV4
+)
 %endif
 %if %build_mks
 echo "Building mks"
@@ -867,13 +929,6 @@ install -m 755 source/nsswitch/pam_winbind.so $RPM_BUILD_ROOT/%{_lib}/security/p
                fi
        done
        
-#These scripts are not handled by make:
-#for i in addtosmbpass mksmbpasswd.sh smbtar convert_smbpasswd
-for i in addtosmbpass mksmbpasswd.sh convert_smbpasswd
-do
-  install -m755 source/script/$i $RPM_BUILD_ROOT/%{_bindir}
-done
-
 #libnss_* not handled by make:
 # Install the nsswitch library extension file
 for i in wins winbind; do
@@ -882,7 +937,7 @@ done
 # Make link for wins and winbind resolvers
 ( cd $RPM_BUILD_ROOT/%{_lib}; ln -s libnss_wins%{samba_major}.so libnss_wins%{samba_major}.so.2; ln -s libnss_winbind%{samba_major}.so libnss_winbind%{samba_major}.so.2)
 
-%if 1
+%if %{?_without_debug:0}%{!?_without_debug:1}
 # Debugging stuff (broken in alpha22)
 for i in smbtorture msgtest masktest locktest locktest2 nsstest vfstest debug2html;do
   install -m755 source/bin/$i $RPM_BUILD_ROOT/%{_bindir}
@@ -899,7 +954,7 @@ done
         install -m755 packaging/Mandrake/smb.init $RPM_BUILD_ROOT/etc/rc.d/init.d/smb%{samba_major}
         install -m755 packaging/Mandrake/smb.init $RPM_BUILD_ROOT/%{_sbindir}/%{name}
        install -m755 packaging/Mandrake/winbind.init $RPM_BUILD_ROOT/etc/rc.d/init.d/winbind%{samba_major}
-       install -m755 packaging/Mandrake/wrepld.init $RPM_BUILD_ROOT/etc/rc.d/init.d/wrepld%{samba_major}
+#      install -m755 packaging/Mandrake/wrepld.init $RPM_BUILD_ROOT/etc/rc.d/init.d/wrepld%{samba_major}
        install -m755 packaging/Mandrake/winbind.init $RPM_BUILD_ROOT/%{_sbindir}/winbind%{samba_major}
         install -m644 packaging/Mandrake/samba.pamd $RPM_BUILD_ROOT/etc/pam.d/%{name}
        install -m644 packaging/Mandrake/system-auth-winbind.pamd $RPM_BUILD_ROOT/etc/pam.d/system-auth-winbind%{samba_major}
@@ -1024,7 +1079,7 @@ rm -rf $RPM_BUILD_ROOT
 %post server
 
 %_post_service smb%{samba_major}
-%_post_service wrepld%{samba_major}
+#%_post_service wrepld%{samba_major}
 
 # Add a unix group for samba machine accounts
 groupadd -frg 421 machines
@@ -1138,7 +1193,7 @@ fi
 %preun server
 
 %_preun_service smb%{samba_major}
-%_preun_service wrepld%{samba_major}
+#%_preun_service wrepld%{samba_major}
 
 if [ $1 = 0 ] ; then
 #    /sbin/chkconfig --level 35 smb reset
@@ -1196,26 +1251,23 @@ fi
 %{_sbindir}/%{name}
 %{_sbindir}/smbd%{samba_major}
 %{_sbindir}/nmbd%{samba_major}
-%{_sbindir}/wrepld%{samba_major}
+#%{_sbindir}/wrepld%{samba_major}
 %{_bindir}/smbcontrol%{samba_major}
 #%{_sbindir}/mkntpwd
-%{_bindir}/addtosmbpass%{samba_major}
-%{_bindir}/mksmbpasswd.sh
 %{_bindir}/smbstatus%{samba_major}
-%{_bindir}/convert_smbpasswd%{samba_major}
 %{_bindir}/pdbedit%{samba_major}
-%{_bindir}/smbgroupedit%{samba_major}
 %{_bindir}/tdbbackup%{samba_major}
 %{_bindir}/profiles%{samba_major}
+%{_bindir}/editreg%{samba_major}
 %attr(755,root,root) /%{_lib}/security/pam_smbpass*
-%{_libdir}/%{name}/vfs/vfs_audit.so
-%{_libdir}/%{name}/vfs/vfs_netatalk.so
-%{_libdir}/%{name}/vfs/vfs_recycle.so
-%{_libdir}/%{name}/vfs/vfs_extd_audit.so
+%dir %{_libdir}/%{name}/vfs
+%{_libdir}/%{name}/vfs/*.so
+%dir %{_libdir}/%{name}/pdb
+
 #/usr/share/swat
 %attr(-,root,root) %config(noreplace) /etc/%{name}/smbusers
 %attr(-,root,root) %config %{_initrddir}/smb%{samba_major}
-%attr(-,root,root) %config %{_initrddir}/wrepld%{samba_major}
+#%attr(-,root,root) %config %{_initrddir}/wrepld%{samba_major}
 %attr(-,root,root) %config(noreplace) /etc/logrotate.d/%{name}
 %attr(-,root,root) %config(noreplace) /etc/pam.d/%{name}
 #%attr(-,root,root) %config(noreplace) /etc/%{name}/samba-slapd.include
@@ -1225,12 +1277,12 @@ fi
 %{_mandir}/man8/smbd*.8*
 %{_mandir}/man8/nmbd*.8*
 %{_mandir}/man8/pdbedit*.8*
-%{_mandir}/man8/smbgroupedit*.8*
 %{_mandir}/man1/smbcontrol*.1*
 %attr(775,root,root) %dir %{_localstatedir}/%{name}/netlogon
 %attr(775,root,root) %dir %{_localstatedir}/%{name}/profiles
-%attr(775,root,root) %dir %{_localstatedir}/%{name}/printers/*
+%attr(775,root,root) %dir %{_localstatedir}/%{name}/printers
 %attr(1777,root,root) %dir /var/spool/%{name}
+%dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/scripts
 %attr(0755,root,root) %{_datadir}/%{name}/scripts/print-pdf
 #%attr(0750,root,root) %{_datadir}/%{name}/scripts/smbldap*.pl
@@ -1306,16 +1358,20 @@ fi
 #%{_bindir}/smbsh%{samba_major}
 %{_bindir}/smbpasswd%{samba_major}
 %{_bindir}/smbcacls%{samba_major}
+%{_bindir}/smbcquotas%{samba_major}
 %{_bindir}/net%{samba_major}
 %{_bindir}/smbtree%{samba_major}
 %{_bindir}/ntlm_auth%{samba_major}
 #%{_libdir}/smbwrapper%{samba_major}.so
+%dir %{_libdir}/%{name}
 %{_libdir}/%{name}/*.dat
 #%{_libdir}/%{name}/lowcase.dat
 #%{_libdir}/%{name}/valid.dat
-%attr(-,root,root) %config(noreplace) /etc/%{name}/smb.conf
-%attr(-,root,root) %config(noreplace) /etc/%{name}/smb-winbind.conf
-%attr(-,root,root) %config(noreplace) /etc/%{name}/lmhosts
+%dir %{_sysconfdir}/%{name}
+%attr(-,root,root) %config(noreplace) %{_sysconfdir}/%{name}/smb.conf
+%attr(-,root,root) %config(noreplace) %{_sysconfdir}/%{name}/smb-winbind.conf
+%attr(-,root,root) %config(noreplace) %{_sysconfdir}/%{name}/lmhosts
+%dir %{_localstatedir}/%{name}
 %attr(-,root,root) %{_localstatedir}/%{name}/codepages
 #%{_mandir}/man1/make_smbcodepage*.1*
 #%{_mandir}/man1/make_unicodemap*.1*
@@ -1349,7 +1405,7 @@ fi
 %attr(755,root,root) /%{_lib}/libnss_wins%{samba_major}.so*
 %endif
 
-%if 1
+%if %{?_without_debug:0}%{!?_without_debug:1}
 %files debug
 %defattr(-,root,root)
 %{_bindir}/debug2html%{samba_major}
@@ -1383,11 +1439,11 @@ fi
 
 %files passdb-mysql
 %defattr(-,root,root)
-%{_libdir}/%{name}/*/pdb_mysql.so
+%{_libdir}/%{name}/pdb/*mysql.so
 
 %files passdb-xml
 %defattr(-,root,root)
-%{_libdir}/%{name}/*/pdb_xml.so
+%{_libdir}/%{name}/pdb/*xml.so
 
 #Files for antivirus support:
 %if %build_fprot
@@ -1447,6 +1503,34 @@ fi
 %endif
 
 %changelog
+* Wed Apr 30 2003 Buchan Milne <bgmilne@linux-mandrake.com> 3.0-0.alpha24.1mdk
+- Remove some files removed upstream
+- In builds from source, don't terminate on missing docs or unpackaged files
+  (if only we could do it for other missing files ...)
+
+* Mon Apr 28 2003 Buchan Milne <bgmilne@linux-mandrake.com> 3.0-0.alpha24.0mdk
+- Reenable debug package by (--without debug to not build it), fixed post-a23
+- Add bugzilla note for builds from source (also intended for packages made
+  available on samba FTP site) at samba team request
+- Fix build from CVS (run autogen.sh, pass options to all rpm commands)
+- Appease distriblint, but not much to be done about /usr/share/swat3/ since
+  samba-doc owns some subdirs, and samba-swat others, and they can be installed
+  independantly.
+- Apply kaspersky vscan build fix from samba2  
+- Final for alpha24
+
+* Wed Apr 23 2003 Buchan Milne <bgmilne@linux-mandrake.com> 3.0-0.alpha23.3mdk
+- Small fixes in preparation for testing as system samba
+- Make debug package optional (--with debug) since it's often broken
+- Add support for 9.2 (including in-line smbd quota patch for glibc2.3)
+- Add --with options option, which will just show you the available options and exit
+
+* Sun Apr 06 2003 Buchan Milne <bgmilne@linux-mandrake.com> 3.0-0.alpha23.2mdk
+- Alpha23
+- buildrequire autconf2.5
+- samba-vscan 0.3.2a
+- Remove patch 102 (upstreamed)
+
 * Thu Mar 06 2003 Buchan Milne <bgmilne@linux-mandrake.com> 3.0-0.alpha22.2mdk
 - Alpha22
 - Add profiles binary to server and ntlm_auth to common
index f2643b774a787d1c54fd3da9c87fc2023650e34c..44c44e2925ace6a49b528f8b65283c7424829ec4 100644 (file)
 ; add machine script = /usr/share/samba/scripts/smbldap-useradd.pl -w -d /dev/null -g machines -c 'Machine Account' -s /bin/false %u
 
 # Domain groups:
-# Domain groups are now configured by using the smbgroupedit tool
+# Domain groups are now configured by using the 'net groupmap' tool
 
 # Samba Password Database configuration:
 # Samba now has runtime-configurable password database backends. Multiple
index 9d71452db8e2c5309eece10442b0c24cc845a354..ee5ebd50400d50eb0877d26efc0f1e00a1cdc3ad 100644 (file)
@@ -37,23 +37,19 @@ case $RPMVER in
     2*)
        echo Building for RPM v2.x
        sed -e "s/MANDIR_MACRO/\%\{prefix\}\/man/g" < samba2.spec > samba.spec
-       sed -e "s/MANDIR_MACRO/\%\{prefix\}\/man/g" < samba2-devel.spec > samba-devel.spec
        ;;
     3*)
        echo Building for RPM v3.x
        sed -e "s/MANDIR_MACRO/\%\{prefix\}\/man/g" < samba2.spec > samba.spec
-       sed -e "s/MANDIR_MACRO/\%\{prefix\}\/man/g" < samba2-devel.spec > samba-devel.spec
        ;;
     4.1*)
        echo Building for RPM v4.1
        RPM="rpmbuild"
        sed -e "s/MANDIR_MACRO/\%\{_mandir\}/g" < samba2.spec > samba.spec
-       sed -e "s/MANDIR_MACRO/\%\{_mandir\}/g" < samba2-devel.spec > samba-devel.spec
        ;;
     4*)
        echo Building for RPM v4.x
        sed -e "s/MANDIR_MACRO/\%\{_mandir\}/g" < samba2.spec > samba.spec
-       sed -e "s/MANDIR_MACRO/\%\{_mandir\}/g" < samba2-devel.spec > samba-devel.spec
        ;;
     *)
        echo "Unknown RPM version: `rpm --version`"
@@ -64,27 +60,13 @@ esac
 ( cd ../../source; if [ -f Makefile ]; then make distclean; fi )
 ( cd ../../.. ; chown -R ${USERID}.${GRPID} samba-${VERSION} )
 
-# We do this to make sure that the package always has the current version in it''s name
-if [ z$1 = z"devel" ]; then
-       (cd ../../.. ; mv samba samba-${VERSION} )
-fi
-
 ( cd ../../.. ; tar --exclude=CVS -cf - samba-${VERSION}/. | bzip2 > ${SRCDIR}/samba-${VERSION}.tar.bz2 )
 
 cp -av samba.spec ${SPECDIR}
-cp -av samba-devel.spec ${SPECDIR}
 
-if [ z$1 = "zdevel" ]; then
-       echo Restoring source samba directory name
-       ( cd ../../.. ; mv samba-${VERSION} samba )
-       echo Getting Ready to build Developmental Build
-       cd ${SPECDIR}
-       ${RPM} -ba -v samba-devel.spec
-else
-       echo Getting Ready to build release package
-       cd ${SPECDIR}
-       ${RPM} -ba -v --clean --rmsource samba.spec
-fi
+echo Getting Ready to build release package
+cd ${SPECDIR}
+${RPM} -ba -v --clean --rmsource samba.spec
 
 echo Done.
 
index 638df4f2cce90e733d4fddb37b2902ba573325d5..12955f322204446f07d7bbacdf4b7ae24ec3aab2 100644 (file)
@@ -2,7 +2,7 @@ Summary: Samba SMB client and server
 Name: samba
 Version: PVERSION
 Release: PRELEASE
-Copyright: GNU GPL version 2
+License: GNU GPL version 2
 Group: Networking
 Source: http://download.samba.org/samba/ftp/samba-%{version}.tar.bz2
 Packager: Gerald Carter [Samba-Team] <jerry@samba.org>
@@ -10,7 +10,7 @@ Requires: pam >= 0.72 kernel >= 2.2.1 glibc >= 2.1.2
 Prereq: chkconfig fileutils
 Provides: samba = %{version}
 Obsoletes: samba-common, samba-client, samba-swat
-BuildRoot: /var/tmp/samba
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Prefix: /usr
 
 %description
@@ -26,6 +26,7 @@ Samba 3.0 also introduces UNICODE support and kerberos/ldap
 integration as a member server in a Windows 2000 domain.
 
 Please refer to the WHATSNEW.txt document for fixup information.
+docs directory for implementation details.
 
 %changelog
 * Mon Nov 18 2002 Gerald Carter <jerry@samba.org>
@@ -46,6 +47,9 @@ autoconf
 EXTRA="-D_LARGEFILE64_SOURCE"
 %endif
 NUMCPU=`grep processor /proc/cpuinfo | wc -l`
+if [ ! -f "configure" ]; then
+       ./autogen.sh
+fi
 CFLAGS="$RPM_OPT_FLAGS $EXTRA" ./configure \
        --prefix=%{prefix} \
        --localstatedir=/var \
@@ -89,7 +93,7 @@ mkdir -p $RPM_BUILD_ROOT%{prefix}/{lib,include}
 
 # Install standard binary files
 for i in nmblookup smbclient smbpasswd smbstatus testparm testprns \
-       rpcclient smbspool smbcacls smbcontrol wbinfo smbmnt net smbgroupedit \
+       rpcclient smbspool smbcacls smbcontrol wbinfo smbmnt net \
        smbcacls pdbedit tdbbackup smbtree
 do
        install -m755 source/bin/$i $RPM_BUILD_ROOT%{prefix}/bin
@@ -101,7 +105,7 @@ do
 done
 
 # Install secure binary files
-for i in smbd nmbd swat smbmount smbumount debug2html winbindd wrepld
+for i in smbd nmbd swat smbmount smbumount debug2html winbindd 
 do
        install -m755 source/bin/$i $RPM_BUILD_ROOT%{prefix}/sbin
 done
@@ -157,6 +161,7 @@ install -m 644 source/include/libsmbclient.h $RPM_BUILD_ROOT%{prefix}/include/
 #done
 
 # Install the miscellany
+install -m755 swat/README $RPM_BUILD_ROOT%{prefix}/share/swat/README
 install -m755 packaging/RedHat/smbprint $RPM_BUILD_ROOT%{prefix}/bin
 install -m755 packaging/RedHat/smb.init $RPM_BUILD_ROOT/etc/rc.d/init.d/smb
 install -m755 packaging/RedHat/winbind.init $RPM_BUILD_ROOT/etc/rc.d/init.d/winbind
@@ -169,6 +174,9 @@ install -m644 packaging/RedHat/samba.pamd.stack $RPM_BUILD_ROOT/etc/samba/samba.
 install -m644 packaging/RedHat/samba.xinetd $RPM_BUILD_ROOT/etc/samba/samba.xinetd
 echo 127.0.0.1 localhost > $RPM_BUILD_ROOT/etc/samba/lmhosts
 
+# Remove "*.old" files
+find $RPM_BUILD_ROOT -name "*.old" -exec rm -f {} \;
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -369,7 +377,6 @@ fi
 %{prefix}/sbin/smbmount
 %{prefix}/sbin/smbumount
 %{prefix}/sbin/winbindd
-%{prefix}/sbin/wrepld
 %{prefix}/sbin/samba
 %{prefix}/sbin/debug2html
 /sbin/mount.smbfs
@@ -389,13 +396,13 @@ fi
 %{prefix}/bin/smbcontrol
 %{prefix}/bin/wbinfo
 %{prefix}/bin/net
-%{prefix}/bin/smbgroupedit
 %{prefix}/bin/smbcacls
 %{prefix}/bin/pdbedit
 %{prefix}/bin/tdbbackup
 %{prefix}/bin/smbtree
 %attr(755,root,root) /lib/libnss_wins.s*
 %attr(755,root,root) %{prefix}/lib/samba/vfs/*.so
+%attr(755,root,root) %{prefix}/lib/samba/pdb/*.so
 %attr(755,root,root) %{prefix}/lib/samba/*.dat
 %{prefix}/include/libsmbclient.h
 %{prefix}/lib/libsmbclient.a
@@ -407,6 +414,7 @@ fi
 %{prefix}/share/swat/lang/*/images/*
 %{prefix}/share/swat/lang/*/include/*.html
 %{prefix}/share/swat/using_samba/*
+%{prefix}/share/swat/README
 %config(noreplace) /etc/samba/lmhosts
 %config(noreplace) /etc/samba/smb.conf
 %config(noreplace) /etc/samba/smbusers
index d055be6c1a31ef25304c9bf106f4e9db637f3ce4..afcf5796776724e9e8768b45466d00c70f470158 100644 (file)
@@ -205,8 +205,17 @@ printer name to describe its location.</DD>
 of the <B>docs</B> directory from the Samba distribution; consult <I>samba</I>(7)
 for an introduction. </P>
 
-<P>There is a mailing list for discussion of Samba.  To subscribe and
-      for more information go to <a href="http://lists.samba.org/">lists.samba.org</a>.
+<P>There is a mailing list for discussion of Samba. To subscribe send mail
+to <A HREF="mailto:listproc@samba.org">listproc@samba.org</A>
+with a body of &quot;subscribe samba Your Name&quot; </P>
+
+<P>To send mail to everyone on the list mail to <A HREF="mailto:samba@samba.org">samba@samba.org</A>.
+</P>
+
+<P>There is also an announcement mailing list where new versions are announced.
+To subscribe send mail to <A HREF="mailto:listproc@samba.org">listproc@samba.org</A>
+with a body of &quot;subscribe samba-announce Your Name&quot;. All announcements
+also go to the samba list. </P>
 
 <P>You might also like to look at the Usenet news group <A HREF="news:comp.protocols.smb">comp.protocols.smb</A>
 as it often contains lots of useful info and is frequented by lots of Samba
@@ -214,10 +223,10 @@ users. The newsgroup was initially setup by people on the Samba mailing
 list. It is not, however, exclusive to Samba, it is a forum for discussing
 the SMB protocol (which Samba implements). </P>
 
-<P>
-      A Samba WWW site has been setup with lots of useful info. Connect to:
-      <A HREF="http://samba.org/">http://samba.org/</A>.  You can
-      contact the webmaster at "webmaster at samba dot org".
+<P>A Samba WWW site has been setup with lots of useful info. Connect to:
+<A HREF="http://samba.org/pub/samba/">http://samba.org/pub/samba/</A>.
+It is maintained by Paul Blackman (thanks Paul!). You can contact him at
+<A HREF="mailto:ictinus@lake.canberra.edu.au">ictinus@lake.canberra.edu.au</A>.
 </P>
 
 </BODY>
diff --git a/packaging/SuSE/7.1/samba-2.2.0-alpha0.dif b/packaging/SuSE/7.1/samba-2.2.0-alpha0.dif
deleted file mode 100644 (file)
index 75bfdf1..0000000
+++ /dev/null
@@ -1,224 +0,0 @@
---- lmhosts
-+++ lmhosts    2000/08/28 07:32:33
-@@ -0,0 +1,8 @@
-+# This file provides the same function that the 
-+# lmhosts file does for Windows.
-+# It provides another way to map netbios names to ip addresses.
-+# See the section on 'name resolve order' in the manual page to
-+# smb.conf for more information.
-+
-+# Sample entry:
-+# 192.168.1.1 samba
---- mount.smbfs
-+++ mount.smbfs        2000/08/28 07:32:55
-@@ -0,0 +1,14 @@
-+#!/bin/sh
-+#
-+# Copyright (c) 1999 SuSE GmbH Nuernberg, Germany.  All rights reserved.
-+#
-+# Author: Carsten Hoeger <choeger@suse.de>
-+#
-+# /sbin/mount.smbfs
-+#
-+# I'm called by the mount-command and smbmount want's to get
-+# called by me, so lets do it.
-+#
-+# P.S.: This is a very very raw solution and I don't know, if this
-+# is intentionally.
-+smbmount "$@"
---- rc
-+++ rc 2000/08/28 07:32:33
-@@ -0,0 +1,53 @@
-+#! /bin/sh
-+# Copyright (c) 1996 StarDivision GmbH. All rights reserved.
-+# Copyright (c) 1996 S.u.S.E. Gmbh Fuerth, Germany. All rights reserved.
-+#
-+# Author: Bastian Epting, StarDivision GmbH <be@stardivision.de>
-+#      Florian La Roche, <florian@suse.de>
-+#      Volker Lendecke, <vl@suse.de>
-+#
-+
-+. /etc/rc.config
-+
-+# Determine the base and follow a runlevel link name.
-+base=${0##*/}
-+link=${base#*[SK][0-9][0-9]}
-+
-+# Force execution if not called by a runlevel directory.
-+test $link = $base && START_SMB=yes
-+test "$START_SMB" = "yes" || exit 0
-+
-+# The echo return value for success (defined in /etc/rc.config).
-+return=$rc_done
-+case "$1" in
-+    start)
-+        echo -n "Starting SMB services:"
-+        startproc /usr/sbin/nmbd -D || return=$rc_failed
-+        startproc /usr/sbin/smbd -D || return=$rc_failed
-+        echo -e "$return"
-+        ;;
-+    stop)
-+        echo -n "Shutting down SMB services:"
-+        killproc -TERM /usr/sbin/nmbd || return=$rc_failed
-+        killproc -TERM /usr/sbin/smbd || return=$rc_failed
-+        echo -e "$return"
-+        ;;
-+    restart|reload)
-+      echo -n "Reloading SMB services:"
-+      killproc -HUP /usr/sbin/nmbd || return=$rc_failed
-+      killproc -HUP /usr/sbin/smbd || return=$rc_failed
-+      echo -e "$return"
-+      ;;
-+    status)
-+      echo -n "Checking for service smb: "
-+      checkproc /usr/sbin/nmbd && echo -n "OK " || echo -n "No process "
-+      checkproc /usr/sbin/smbd && echo "OK " || echo "No process"
-+      ;;
-+    *)
-+        echo "Usage: $0 {start|stop|restart|reload|status}"
-+        exit 1
-+esac
-+
-+# Inform the caller not only verbosely and set an exit status.
-+test "$return" = "$rc_done" || exit 1
-+exit 0
---- rc.config.samba
-+++ rc.config.samba    2000/08/28 07:32:33
-@@ -0,0 +1,5 @@
-+#
-+# start samba? ("yes" or "no")
-+# Windows 95 / NT  -  File- and Printservices
-+#
-+START_SMB="no"
---- smb.conf
-+++ smb.conf   2000/08/28 07:32:33
-@@ -0,0 +1,80 @@
-+;
-+; /etc/smb.conf
-+;
-+; Copyright (c) 1999 SuSE GmbH Nuernberg, Germany.
-+;
-+[global]
-+   workgroup = arbeitsgruppe
-+   guest account = nobody
-+   keep alive = 30
-+   os level = 2
-+   kernel oplocks = false
-+   security = user
-+
-+; Uncomment the following, if you want to use an existing
-+; NT-Server to authenticate users, but don't forget that
-+; you also have to create them locally!!!
-+;  security = server
-+;  password server = 192.168.1.10
-+;  encrypt passwords = yes
-+
-+   printing = bsd
-+   printcap name = /etc/printcap
-+   load printers = yes
-+
-+   socket options = TCP_NODELAY
-+
-+   map to guest = Bad User
-+
-+; Uncomment this, if you want to integrate your server
-+; into an existing net e.g. with NT-WS to prevent nettraffic
-+;  local master = no   
-+
-+; Please uncomment the following entry and replace the 
-+; ip number and netmask with the correct numbers for
-+; your ethernet interface.
-+;   interfaces = 192.168.1.1/255.255.255.0
-+   
-+; If you want Samba to act as a wins server, please set
-+; 'wins support = yes'
-+   wins support = no
-+
-+; If you want Samba to use an existing wins server,
-+; please uncomment the following line and replace
-+; the dummy with the wins server's ip number.
-+;   wins server = 192.168.1.1
-+
-+; Do you wan't samba to act as a logon-server for
-+; your windows 95/98 clients, so uncomment the
-+; following:
-+;   logon script =%U.bat
-+;   domain logons = yes
-+;   domain master = yes
-+; [netlogon]
-+;   path = /netlogon
-+
-+
-+[homes]
-+   comment = Heimatverzeichnis
-+   browseable = no
-+   read only = no
-+   create mode = 0750
-+
-+; The following share gives all users access to the Server's CD drive,
-+; assuming it is mounted under /cd. To enable this share, please remove
-+; the semicolons before the lines
-+;
-+; [cdrom]
-+;   comment = Linux CD-ROM
-+;   path = /cdrom
-+;   read only = yes
-+;   locking = no
-+
-+[printers]
-+   comment = All Printers
-+   browseable = no
-+   printable = yes
-+   public = no
-+   read only = yes
-+   create mode = 0700
-+   directory = /tmp
---- smbfs
-+++ smbfs      2000/08/28 07:32:33
-@@ -0,0 +1,40 @@
-+#! /bin/bash
-+# Copyright (c) 1996 SuSE GmbH Nuernberg, Germany.  All rights reserved.
-+#
-+# Author: Thomas Fehr <fehr@suse.de>, 1999
-+#
-+# /sbin/init.d/smbfs
-+#
-+
-+smbfs=no
-+if [ `cat /proc/mounts | grep " smbfs " | wc -l` -gt 0 ]
-+then
-+    smbfs=yes
-+fi
-+
-+return=$rc_done
-+case "$1" in
-+    start|reload)
-+      ;;
-+    stop)
-+      if [ "$smbfs" = "yes" ]
-+      then
-+          echo -n "Remove SMB File System"
-+          #
-+          # Unmount in background because during long timeouts
-+          #
-+          umount -at smbfs &
-+          sleep 2
-+          echo -e "$return"
-+      fi
-+      ;;
-+    restart)
-+      $0 stop && $0 start || return=$rc_failed
-+      ;;
-+    status)
-+      ;;
-+    *)
-+      echo "Usage: $0 {start|stop|status|reload|restart}"
-+      exit 1
-+esac
-+exit 0
---- smbpasswd
-+++ smbpasswd  2000/08/28 07:32:33
-@@ -0,0 +1,3 @@
-+# Sample smbpasswd file.
-+# To use this, set 'encrypt passwords = yes' in the [global]-section
-+# of /etc/smb.conf
diff --git a/packaging/SuSE/7.1/samba.pamd b/packaging/SuSE/7.1/samba.pamd
deleted file mode 100644 (file)
index d9e7088..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-#%PAM-1.0
-auth     required       /lib/security/pam_unix.so
-account  required       /lib/security/pam_unix.so
diff --git a/packaging/SuSE/7.1/samba.spec b/packaging/SuSE/7.1/samba.spec
deleted file mode 100644 (file)
index 60d8099..0000000
+++ /dev/null
@@ -1,381 +0,0 @@
-#
-# spec file for package samba (Version 2.0.7)
-# 
-# Copyright  (c)  2000  SuSE GmbH  Nuernberg, Germany.
-#
-# please send bugfixes or comments to feedback@suse.de.
-#
-
-# neededforbuild  automake openldap
-# usedforbuild    aaa_base aaa_dir autoconf automake base bash bindutil binutils bison bzip compress cpio cracklib devs diff ext2fs file fileutil find flex gawk gcc gdbm gettext gpm gppshare groff gzip kbd less libc libtool libz lx_suse make mktemp modules ncurses net_tool netcfg nkita nkitb nssv1 openldap pam patch perl pgp ps rcs rpm sendmail sh_utils shadow shlibs strace syslogd sysvinit texinfo textutil timezone unzip util vim xdevel xf86 xshared
-
-Vendor:       SuSE GmbH, Nuernberg, Germany
-Distribution: SuSE Linux 7.1a (i386)
-Name:         samba
-Release:      0
-Packager:     feedback@suse.de
-
-Copyright:    1992-95 Andrew Tridgell, Karl Auer, Jeremy Allison
-Group:        Networking/Daemons
-Url:          http://www.samba.org
-Provides:     samba smbfs 
-Requires:     smbclnt
-Autoreqprov:  on
-Version:      2.2
-Summary:      An SMB file server for Unix
-Source: samba-2.2.0-alpha0.tar.gz
-Source1: samba.pamd
-Patch: samba-2.2.0-alpha0.dif
-%package -n smbclnt
-Summary:      Samba client utilities
-Autoreqprov:  on
-Group:        Networking
-%prep
-%setup -n samba-2.2.0-alpha0
-%patch
-
-%build
-cd source
-%{?suse_update_config:%{suse_update_config -f}}
-LIBS=-lnsl \
-./configure --prefix=/usr --libdir=/etc \
-       --with-privatedir=/etc --localstatedir=/var/log \
-       --with-smbmount --with-pam \
-       --mandir=%{_mandir} \
-       --with-swatdir=/usr/lib/samba/swat \
-       --with-sambabook=/usr/lib/samba/swat/using_samba
-cd ..
-make LOCKDIR=/var/lock/samba SBINDIR=/usr/sbin \
-       CODEPAGEDIR=/usr/lib/samba/codepages -C source
-
-%install
-mkdir -p /usr/lib/samba
-make install LOCKDIR=/var/lock/samba SBINDIR=/usr/sbin \
-       CODEPAGEDIR=/usr/lib/samba/codepages -C source
-# cleanup docs
-rm -rf docs/*.[0-9]
-chmod 644 `find docs examples -type f`
-chmod 755 `find docs examples -type d`
-#utility scripts
-mkdir -p /usr/lib/samba/scripts
-cp -a source/script/* /usr/lib/samba/scripts
-# configuration files
-install -m 644 smb.conf /etc/smb.conf
-install -m 644 lmhosts /etc/lmhosts
-install -m 600 smbpasswd -o root -g root /etc/smbpasswd
-install -d 755 /etc/pam.d
-install -m 644 $RPM_SOURCE_DIR/samba.pamd /etc/pam.d/samba
-install -m 755 mount.smbfs /sbin/mount.smbfs
-# start script
-install rc /sbin/init.d/smb
-ln -sf ../smb /sbin/init.d/rc2.d/S20smb
-ln -sf ../smb /sbin/init.d/rc2.d/K20smb
-ln -sf ../smb /sbin/init.d/rc3.d/S20smb
-ln -sf ../smb /sbin/init.d/rc3.d/K20smb
-ln -sf ../../sbin/init.d/smb /usr/sbin/rcsmb
-install smbfs /sbin/init.d/smbfs
-ln -sf ../smbfs /sbin/init.d/rc2.d/S21smbfs
-ln -sf ../smbfs /sbin/init.d/rc2.d/K19smbfs
-ln -sf ../smbfs /sbin/init.d/rc3.d/S21smbfs
-ln -sf ../smbfs /sbin/init.d/rc3.d/K19smbfs
-ln -sf ../../sbin/init.d/smbfs /usr/sbin/rcsmbfs
-# rc.config fragment
-mkdir -p /var/adm/fillup-templates
-cp rc.config.samba /var/adm/fillup-templates
-%{?suse_check}
-
-%post
-echo "Updating etc/rc.config..."
-if [ -x bin/fillup ] ; then
-  bin/fillup -q -d = etc/rc.config var/adm/fillup-templates/rc.config.samba
-else
-  echo "ERROR: fillup not found. This should not happen. Please compare"
-  echo "etc/rc.config and var/adm/fillup-templates/rc.config.samba and"
-  echo "update by hand."
-fi
-if grep -q '^[#[:space:]]*swat' etc/inetd.conf ; then
-   echo /etc/inetd.conf is up to date
-else
-   echo updating inetd.conf
-   cat >> etc/inetd.conf << EOF
-# swat is the Samba Web Administration Tool
-swat    stream  tcp     nowait.400  root    /usr/sbin/swat swat
-EOF
-fi
-if grep -q '^swat' etc/services ; then
-   echo /etc/services is up to date
-else
-   echo updating services
-   cat >> etc/services << EOF
-swat            901/tcp                # swat is the Samba Web Administration Tool
-EOF
-fi
-mkdir -p var/adm/notify/messages
-cat << EOF > var/adm/notify/messages/samba-notify
-Achtung!
-========
-Die Syntax des smbmount Kommandos hat sich geaendert!
-smbmount kann nicht mehr direkt aufgerufen werden. Es wird von einem
-Shellscript /sbin/mount.smbfs aufgerufen, welches wiederum von mount
-aufgerufen wird.
-Hier ein Beispielaufruf:
-mount -t smbfs -o username=uname,password=passwd //smbserv/share /destination
-*****************************************************************************
-Attention!
-==========
-The syntax of smbmount has changed!
-smbmount can not be called direct anymore. It will be called by a shell
-script /sbin/mount.smbfs, which will be called by mount.
-A sample call to smbfs:
-mount -t smbfs -o username=uname,password=passwd //smbserv/share /destination
-EOF
-
-%files
-%config(noreplace) /etc/smb.conf
-%config(noreplace) /etc/lmhosts
-%config(noreplace) /etc/smbpasswd
-%config /etc/pam.d/samba
-/usr/lib/samba
-/sbin/init.d/rc2.d/K20smb
-/sbin/init.d/rc2.d/S20smb
-/sbin/init.d/rc3.d/K20smb
-/sbin/init.d/rc3.d/S20smb
-%config /sbin/init.d/smb
-/usr/bin/addtosmbpass
-/usr/bin/convert_smbpasswd
-/usr/bin/make_printerdef
-/usr/bin/make_smbcodepage
-/usr/bin/make_unicodemap
-/usr/bin/smbpasswd
-/usr/bin/smbstatus
-/usr/bin/testparm
-/usr/bin/testprns
-%doc docs/* examples
-%doc %{_mandir}/man1/make_smbcodepage.1.gz
-%doc %{_mandir}/man1/make_unicodemap.1.gz
-%doc %{_mandir}/man1/smbrun.1.gz
-%doc %{_mandir}/man1/smbsh.1.gz
-%doc %{_mandir}/man1/smbstatus.1.gz
-%doc %{_mandir}/man1/testparm.1.gz
-%doc %{_mandir}/man1/testprns.1.gz
-%doc %{_mandir}/man5/lmhosts.5.gz
-%doc %{_mandir}/man5/smb.conf.5.gz
-%doc %{_mandir}/man5/smbpasswd.5.gz
-%doc %{_mandir}/man7/samba.7.gz
-%doc %{_mandir}/man8/nmbd.8.gz
-%doc %{_mandir}/man8/smbd.8.gz
-%doc %{_mandir}/man8/smbpasswd.8.gz
-%doc %{_mandir}/man8/swat.8.gz
-/usr/sbin/nmbd
-/usr/sbin/rcsmb
-/usr/sbin/smbd
-/usr/sbin/swat
-/var/adm/fillup-templates/rc.config.samba
-
-%files -n smbclnt
-/sbin/init.d/rc2.d/K19smbfs
-/sbin/init.d/rc2.d/S21smbfs
-/sbin/init.d/rc3.d/K19smbfs
-/sbin/init.d/rc3.d/S21smbfs
-%config /sbin/init.d/smbfs
-/usr/sbin/rcsmbfs
-/sbin/mount.smbfs
-/usr/bin/nmblookup
-/usr/bin/rpcclient
-/usr/bin/smbclient
-/usr/bin/smbmnt
-/usr/bin/smbmount
-/usr/bin/smbumount
-/usr/bin/smbspool
-/usr/bin/smbtar
-%doc %{_mandir}/man1/nmblookup.1.gz
-%doc %{_mandir}/man1/smbclient.1.gz
-%doc %{_mandir}/man1/smbtar.1.gz
-%doc %{_mandir}/man8/smbmnt.8.gz
-%doc %{_mandir}/man8/smbmount.8.gz
-%doc %{_mandir}/man8/smbspool.8.gz
-%doc %{_mandir}/man8/smbumount.8.gz
-
-%description
-Samba is a suite of programs which work together to allow clients to
-access Unix filespace and printers via the SMB protocol (Server Message
-Block). 
-In practice, this means that you can redirect disks and printers to
-Unix disks and printers from LAN Manager clients, Windows for
-Workgroups 3.11 clients, Windows'95 clients, Windows NT clients
-and OS/2 clients. There is
-also a Unix client program supplied as part of the suite which allows
-Unix users to use an ftp-like interface to access filespace and
-printers on any other SMB server.
-Samba includes the following programs (in summary):
-* smbd, the SMB server. This handles actual connections from clients.
-* nmbd, the Netbios name server, which helps clients locate servers.
-* smbclient, the Unix-hosted client program.
-* smbrun, a little 'glue' program to help the server run external
-programs. 
-* testprns, a program to test server access to printers.
-* testparm, a program to test the Samba configuration file for correctness.
-* smb.conf, the Samba configuration file.
-* smbprint, a sample script to allow a Unix host to use smbclient
-to print to an SMB server.
-The suite is supplied with full source and is GPLed.
-This package expects its config file under /etc/smb.conf .
-
-Authors:
---------
-    Andrew Tridgell <Andrew.Tridgell@anu.edu.au>
-    Karl Auer <Karl.Auer@anu.edu.au>
-    Jeremy Allison <jeremy@netcom.com>
-
-SuSE series: n
-
-
-%description -n smbclnt
-This package contains all programs, that are needed to act as a samba
-client. This includes also smbmount, of course.
-
-Authors:
---------
-    Andrew Tridgell <Andrew.Tridgell@anu.edu.au>
-    Karl Auer <Karl.Auer@anu.edu.au>
-    Jeremy Allison <jeremy@netcom.com>
-
-SuSE series: n
-
-
-%changelog -n samba
-* Mon Aug 28 2000 - choeger@suse.de
-- changed $* to "$@" in mount.smbfs to make it also
-  possible to mount shares with spaces
-* Mon Jul 31 2000 - choeger@suse.de
-- improvement for rcsmb
-- fix for spec-file to compile with NIS netgroups
-* Thu Jul 20 2000 - choeger@suse.de
-- added smbfs initscript that has been removed
-  by an error
-* Tue Jul 11 2000 - choeger@suse.de
-- split package into client and server parts
-  client package name: smbclnt
-* Wed Apr 26 2000 - choeger@suse.de
-- new version, 2.0.7
-* Thu Apr 06 2000 - ro@suse.de
-- removed pam,cracklib from neededforbuild: build handles this
-* Wed Apr 05 2000 - bk@suse.de
-- s390 team added config.{sub,guess} update macro for s390
-* Mon Mar 27 2000 - choeger@suse.de
-- fixed bug in specfile
-  the multilined configure call missed a "" :-(
-* Thu Mar 09 2000 - choeger@suse.de
-- fixed typo in specfile
-* Wed Mar 01 2000 - choeger@suse.de
-- added %{_mandir}
-* Tue Feb 08 2000 - choeger@suse.de
-- removed /sbin/init.d/smbfs because it is no longer needed
-* Mon Jan 03 2000 - choeger@suse.de
-- bugfix for ipc.c
-  to make roaming profiles work again.
-* Tue Nov 30 1999 - choeger@suse.de
-- changed kernel oplocks = off to
-  kernel oplocks = false
-* Tue Nov 16 1999 - choeger@suse.de
-- added kernel oplocks = off in smb.conf
-* Fri Nov 12 1999 - choeger@suse.de
-- new version, 2.0.6
-* Fri Nov 05 1999 - choeger@suse.de
-- Fix for the smbmount lost-connection problem
-  _seems_ to work...
-* Fri Oct 29 1999 - choeger@suse.de
-- removed comment sign in /etc/inetd.conf for swat
-* Mon Sep 13 1999 - bs@suse.de
-- ran old prepare_spec on spec file to switch to new prepare_spec.
-* Tue Aug 10 1999 - fehr@suse.de
-- set execute permissions for mksmbpasswd.sh and changesmbpasswd.sh
-* Thu Jul 29 1999 - fehr@suse.de
-- fixed typo in /sbin/init.d/smbfs
-* Thu Jul 22 1999 - fehr@suse.de
-- changed to new version 2.0.5a
-* Wed Jul 21 1999 - fehr@suse.de
-- changed to new version 2.0.5
-* Tue Jul 20 1999 - fehr@suse.de
-- install /sbin/init.d/smbfs
-- changed to new version 2.0.5pre4
-* Mon Jul 19 1999 - fehr@suse.de
-- add /sbin/init.d/smbfs
-- changed to new version 2.0.5pre3
-* Fri Jul 02 1999 - fehr@suse.de
-- removed "umount -a -t smbfs" from start sscript
-* Tue Jun 22 1999 - kukuk@suse.de
-- 2.0.4b changed default values, enable PAM again
-* Fri Jun 18 1999 - kukuk@suse.de
-- changed to new version 2.0.4b
-* Mon Jun 14 1999 - kukuk@suse.de
-- Enable PAM, add samba.pamd
-* Mon May 03 1999 - fehr@suse.de
-- add umount -a -t smbfs to shutdown sequence of samba
-* Thu Mar 11 1999 - ro@suse.de
-- smbmount: define NR_OPEN to 1024 if undefined (GLIBC-2.1)
-* Wed Mar 10 1999 - choeger@suse.de
-- some enhancements for smb.conf
-* Wed Mar 10 1999 - choeger@suse.de
-- new version 2.0.3 and smbmount now seems to work
-* Tue Mar 09 1999 - ro@suse.de
-- use samba-2.0.2 for STABLE
-- use smbfs-2.1 with kernel 2.2.2
-* Sun Feb 28 1999 - ro@suse.de
-- for glibc-2.1 strncat uses strcat for one subcase, so don't
-  redefine strcat to "ERROR" for glibc-2.1
-* Mon Feb 15 1999 - fehr@suse.de
-- fix for umount problem from Volker
-* Tue Feb 09 1999 - fehr@suse.de
-- changed to version 2.0.2 of samba
-* Fri Jan 15 1999 - bs@suse.de
-- replaced /sbin/init.d/smb with newer style version (again)
-* Fri Jan 15 1999 - fehr@suse.de
-- switched to new version 2.0.0
-* Wed Jan 13 1999 - bs@suse.de
-- fixed entry in inetd.conf
-* Wed Jan 13 1999 - bs@suse.de
-- replaced /sbin/init.d/smb with newer style version
-* Mon Jan 11 1999 - vl@suse.de
-- make 2.0.0beta5 package of samba
-* Mon Aug 24 1998 - vl@suse.de
-- changed to version 1.9.18p10
-* Mon Jun 29 1998 - vl@suse.de
-- changed to version 1.9.18p8
-* Mon Apr 20 1998 - vl@suse.de
-- changed to version 1.9.18p4
-* Thu Feb 19 1998 - vl@suse.de
-- changed to version 1.9.18p3
-* Tue Feb 03 1998 - vl@suse.de
-- changed to version 1.9.18p2
-- fixed some problems in spec-file, some files were missing :-(
-- fixed smbfs-2.0.2/Makefile.Linux
-* Tue Jan 13 1998 - vl@suse.de
-- changed to version 1.9.18p1
-* Fri Jan 09 1998 - vl@suse.de
-- changed to version 1.9.18
-* Tue Dec 02 1997 - bs@suse.de
-- disable samba by default in /etc/rc.config
-* Mon Oct 06 1997 - fehr@suse.de
-- package prepared for automatic building
-* Mon Sep 29 1997 - fehr@suse.de
-- updated to version 1.9.17p2 due to security hole.
-* Wed Jul 16 1997 - fehr@suse.de
-- add fillup-template for rc.config and install it in doinst.sh
-* Fri Jun 27 1997 - bs@suse.de
-- update to smbfs-2.0.2, due to security hole.
-* Tue Jun 17 1997 - fehr@suse.de
-- changed init-skript to recognize entry START_SMB of rc.config
-* Mon Jun 02 1997 - vl@suse.de
-- update to version 1.9.16p11
-- Starting Samba from /sbin/init.d, not from inetd.conf
-* Sun Feb 02 1997 - vl@suse.de
-- update to version 1.9.16p10
-- Adapted /etc/smb.conf.sample to 4.4.1 manual
-* Thu Jan 02 1997 - florian@suse.de
-- update to version 1.9.16p9
-- configuration file is now /etc/smb.conf
-- smbd and nmbd are now in /usr/sbin
-- added start-script /sbin/init.d/smb and entry in /etc/rc.config
-* Thu Jan 02 1997 - florian@suse.de
-- Update auf neue Version 1.9.16p6.
diff --git a/packaging/SuSE/README b/packaging/SuSE/README
new file mode 100644 (file)
index 0000000..5d0af99
--- /dev/null
@@ -0,0 +1,18 @@
+Date: March 29, 2003
+
+Note: The current packaging files are NOT officially supported files.
+---------------------------------------------------------------------
+
+While the SPEC file shows who the original author was, these files imply no warranty of
+fitness what so ever. These files are NOT official SuSE files and are NOT supported by
+them. If you have ANY problems with the use of these files then please email jht@samba.org
+and NOT SuSE support.
+
+
+These files may be used to build Samba-3.0 packages for SuSE Linux 8.1 and/or for
+UnitedLinux 1.0 systems.
+
+Note2: You most likely will need to update to heimdal-0.5.1 or later if you intend to
+use any Kerberos functionality.
+
+- John T.
diff --git a/packaging/SuSE/samba-3.0.0-msdfs.diff b/packaging/SuSE/samba-3.0.0-msdfs.diff
new file mode 100644 (file)
index 0000000..1e688e6
--- /dev/null
@@ -0,0 +1,97 @@
+--- source/param/loadparm.c    Wed Oct  9 21:17:05 2002
++++ source/param/loadparm.c    Mon Oct 14 16:33:08 2002
+@@ -386,6 +386,8 @@
+       BOOL bInheritPerms;
+       BOOL bInheritACLS;
+       BOOL bMSDfsRoot;
++      BOOL bMSDfsProxy;
++      char *bMSDfsLinkName;
+       BOOL bUseClientDriver;
+       BOOL bDefaultDevmode;
+       BOOL bNTAclSupport;
+@@ -508,6 +510,8 @@
+       False,                  /* bInheritPerms */
+       False,                  /* bInheritACLS */
+       False,                  /* bMSDfsRoot */
++      False,                  /* bMSDfsProxy */
++      NULL,                   /* bMSDfsLinkName */
+       False,                  /* bUseClientDriver */
+       False,                  /* bDefaultDevmode */
+       True,                   /* bNTAclSupport */
+@@ -1079,6 +1083,8 @@
+       
+       {"msdfs root", P_BOOL, P_LOCAL, &sDefault.bMSDfsRoot, NULL, NULL, FLAG_SHARE},
++      {"msdfs proxy", P_BOOL, P_LOCAL, &sDefault.bMSDfsProxy, NULL, NULL, FLAG_SHARE},
++      {"msdfs link name", P_STRING, P_LOCAL, &sDefault.bMSDfsLinkName, NULL, NULL, FLAG_SHARE},
+       {"host msdfs", P_BOOL, P_GLOBAL, &Globals.bHostMSDfs, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
+       {"Winbind options", P_SEP, P_SEPARATOR},
+@@ -1730,6 +1736,8 @@
+ FN_LOCAL_STRING(lp_veto_oplocks, szVetoOplockFiles)
+ FN_LOCAL_STRING(lp_driverlocation, szPrinterDriverLocation)
+ FN_LOCAL_BOOL(lp_msdfs_root, bMSDfsRoot)
++FN_LOCAL_BOOL(lp_msdfs_proxy, bMSDfsProxy)
++FN_LOCAL_STRING(lp_msdfs_link_name, bMSDfsLinkName)
+ FN_LOCAL_BOOL(lp_autoloaded, autoloaded)
+ FN_LOCAL_BOOL(lp_preexec_close, bPreexecClose)
+ FN_LOCAL_BOOL(lp_rootpreexec_close, bRootpreexecClose)
+--- source/msdfs/msdfs.c       Tue Jul  2 08:34:24 2002
++++ source/msdfs/msdfs.c       Mon Oct 14 16:49:57 2002
+@@ -600,12 +600,38 @@
+       int reply_size = 0;
+       char *pathnamep = pathname;
++      struct connection_struct conns;
++      struct connection_struct* conn = &conns;
++      int snum;
++      pstring conn_path;
++      struct dfs_path dpi;
++
++      struct junction_map junction2;
++      parse_dfs_path(pathname, &dpi);
++      pstrcpy(junction2.service_name, dpi.servicename);
++      snum = lp_servicenumber(junction2.service_name);
++      create_conn_struct(conn, snum, conn_path);
++      
++
+       ZERO_STRUCT(junction);
+       /* get the junction entry */
+       if (!pathnamep)
+               return -1;
++        if (lp_msdfs_proxy(SNUM(conn))) {
++              DEBUG(10,("running in proxy mode\n"));
++              pstrcpy(pathnamep, "\\");
++              pstrcat(pathnamep, dpi.hostname);
++              pstrcat(pathnamep, "\\");
++              pstrcat(pathnamep, dpi.servicename);
++              pstrcat(pathnamep, "\\");
++              pstrcat(pathnamep, (char *) lp_msdfs_link_name(SNUM(conn)));
++       } else {
++              DEBUG(10,("running in normal mode\n"));
++      }
++      
++      
+       /* Trim pathname sent by client so it begins with only one backslash.
+          Two backslashes confuse some dfs clients
+        */
+@@ -631,6 +657,17 @@
+               }
+       }
+       
++        if ( lp_msdfs_proxy(SNUM(conn)) ) {
++              DEBUG(10,("running in proxy mode\n"));
++              pstrcpy ( pathnamep, "\\" );
++              pstrcat ( pathnamep, dpi.hostname);
++              pstrcat ( pathnamep, "\\" );
++              pstrcat ( pathnamep, dpi.servicename);
++        } else {
++              DEBUG(10,("running in normal mode\n"));
++      }
++              
++      
+       /* create the referral depeding on version */
+       DEBUG(10,("max_referral_level :%d\n",max_referral_level));
+       if(max_referral_level<2 || max_referral_level>3)
diff --git a/packaging/SuSE/samba-3.0.0-net_ads.diff b/packaging/SuSE/samba-3.0.0-net_ads.diff
new file mode 100644 (file)
index 0000000..b1224c0
--- /dev/null
@@ -0,0 +1,140 @@
+diff -Nur source/utils/net.c source/utils/net.c
+--- source/utils/net.c Fri Sep 27 09:42:34 2002
++++ source/utils/net.c Tue Oct  1 12:22:00 2002
+@@ -68,6 +68,7 @@
+ int opt_port = 0;
+ int opt_maxusers = -1;
+ char *opt_comment = "";
++char *opt_container = "cn=Users";
+ int opt_flags = -1;
+ int opt_jobid = 0;
+ int opt_timeout = 0;
+@@ -459,6 +460,7 @@
+               {"myname",      'n', POPT_ARG_STRING, &opt_requester_name},
+               {"conf",        's', POPT_ARG_STRING, &servicesf},
+               {"server",      'S', POPT_ARG_STRING, &opt_host},
++              {"container",   'c', POPT_ARG_STRING, &opt_container},
+               {"comment",     'C', POPT_ARG_STRING, &opt_comment},
+               {"maxusers",    'M', POPT_ARG_INT,    &opt_maxusers},
+               {"flags",       'F', POPT_ARG_INT,    &opt_flags},
+diff -Nur source/utils/net.h source/utils/net.h
+--- source/utils/net.h Tue Jun 25 04:29:09 2002
++++ source/utils/net.h Tue Oct  1 12:19:51 2002
+@@ -38,10 +38,8 @@
+ extern int opt_maxusers;
+ extern char *opt_comment;
++extern char *opt_container;
+ extern int opt_flags;
+-
+-extern char *opt_comment;
+-
+ extern char *opt_target_workgroup;
+ extern int opt_long_list_entries;
+ extern int opt_reboot;
+diff -Nur source/utils/net_ads.c source/utils/net_ads.c
+--- source/utils/net_ads.c     Tue Sep 17 14:15:52 2002
++++ source/utils/net_ads.c     Tue Oct  1 12:33:44 2002
+@@ -255,7 +255,7 @@
+               goto done;
+       }
+-      status = ads_add_user_acct(ads, argv[0], opt_comment);
++      status = ads_add_user_acct(ads, argv[0], opt_container, opt_comment);
+       if (!ADS_ERR_OK(status)) {
+               d_printf("Could not add user %s: %s\n", argv[0],
+@@ -431,7 +431,7 @@
+               goto done;
+       }
+-      status = ads_add_group_acct(ads, argv[0], opt_comment);
++      status = ads_add_group_acct(ads, argv[0], opt_container, opt_comment);
+       if (ADS_ERR_OK(status)) {
+               d_printf("Group %s added\n", argv[0]);
+diff -Nur source/utils/net_help.c source/utils/net_help.c
+--- source/utils/net_help.c    Tue Sep 24 20:10:30 2002
++++ source/utils/net_help.c    Tue Oct  1 13:01:50 2002
+@@ -69,14 +69,14 @@
+                "\n\tDelete specified user\n");
+       d_printf("\nnet [<method>] user INFO <name> [misc. options] [targets]"\
+                "\n\tList the domain groups of the specified user\n");
+-      d_printf("\nnet [<method>] user ADD <name> [password] "\
++      d_printf("\nnet [<method>] user ADD <name> [password] [-c container] "\
+                "[-F user flags] [misc. options]"\
+                " [targets]\n\tAdd specified user\n");
+       net_common_methods_usage(argc, argv);
+       net_common_flags_usage(argc, argv);
+-      d_printf(
+-       "\t-C or --comment=<comment>\tdescriptive comment (for add only)\n");
++      d_printf("\t-C or --comment=<comment>\tdescriptive comment (for add only)\n");
++      d_printf("\t-c or --container=<container>\tLDAP container, defaults to cn=Users (for add in ADS only)\n");
+       return -1;
+ }
+@@ -85,12 +85,12 @@
+                "\n\tList user groups\n\n");
+       d_printf("net [<method>] group DELETE <name> [misc. options] [targets]"\
+                "\n\tDelete specified group\n");
+-      d_printf("\nnet [<method>] group ADD <name> [-C comment]"\
++      d_printf("\nnet [<method>] group ADD <name> [-C comment] [-c container]"\
+                " [misc. options] [targets]\n\tCreate specified group\n");
+       net_common_methods_usage(argc, argv);
+       net_common_flags_usage(argc, argv);
+-      d_printf(
+-       "\t-C or --comment=<comment>\tdescriptive comment (for add only)\n");
++      d_printf("\t-C or --comment=<comment>\tdescriptive comment (for add only)\n");
++      d_printf("\t-c or --container=<container>\tLDAP container, defaults to cn=Users (for add in ADS only)\n");
+       return -1;
+ }
+diff -Nur source/libads/ldap_user.c source/libads/ldap_user.c
+--- source/libads/ldap_user.c  Wed Aug  7 12:33:22 2002
++++ source/libads/ldap_user.c  Tue Oct  1 12:46:08 2002
+@@ -38,7 +38,7 @@
+ }
+ ADS_STATUS ads_add_user_acct(ADS_STRUCT *ads, const char *user, 
+-                           const char *fullname)
++                           const char *container, const char *fullname)
+ {
+       TALLOC_CTX *ctx;
+       ADS_MODLIST mods;
+@@ -57,7 +60,7 @@
+       if (!(upn = talloc_asprintf(ctx, "%s@%s", user, ads->config.realm)))
+               goto done;
+-      if (!(new_dn = talloc_asprintf(ctx, "cn=%s,cn=Users,%s", name, 
++      if (!(new_dn = talloc_asprintf(ctx, "cn=%s,%s,%s", name, container,
+                                      ads->config.bind_path)))
+               goto done;
+       if (!(controlstr = talloc_asprintf(ctx, "%u", UF_NORMAL_ACCOUNT)))
+@@ -80,7 +83,7 @@
+ }
+ ADS_STATUS ads_add_group_acct(ADS_STRUCT *ads, const char *group, 
+-                            const char *comment)
++                            const char *container, const char *comment)
+ {
+       TALLOC_CTX *ctx;
+       ADS_MODLIST mods;
+@@ -93,7 +96,7 @@
+       status = ADS_ERROR(LDAP_NO_MEMORY);
+-      if (!(new_dn = talloc_asprintf(ctx, "cn=%s,cn=Users,%s", group, 
++      if (!(new_dn = talloc_asprintf(ctx, "cn=%s,%s,%s", group, container,
+                                      ads->config.bind_path)))
+               goto done;
+       if (!(mods = ads_init_mods(ctx)))
+@@ -102,7 +105,7 @@
+       ads_mod_str(ctx, &mods, "cn", group);
+       ads_mod_strlist(ctx, &mods, "objectClass",objectClass);
+       ads_mod_str(ctx, &mods, "name", group);
+-      if (comment)
++      if (comment && *comment) 
+               ads_mod_str(ctx, &mods, "description", comment);
+       ads_mod_str(ctx, &mods, "sAMAccountName", group);
+       status = ads_gen_add(ads, new_dn, mods);
diff --git a/packaging/SuSE/samba-3.0.0-pdb.diff b/packaging/SuSE/samba-3.0.0-pdb.diff
new file mode 100644 (file)
index 0000000..4f767c4
--- /dev/null
@@ -0,0 +1,11 @@
+--- examples/pdb/Makefile      Thu Sep  5 02:11:41 2002
++++ examples/pdb/Makefile      Thu Sep  5 02:11:59 2002
+@@ -8,7 +8,7 @@
+ SAMBA_INCL = ../../source/include
+ UBIQX_SRC = ../../source/ubiqx
+ SMBWR_SRC = ../../source/smbwrapper
+-CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -Wall -g
++CFLAGS = -I/usr/include/heimdal -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -Wall -g
+ PDB_OBJS = pdb_test.so
+ # Default target
diff --git a/packaging/SuSE/samba-3.0.0-python.diff b/packaging/SuSE/samba-3.0.0-python.diff
new file mode 100644 (file)
index 0000000..8c5931e
--- /dev/null
@@ -0,0 +1,44 @@
+--- source/python/py_common.c  2002-12-22 03:07:40.000000000 +0100
++++ source/python/py_common.c  2002-11-29 11:50:22.000000000 +0100
+@@ -45,9 +45,6 @@
+ void py_samba_init(void)
+ {
+-      extern pstring global_myname;
+-      char *p;
+-
+       if (initialised)
+               return;
+@@ -59,11 +56,7 @@
+       /* Misc other stuff */
+       load_interfaces();
+-      
+-      fstrcpy(global_myname, myhostname());
+-      p = strchr(global_myname, '.');
+-      if (p)
+-              *p = 0;
++      init_names();
+       initialised = True;
+ }
+--- source/python/py_smb.c     2002-11-27 03:54:20.000000000 +0100
++++ source/python/py_smb.c     2002-11-29 11:50:22.000000000 +0100
+@@ -61,7 +61,6 @@
+       static char *kwlist[] = { "called", "calling", NULL };
+       char *calling_name = NULL, *called_name;
+       struct nmb_name calling, called;
+-      extern pstring global_myname;
+       BOOL result;
+       if (!PyArg_ParseTupleAndKeywords(args, kw, "s|s", kwlist, &called_name, 
+@@ -69,7 +68,7 @@
+               return NULL;
+       if (!calling_name)
+-              calling_name = global_myname;
++              calling_name = global_myname();
+       make_nmb_name(&calling, calling_name, 0x00);
+       make_nmb_name(&called, called_name, 0x20);
diff --git a/packaging/SuSE/samba-3.0.0-vscan.diff b/packaging/SuSE/samba-3.0.0-vscan.diff
new file mode 100644 (file)
index 0000000..cb860e3
--- /dev/null
@@ -0,0 +1,80 @@
+--- examples/VFS/samba-vscan-0.3.1/fprot/Makefile      2002-11-26 15:20:17.000000000 +0100
++++ examples/VFS/samba-vscan-0.3.1/fprot/Makefile      2002-12-19 13:26:19.000000000 +0100
+@@ -14,7 +14,7 @@
+ SMBWR_SRC = ../../../../source/smbwrapper
+ SMBVS_INCL = ../include
+ SMBVS_GLB = ../global
+-CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64  
++CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/include/heimdal 
+ VFS_OBJS = vscan-fprotd.so
+ SOURCES = $(SMBVS_GLB)/vscan-functions.c $(SMBVS_GLB)/vscan-message.c $(SMBVS_GLB)/vscan-quarantine.c vscan-fprotd.c vscan-fprotd_core.c vscan-fprotd.h vscan-fprotd_core.h
+ OBJS = vscan-functions.lo vscan-message.lo vscan-quarantine.lo vscan-fprotd.lo vscan-fprotd_core.lo
+--- examples/VFS/samba-vscan-0.3.1/include/vscan-global.h      2002-11-25 16:48:10.000000000 +0100
++++ examples/VFS/samba-vscan-0.3.1/include/vscan-global.h      2002-12-19 13:26:34.000000000 +0100
+@@ -93,7 +93,7 @@
+ */
+ #ifndef SAMBA_VERSION_MAJOR
+-# define SAMBA_VERSION_MAJOR 2 
++# define SAMBA_VERSION_MAJOR 3 
+ #endif
+ #ifndef SAMBA_VERSION_MINOR
+--- examples/VFS/samba-vscan-0.3.1/kaspersky/Makefile  2002-11-28 17:40:35.000000000 +0100
++++ examples/VFS/samba-vscan-0.3.1/kaspersky/Makefile  2002-12-19 13:27:23.000000000 +0100
+@@ -23,9 +23,9 @@
+ VFS_OBJS = vscan-kavp.so
+ ifdef USE_DEBUG
+-CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64  
++CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/include/heimdal
+ else
+-CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 
++CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/include/heimdal 
+ endif
+ ifndef USE_KAVPSHAREDLIB
+--- examples/VFS/samba-vscan-0.3.1/mks/Makefile        2002-11-26 16:29:55.000000000 +0100
++++ examples/VFS/samba-vscan-0.3.1/mks/Makefile        2002-12-19 13:27:53.000000000 +0100
+@@ -13,7 +13,7 @@
+ SMBWR_SRC = ../../../../source/smbwrapper
+ SMBVS_INCL = ../include
+ SMBVS_GLB = ../global
+-CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64  
++CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/include/heimdal 
+ VFS_OBJS = vscan-mksd.so
+ SOURCES = $(SMBVS_GLB)/vscan-functions.c $(SMBVS_GLB)/vscan-message.c $(SMBVS_GLB)/vscan-quarantine.c  vscan-mksd.c vscan-mksd_core.c vscan-mksd.h vscan-mksd_core.h mks.h mks_c.c
+ OBJS = vscan-functions.lo vscan-message.lo vscan-quarantine.lo vscan-mksd.lo vscan-mksd_core.lo mks_c.lo
+--- examples/VFS/samba-vscan-0.3.1/openantivirus/Makefile      2002-11-27 19:24:03.000000000 +0100
++++ examples/VFS/samba-vscan-0.3.1/openantivirus/Makefile      2002-12-19 13:28:10.000000000 +0100
+@@ -15,7 +15,7 @@
+ SMBWR_SRC = ../../../../source/smbwrapper
+ SMBVS_INCL = ../include
+ SMBVS_GLB = ../global
+-CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64  
++CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/include/heimdal 
+ VFS_OBJS = vscan-oav.so
+ SOURCES = $(SMBVS_GLB)/vscan-functions.c $(SMBVS_GLB)/vscan-message.c $(SMBVS_GLB)/vscan-quarantine.c  vscan-oav.c vscan-oav_core.c vscan-oav.h vscan-oav_core.h
+ OBJS = vscan-functions.lo vscan-message.lo vscan-quarantine.lo vscan-oav.lo vscan-oav_core.lo
+--- examples/VFS/samba-vscan-0.3.1/sophos/Makefile     2002-11-27 19:24:03.000000000 +0100
++++ examples/VFS/samba-vscan-0.3.1/sophos/Makefile     2002-12-19 13:29:20.000000000 +0100
+@@ -15,7 +15,7 @@
+ SMBWR_SRC = ../../../../source/smbwrapper
+ SMBVS_INCL = ../include
+ SMBVS_GLB = ../global
+-CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64  
++CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/include/heimdal 
+ VFS_OBJS = vscan-sophos.so
+ SOURCES = $(SMBVS_GLB)/vscan-functions.c $(SMBVS_GLB)/vscan-message.c $(SMBVS_GLB)/vscan-quarantine.c vscan-sophos.c vscan-sophos_core.c vscan-sophos.h vscan-sophos_core.h
+ OBJS = vscan-functions.lo vscan-message.lo vscan-quarantine.lo vscan-sophos.lo vscan-sophos_core.lo
+--- examples/VFS/samba-vscan-0.3.1/trend/Makefile      2002-11-27 19:24:03.000000000 +0100
++++ examples/VFS/samba-vscan-0.3.1/trend/Makefile      2002-12-19 13:29:31.000000000 +0100
+@@ -15,7 +15,7 @@
+ SMBWR_SRC = ../../../../source/smbwrapper
+ SMBVS_INCL = ../include
+ SMBVS_GLB = ../global
+-CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64  
++CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/include/heimdal 
+ VFS_OBJS = vscan-trend.so
+ SOURCES = $(SMBVS_GLB)/vscan-functions.c $(SMBVS_GLB)/vscan-message.c $(SMBVS_GLB)/vscan-quarantine.c vscan-trend.c vscan-trend_core.c vscan-trend.h vscan-trend_core.h
+ OBJS = vscan-functions.lo vscan-message.lo vscan-quarantine.lo vscan-trend.lo vscan-trend_core.lo
diff --git a/packaging/SuSE/samba-3.0.0.files.tar.bz2 b/packaging/SuSE/samba-3.0.0.files.tar.bz2
new file mode 100644 (file)
index 0000000..1e8fc9b
Binary files /dev/null and b/packaging/SuSE/samba-3.0.0.files.tar.bz2 differ
diff --git a/packaging/SuSE/samba-vscan-0.3.1.tar.bz2 b/packaging/SuSE/samba-vscan-0.3.1.tar.bz2
new file mode 100644 (file)
index 0000000..5639279
Binary files /dev/null and b/packaging/SuSE/samba-vscan-0.3.1.tar.bz2 differ
diff --git a/packaging/SuSE/samba3.spec b/packaging/SuSE/samba3.spec
new file mode 100644 (file)
index 0000000..dd2860b
--- /dev/null
@@ -0,0 +1,764 @@
+#
+# spec file for package samba (Version HEAD) CVS
+# 
+# Copyright (c) 2002 SuSE Linux AG, Nuernberg, Germany.
+# This file and all modifications and additions to the pristine
+# package are under the same license as the package itself.
+#
+# packaged by Guenther Deschner <gd@suse.de> - work is not finished yet !
+
+# neededforbuild  acl acl-devel attr attr-devel autoconf automake heimdal-devel heimdal-lib libxml2 libxml2-devel mysql-devel mysql-shared openldap2 openldap2-client openldap2-devel openssl openssl-devel popt popt-devel python python-devel readline readline-devel
+# usedforbuild    aaa_base aaa_version acl attr bash bind9-utils bison cpio cpp cyrus-sasl db devs diffutils e2fsprogs file filesystem fileutils fillup findutils flex gawk gdbm-devel glibc glibc-devel glibc-locale gpm grep groff gzip kbd less libgcc libstdc++ libxcrypt m4 make man mktemp modutils ncurses ncurses-devel net-tools netcfg pam pam-devel pam-modules patch permissions ps rcs readline sed sendmail sh-utils shadow strace syslogd sysvinit tar texinfo textutils timezone unzip util-linux vim zlib-devel acl-devel attr-devel autoconf automake binutils bzip2 cracklib gcc gdbm gettext heimdal-devel heimdal-lib libtool libxml2 libxml2-devel mysql-devel mysql-shared openldap2 openldap2-client openldap2-devel openssl openssl-devel perl popt popt-devel python python-devel readline-devel rpm zlib
+
+
+Vendor:                SuSE Linux AG, GS Berlin, Germany
+Distribution:  SuSE Linux 8.1 (i386)
+Name:          samba
+Packager:      gd@suse.de
+License:       GPL
+Group:         Productivity/Networking/Samba
+Url:           http://www.samba.org
+Provides:      samba smbfs
+Obsoletes:     samba-classic samba-ldap
+Autoreqprov:   on
+%define         smbwrap 0
+%define                mit_kerberos 0
+%define                heimdal_kerberos 1
+%define                devel 0
+%define         head 0
+%define                python 1
+%define                netatalk 0
+%define                newsam 0
+%define         samba_ver 3.0.0
+Requires:      samba-client = %{samba_ver}
+Version:        3.0.0
+Release:       %(date +%%j)
+Summary:       An SMB file server for Unix
+Source:                %{name}-%{version}.tar.bz2
+Source10:      %{name}-%{version}.files.tar.bz2
+Source50:      http://prdownloads.sourceforge.net/openantivirus/samba-vscan-%{vscan_ver}.tar.bz2
+Patch1:                %{name}-%{version}-pdb.diff
+Patch10:       %{name}-%{version}-net_ads.diff
+Patch22:       %{name}-%{version}-msdfs.diff
+Patch30:       %{name}-%{version}-python.diff
+BuildRoot:     %{_tmppath}/%{name}-%{version}-buildroot
+%define                DOCDIR %{_defaultdocdir}/%{name}
+%define                SWATDIR %{_datadir}/samba/swat
+%define                vscan_ver 0.3.1
+%define                vscan_modules fprot kaspersky mks openantivirus sophos trend
+Patch51:       %{name}-%{version}-vscan.diff
+
+%package client
+Summary:       Samba client utilities
+Autoreqprov:   on
+Requires:      cups-libs
+Obsoletes:     smbclnt samba-classic-client samba-ldap-client
+Group:         Productivity/Networking/Samba
+
+%package winbind
+Requires:      samba-client samba
+Summary:       Samba Winbind-package
+Autoreqprov:   on
+Group:         Productivity/Networking/Samba
+
+%package utils
+Summary:       Samba Testing Utilities
+Autoreqprov:   on
+Group:         Productivity/Networking/Samba
+
+%package doc
+Summary:       Samba Documentation
+Autoreqprov:   on
+Group:         Productivity/Networking/Samba
+
+%package pdb
+Summary:       Samba PDB-Modules
+Autoreqprov:   on
+Group:         Productivity/Networking/Samba
+
+%package vfs
+Summary:       Samba VFS-Modules
+Autoreqprov:   on
+Group:         Productivity/Networking/Samba
+
+%if %{newsam} > 0
+%package sam
+Summary:       Samba SAM-Modules
+Autoreqprov:   on
+Group:         Productivity/Networking/Samba
+%endif
+
+%package vscan
+Summary:       Samba VFS-Modules for Virusscanners
+Autoreqprov:   on
+Group:         Productivity/Networking/Samba
+Version:       0.3.1
+
+%package python
+Summary:       Samba Python-Modules
+Autoreqprov:   on
+Group:         Productivity/Networking/Samba
+
+
+
+
+%changelog
+* Sat Nov 3 2001 - gd@suse.de
+- start
+
+
+%prep
+[ $RPM_BUILD_ROOT = "/" ] && (echo "your buildroot is /" && exit 0) || rm -rf $RPM_BUILD_ROOT
+mkdir $RPM_BUILD_ROOT
+
+%setup -n %{name}-%{samba_ver}
+%setup -T -D -a 50
+cp -ar samba-vscan-%{vscan_ver} examples/VFS/
+
+# untar my configs
+%setup -T -D -a 10
+
+%if %{heimdal_kerberos} > 0
+%patch1
+%patch51
+%endif
+#%patch10
+#%patch22
+#%patch30
+
+find . -name CVS -print | xargs rm -rf
+find . -name ".cvsignore" -print | xargs rm -rf
+find . -name "'*.gd'" -print | xargs rm -rvf
+find . -name "'*.orig'" -print | xargs rm -rvf
+
+%build %{name}-%{samba_ver}
+%{?suse_update_config:%{suse_update_config -f}}
+cd source
+./autogen.sh
+libtoolize --force --copy
+autoconf
+export CFLAGS="$RPM_OPT_FLAGS -Wall -O -D_GNU_SOURCE -D_LARGEFILE64_SOURCE"
+%ifarch ppc64
+export CFLAGS="$CFLAGS -mminimal-toc"
+%endif
+CONF_OPTS_BASIC="\
+       --prefix=/usr \
+       --libdir=/etc/samba \
+       --localstatedir=/var/lib/samba \
+       --mandir=%{_mandir} \
+       --sbindir=/usr/sbin \
+       --with-privatedir=/etc/samba \
+       --with-piddir=/var/run/samba \
+       --with-codepagedir=/usr/share/samba/codepages \
+       --with-swatdir=/usr/share/samba/swat \
+       --with-smbmount \
+       --with-automount \
+       --enable-cups \
+       --with-msdfs \
+       --with-vfs \
+       --with-pam \
+       --with-pam_smbpass \
+       --with-utmp \
+       --with-winbind \
+       --with-tdbsam \
+       --with-ldapsam \
+%if %{smbwrap}
+       --with-smbwrapper \
+%endif
+       --with-quotas \
+       --with-acl-support \
+       --with-python=python2.2 \
+       --with-syslog \
+"
+CONF_OPTS_HEAD="\
+       --with-sam \
+"
+CONF_OPTS_HEIMDAL_KERBEROS="\
+       --with-krb5impl=heimdal \
+"
+CONF_OPTS_HEIMDAL_51_KERBEROS="\
+       --with-krb5impl=heimdal \
+       --with-krb5includes=/opt/heimdal-0.5.1/include \
+       --with-krb5libs=/opt/heimdal-0.5.1/lib \
+"
+CONF_OPTS_MIT_KERBEROS="\
+       --with-krb5impl=mit \
+       --with-krb5includes=/usr/kerberos/include \
+       --with-krb5libs=/usr/kerberos/lib \
+"
+CONF_OPTS_DEVEL="\
+       --enable-developer \
+       --enable-krb5developer \
+       --with-profiling-data \
+"
+CONF_OPTS="$CONF_OPTS_BASIC"
+%if %{head} > 0
+CONF_OPTS="$CONF_OPTS $CONF_OPTS_HEAD"
+%endif 
+%if %{heimdal_kerberos} > 0
+CONF_OPTS="$CONF_OPTS $CONF_OPTS_HEIMDAL_KERBEROS"
+%endif 
+%if %{mit_kerberos} > 0
+CONF_OPTS="$CONF_OPTS $CONF_OPTS_MIT_KERBEROS"
+%endif 
+%if %{devel} > 0
+CONF_OPTS="$CONF_OPTS $CONF_OPTS_DEVEL"
+%endif 
+
+./configure $CONF_OPTS
+
+###    --with-ldapsam is now standard!
+###    --with-sendfile-support ---default now
+#      --with-nisplussam \
+#      --with-nisplus_home \
+
+# with the new passdb-code we can finaly compile several passdb-backends
+# and make our choice at runtime. 
+# HEAD and thus alpha21 no longer need this
+#make proto
+
+make \
+       LOCKDIR=/var/lib/samba \
+       LOGFILEBASE=/var/log/samba \
+       SBINDIR=/usr/sbin \
+       all \
+       torture \
+       nsswitch/libnss_wins.so \
+       debug2html \
+       libsmbclient \
+       bin/profiles \
+       everything
+
+# everything = nsswitch smbwrapper smbtorture debug2html smbfilter nsswitch/libnss_wins.so
+
+%if %{newsam} > 0
+make bin/samtest 
+%endif
+make modules 
+
+make -C tdb tdbdump tdbtest tdbtool tdbtorture 
+# tdbbackup is now in main Makefile
+
+make talloctort 
+
+# VFS,PDB and SAM
+EXAMPLEDIRS="pdb"
+for i in $EXAMPLEDIRS; do make -C ../examples/$i; done
+
+export USE_KAVPSHAREDLIB=0
+for module in %{vscan_modules}; do 
+       make -C ../examples/VFS/%{name}-vscan-%{vscan_ver}/${module}; 
+done
+
+# tim potters python
+%if %{python} > 0
+make python_ext
+%endif
+
+
+
+%install
+
+mkdir -p \
+       $RPM_BUILD_ROOT/usr/{bin,sbin} \
+       $RPM_BUILD_ROOT/usr/share/{man,samba/{scripts,swat}} \
+       $RPM_BUILD_ROOT/usr/lib/samba/{vfs,pdb,sam,vscan} \
+       $RPM_BUILD_ROOT/usr/lib/python2.2/lib-dynload \
+       $RPM_BUILD_ROOT/usr/include \
+       $RPM_BUILD_ROOT/etc/{pam.d,init.d,samba} \
+       $RPM_BUILD_ROOT/var/adm \
+       $RPM_BUILD_ROOT/sbin \
+       $RPM_BUILD_ROOT/lib/security \
+       $RPM_BUILD_ROOT/%{DOCDIR} \
+       $RPM_BUILD_ROOT/%{DOCDIR}-vscan \
+       $RPM_BUILD_ROOT/var/spool/samba \
+       $RPM_BUILD_ROOT/var/log/samba \
+       $RPM_BUILD_ROOT/var/run/samba \
+       $RPM_BUILD_ROOT/var/lib/samba/{netlogon,drivers/{W32X86,WIN40,W32ALPHA,W32MIPS,W32PPC},profiles}        
+
+cd source/
+make install \
+       LIBDIR=$RPM_BUILD_ROOT/etc/samba \
+       LOGFILEBASE=$RPM_BUILD_ROOT/var/log/samba \
+       CONFIGFILE=$RPM_BUILD_ROOT/etc/samba/smb.conf \
+       LMHOSTSFILE=$RPM_BUILD_ROOT/etc/samba/lmhosts \
+       SWATDIR=$RPM_BUILD_ROOT/usr/share/samba/swat \
+       SBINDIR=$RPM_BUILD_ROOT/usr/sbin \
+       LOCKDIR=$RPM_BUILD_ROOT/var/lock/samba \
+       CODEPAGEDIR=$RPM_BUILD_ROOT/usr/share/samba/codepages \
+       DRIVERFILE=$RPM_BUILD_ROOT/etc/samba/printers.def \
+       BINDIR=$RPM_BUILD_ROOT/usr/bin \
+       SMB_PASSWD_FILE=$RPM_BUILD_ROOT/etc/samba/smbpasswd \
+       TDB_PASSWD_FILE=$RPM_BUILD_ROOT/etc/samba/smbpasswd.tdb \
+       MANDIR=$RPM_BUILD_ROOT/usr/share/man
+cd ..
+
+# utility scripts
+%if %{head} > 0
+scripts="creategroup cvslog.pl scancvslog.pl"
+%else
+scripts="scancvslog.pl"
+%endif
+for i in $scripts; do
+       cp -a source/script/$i          $RPM_BUILD_ROOT/usr/share/samba/scripts/
+done
+
+# move the man-pages (ugly lang thing, fixed in alpha16)
+#mv $RPM_BUILD_ROOT/usr/share/man/lang/*       $RPM_BUILD_ROOT/usr/share/man/
+
+# configuration files
+install -m 644 smb.conf*       $RPM_BUILD_ROOT/etc/samba/
+install -m 644 shares.conf     $RPM_BUILD_ROOT/etc/samba/
+install -m 644 lmhosts         $RPM_BUILD_ROOT/etc/samba/
+install -m 600 smbpasswd -o root -g root  $RPM_BUILD_ROOT/etc/samba/
+
+# pam
+install -m 644 samba.pamd      $RPM_BUILD_ROOT/etc/pam.d/samba
+
+# sambamount
+ln -sf /usr/bin/smbmount       $RPM_BUILD_ROOT/sbin/mount.smbfs
+
+# start scripts
+install rc.smb                 $RPM_BUILD_ROOT/etc/init.d/smb
+ln -sf ../../etc/init.d/smb    $RPM_BUILD_ROOT/usr/sbin/rcsmb
+install rc.smbfs               $RPM_BUILD_ROOT/etc/init.d/smbfs
+ln -sf ../../etc/init.d/smbfs  $RPM_BUILD_ROOT/usr/sbin/rcsmbfs
+install rc.winbind             $RPM_BUILD_ROOT/etc/init.d/winbind
+ln -sf ../../etc/init.d/winbind        $RPM_BUILD_ROOT/usr/sbin/rcwinbind
+install rc.wrepl               $RPM_BUILD_ROOT/etc/init.d/wrepl
+ln -sf ../../etc/init.d/wrepl  $RPM_BUILD_ROOT/usr/sbin/rcwrepl
+
+#### disabled for 8.0
+### rc.config fragment
+mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates
+cp rc.config.samba                             $RPM_BUILD_ROOT/var/adm/fillup-templates
+cp rc.config.winbind                           $RPM_BUILD_ROOT/var/adm/fillup-templates
+cp rc.config.wrepl                             $RPM_BUILD_ROOT/var/adm/fillup-templates
+
+# libnss_wins.so
+cp source/nsswitch/libnss_wins.so              $RPM_BUILD_ROOT/lib/libnss_wins.so
+ln -sf /lib/libnss_wins.so                     $RPM_BUILD_ROOT/lib/libnss_wins.so.2
+
+# winbind stuff
+cp -a source/nsswitch/pam_winbind.so           $RPM_BUILD_ROOT/lib/security/
+cp -a source/nsswitch/libnss_winbind.so                $RPM_BUILD_ROOT/lib/
+cp -a source/bin/winbindd                      $RPM_BUILD_ROOT/usr/sbin/
+ln -sf /lib/libnss_winbind.so                  $RPM_BUILD_ROOT/lib/libnss_winbind.so.2
+
+# pam_smbpass
+cp -a source/bin/pam_smbpass.so                        $RPM_BUILD_ROOT/lib/security/
+
+# smbfilter
+cp -a source/bin/smbfilter                     $RPM_BUILD_ROOT/usr/bin/
+
+
+%{?suse_check}
+
+## install libsmbclient
+install -m0755 source/bin/{libsmbclient.so,libsmbclient.a}     $RPM_BUILD_ROOT/%{_libdir}
+ln -s /usr/lib/libsmbclient.so                 $RPM_BUILD_ROOT/%{_libdir}/libsmbclient.so.0
+install -m0644 source/include/libsmbclient.h   $RPM_BUILD_ROOT/%{_includedir}
+
+# install smbtorture and other test-programs
+install -m0755 source/bin/smbtorture           $RPM_BUILD_ROOT/usr/bin/
+install -m0755 source/bin/talloctort           $RPM_BUILD_ROOT/usr/bin/
+install -m0755 source/bin/{msgtest,masktest,locktest*} $RPM_BUILD_ROOT/usr/bin/
+install -m0755 source/bin/{vfstest,nsstest}    $RPM_BUILD_ROOT/usr/bin/
+%if %{head} > 0
+%if %{newsam} > 0
+install -m0755 source/bin/samtest              $RPM_BUILD_ROOT/usr/bin/ 
+%endif
+%endif
+
+# install tdb tools
+install -m0755 source/tdb/{tdbdump,tdbtest,tdbtool,tdbtorture} $RPM_BUILD_ROOT/usr/bin/
+
+
+# install VFS-modules
+%if %{head} > 0
+install -m0755 source/bin/developer.so         $RPM_BUILD_ROOT/%{_libdir}/samba/vfs/
+#install -m0755 examples/VFS/block/block.so    $RPM_BUILD_ROOT/%{_libdir}/samba/vfs/
+#install -m0755 examples/VFS/skel.so           $RPM_BUILD_ROOT/%{_libdir}/samba/vfs/
+%else
+#install -m0755 examples/VFS/block/block.so    $RPM_BUILD_ROOT/%{_libdir}/samba/vfs/
+#install -m0755 examples/VFS/skel.so           $RPM_BUILD_ROOT/%{_libdir}/samba/vfs/
+%endif
+install -m0755 source/bin/vfs_audit.so         $RPM_BUILD_ROOT/%{_libdir}/samba/vfs/
+install -m0755 source/bin/vfs_extd_audit.so    $RPM_BUILD_ROOT/%{_libdir}/samba/vfs/
+install -m0755 source/bin/vfs_recycle.so       $RPM_BUILD_ROOT/%{_libdir}/samba/vfs/
+%if %{netatalk}
+install -m0755 source/bin/vfs_netatalk.so      $RPM_BUILD_ROOT/%{_libdir}/samba/vfs/
+%endif
+
+# install PDB-modules
+%if %{head} > 0
+install -m0755 source/bin/xml.so               $RPM_BUILD_ROOT/%{_libdir}/samba/pdb/
+install -m0755 source/bin/mysql.so             $RPM_BUILD_ROOT/%{_libdir}/samba/pdb/
+%else
+install -m0755 source/bin/pdb_xml.so           $RPM_BUILD_ROOT/%{_libdir}/samba/pdb/
+install -m0755 source/bin/pdb_mysql.so         $RPM_BUILD_ROOT/%{_libdir}/samba/pdb/
+%endif
+install -m0755 examples/pdb/pdb_test.so                $RPM_BUILD_ROOT/%{_libdir}/samba/pdb/
+
+# install SAM-modules
+%if %{head} > 0
+%if %{newsam} > 0
+install -m0755 examples/sam/sam_skel.so                $RPM_BUILD_ROOT/%{_libdir}/samba/sam/
+%endif
+%endif
+
+# install VSCAN-vfs-modules
+install -m0755 examples/VFS/%{name}-vscan-%{vscan_ver}/*/*.so  $RPM_BUILD_ROOT/%{_libdir}/samba/vscan/
+
+# make examples clean
+VFS="$RPM_BUILD_DIR/%{name}-%{samba_ver}/examples/VFS"
+VSCAN="$VFS/%{name}-vscan-%{vscan_ver}"
+PDB="$RPM_BUILD_DIR/%{name}-%{samba_ver}/examples/pdb"
+%if %{head} > 0
+%if %{newsam} > 0
+SAM="$RPM_BUILD_DIR/%{name}-%{samba_ver}/examples/sam"
+%endif
+%endif
+dirs="$PDB $SAM"
+(for i in $dirs; do make -C $i clean; done)
+(for i in %{vscan_modules}; do make -C $VSCAN/$i clean; done)
+
+%if %{python} > 0
+# install python
+cp -a source/build/lib.*/samba                         $RPM_BUILD_ROOT/usr/lib/python2.2/lib-dynload/
+%endif
+
+# whats this ?
+install -m0755 source/bin/debug2html           $RPM_BUILD_ROOT/usr/bin/
+
+%if %{smbwrap}
+# install smbwrapper
+install -m0755 source/bin/smbwrapper.so                $RPM_BUILD_ROOT/%{_libdir}/samba/
+install -m0755 source/bin/smbsh                        $RPM_BUILD_ROOT/usr/bin/
+%endif
+
+# finally obsolete with alpha17 makefile
+# install unicode-codepages
+#install -m0755 source/codepages/{lowcase,upcase,valid}.dat    $RPM_BUILD_ROOT/etc/samba/
+
+# cleanup docs
+rm -rf docs/*.[0-9]
+chmod 644 `find docs examples -type f`
+chmod 755 `find docs examples -type d`
+mv COPYING Manifest README Read-Manifest-Now Roadmap WHATSNEW.txt $RPM_BUILD_ROOT/%{DOCDIR}/
+cp source/msdfs/README                 $RPM_BUILD_ROOT/%{DOCDIR}/README.msdfs
+#cp source/nsswitch/README     $RPM_BUILD_ROOT/%{DOCDIR}/README.nsswitch
+cp source/smbwrapper/README    $RPM_BUILD_ROOT/%{DOCDIR}/README.smbwrapper
+cp -a docs/*                   $RPM_BUILD_ROOT/%{DOCDIR}
+cp -a examples/                        $RPM_BUILD_ROOT/%{DOCDIR}
+# save space...
+rm -r \
+       $RPM_BUILD_ROOT/%{SWATDIR}/using_samba 
+ln -s %{DOCDIR}/htmldocs/using_samba $RPM_BUILD_ROOT/%{SWATDIR}
+
+
+%post
+###### disabled for 8.1
+###echo "Updating etc/rc.config..."
+##if [ -x bin/fillup ] ; then
+##  bin/fillup -q -d = etc/rc.config var/adm/fillup-templates/rc.config.samba
+##  bin/fillup -q -d = etc/rc.config var/adm/fillup-templates/rc.config.winbind
+##else
+##  echo "ERROR: fillup not found. This should not happen. Please compare"
+##  echo "etc/rc.config and var/adm/fillup-templates/rc.config.samba and"
+##  echo "var/adm/fillup-templates/rc.config.winbind and update by hand."
+##fi
+mkdir -p $RPM_BUILD_ROOT/var/adm/notify/messages
+cat << EOF > var/adm/notify/messages/samba-notify
+Achtung!
+
+This is %{name}-%{samba_ver}. Please do not run on production systems.
+
+You have been warned.
+EOF
+
+# Initialize runlevel links
+#
+%{fillup_and_insserv smb}
+#sbin/insserv /etc/init.d/smb
+
+%post client
+#sbin/insserv /etc/init.d/smbfs
+%{fillup_and_insserv -fpy smbfs}
+%{fillup_only -ans samba client}
+
+%postun
+%{insserv_cleanup}
+#sbin/insserv /etc/init.d/
+
+%postun client
+%{insserv_cleanup}
+#sbin/insserv /etc/init.d/
+
+%post winbind
+%{fillup_and_insserv winbind}
+#sbin/insserv /etc/init.d/winbind
+
+%postun winbind
+%{insserv_cleanup}
+#sbin/insserv /etc/init.d/
+
+%clean
+#make -C source realclean
+
+%files
+%config(noreplace) /etc/samba/smbpasswd
+%config /etc/pam.d/samba
+%config /etc/init.d/smb
+%config /etc/init.d/wrepl
+#/usr/bin/make_printerdef
+/usr/bin/addtosmbpass
+/usr/bin/convert_smbpasswd
+/usr/bin/ntlm_auth
+/usr/bin/profiles
+/usr/bin/smbfilter
+/usr/bin/smbpasswd
+/usr/bin/smbstatus
+/usr/bin/testparm
+/usr/bin/testprns
+#%doc %{_mandir}/man1/smbrun.1.gz
+%doc %{_mandir}/man1/smbsh.1.gz
+%doc %{_mandir}/man1/smbstatus.1.gz
+%doc %{_mandir}/man1/testparm.1.gz
+%doc %{_mandir}/man1/testprns.1.gz
+%doc %{_mandir}/man5/smbpasswd.5.gz
+%doc %{_mandir}/man7/samba.7.gz
+%doc %{_mandir}/man8/nmbd.8.gz
+%doc %{_mandir}/man8/smbd.8.gz
+%doc %{_mandir}/man8/smbpasswd.8.gz
+%doc %{_mandir}/man8/swat.8.gz
+/usr/sbin/nmbd
+/usr/sbin/smbd
+/usr/sbin/swat
+/usr/sbin/wrepld
+/usr/sbin/rcsmb
+/usr/sbin/rcwrepl
+#/var/adm/fillup-templates/rc.config.samba
+/var/log/samba
+/var/spool/samba
+/var/run/samba
+/var/lib/samba
+/usr/share/samba
+/lib/security/pam_smbpass.so
+
+%files client
+%config(noreplace) /etc/samba/smb.conf
+%config(noreplace) /etc/samba/lmhosts
+/etc/samba/lowcase.dat
+/etc/samba/upcase.dat
+/etc/samba/valid.dat
+%config /etc/init.d/smbfs
+/usr/sbin/rcsmbfs
+/sbin/mount.smbfs
+/usr/bin/findsmb
+/usr/bin/net
+/usr/bin/nmblookup
+/usr/bin/pdbedit
+/usr/bin/rpcclient
+/usr/bin/smbcacls
+/usr/bin/smbcontrol
+/usr/bin/smbclient
+/usr/bin/smbmnt
+/usr/bin/smbmount
+%if %{smbwrap}
+/usr/bin/smbsh
+%endif
+/usr/bin/smbumount
+/usr/bin/smbspool
+/usr/bin/smbtar
+/usr/bin/smbtree
+%doc %{_mandir}/man1/nmblookup.1.gz
+%doc %{_mandir}/man1/rpcclient.1.gz
+%doc %{_mandir}/man1/smbclient.1.gz
+%doc %{_mandir}/man1/smbcacls.1.gz
+%doc %{_mandir}/man1/smbcontrol.1.gz
+%doc %{_mandir}/man1/smbtar.1.gz
+%doc %{_mandir}/man5/lmhosts.5.gz
+%doc %{_mandir}/man5/smb.conf.5.gz
+%doc %{_mandir}/man8/net.8.gz
+%doc %{_mandir}/man8/pdbedit.8.gz
+%doc %{_mandir}/man8/smbmnt.8.gz
+%doc %{_mandir}/man8/smbmount.8.gz
+%doc %{_mandir}/man8/smbspool.8.gz
+%doc %{_mandir}/man8/smbumount.8.gz
+/usr/include/libsmbclient.h
+%if %{smbwrap}
+/usr/lib/samba/smbwrapper.so
+%endif
+/usr/lib/libsmbclient.a
+/usr/lib/libsmbclient.so
+/usr/lib/libsmbclient.so.0
+
+%files winbind
+%config(noreplace) /etc/samba/smb.conf.winbind
+%config /etc/init.d/winbind
+%doc %{_mandir}/man1/wbinfo.1.gz
+%doc %{_mandir}/man8/winbindd.8.gz
+/usr/bin/wbinfo
+%if %{head} > 0
+/usr/bin/ntlm_auth
+%endif
+/usr/sbin/winbindd
+/usr/sbin/rcwinbind
+#/var/adm/fillup-templates/rc.config.winbind
+/lib/security/pam_winbind.so
+/lib/libnss_winbind.so
+/lib/libnss_winbind.so.2
+/lib/libnss_wins.so
+/lib/libnss_wins.so.2
+
+%files utils
+/usr/bin/smbtorture
+/usr/bin/msgtest
+/usr/bin/masktest
+/usr/bin/locktest
+/usr/bin/locktest2
+/usr/bin/debug2html
+/usr/bin/talloctort
+/usr/bin/tdbbackup
+/usr/bin/tdbdump  
+/usr/bin/tdbtest  
+/usr/bin/tdbtool  
+/usr/bin/tdbtorture
+/usr/bin/vfstest
+/usr/bin/nsstest
+%if %{head} > 0
+%if %{newsam} > 0
+/usr/bin/samtest
+%endif
+/usr/bin/profiles
+/usr/bin/editreg
+%endif
+%doc %{_mandir}/man1/vfstest.1.gz
+
+%files doc
+%docdir %{DOCDIR}
+%{DOCDIR}
+
+%files pdb
+/usr/lib/samba/pdb
+%doc examples/pdb/*
+
+%files vfs
+/usr/lib/samba/vfs
+%doc examples/VFS/README*
+%doc examples/VFS/Makefile*
+#doc examples/VFS/audit*
+#%doc examples/VFS/block*
+#doc examples/VFS/netatalk*
+#doc examples/VFS/recycle*
+%doc examples/VFS/skel*
+
+%if %{newsam} > 0
+%files sam
+/usr/lib/samba/sam
+%if %{head} > 0
+%doc examples/sam/*
+%endif
+%endif
+
+%files vscan
+/usr/lib/samba/vscan
+%doc %{name}-vscan-%{vscan_ver}/{AUTHORS,COPYING,ChangeLog,FAQ,NEWS,README,TODO}
+
+
+%files python
+%doc source/python/README 
+%if %{python} > 0
+/usr/lib/python2.2/lib-dynload/samba
+%doc source/python/examples 
+%doc source/python/gprinterdata
+%doc source/python/gtdbtool
+%doc source/python/gtkdictbrowser.py
+%if %{head} > 0
+%doc source/python/gtkdictbrowser.pyc
+%doc source/python/printerdata.pyc
+%endif
+%endif
+
+%description
+Samba is a suite of programs which work together to allow clients to
+access Unix filespace and printers via the SMB protocol (Server Message
+Block). 
+In practice, this means that you can redirect disks and printers to
+Unix disks and printers from LAN Manager clients, Windows for
+Workgroups 3.11 clients, Windows'95 clients, Windows NT clients
+and OS/2 clients. There is
+also a Unix client program supplied as part of the suite which allows
+Unix users to use an ftp-like interface to access filespace and
+printers on any other SMB server.
+Samba includes the following programs (in summary):
+* smbd, the SMB server. This handles actual connections from clients.
+* nmbd, the Netbios name server, which helps clients locate servers.
+* smbclient, the Unix-hosted client program.
+* smbrun, a little 'glue' program to help the server run external
+programs. 
+* testprns, a program to test server access to printers.
+* testparm, a program to test the Samba configuration file for correctness.
+* smb.conf, the Samba configuration file.
+* smbprint, a sample script to allow a Unix host to use smbclient
+to print to an SMB server.
+The suite is supplied with full source and is GPLed.
+This package expects its config file under /etc/smb.conf .
+
+Authors:
+--------
+    Andrew Tridgell <Andrew.Tridgell@anu.edu.au>
+    Karl Auer <Karl.Auer@anu.edu.au>
+    Jeremy Allison <jeremy@netcom.com>
+
+SuSE series: n
+
+
+%description client
+This package contains all programs, that are needed to act as a samba
+client. This includes also smbmount, of course.
+
+Authors:
+--------
+    Andrew Tridgell <Andrew.Tridgell@anu.edu.au>
+    Karl Auer <Karl.Auer@anu.edu.au>
+    Jeremy Allison <jeremy@netcom.com>
+
+SuSE series: n
+
+
+%description winbind
+This is the winbind-daemon and the wbinfo-tool.
+
+%description utils
+Some of the debug-tools for developpers.
+Contains:
+       - debug2html
+       - locktest
+       - locktest2
+       - masktest
+       - msgtest
+       - smbtorture
+       - talloctort
+       - several tdb-tools
+
+%description doc
+The Samba Documentation.
+
+%description vfs
+The Samba VFS-Modules.
+
+%description pdb
+The Samba PDB-Modules.
+
+%if %{newsam} > 0
+%description sam
+The Samba SAM-Modules.
+%endif
+
+%description vscan
+The Samba VFS-Modules for Virusscanners.
+
+%description python
+The Samba python-Modules.
index 848cf69a7559869080f9e58cdcb5d020cdc0ba9b..eb0a5c81aa1a180147e0fe012b0d146e731cb1f7 100644 (file)
@@ -4,8 +4,8 @@
 test_joindomain() {
        test_join_domain_password="$1"
 
-       echo "$prefix/bin/net rpc join -S localhost  -U $whoami%$test_join_domain_password -d$loglevel"
-       $prefix/bin/net rpc join -S localhost  -U $whoami%$test_join_domain_password -d$loglevel
+       echo "$prefix/bin/net rpc join -S localhost  -U $whoami%$test_join_domain_password"
+       $prefix/bin/net rpc join -S localhost  -U $whoami%$test_join_domain_password
        status=$?
        if [ $status = 0 ]; then
            echo "'net rpc join' correctly joined the domain"
index f5143cc4d883e446abef323c0038481565a33533..31e097bd357ac9428a0b42476c58b367f7422e61 100644 (file)
@@ -63,8 +63,16 @@ test_smb_conf_setup() {
     template_smb_conf_setup .preexec_close
     template_smb_conf_setup .preexec_cl_fl
 
+    template_smb_conf_setup .share
+    template_smb_conf_setup .user
+    template_smb_conf_setup .server
+    template_smb_conf_setup .domain
+
     template_setup preexec lib/preexec
 
+    touch $prefix/lib/smb.conf.
+    touch $prefix/lib/smb.conf.localhost
+
        echo "127.0.0.1    localhost">$prefix/lib/lmhosts
        echo "127.0.0.2    BUILDFARM">>$prefix/lib/lmhosts
     echo "127.0.0.3    SHARE">>$prefix/lib/lmhosts
@@ -81,13 +89,6 @@ test_smb_conf_setup() {
 
        echo "127.0.0.1" > $prefix/lib/hosts.equiv
 
-    cp basicsmb.smb.conf.share $prefix/lib/smb.conf.share
-    cp basicsmb.smb.conf.user $prefix/lib/smb.conf.user
-    cp basicsmb.smb.conf.server $prefix/lib/smb.conf.server
-    cp basicsmb.smb.conf.domain $prefix/lib/smb.conf.domain
-
-    touch $prefix/lib/smb.conf.
-    touch $prefix/lib/smb.conf.localhost
 }
 
 test_smbpasswd() {
index b847e13fbc8432da1f0428c057607aaf147f7137..5996f24ba8960e0f090b9b465f8903fbe5a62372 100644 (file)
@@ -6,11 +6,13 @@ basicsmb-hostsdeny basicsmb-remote-pass-change \
 basicsmb-preexec \
 torture-FDPASS torture-LOCK1 torture-LOCK2 \
 torture-LOCK3 torture-LOCK4 torture-LOCK5 \
+torture-LOCK6 torture-LOCK7 \
 torture-UNLINK torture-BROWSE torture-ATTR \
 torture-TRANS2 torture-TORTURE torture-OPLOCK1 \
-torture-OPLOCK3 torture-DIR torture-DENY1 \
-torture-DENY2 torture-TCON torture-RW1 \
-torture-RW2 torture-OPEN torture-RENAME \
-torture-DELETE"
+torture-OPLOCK3 torture-DIR torture-DIR1 torture-DENY1 \
+torture-DENY2 torture-TCON torture-TCON2 torture-TCONDEV \
+torture-RW1 torture-RW2 torture-OPEN torture-XCOPY \
+torture-RENAME torture-DELETE torture-PROPERTIES \
+torture-MANGLE torture-FDSESS"
 
 #basicsmb-serversec
index 234419b68855567857311d9afdf69b1c4dc68c40..ecc64051c070fe1669ca44ef6199f525f01712e5 100644 (file)
@@ -19,7 +19,7 @@
 
     passdb backend = smbpasswd
 
-    idmap uid = 10000-200000
+    winbind uid = 10000-200000
     map hidden = yes
     create mask = 0777
 
index e417d6a0170f39a8928b9edbd9c3623a03539b54..23809aaf893ac2a0bc1577d3a8d6c1b7af9b6cf4 100644 (file)
@@ -1,2 +1,3 @@
 #!/bin/sh
+
 echo "Test worked" > PREFIX/testdir/preexec_touch
diff --git a/testsuite/build_farm/torture-DIR1.test b/testsuite/build_farm/torture-DIR1.test
new file mode 100644 (file)
index 0000000..6cc075e
--- /dev/null
@@ -0,0 +1,2 @@
+. torture_setup.fns
+test_torture "DIR1"
index e8af277d43063b4aea1b3f79e11a01219019efe5..40ffdb666d794b7e5b169d557350c789e3b43ecd 100644 (file)
@@ -1,2 +1,2 @@
 . torture_setup.fns
-test_torture "FDPASS"
+test_torture "FDSESS"
diff --git a/testsuite/build_farm/torture-FDSESS.test b/testsuite/build_farm/torture-FDSESS.test
new file mode 100644 (file)
index 0000000..e8af277
--- /dev/null
@@ -0,0 +1,2 @@
+. torture_setup.fns
+test_torture "FDPASS"
diff --git a/testsuite/build_farm/torture-LOCK6.test b/testsuite/build_farm/torture-LOCK6.test
new file mode 100644 (file)
index 0000000..78e139e
--- /dev/null
@@ -0,0 +1,2 @@
+. torture_setup.fns
+test_torture "LOCK6"
diff --git a/testsuite/build_farm/torture-LOCK7.test b/testsuite/build_farm/torture-LOCK7.test
new file mode 100644 (file)
index 0000000..fc967fc
--- /dev/null
@@ -0,0 +1,2 @@
+. torture_setup.fns
+test_torture "LOCK7"
diff --git a/testsuite/build_farm/torture-MANGLE.test b/testsuite/build_farm/torture-MANGLE.test
new file mode 100644 (file)
index 0000000..5a3d478
--- /dev/null
@@ -0,0 +1,2 @@
+. torture_setup.fns
+test_torture "MANGLE"
diff --git a/testsuite/build_farm/torture-PROPERTIES.test b/testsuite/build_farm/torture-PROPERTIES.test
new file mode 100644 (file)
index 0000000..91fde27
--- /dev/null
@@ -0,0 +1,2 @@
+. torture_setup.fns
+test_torture "PROPERTIES"
diff --git a/testsuite/build_farm/torture-TCON1.test b/testsuite/build_farm/torture-TCON1.test
new file mode 100644 (file)
index 0000000..3c92676
--- /dev/null
@@ -0,0 +1,2 @@
+. torture_setup.fns
+test_torture "TCON1"
diff --git a/testsuite/build_farm/torture-TCON2.test b/testsuite/build_farm/torture-TCON2.test
new file mode 100644 (file)
index 0000000..1f30a97
--- /dev/null
@@ -0,0 +1,2 @@
+. torture_setup.fns
+test_torture "TCON2"
diff --git a/testsuite/build_farm/torture-TCONDEV.test b/testsuite/build_farm/torture-TCONDEV.test
new file mode 100644 (file)
index 0000000..18bd534
--- /dev/null
@@ -0,0 +1,2 @@
+. torture_setup.fns
+test_torture "TCONDEV"
diff --git a/testsuite/build_farm/torture-XCOPY.test b/testsuite/build_farm/torture-XCOPY.test
new file mode 100644 (file)
index 0000000..94cc797
--- /dev/null
@@ -0,0 +1,2 @@
+. torture_setup.fns
+test_torture "XCOPY"
index bf5146148ea4de9b80b8e6ca26732aafa2a41cb7..a42be94129b726facdda40b795f988b44060fa1b 100644 (file)
@@ -12,7 +12,7 @@ test_torture() {
        if [ $status = 0 ]; then
                echo "smbtorture test $torture_test worked"
        else
-               echo "smbtorture test $torture_test FAILED!"
+               echo "smbtorture test $torture_test FAILED (status $status)!"
                return 1
        fi
        return 0