Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 10 Mar 2004 12:50:22 -0800 (PST)
From:      "Timur I. Bakeyev" <timur@com.bat.ru>
To:        freebsd-ports-bugs@FreeBSD.org
Subject:   Re: ports/64057: Update for samba-devel
Message-ID:  <200403102050.i2AKoMrV044814@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/64057; it has been noted by GNATS.

From: "Timur I. Bakeyev" <timur@com.bat.ru>
To: FreeBSD-gnats-submit@FreeBSD.org
Cc: "Timur I. Bakeyev" <timur@gnu.org>
Subject: Re: ports/64057: Update for samba-devel
Date: Wed, 10 Mar 2004 21:40:24 +0100

 --=-ZR1rZVNFx45IoDp/aOEr
 Content-Type: text/plain
 Content-Transfer-Encoding: quoted-printable
 
 Small fixes after talk with ozz.
 
 Index: Makefile
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 RCS file: /home/ncvs/ports/net/samba-devel/Makefile,v
 retrieving revision 1.106
 diff -u -r1.106 Makefile
 --- Makefile	10 Mar 2004 07:46:51 -0000	1.106
 +++ Makefile	10 Mar 2004 20:21:17 -0000
 @@ -32,7 +32,6 @@
 =20
  OPTIONS=3D	CUPS		"With CUPS printing support" on \
  		LDAP		"With LDAP support" on \
 -		KRB5		"With Kerberos5 support" on \
  		ADS		"With Active Directory support" on \
  		WINBIND		"With WinBIND support" on \
  		ACL_SUPPORT	"With ACL support" off \
 @@ -100,10 +99,6 @@
  PLIST_SUB+=3D		PYTHON=3D"@comment "
  .endif
 =20
 -.if !defined(WITHOUT_CUPS)
 -WITH_CUPS=3D		yes
 -.endif
 -
  .if defined(WITH_CUPS)
  LIB_DEPENDS+=3D		cups.2:${PORTSDIR}/print/cups-base
  CONFIGURE_ARGS+=3D	--enable-cups
 @@ -132,40 +127,35 @@
  .if !defined(WITHOUT_WINBIND)
  CONFIGURE_ARGS+=3D	--with-winbind
  PLIST_SUB+=3D		WINBIND=3D""
 +.if ${OSVERSION} >=3D 500112
 +WITH_WINBIND_NSS=3D	yes
 +.endif
  .else
  CONFIGURE_ARGS+=3D	--without-winbind
  PLIST_SUB+=3D		WINBIND=3D"@comment "
  .endif
 =20
 -.if !defined(WITHOUT_LDAP)
 -WANT_LDAP=3D		yes
 -CONFIGURE_ARGS+=3D	--with-ldap
 -.else
 -CONFIGURE_ARGS+=3D	--without-ldap
 -.endif
 -
 -.if !defined(WITHOUT_KRB5) && defined(KRB5_HOME) &&
 exists(${KRB5_HOME}/lib/libgssapi_krb5.a)
 -CONFIGURE_ARGS+=3D	--with-krb5=3D${KRB5_HOME}
 -.elif !defined(WITHOUT_KRB5) && defined(HEIMDAL_HOME) &&
 exists(${HEIMDAL_HOME}/lib/libgssapi.a)
 -CONFIGURE_ARGS+=3D	--with-krb5=3D${HEIMDAL_HOME}
 -.elif !defined(WITHOUT_KRB5) && (defined(MAKE_KERBEROS5) ||
 ${OSVERSION} > 500105) && exists(/usr/lib/libkrb5.a)
 -CONFIGURE_ARGS+=3D	--with-krb5=3D/usr
 +.if defined(WITH_WINBIND_NSS)
 +PLIST_SUB+=3D		WINBIND_NSS=3D""
  .else
 -# Kerberos5 is necessary for ADS
 -.if defined(WITH_ADS)
 -BROKEN=3D			"Kerberos5 is necessary for ADS support. Please, install
 either Heimdal or MIT-Kerberos"
 -.endif
 -WITHOUT_ADS=3D		yes
 -CONFIGURE_ARGS+=3D	--without-krb5
 +PLIST_SUB+=3D		WINBIND_NSS=3D"@comment "
  .endif
 =20
  .if !defined(WITHOUT_ADS)
  WANT_LDAP=3D		yes
 +WANT_KRB5=3D		yes
  CONFIGURE_ARGS+=3D	--with-ads
  .else
  CONFIGURE_ARGS+=3D	--without-ads
  .endif
 =20
 +.if !defined(WITHOUT_LDAP)
 +WANT_LDAP=3D		yes
 +CONFIGURE_ARGS+=3D	--with-ldap
 +.else
 +CONFIGURE_ARGS+=3D	--without-ldap
 +.endif
 +
  # SAM
  .if defined(WITH_SAM_XML)
  #USE_GNOME=3D		libxml2
 @@ -208,6 +198,21 @@
  .endif
  # SAM
 =20
 +# Kerberos5 is necessary for ADS
 +.if defined(WANT_KRB5)
 +.if defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libgssapi_krb5.a)
 +CONFIGURE_ARGS+=3D	--with-krb5=3D${KRB5_HOME}
 +.elif defined(HEIMDAL_HOME) && exists(${HEIMDAL_HOME}/lib/libgssapi.a)
 +CONFIGURE_ARGS+=3D	--with-krb5=3D${HEIMDAL_HOME}
 +.elif (defined(MAKE_KERBEROS5) || ${OSVERSION} > 500105) &&
 exists(/usr/lib/libkrb5.a)
 +CONFIGURE_ARGS+=3D	--with-krb5=3D${DESTDIR}/usr
 +.else
 +BROKEN=3D			"Kerberos5 is necessary for ADS support. Please, install
 either Heimdal or MIT-Kerberos"
 +.endif
 +.else
 +CONFIGURE_ARGS+=3D	--without-krb5
 +.endif
 +
  .if defined(WANT_LDAP)
  USE_OPENLDAP=3D		yes
  USE_OPENLDAP_VER?=3D	21
 @@ -223,7 +228,7 @@
 =20
  .if defined(WITH_ACL_SUPPORT)
  .if ${OSVERSION} < 500018
 -BROKEN=3D	"Requires a recent FreeBSD 5.0-CURRENT"
 +BROKEN=3D			"Requires FreeBSD 5.x at least after 20010326"
  .else
  CONFIGURE_ARGS+=3D	--with-acl-support
  .endif
 @@ -277,6 +282,11 @@
  			SAMBA_SPOOL=3D${SAMBA_SPOOL} \
  			SAMBA_RUNDIR=3D${SAMBA_RUNDIR}
 =20
 +pre-fetch:
 +	@${ECHO_MSG} "=3D=3D=3D>  -------------------------------------------"
 +	@${ECHO_MSG} "=3D=3D=3D>  Run 'make config' to (re)configure the port"
 +	@${ECHO_MSG} "=3D=3D=3D>  -------------------------------------------"
 +
  post-install:
  .for sect in 1 5 7 8
  	@${MKDIR} ${MAN${sect}PREFIX}/man/man${sect}
 @@ -328,8 +338,10 @@
  .endif
  	-@${LN} -snf libsmbclient.so.0 ${SAMBA_LIBDIR}/libsmbclient.so
  .if !defined(WITHOUT_WINBIND)
 +.if defined(WITH_WINBIND_NSS)
  	${INSTALL_PROGRAM} ${WRKSRC}/nsswitch/nss_winbind.so
 ${SAMBA_LIBDIR}/nss_winbind.so.1
  	${INSTALL_PROGRAM} ${WRKSRC}/nsswitch/nss_wins.so
 ${SAMBA_LIBDIR}/nss_wins.so.1
 +.endif
  	${INSTALL_PROGRAM} ${WRKSRC}/nsswitch/pam_winbind.so ${SAMBA_LIBDIR}
  .endif
  .if defined(WITH_PAM_SMBPASS)
 Index: pkg-plist
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 RCS file: /home/ncvs/ports/net/samba-devel/pkg-plist,v
 retrieving revision 1.46
 diff -u -r1.46 pkg-plist
 --- pkg-plist	5 Mar 2004 14:25:42 -0000	1.46
 +++ pkg-plist	10 Mar 2004 20:21:17 -0000
 @@ -56,8 +56,8 @@
  lib/libsmbclient.a
  lib/libsmbclient.so
  lib/libsmbclient.so.0
 -%%WINBIND%%lib/nss_winbind.so.1
 -%%WINBIND%%lib/nss_wins.so.1
 +%%WINBIND_NSS%%lib/nss_winbind.so.1
 +%%WINBIND_NSS%%lib/nss_wins.so.1
  %%WINBIND%%lib/pam_winbind.so
  %%SMBPASS%%lib/pam_smbpass.so
  %%PYTHON%%lib/%%PYTHON_VERSION%%/site-packages/samba/__init__.py
 Index: files/patch-script_installbin.sh
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 RCS file: files/patch-script_installbin.sh
 diff -N files/patch-script_installbin.sh
 --- /dev/null	1 Jan 1970 00:00:00 -0000
 +++ files/patch-script_installbin.sh	10 Mar 2004 20:21:17 -0000
 @@ -0,0 +1,12 @@
 +--- script/installbin.sh.orig	Tue Mar  9 15:33:32 2004
 ++++ script/installbin.sh	Tue Mar  9 15:35:43 2004
 +@@ -17,8 +17,7 @@
 +  p2=3D`basename $p`
 +  echo Installing $p as $BINDIR/$p2
 +  if [ -f $BINDIR/$p2 ]; then
 +-   rm -f $BINDIR/$p2.old
 +-   mv $BINDIR/$p2 $BINDIR/$p2.old
 ++   rm -f $BINDIR/$p2 $BINDIR/$p2.old
 +  fi
 +  cp $p $BINDIR/
 +  chmod $INSTALLPERMS $BINDIR/$p2
 Index: files/patch-script_installscripts.sh
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 RCS file: files/patch-script_installscripts.sh
 diff -N files/patch-script_installscripts.sh
 --- /dev/null	1 Jan 1970 00:00:00 -0000
 +++ files/patch-script_installscripts.sh	10 Mar 2004 20:21:17 -0000
 @@ -0,0 +1,12 @@
 +--- script/installscripts.sh.orig	Tue Mar  9 15:35:54 2004
 ++++ script/installscripts.sh	Tue Mar  9 15:36:38 2004
 +@@ -25,8 +25,7 @@
 +   p2=3D`basename $p`
 +   echo Installing $BINDIR/$p2
 +   if [ -f $BINDIR/$p2 ]; then
 +-    rm -f $BINDIR/$p2.old
 +-    mv $BINDIR/$p2 $BINDIR/$p2.old
 ++    rm -f $BINDIR/$p2 $BINDIR/$p2.old
 +   fi
 +   cp $p $BINDIR/
 +   chmod $INSTALLPERMS $BINDIR/$p2
 Index: files/smb.conf.default
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 RCS file: /home/ncvs/ports/net/samba-devel/files/smb.conf.default,v
 retrieving revision 1.12
 diff -u -r1.12 smb.conf.default
 --- files/smb.conf.default	5 Mar 2004 14:25:42 -0000	1.12
 +++ files/smb.conf.default	10 Mar 2004 20:21:17 -0000
 @@ -3,7 +3,7 @@
  # here. Samba has a huge number of configurable options (perhaps too
  # many!) most of which are not shown in this example
  #
 -# For a step by step guide on installation, configuration and usage of
 Samba,=20
 +# For a step to step guide on installing, configuring and using samba,=20
  # read the Samba HOWTO Collection.
  #
  # Any line which starts with a ; (semi-colon) or a # (hash)=20
 @@ -28,26 +28,6 @@
  # user level security. See the HOWTO Collection for details.
     security =3D user
 =20
 -# Use password server option only with security =3D server
 -# The argument list may include:
 -#   password server =3D My_PDC_Name [My_BDC_Name] [My_Next_BDC_Name]
 -# or to auto-locate the domain controller/s
 -#   password server =3D *
 -;   password server =3D <NT-Server-Name>
 -
 -# You may wish to use password encryption. Please read
 -# ENCRYPTION.txt, Win95.txt and WinNT.txt in the Samba documentation.
 -# Do not enable this option unless you have read those documents
 -;  encrypt passwords =3D yes
 -# Use the realm option only with security =3D ads
 -# Specifies the Active Directory realm the host is part of
 -;   realm =3D MY_REALM
 -
 -# Backend to store user information in. New installations should=20
 -# use either tdbsam or ldapsam. smbpasswd is available for backwards=20
 -# compatibility. tdbsam requires no further configuration.
 -;   passdb backend =3D tdbsam
 -
  # This option is important for security. It allows you to restrict
  # connections to machines which are on your local network. The
  # following example restricts access to two C class networks and
 @@ -69,8 +49,8 @@
 =20
  # It should not be necessary to specify the print system type unless
  # it is non-standard. Currently supported print systems include:
 -# cups, bsd, sysv, plp, lprng, aix, hpux, qnx
 -;   printing =3D bsd
 +# bsd, cups, sysv, plp, lprng, aix, hpux, qnx
 +;   printing =3D cups
 =20
  # Uncomment this if you want a guest account, you must add this to
 /etc/passwd
  # otherwise the user "nobody" is used
 @@ -83,6 +63,21 @@
  # Put a capping on the size of the log files (in Kb).
     max log size =3D 50
 =20
 +# Use password server option only with security =3D server
 +# The argument list may include:
 +#   password server =3D My_PDC_Name [My_BDC_Name] [My_Next_BDC_Name]
 +# or to auto-locate the domain controller/s
 +#   password server =3D *
 +;   password server =3D <NT-Server-Name>
 +
 +# Use the realm option only with security =3D ads
 +# Specifies the Active Directory realm the host is part of
 +;   realm =3D MY_REALM
 +
 +# Backend to store user information in. New installations should=20
 +# use either tdbsam or ldapsam. smbpasswd is available for backwards=20
 +# compatibility. tdbsam requires no further configuration.
 +;   passdb backend =3D tdbsam
 =20
  # Using the following line enables you to customise your configuration
  # on a per machine basis. The %m gets replaced with the netbios name
 @@ -94,6 +89,8 @@
  # Most people will find that this option gives better performance.
  # See the chapter 'Samba performance issues' in the Samba HOWTO
 Collection
  # and the manual pages for details.
 +# You may want to add the following on a Linux system:
 +#         SO_RCVBUF=3D8192 SO_SNDBUF=3D8192
     socket options =3D TCP_NODELAY=20
 =20
  # Configure Samba to use multiple interfaces
 @@ -118,10 +115,6 @@
  # Preferred Master causes Samba to force a local browser election on
 startup
  # and gives it a slightly higher chance of winning the election
  ;   preferred master =3D yes
 -
 -# Use only if you have an NT server on your network that has been
 -# configured at install time to be a primary domain controller.
 -;   domain controller =3D <NT-Domain-Controller-SMBName>
 =20
  # Enable this if you want Samba to be a domain logon server for=20
  # Windows95 workstations.=20
 
 
 --=-ZR1rZVNFx45IoDp/aOEr
 Content-Type: application/pgp-signature; name=signature.asc
 Content-Description: =?koi8-r?Q?=FC=D4=C1?= =?koi8-r?Q?_=DE=C1=D3=D4=D8?=
 	=?koi8-r?Q?_=D3=CF=CF=C2=DD=C5=CE=C9=D1?=
 	=?koi8-r?Q?_=D0=CF=C4=D0=C9=D3=C1=CE=C1?=
 	=?koi8-r?Q?_=C3=C9=C6=D2=CF=D7=CF=CA?=
 	=?koi8-r?Q?_=D0=CF=C4=D0=C9=D3=D8=C0?=
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.4 (FreeBSD)
 
 iD8DBQBAT301C/BkEmC6H0cRAri2AJwOPJFNII1Gv7YC8UslZnC9J4ruIgCfctcU
 9p78YfAQXvS6bZqEWmcmpz4=
 =c1Fl
 -----END PGP SIGNATURE-----
 
 --=-ZR1rZVNFx45IoDp/aOEr--
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200403102050.i2AKoMrV044814>