[SCM] Samba Shared Repository - branch v3-3-stable updated - release-3-3-0pre1-167-g679f260

Karolin Seeger kseeger at samba.org
Thu Sep 11 13:03:13 GMT 2008


The branch, v3-3-stable has been updated
       via  679f2606d64ec6693aadc7ff579d45d769f988f2 (commit)
       via  ec4833039932f19b483466deaab08ba6c1e8acee (commit)
       via  08721d60543cbab1403ca76bb0ee77ed9ef57dff (commit)
       via  fae04ac78606b073e639a21b713580d86178bc84 (commit)
       via  9daa803b93c5e829ac6ee7be37ca1b39c1d65609 (commit)
       via  3bd73cfedecb2c96585f2a94c62d498324dd9463 (commit)
       via  6125d20c0f7e5a7ecaa1f5b0bfedb43c16436f0f (commit)
       via  a70464dcba932a8a001833f92a119ed5a0153d2e (commit)
       via  9417b44f107da2b4c8a608f051cd6e6eee3a565b (commit)
       via  ec9de64aaba080d58a9771ca4f0eae014d2b244e (commit)
       via  d1aa173916b4a94dec8d4d5933307e1a3cfa18fb (commit)
       via  1df3d71c94ee949d0cbbad01c25f917db3b97e35 (commit)
       via  65a75998e355ec26b708b5cb7787f2c7f9f0892b (commit)
       via  d37c3bea6beeafad351bd3318e307fcf58b2bc66 (commit)
       via  5269c58ee639c655786a7fdb78c4ed7e66e01cdf (commit)
       via  e41d0d7f1d4d6ea31f5be710c0891f96bc4fd72a (commit)
       via  3c179505c7435f33705e7f09823ec25da6be5d43 (commit)
       via  9c2380bc1d5ba73d4d38ff4334ee5dfcd8d50dc6 (commit)
       via  d3d7fa2b864671ec8b3b0a9252e42b8f3a2a921a (commit)
       via  7af721ea1c1bfd1fce60768a50b08e0923972b01 (commit)
       via  305504f7ad7cc96f349d89788b382e40413aea8e (commit)
       via  2816202125ca2173bfa6fa640f2c83104a1047d5 (commit)
       via  40a1958b945819a9d53d5b3de2340b789957ff75 (commit)
      from  dc4b7a43192543d90ede3817fbfaccea61d8f5c8 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-stable


- Log -----------------------------------------------------------------
commit 679f2606d64ec6693aadc7ff579d45d769f988f2
Author: Karolin Seeger <kseeger at samba.org>
Date:   Thu Sep 11 14:52:46 2008 +0200

    WHATSNEW: Move some entries.
    
    Karolin
    (cherry picked from commit f0986aaf951bc3e202d4e196acb7fab2647f657a)

commit ec4833039932f19b483466deaab08ba6c1e8acee
Author: Karolin Seeger <kseeger at samba.org>
Date:   Mon Sep 8 15:44:07 2008 +0200

    WHATSNEW: Add changes since 3.3.0pre1.
    
    Karolin
    (cherry picked from commit 4df7f57b612a361b56a40b2591ac8b1d9c899d8c)

commit 08721d60543cbab1403ca76bb0ee77ed9ef57dff
Author: Michael Adam <obnox at samba.org>
Date:   Mon Sep 8 14:09:41 2008 +0200

    packaging(RHEL-CTDB): add fix for versions containing "-" signs.
    
    Michael
    (cherry picked from commit 423105e29aaef449dbc40d124900a3f654b7266b)
    (cherry picked from commit 5c6628c1929312c9af487a5a48c61cfb9572eefb)

commit fae04ac78606b073e639a21b713580d86178bc84
Author: Michael Adam <obnox at samba.org>
Date:   Mon Sep 8 13:11:17 2008 +0200

    packaging(RHEL-CTDB): extend and slightly reformat comment header block
    
    Michael
    (cherry picked from commit 1bfc8cc575cd84f24ceb6f6c5d13c9171c0895a5)
    (cherry picked from commit 2ea32abe33b25fd5b7539e3365a2b8fc18a7fdf3)

commit 9daa803b93c5e829ac6ee7be37ca1b39c1d65609
Author: Michael Adam <obnox at samba.org>
Date:   Mon Sep 8 13:08:18 2008 +0200

    packaging(RHEL-CTDB): unify and extend (C) header
    
    Michael
    (cherry picked from commit e051c1cbf7a993e3885c4a515e516da3574a1f57)
    (cherry picked from commit 5b0a07b2d2bd1605891e30a1b04f9dbc8346380f)

