OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Michael Schloh
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   28-Jun-2004 17:19:44
  Branch: HEAD                             Handle: -NONE-

  Modified files:
    openpkg-src/samba3      samba3.spec smb.conf

  Log:
    merge improvements from samba2 config file, and introduce Bill
    CAMPBELL's many corrections to samba3 spec file

  Summary:
    Revision    Changes     Path
    1.12        +22 -4      openpkg-src/samba3/samba3.spec
    1.2         +6  -5      openpkg-src/samba3/smb.conf
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/samba3/samba3.spec
  ============================================================================
  $ cvs diff -u -r1.11 -r1.12 samba3.spec
  --- openpkg-src/samba3/samba3.spec    9 May 2004 16:25:34 -0000       1.11
  +++ openpkg-src/samba3/samba3.spec    28 Jun 2004 15:19:44 -0000      1.12
  @@ -34,11 +34,13 @@
   Group:        Filesystem
   License:      GPL
   Version:      3.0.4
  -Release:      20040509
  +Release:      20040628
   
   #   package options
   %option       with_pam  no
   %option       with_swat no
  +%option       with_ldap no
  +%option       with_smbmount no
   
   #   list of sources
   Source0:      http://download.samba.org/samba/ftp/samba-%{version}.tar.gz
  @@ -57,6 +59,10 @@
   BuildPreReq:  PAM
   PreReq:       PAM
   %endif
  +%if "%{with_ldap}" == "yes"
  +BuildPreReq:  openldap
  +PreReq:       openldap
  +%endif
   AutoReq:      no
   AutoReqProv:  no
   Provides:     samba
  @@ -94,19 +100,31 @@
       export CPPFLAGS
       ./configure \
           --prefix=%{l_prefix} \
  +        --libexecdir=%{l_prefix}/libexec/samba \
           --localstatedir=%{l_prefix}/var/samba/run \
           --sysconfdir=%{l_prefix}/etc/samba \
  +        --with-libdir=%{l_prefix}/lib/samba \
  +        --with-privatedir=%{l_prefix}/etc/samba \
  +        --with-codepagedir=%{l_prefix}/share/samba \
  +        --with-configdir=%{l_prefix}/etc/samba \
  +        --with-lockdir=%{l_prefix}/var/samba/run/locks \
  +        --with-piddir=%{l_prefix}/var/samba/run \
           --with-privatedir=%{l_prefix}/var/samba/run \
  -        --with-sambaconfdir=%{l_prefix}/etc/samba \
  -        --with-lockdir=%{l_prefix}/var/samba/run \
  +        --with-privatedir=%{l_prefix}/var/samba/run/private \
           --with-swatdir=%{l_prefix}/share/samba \
  -        --with-codepagedir=%{l_prefix}/share/samba \
  +        --with-acl-support \
           --with-ssl \
           --with-sslinc=%{l_prefix}/include \
           --with-included-popt \
   %if "%{with_pam}" == "yes"
           --with-pam \
   %endif
  +%if "%{with_ldap}" == "yes"
  +        --with-ldap \
  +%endif
  +%if "%{with_smbmount}" == "yes"
  +        --with-smbmount \
  +%endif
           --with-vfs
       %{l_make} %{l_mflags}
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/samba3/smb.conf
  ============================================================================
  $ cvs diff -u -r1.1 -r1.2 smb.conf
  --- openpkg-src/samba3/smb.conf       29 Sep 2003 16:45:09 -0000      1.1
  +++ openpkg-src/samba3/smb.conf       28 Jun 2004 15:19:44 -0000      1.2
  @@ -15,7 +15,6 @@
       security             = user
       encrypt passwords    = yes
       domain admin group   = root
  -    domain logons        = yes
       share modes          = no
       printing             = bsd
       printcap name        = /etc/printcap
  @@ -35,9 +34,10 @@
       widelinks            = yes
       log level            = 1
       os level             = 64
  -    preferred master     = yes
  -    domain master        = yes
  -    local master         = yes
  +    preferred master     = no
  +    domain master        = no
  +    domain logons        = no
  +    local master         = no
       logon path           = \\%N\profiles\%u
       logon drive          = U:
       logon home           = \\%N\%u
  @@ -61,7 +61,8 @@
       comment              = Home Directories
       browseable           = yes
       read only            = no
  -    create mode          = 0664
  +    create mask          = 0644
  +    directory mask       = 0755
       map archive          = no
   
   #   magic share for all printers
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to