OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 25-Feb-2006 19:08:37
Branch: OPENPKG_2_5_SOLID Handle: 2006022518083600
Modified files: (Branch: OPENPKG_2_5_SOLID)
openpkg-src/samba samba.patch samba.spec
Log:
MFC: path to smb.hosts file; fixed LDAP support; add Kerberos/ADS
support
Summary:
Revision Changes Path
1.9.2.1 +26 -0 openpkg-src/samba/samba.patch
1.92.2.3 +29 -6 openpkg-src/samba/samba.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/samba/samba.patch
============================================================================
$ cvs diff -u -r1.9 -r1.9.2.1 samba.patch
--- openpkg-src/samba/samba.patch 29 Sep 2005 21:47:45 -0000 1.9
+++ openpkg-src/samba/samba.patch 25 Feb 2006 18:08:36 -0000 1.9.2.1
@@ -26,3 +26,29 @@
#ifdef INITQFNAMES
#define USERQUOTAFILE_EXTENSION ".user"
#else
+Index: source/Makefile.in
+--- source/Makefile.in.orig 2006-02-20 21:33:23 +0100
++++ source/Makefile.in 2006-02-25 09:39:49 +0100
+@@ -77,7 +77,7 @@
+ # or in smb.conf (see smb.conf(5))
+ LOGFILEBASE = @logfilebase@
+ CONFIGFILE = $(CONFIGDIR)/smb.conf
+-LMHOSTSFILE = $(CONFIGDIR)/lmhosts
++LMHOSTSFILE = $(CONFIGDIR)/smb.hosts
+
+ # This is where smbpasswd et al go
+ PRIVATEDIR = @privatedir@
+Index: source/smbd/uid.c
+--- source/smbd/uid.c.orig 2006-01-25 00:46:32 +0100
++++ source/smbd/uid.c 2006-02-25 09:39:08 +0100
+@@ -200,6 +200,10 @@
+ BOOL must_free_token = False;
+ NT_USER_TOKEN *token = NULL;
+
++ if (vuser)
++ DEBUG(9,("change_to_user: SMB user \"%s\" (unix user \"%s\", vuid
%d)\n",
++ vuser->user.smb_name ? vuser->user.smb_name : "?",
vuser->user.unix_name ? vuser->user.unix_name : "?", vuid));
++
+ if (!conn) {
+ DEBUG(2,("change_to_user: Connection not open\n"));
+ return(False);
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/samba/samba.spec
============================================================================
$ cvs diff -u -r1.92.2.2 -r1.92.2.3 samba.spec
--- openpkg-src/samba/samba.spec 13 Oct 2005 18:25:02 -0000 1.92.2.2
+++ openpkg-src/samba/samba.spec 25 Feb 2006 18:08:36 -0000 1.92.2.3
@@ -33,13 +33,20 @@
Group: Filesystem
License: GPL
Version: 3.0.20b
-Release: 2.5.0
+Release: 2.5.1
# package options
-%option with_pam no
-%option with_swat no
-%option with_acl no
-%option with_ldap no
+%option with_pam no
+%option with_swat no
+%option with_acl no
+%option with_ldap no
+%option with_ads no
+
+# option sanity
+%if "%{with_ads}" == "yes"
+%undefine with_ldap
+%define with_ldap yes
+%endif
# list of sources
Source0: ftp://ftp.samba.org/pub/samba/samba-%{version}.tar.gz
@@ -63,6 +70,10 @@
BuildPreReq: openldap
PreReq: openldap
%endif
+%if "%{with_ads}" == "yes"
+BuildPreReq: kerberos
+PreReq: kerberos
+%endif
AutoReq: no
AutoReqProv: no
@@ -88,7 +99,7 @@
%setup -q
%patch -p0
%{l_shtool} subst \
- -e
'/WINBINDD_SOCKET_DIR/s;/tmp/\.winbindd;%{l_prefix}/var/samba/tmp/\.winbindd;' \
+ -e
'/WINBINDD_SOCKET_DIR/s;/tmp/\.winbindd;%{l_prefix}/var/samba/tmp/.winbindd;' \
source/nsswitch/winbindd_nss.h
%build
@@ -97,10 +108,14 @@
CFLAGS="%{l_cflags -O}"
CPPFLAGS="%{l_cppflags openssl} -DOPENSSL_DISABLE_OLD_DES_SUPPORT"
LDFLAGS="%{l_ldflags}"
+ LIBS=""
%if "%{with_pam}" == "yes"
CPPFLAGS="$CPPFLAGS -I`%{l_rc} --query pam_incdir`"
LDFLAGS="$LDFLAGS -L`%{l_rc} --query pam_libdir`"
%endif
+%if "%{with_ldap}" == "yes"
+ LIBS="$LIBS -lssl -lcrypto"
+%endif
options=""
case "%{l_platform -t}" in
*-linux2.[46]* ) options="--with-smbmount" ;;
@@ -109,7 +124,9 @@
export CFLAGS
export CPPFLAGS
export LDFLAGS
+ export LIBS
./configure \
+ --cache-file=./config.cache \
--prefix=%{l_prefix} \
--libexecdir=%{l_prefix}/libexec/samba \
--localstatedir=%{l_prefix}/var/samba/run \
@@ -138,6 +155,12 @@
%else
--without-ldap \
%endif
+%if "%{with_ads}" == "yes"
+ --with-ads \
+ --with-krb5=%{l_prefix} \
+%else
+ --without-ads \
+%endif
--with-vfs \
--disable-pie \
$options
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