commit 3bd73cfedecb2c96585f2a94c62d498324dd9463
Author: Michael Adam <obnox at samba.org>
Date:   Thu Sep 4 14:36:29 2008 +0200

    packaging(RHEL-CTDB): autodetect the samba version number from version.h
    
    Generate version.h first.
    Create samba.spec from (new) samba.spec.tmpl, replacing PVERSION
    by the version string. (as is done with update-pkginfo called
    from the create-tarball release script)
    
    Michael
    (cherry picked from commit 88f20bb1f56f22d368bfb2122d0e9ac24c5e4dc3)

commit 6125d20c0f7e5a7ecaa1f5b0bfedb43c16436f0f
Author: Michael Adam <obnox at samba.org>
Date:   Thu Sep 4 14:10:45 2008 +0200

    packaging(RHEL-CTDB): introduce variable TOPDIR
    
    Michael
    (cherry picked from commit 74e335ebf210c4812b0f790d05b697a183803af7)
    (cherry picked from commit 8ef0294884ad7d5c1027fd3bc1d29ed4fa064094)

commit a70464dcba932a8a001833f92a119ed5a0153d2e
Author: Michael Adam <obnox at samba.org>
Date:   Thu Sep 4 14:09:36 2008 +0200

    packaging(RHEL-CTDB): rename SPECDIR to RPMSPECDIR
    
    Michael
    (cherry picked from commit ac2b09b2274a12c34c446c4536793a33515958cc)
    (cherry picked from commit ae88c6b45a3f0dad125b292622fb7e34c3645e22)

commit 9417b44f107da2b4c8a608f051cd6e6eee3a565b
Author: Michael Adam <obnox at samba.org>
Date:   Thu Sep 4 14:09:15 2008 +0200

    packaging(RHEL-CTDB): rename SRCDIR to RPMSRCDIR
    
    Michael
    (cherry picked from commit d8a8ea87439315ecf407a866a12e2993343af39c)
    (cherry picked from commit d1fa6c45cdce6d436f83dcf19b07d56cf779911e)

commit ec9de64aaba080d58a9771ca4f0eae014d2b244e
Author: Michael Adam <obnox at samba.org>
Date:   Thu Aug 28 17:36:48 2008 +0200

    packaging(RHEL-CTDB): add the cifs.upcall manpage to package.
    
    Michael
    (cherry picked from commit 7fbeb5c5709b0e4df89f6025c534829a51064cb1)

commit d1aa173916b4a94dec8d4d5933307e1a3cfa18fb
Author: Michael Adam <obnox at samba.org>
Date:   Thu Aug 28 17:14:45 2008 +0200

    packaging(RHEL-CTDB): Add the ldbtools' manpages to the package.
    
    Michael
    (cherry picked from commit e4f657b98e094eee257ffd7f2ef7b5060886e01f)

commit 1df3d71c94ee949d0cbbad01c25f917db3b97e35
Author: Michael Adam <obnox at samba.org>
Date:   Wed Aug 27 15:53:00 2008 +0200

    packaging(RHEL-CTDB): fix direction of symlink for libnss_winbind.so.2
    
    This is a workaround, until we have proper creation
    of libnss_winbind.so.2 and .so as a symlink from the Makefile.
    
    Michael
    (cherry picked from commit 00ca1cff67b616e5da9b93c391bcff596170cf2b)

commit 65a75998e355ec26b708b5cb7787f2c7f9f0892b
Author: Michael Adam <obnox at samba.org>
Date:   Wed Aug 27 15:52:03 2008 +0200

    packaging(RHEL-CTDB): move libnss_winbind.so bits closer together
    
    and comment on commented out libnss_wins.so installation
    
    Michael
    (cherry picked from commit b50cf3576e0a351c60e54e792e53823df4435073)

commit d37c3bea6beeafad351bd3318e307fcf58b2bc66
Author: Michael Adam <obnox at samba.org>
Date:   Wed Aug 27 12:58:06 2008 +0200

    packaging(RHEL-CTDB): remove duplicate installation of pam_smbpass.so
    
    Michael
    (cherry picked from commit 013b143d78d1a12255bf436c2440ebf70f82784d)

commit 5269c58ee639c655786a7fdb78c4ed7e66e01cdf
Author: Michael Adam <obnox at samba.org>
Date:   Fri Aug 29 15:16:42 2008 +0200

    packaging(RHEL-CTDB): remove library packaging hacks due to fixed Makfile.
    
    Use --libdir instead of --with-libdir .
    Use new --with-modulesdir to separate LIBDIR and MODULESDIR.
    
    This makes post "make install" hacks unnecessary.
    
    Michael
    (cherry picked from commit 1f9467e1637cb5930b2400f588656092b82c2cf3)

commit e41d0d7f1d4d6ea31f5be710c0891f96bc4fd72a
Author: Michael Adam <obnox at samba.org>
Date:   Wed Aug 27 12:10:07 2008 +0200

    packaging(RHEL-CTDB): remove unused variable from makerpms.sh
    
    Michael
    (cherry picked from commit def28910f4aeebeddcd3a583831d098ec1e40424)

commit 3c179505c7435f33705e7f09823ec25da6be5d43
Author: Michael Adam <obnox at samba.org>
Date:   Wed Aug 27 12:09:40 2008 +0200

    packaging(RHEL-CTDB): auto-detect samba version from spec in makerpms.sh
    
    Michael
    (cherry picked from commit e6d9c931e3ecfd01b6ad34155976f8fe24abb0d8)

commit 9c2380bc1d5ba73d4d38ff4334ee5dfcd8d50dc6
Author: Michael Adam <obnox at samba.org>
Date:   Wed Sep 10 23:22:49 2008 +0200

    packaging(RHEL): fix direction of link (.so) of nss libs.
    
    libnss_winbindd.so -> libnss_winbindd.so.2
    libnss_wins.so -> libnss_wins.so.2
    
    Michael
    (cherry picked from commit 295bfb6af8153e91ae881e2437cc707d5736bc97)
    (cherry picked from commit 823d7132e015fbf887ed61606148fee35f4a5f80)

commit d3d7fa2b864671ec8b3b0a9252e42b8f3a2a921a
Author: Michael Adam <obnox at samba.org>
Date:   Mon Sep 8 13:44:52 2008 +0200

    packaging(RHEL): add makerpms.git.sh to build rpms from inside a git checkout
    
    This expects a path to a release docs tarball (.tar.bz2) in the DOCS_TARBALL
    environment variable. The tarball should have a prefix of "docs/".
    
    Michael
    (cherry picked from commit d87c2192ab7b68b2f68442c50618d94146d77ad9)
    (cherry picked from commit f842585ec3d021eab5f44a7907534ac85acb479a)

commit 7af721ea1c1bfd1fce60768a50b08e0923972b01
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Sep 10 16:23:31 2008 -0700

    Fix bug #5052 - not work cancel inheritance on share. We were
    using the parent security descriptor type and flags instead
    of using the passed in SD.
    Jeremy.
    (cherry picked from commit 7ef92e36e4293e6ee30beaba2d63ccf2cbd443d0)

commit 305504f7ad7cc96f349d89788b382e40413aea8e
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Sep 10 14:53:39 2008 -0700

    When requesting UNIX info levels on findfirst/findnext, don't play games with write time,
    just return what the underlying filesystem says. Trying not to confuse UNIX apps any more than necessary.
    Jeremy.
    (cherry picked from commit 9a70a1305732fb22d85d57cb381fa35e3ba31c54)

commit 2816202125ca2173bfa6fa640f2c83104a1047d5
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Sep 10 10:17:21 2008 -0700

    Fix blocker bug 5745 kerberos authentication with (lib)smbclient is broken.
    Jeremy.
    (cherry picked from commit 55d43c04b47855e40b9ceeec2bc6f0deb3bf39d0)

commit 40a1958b945819a9d53d5b3de2340b789957ff75
Author: Kai Blin <kai at samba.org>
Date:   Wed Sep 10 12:05:18 2008 +0200

    net: share_type is defined in net_rap.c, net_rpc.c needs to use that.
    
    This fixes a crash in net rpc share that Günther Deschner found.
    (cherry picked from commit 89a2558d7ac2d3f596534e4add98eb0e9302d940)

-----------------------------------------------------------------------

Summary of changes:
 WHATSNEW.txt                                  |   73 +++-
 packaging/RHEL-CTDB/makerpms.sh               |   63 ++-
 packaging/RHEL-CTDB/samba.spec                |  572 -------------------------
 packaging/{RHEL => RHEL-CTDB}/samba.spec.tmpl |  139 ++++---
 packaging/RHEL/makerpms.git.sh                |  149 +++++++
 packaging/RHEL/samba.spec.tmpl                |    8 +-
 source/libsmb/clikrb5.c                       |   16 +-
 source/smbd/posix_acls.c                      |   13 +-
 source/smbd/trans2.c                          |    6 +-
 source/utils/net.h                            |    1 -
 source/utils/net_rpc.c                        |    4 +-
 11 files changed, 384 insertions(+), 660 deletions(-)
 delete mode 100644 packaging/RHEL-CTDB/samba.spec
 copy packaging/{RHEL => RHEL-CTDB}/samba.spec.tmpl (85%)
 create mode 100755 packaging/RHEL/makerpms.git.sh


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 798ae25..be36136 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -53,8 +53,7 @@ parameter, instead with "idmap backend" the default idmap backend is
 specified.
 
 Accordingly, the "idmap config <domain> : default = yes" setting is no
-longer being looked at. As another simplification, there can be only one
-allocating backend.
+longer being looked at.
 
 The alloc backend defaults to the default backend, which should be able to
 allocate IDs. In the default distribution the tdb and ldap backends can
@@ -87,12 +86,73 @@ smb.conf changes
     winbind reconnect delay		New		30
 
 
-Commit Highlights:
-------------------
+Changes since 3.3.0pre1:
+------------------------
+
 
 o   Michael Adam <obnox at samba.org>
+
     * BUG 5492: Fix RHEL SPEC file by removing libmsrpc stuff.
     * BUG 5507: Fix several issues in the RHEL SPEC file.
+
+o   Jeremy Allison <jra at samba.org>
+    * BUG 5729: Explicitly allow "-valid".
+    * Add st_birthtime and friends for accurate create times on *BSD
+      and MacOSX).
+    * Fix the wcache_invalidate_samlogon calls.
+    * Clarify usage of "force create mode".
+    * Get smbd to look (read-only) into the winbindd cache for uid/gid <--> sid
+      mappings.
+    * Write times code update.
+
+
+
+o   Steven Danneman <steven.danneman at isilon.com>
+    * Cleanup of DC enumeration in get_dcs().
+
+
+o   Günther Deschner <gd at samba.org>
+    * BUG 5710: Fix changing of machine account passwords.
+    * Fix invalid sid copy (hit when enumerating sibling domains) in Winbind.
+
+
+o   James Ding <ding_cc at hotmail.com>
+    * BUG 5736: Fix Winbind crash bug with trusted domains.
+
+
+o   Ephi Dror <Ephi.Dror at datadomain.com>
+    * Correct the netsamlogon_clear_cached_user function.
+
+
+o   Volker Lendecke <vl at sernet.de>
+    * Fix Coverity IDs 587 and 589.
+    * Increase the default positive idmap cache time to a week.
+    * BUG 5707: Do proper error handling if the socket is closed.
+    * Fix calculation of useable_space for trans2 and nttrans replies.
+    * Add mapping of generic bits when setting an NFSv4 ACL.
+
+
+o   Stefan Metzmacher <metze at samba.org>
+    * Some write time fixes.
+
+
+o   Andrew Tridgell <tridge at samba.org>
+    * Fix permissions of group_mapping.ldb (CVE-2008-3789).
+    * Avoid a race condition in glibc between AIO and setresuid().
+    * Add missing become root for AIO operations.
+    * Fix an errno handling bug that could lead to an infinite loop.
+    * Fix logic of tsmsm_sendfile().
+    * Fix handling of arbitrary new PAC types.
+
+
+o   Qiao Yang <geoyang at ironport.com>
+    * Fix a memleak.
+
+
+Commit Highlights:
+------------------
+
+o   Michael Adam <obnox at samba.org>
     * BUG 5609: Remove configure option "--with-libdir" and add
       "--with-modulesdir".
     * Extend "net rpc vampire keytab" to support differential replication
@@ -105,7 +165,6 @@ o   Jeremy Allison <jra at samba.org>
     * Add new "winbind reconnect delay" parameter.
     * Make the change to smbcontrol for "all" to mean broadcast,
       and "smbd" to mean the main smb daemon.
-    * Write times code update.
 
 
 o   Guenther Deschner <gd at samba.org>
@@ -119,10 +178,6 @@ o   Volker Lendecke <vl at samba.org>
     * Add mapping of generic bits when setting an NFSv4 ACL.
 
 
-o   Stefan Metzmacher <metze at samba.org>
-    * Some write time fixes.
-
-
 ######################################################################
 Reporting bugs & Development Discussion
 #######################################
diff --git a/packaging/RHEL-CTDB/makerpms.sh b/packaging/RHEL-CTDB/makerpms.sh
index 8a0345b..219982f 100755
--- a/packaging/RHEL-CTDB/makerpms.sh
+++ b/packaging/RHEL-CTDB/makerpms.sh
@@ -1,28 +1,33 @@
 #!/bin/sh
 # Copyright (C) John H Terpstra 1998-2002
-#               Gerald (Jerry) Carter 2003
+# Copyright (C) Gerald (Jerry) Carter 2003
+# Copyright (C) Michael Adam 2008
+
+# Script to build RPMs for RHEL from inside a git checkout.
 
 # The following allows environment variables to override the target directories
 #   the alternative is to have a file in your home directory calles .rpmmacros
 #   containing the following:
 #   %_topdir  /home/mylogin/redhat
 #
-# Note: Under this directory rpm expects to find the same directories that are under the
-#   /usr/src/redhat directory
-#
+# Note: Under this directory rpm expects to find the same directories
+# that are under the /usr/src/redhat directory.
 
-# set DOCS_TARBALL to the path to a docs release tarball in .tar.bz2 format
+# Set DOCS_TARBALL to the path to a docs release tarball in .tar.bz2 format.
 
 # extra options passed to rpmbuild
 EXTRA_OPTIONS="$1"
 
-SPECDIR=`rpm --eval %_specdir`
-SRCDIR=`rpm --eval %_sourcedir`
+RPMSPECDIR=`rpm --eval %_specdir`
+RPMSRCDIR=`rpm --eval %_sourcedir`
 
-# At this point the SPECDIR and SRCDIR variables must have a value!
+# At this point the RPMSPECDIR and RPMSRCDIR variables must have a value!
+
+DIRNAME=$(dirname $0)
+TOPDIR=${DIRNAME}/../..
+SRCDIR=${TOPDIR}/source
+VERSION_H=${SRCDIR}/include/version.h
 
-VERSION='3.3.0'
-REVISION='ctdb'
 SPECFILE="samba.spec"
 DOCS="docs.tar.bz2"
 RPMVER=`rpm --version | awk '{print $3}'`
@@ -41,11 +46,35 @@ case $RPMVER in
        ;;
 esac
 
-DIRNAME=$(dirname $0)
+##
+## determine the samba version and create the SPEC file
+##
+pushd ${SRCDIR}
+./script/mkversion.sh
+popd
+if [ ! -f ${VERSION_H} ] ; then
+	echo "Error creating version.h"
+	exit 1
+fi
+
+VERSION=`grep SAMBA_VERSION_OFFICIAL_STRING ${VERSION_H} | awk '{print $3}'`
+vendor_version=`grep SAMBA_VERSION_VENDOR_SUFFIX ${VERSION_H} | awk '{print $3}'`
+if test "x${vendor_version}"  != "x" ; then
+	VERSION="${VERSION}-${vendor_version}"
+fi
+VERSION=`echo ${VERSION} | sed 's/-/_/g'`
+VERSION=`echo ${VERSION} | sed 's/\"//g'`
+echo "VERSION: ${VERSION}"
+sed -e s/PVERSION/${VERSION}/g \
+	< ${DIRNAME}/${SPECFILE}.tmpl \
+	> ${DIRNAME}/${SPECFILE}
 
-pushd ${DIRNAME}/../..
+##
+## create the tarball
+##
+pushd ${TOPDIR}
 echo -n "Creating samba-${VERSION}.tar.bz2 ... "
-git archive --prefix=samba-${VERSION}/ HEAD | bzip2 > ${SRCDIR}/samba-${VERSION}.tar.bz2
+git archive --prefix=samba-${VERSION}/ HEAD | bzip2 > ${RPMSRCDIR}/samba-${VERSION}.tar.bz2
 RC=$?
 popd
 echo "Done."
@@ -59,15 +88,15 @@ fi
 ## copy additional source files
 ##
 if [ "x${DOCS_TARBALL}" != "x" ] && [ -f ${DOCS_TARBALL} ]; then
-    cp ${DOCS_TARBALL} ${SRCDIR}/${DOCS}
+    cp ${DOCS_TARBALL} ${RPMSRCDIR}/${DOCS}
 fi
 
 pushd ${DIRNAME}
 
 chmod 755 setup/filter-requires-samba.sh
-tar --exclude=.svn -jcvf - setup > ${SRCDIR}/setup.tar.bz2
+tar --exclude=.svn -jcvf - setup > ${RPMSRCDIR}/setup.tar.bz2
 
-cp -p ${SPECFILE} ${SPECDIR}
+cp -p ${SPECFILE} ${RPMSPECDIR}
 
 popd
 
@@ -75,7 +104,7 @@ popd
 ## Build
 ##
 echo "$(basename $0): Getting Ready to build release package"
-pushd ${SPECDIR}
+pushd ${RPMSPECDIR}
 ${RPM} -ba $EXTRA_OPTIONS $SPECFILE
 if [ "x$?" = "x0" ] && [ `arch` = "x86_64" ]; then
     echo "Building 32 bit winbind libs"
diff --git a/packaging/RHEL-CTDB/samba.spec b/packaging/RHEL-CTDB/samba.spec
deleted file mode 100644
index 16340c6..0000000
--- a/packaging/RHEL-CTDB/samba.spec
+++ /dev/null
@@ -1,572 +0,0 @@
-%define initdir %{_sysconfdir}/rc.d/init.d
-%define auth %(test -f /etc/pam.d/system-auth && echo /etc/pam.d/system-auth || echo)
-
-Summary: Samba SMB client and server
-Vendor: Samba Team
-Packager: Samba Team <samba at samba.org>
-Name:         samba
-Version:      3.3.0
-Release:      ctdb.1
-Epoch:        0
-License: GNU GPL version 3
-Group: System Environment/Daemons
-URL: http://www.samba.org/
-
-Source: samba-%{version}.tar.bz2
-
-# Don't depend on Net::LDAP
-Source997: docs.tar.bz2
-Source998: filter-requires-samba.sh
-Source999: setup.tar.bz2
-
-Prereq: /sbin/chkconfig /bin/mktemp /usr/bin/killall
-Prereq: fileutils sed /etc/init.d
-
-Requires: pam >= 0.64 %{auth} 
-Requires: samba-common = %{version}-%{release}
-Requires: logrotate >= 3.4 initscripts >= 5.54-1
-Provides: samba = %{version}
-
-Prefix: /usr
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: pam-devel, readline-devel, fileutils, libacl-devel, openldap-devel, krb5-devel, cups-devel, ctdb
-
-# Working around perl dependency problem from docs
-%define __perl_requires %{SOURCE998}
-
-# rpm screws up the arch lib dir when using --target on RHEL5
-%ifarch i386 i486 i586 i686 ppc s390
-%define _libarch lib
-%else
-%define _libarch %_lib
-%endif
-
-%define _libarchdir /usr/%{_libarch}
-
-
-%description
-Samba is the protocol by which a lot of PC-related machines share
-files, printers, and other information (such as lists of available
-files and printers). The Windows NT, OS/2, and Linux operating systems
-support this natively, and add-on packages can enable the same thing
-for DOS, Windows, VMS, UNIX of all kinds, MVS, and more. This package
-provides an SMB server that can be used to provide network services to
-SMB (sometimes called "Lan Manager") clients. Samba uses NetBIOS over
-TCP/IP (NetBT) protocols and does NOT need the NetBEUI (Microsoft Raw
-NetBIOS frame) protocol.
-
-
-######################################################################
-%package client
-Summary: Samba (SMB) client programs.
-Group: Applications/System
-Requires: samba-common = %{version}-%{release}
-Obsoletes: smbfs
-Provides: samba-client = %{version}-%{release}
-
-%description client
-The samba-client package provides some SMB clients to compliment the
-built-in SMB filesystem in Linux. These clients allow access of SMB
-shares and printing to SMB printers.
-
-
-#######################################################################
-%package common
-Summary: Files used by both Samba servers and clients.
-Group: Applications/System
-Provides: samba-common = %{version}-%{release}
-
-%description common
-Samba-common provides files necessary for both the server and client
-packages of Samba.
-
-
-#######################################################################
-%package swat
-Summary: The Samba SMB server configuration program.
-Group: Applications/System
-Requires: samba = %{version} xinetd
-Provides: samba-swat = %{version}-%{release}
-
-%description swat
-The samba-swat package includes the new SWAT (Samba Web Administration
-Tool), for remotely managing Samba's smb.conf file using your favorite
-Web browser.
-
-%ifarch i386 i486 i586 i686 ppc s390
-%package winbind-32bit
-Summary:        Samba winbind compatibility package for 32bit apps on 64bit archs
-Group:          Applications/System
-
-%description winbind-32bit
-Compatibility package for 32 bit apps on 64 bit architecures
-%endif
-
-
-#######################################################################
-%package doc
-Summary:      Samba Documentation
-Group:        Documentation/Other
-Provides:     samba-doc = %{version}-%{release}
-Prereq:       /usr/bin/find /bin/rm /usr/bin/xargs
-
-%description doc
-The samba-doc package includes the HTML versions of the Samba manpages
-utilized by SWAT as well as the HTML and PDF version of "Using Samba",
-"Samba By Example", and "The Official Samba HOWTO and Reference Guide".
-
-
-#######################################################################
-
-%prep
-%setup -q
-
-# setup the vendor files (init scripts, etc...)
-%setup -T -D -a 999 -n samba-%{version} -q
-%setup -T -D -a 997 -n samba-%{version} -q
-
-%build
-
-/bin/cp setup/filter-requires-samba.sh %{SOURCE998}
-
-cd source
-# RPM_OPT_FLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64"
-
-## check for ccache
-# ccache -h 2>&1 > /dev/null
-#if [ $? -eq 0 ]; then
-#	CC="ccache gcc"
-#else
-	CC="gcc"
-#fi 
-
-## always run autogen.sh
-./autogen.sh
-
-CFLAGS="$RPM_OPT_FLAGS $EXTRA -D_GNU_SOURCE" ./configure \
-	--prefix=%{_prefix} \
-	--localstatedir=/var \
-        --with-configdir=%{_sysconfdir}/samba \
-        --with-libdir=%{_libarchdir}/samba \
-        --with-lockdir=/var/lib/samba \
-        --with-logfilebase=/var/log/samba \
-        --with-mandir=%{_mandir} \
-        --with-piddir=/var/run \
-	--with-privatedir=%{_sysconfdir}/samba \
-        --with-sambabook=%{_datadir}/swat/using_samba \
-        --with-swatdir=%{_datadir}/swat \
-	--disable-cups \
-        --with-acl-support \
-	--with-ads \
-        --with-automount \
-        --with-fhs \
-	--with-pam_smbpass \
-	--with-libsmbclient \
-	--with-libsmbsharemodes \
-        --without-smbwrapper \
-	--with-pam \
-	--with-quotas \
-	--with-shared-modules=idmap_rid,idmap_ad,idmap_tdb2 \
-	--with-syslog \
-	--with-utmp \
-	--with-cluster-support \
-	--with-ctdb=/usr/include \
-	--without-ldb \
-	--without-dnsupdate \
-	--with-aio-support
-
-make showlayout
-
-## check for gcc 3.4 or later
-CC_VERSION=`${CC} --version | head -1 | awk '{print $3}'`
-CC_MAJOR=`echo ${CC_VERSION} | cut -d. -f 1`
-CC_MINOR=`echo ${CC_VERSION} | cut -d. -f 2`
-if [ ${CC_MAJOR} -ge 3 ]; then
-        if [ ${CC_MAJOR} -gt 3 -o ${CC_MINOR} -ge 4 ]; then
-                make pch
-        fi
-fi
-
-
-make CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" %{?_smp_mflags} \
-	all modules pam_smbpass
-
-## build the cifs fs mount helper
-cd client
-gcc  -o mount.cifs $RPM_OPT_FLAGS  -D_GNU_SOURCE -Wall -D_GNU_SOURCE -D_LARGEFILE64_SOURCE mount.cifs.c
-gcc  -o umount.cifs $RPM_OPT_FLAGS  -D_GNU_SOURCE -Wall -D_GNU_SOURCE -D_LARGEFILE64_SOURCE umount.cifs.c
-cd ..
-
-# Remove some permission bits to avoid to many dependencies
-cd ..
-find examples docs -type f | xargs -r chmod -x
-
-%install
-# Clean up in case there is trash left from a previous build
-rm -rf $RPM_BUILD_ROOT
-
-# Create the target build directory hierarchy
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/swat/{help,include,using_samba/{figs,gifsa}}
-mkdir -p $RPM_BUILD_ROOT%{_includedir}
-mkdir -p $RPM_BUILD_ROOT%{_initrddir}
-mkdir -p $RPM_BUILD_ROOT{%{_libarchdir},%{_includedir}}
-mkdir -p $RPM_BUILD_ROOT%{_libarchdir}/samba/{auth,charset,idmap,vfs,pdb}
-mkdir -p $RPM_BUILD_ROOT/%{_libarch}/security
-mkdir -p $RPM_BUILD_ROOT%{_mandir}
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/{bin,sbin}
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib
-mkdir -p $RPM_BUILD_ROOT/sbin
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/{logrotate.d,pam.d,samba}
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/{pam.d,logrotate.d}
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/{samba,sysconfig}
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d
-mkdir -p $RPM_BUILD_ROOT/var/lib/samba/winbindd_privileged
-mkdir -p $RPM_BUILD_ROOT/var/{log,run/winbindd,spool}/samba
-
-cd source
-make DESTDIR=$RPM_BUILD_ROOT \
-        install
-cd ..
-
-# pam_smbpass
-cp source/bin/pam_smbpass.so $RPM_BUILD_ROOT/%{_libarch}/security/pam_smbpass.so
-
-# NSS & PAM winbind support
-install -m 755 source/bin/pam_winbind.so $RPM_BUILD_ROOT/%{_libarch}/security/pam_winbind.so
-install -m 755 source/nsswitch/libnss_winbind.so $RPM_BUILD_ROOT/%{_libarch}/libnss_winbind.so
-#install -m 755 source/nsswitch/libnss_wins.so $RPM_BUILD_ROOT/%{_libarch}/libnss_wins.so
-( cd $RPM_BUILD_ROOT/%{_libarch};
-  ln -sf libnss_winbind.so  libnss_winbind.so.2 )
-# ( cd $RPM_BUILD_ROOT/%{_libarch}; ln -sf libnss_wins.so  libnss_wins.so.2 )
-
-# make install puts libsmbclient.so in the wrong place on x86_64
-rm -f $RPM_BUILD_ROOT/usr/lib*/samba/libsmbclient.so* $RPM_BUILD_ROOT/usr/lib*/samba/libsmbclient.a || true
-install -m 755 source/bin/libsmbclient.so.0 $RPM_BUILD_ROOT%{_libarchdir}/libsmbclient.so.0
-install -m 755 source/bin/libsmbclient.a $RPM_BUILD_ROOT%{_libarchdir}/libsmbclient.a
-install -m 644 source/include/libsmbclient.h $RPM_BUILD_ROOT%{_includedir}
-ln -s libsmbclient.so.0 $RPM_BUILD_ROOT%{_libarchdir}/libsmbclient.so
-
-# make install puts libmsrpc.so in the wrong place on x86_64
-#rm -f $RPM_BUILD_ROOT/usr/lib*/samba/libmsrpc.so $RPM_BUILD_ROOT/usr/lib*/samba/libmsrpc.a || true
-#install -m 755 source/bin/libmsrpc.so $RPM_BUILD_ROOT%{_libarchdir}/libmsrpc.so
-#install -m 755 source/bin/libmsrpc.a $RPM_BUILD_ROOT%{_libarchdir}/libmsrpc.a
-#install -m 644 source/include/libmsrpc.h $RPM_BUILD_ROOT%{_includedir}
-#rm -f $RPM_BUILD_ROOT%{_libarchdir}/samba/libmsrpc.*
-#ln -s /%{_libarchdir}/libmsrpc.so $RPM_BUILD_ROOT%{_libarchdir}/libmsrpc.so.0
-
-# make install puts libsmbsharemodes.so in the wrong place on x86_64
-rm -f $RPM_BUILD_ROOT/usr/lib*/samba/libsmbsharemodes.so* $RPM_BUILD_ROOT/usr/lib*/samba/libsmbsharemodes.a || true
-install -m 755 source/bin/libsmbsharemodes.so.0 $RPM_BUILD_ROOT%{_libarchdir}/libsmbsharemodes.so.0
-install -m 755 source/bin/libsmbsharemodes.a $RPM_BUILD_ROOT%{_libarchdir}/libsmbsharemodes.a
-install -m 644 source/include/smb_share_modes.h $RPM_BUILD_ROOT%{_includedir}
-rm -f $RPM_BUILD_ROOT%{_libarchdir}/samba/libsmbsharemodes.*
-ln -s libsmbsharemodes.so.0 $RPM_BUILD_ROOT%{_libarchdir}/libsmbsharemodes.so
-
-# Install pam_smbpass.so
-install -m755 source/bin/pam_smbpass.so $RPM_BUILD_ROOT/%{_libarch}/security/pam_smbpass.so
-
-# Put the shared libraries to their SONAME under /usr/lib{,64}
-# and create the proper .so symlinks


-- 
Samba Shared Repository


More information about the samba-cvs mailing list