ports/64057: Update for samba-devel
Timur I. Bakeyev
timur at com.bat.ru
Fri Mar 12 14:30:20 UTC 2004
The following reply was made to PR ports/64057; it has been noted by GNATS.
From: "Timur I. Bakeyev" <timur at com.bat.ru>
To: Mark Linimon <linimon at lonesome.com>
Cc: FreeBSD-gnats-submit at FreeBSD.org
Subject: Re: ports/64057: Update for samba-devel
Date: Fri, 12 Mar 2004 15:26:21 +0100
--EeQfGwPcQSOJBaQU
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Hi Mark!
I think, the problem you got is the result of screwed up by line
wrapping patch. I made shar out of it, hope, it'll work this time :>
With regards,
Timur.
--EeQfGwPcQSOJBaQU
Content-Type: application/x-shar
Content-Disposition: attachment; filename="samba-devel.shar"
# This is a shell archive. Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file". Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
# samba-devel.diff
#
echo x - samba-devel.diff
sed 's/^X//' >samba-devel.diff << 'END-of-samba-devel.diff'
XIndex: Makefile
X===================================================================
XRCS file: /home/ncvs/ports/net/samba-devel/Makefile,v
Xretrieving revision 1.108
Xdiff -u -r1.108 Makefile
X--- Makefile 12 Mar 2004 02:48:24 -0000 1.108
X+++ Makefile 12 Mar 2004 14:05:06 -0000
X@@ -21,7 +21,6 @@
X
X OPTIONS= CUPS "With CUPS printing support" on \
X LDAP "With LDAP support" on \
X- KRB5 "With Kerberos5 support" on \
X ADS "With Active Directory support" on \
X WINBIND "With WinBIND support" on \
X ACL_SUPPORT "With ACL support" off \
X@@ -39,7 +38,6 @@
X POPT "With installed POPT library" on
X
X USE_BZIP2= yes
X-USE_SIZE= yes
X USE_RC_SUBR= yes
X NO_LATEST_LINK= yes
X INSTALLS_SHLIB= yes
X@@ -87,10 +85,6 @@
X PLIST_SUB+= PYTHON="@comment "
X .endif
X
X-.if !defined(WITHOUT_CUPS)
X-WITH_CUPS= yes
X-.endif
X-
X .if defined(WITH_CUPS)
X LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-base
X CONFIGURE_ARGS+= --enable-cups
X@@ -119,40 +113,35 @@
X .if !defined(WITHOUT_WINBIND)
X CONFIGURE_ARGS+= --with-winbind
X PLIST_SUB+= WINBIND=""
X+.if ${OSVERSION} >= 500112
X+WITH_WINBIND_NSS= yes
X+.endif
X .else
X CONFIGURE_ARGS+= --without-winbind
X PLIST_SUB+= WINBIND="@comment "
X .endif
X
X-.if !defined(WITHOUT_LDAP)
X-WANT_LDAP= yes
X-CONFIGURE_ARGS+= --with-ldap
X-.else
X-CONFIGURE_ARGS+= --without-ldap
X-.endif
X-
X-.if !defined(WITHOUT_KRB5) && defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libgssapi_krb5.a)
X-CONFIGURE_ARGS+= --with-krb5=${KRB5_HOME}
X-.elif !defined(WITHOUT_KRB5) && defined(HEIMDAL_HOME) && exists(${HEIMDAL_HOME}/lib/libgssapi.a)
X-CONFIGURE_ARGS+= --with-krb5=${HEIMDAL_HOME}
X-.elif !defined(WITHOUT_KRB5) && (defined(MAKE_KERBEROS5) || ${OSVERSION} > 500105) && exists(/usr/lib/libkrb5.a)
X-CONFIGURE_ARGS+= --with-krb5=/usr
X+.if defined(WITH_WINBIND_NSS)
X+PLIST_SUB+= WINBIND_NSS=""
X .else
X-# Kerberos5 is necessary for ADS
X-.if defined(WITH_ADS)
X-BROKEN= "Kerberos5 is necessary for ADS support. Please, install either Heimdal or MIT-Kerberos"
X-.endif
X-WITHOUT_ADS= yes
X-CONFIGURE_ARGS+= --without-krb5
X+PLIST_SUB+= WINBIND_NSS="@comment "
X .endif
X
X .if !defined(WITHOUT_ADS)
X WANT_LDAP= yes
X+WANT_KRB5= yes
X CONFIGURE_ARGS+= --with-ads
X .else
X CONFIGURE_ARGS+= --without-ads
X .endif
X
X+.if !defined(WITHOUT_LDAP)
X+WANT_LDAP= yes
X+CONFIGURE_ARGS+= --with-ldap
X+.else
X+CONFIGURE_ARGS+= --without-ldap
X+.endif
X+
X # SAM
X .if defined(WITH_SAM_XML)
X #USE_GNOME= libxml2
X@@ -195,6 +184,21 @@
X .endif
X # SAM
X
X+# Kerberos5 is necessary for ADS
X+.if defined(WANT_KRB5)
X+.if defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libgssapi_krb5.a)
X+CONFIGURE_ARGS+= --with-krb5=${KRB5_HOME}
X+.elif defined(HEIMDAL_HOME) && exists(${HEIMDAL_HOME}/lib/libgssapi.a)
X+CONFIGURE_ARGS+= --with-krb5=${HEIMDAL_HOME}
X+.elif (defined(MAKE_KERBEROS5) || ${OSVERSION} > 500105) && exists(/usr/lib/libkrb5.a)
X+CONFIGURE_ARGS+= --with-krb5=${DESTDIR}/usr
X+.else
X+BROKEN= "Kerberos5 is necessary for ADS support. Please, install either Heimdal or MIT-Kerberos"
X+.endif
X+.else
X+CONFIGURE_ARGS+= --without-krb5
X+.endif
X+
X .if defined(WANT_LDAP)
X USE_OPENLDAP= yes
X USE_OPENLDAP_VER?= 21
X@@ -210,7 +214,7 @@
X
X .if defined(WITH_ACL_SUPPORT)
X .if ${OSVERSION} < 500018
X-BROKEN= "Requires a recent FreeBSD 5.0-CURRENT"
X+BROKEN= "Requires FreeBSD 5.x at least after 20010326"
X .else
X CONFIGURE_ARGS+= --with-acl-support
X .endif
X@@ -264,6 +268,11 @@
X SAMBA_SPOOL=${SAMBA_SPOOL} \
X SAMBA_RUNDIR=${SAMBA_RUNDIR}
X
X+pre-fetch:
X+ @${ECHO_MSG} "===> -------------------------------------------"
X+ @${ECHO_MSG} "===> Run 'make config' to (re)configure the port"
X+ @${ECHO_MSG} "===> -------------------------------------------"
X+
X post-install:
X .for sect in 1 5 7 8
X @${MKDIR} ${MAN${sect}PREFIX}/man/man${sect}
X@@ -315,8 +324,10 @@
X .endif
X -@${LN} -snf libsmbclient.so.0 ${SAMBA_LIBDIR}/libsmbclient.so
X .if !defined(WITHOUT_WINBIND)
X+.if defined(WITH_WINBIND_NSS)
X ${INSTALL_PROGRAM} ${WRKSRC}/nsswitch/nss_winbind.so ${SAMBA_LIBDIR}/nss_winbind.so.1
X ${INSTALL_PROGRAM} ${WRKSRC}/nsswitch/nss_wins.so ${SAMBA_LIBDIR}/nss_wins.so.1
X+.endif
X ${INSTALL_PROGRAM} ${WRKSRC}/nsswitch/pam_winbind.so ${SAMBA_LIBDIR}
X .endif
X .if defined(WITH_PAM_SMBPASS)
XIndex: pkg-plist
X===================================================================
XRCS file: /home/ncvs/ports/net/samba-devel/pkg-plist,v
Xretrieving revision 1.46
Xdiff -u -r1.46 pkg-plist
X--- pkg-plist 5 Mar 2004 14:25:42 -0000 1.46
X+++ pkg-plist 12 Mar 2004 14:05:07 -0000
X@@ -56,8 +56,8 @@
X lib/libsmbclient.a
X lib/libsmbclient.so
X lib/libsmbclient.so.0
X-%%WINBIND%%lib/nss_winbind.so.1
X-%%WINBIND%%lib/nss_wins.so.1
X+%%WINBIND_NSS%%lib/nss_winbind.so.1
X+%%WINBIND_NSS%%lib/nss_wins.so.1
X %%WINBIND%%lib/pam_winbind.so
X %%SMBPASS%%lib/pam_smbpass.so
X %%PYTHON%%lib/%%PYTHON_VERSION%%/site-packages/samba/__init__.py
XIndex: files/patch-script_installbin.sh
X===================================================================
XRCS file: files/patch-script_installbin.sh
Xdiff -N files/patch-script_installbin.sh
X--- /dev/null 1 Jan 1970 00:00:00 -0000
X+++ files/patch-script_installbin.sh 12 Mar 2004 14:05:07 -0000
X@@ -0,0 +1,12 @@
X+--- script/installbin.sh.orig Tue Mar 9 15:33:32 2004
X++++ script/installbin.sh Tue Mar 9 15:35:43 2004
X+@@ -17,8 +17,7 @@
X+ p2=`basename $p`
X+ echo Installing $p as $BINDIR/$p2
X+ if [ -f $BINDIR/$p2 ]; then
X+- rm -f $BINDIR/$p2.old
X+- mv $BINDIR/$p2 $BINDIR/$p2.old
X++ rm -f $BINDIR/$p2 $BINDIR/$p2.old
X+ fi
X+ cp $p $BINDIR/
X+ chmod $INSTALLPERMS $BINDIR/$p2
XIndex: files/patch-script_installscripts.sh
X===================================================================
XRCS file: files/patch-script_installscripts.sh
Xdiff -N files/patch-script_installscripts.sh
X--- /dev/null 1 Jan 1970 00:00:00 -0000
X+++ files/patch-script_installscripts.sh 12 Mar 2004 14:05:07 -0000
X@@ -0,0 +1,12 @@
X+--- script/installscripts.sh.orig Tue Mar 9 15:35:54 2004
X++++ script/installscripts.sh Tue Mar 9 15:36:38 2004
X+@@ -25,8 +25,7 @@
X+ p2=`basename $p`
X+ echo Installing $BINDIR/$p2
X+ if [ -f $BINDIR/$p2 ]; then
X+- rm -f $BINDIR/$p2.old
X+- mv $BINDIR/$p2 $BINDIR/$p2.old
X++ rm -f $BINDIR/$p2 $BINDIR/$p2.old
X+ fi
X+ cp $p $BINDIR/
X+ chmod $INSTALLPERMS $BINDIR/$p2
XIndex: files/smb.conf.default
X===================================================================
XRCS file: /home/ncvs/ports/net/samba-devel/files/smb.conf.default,v
Xretrieving revision 1.12
Xdiff -u -r1.12 smb.conf.default
X--- files/smb.conf.default 5 Mar 2004 14:25:42 -0000 1.12
X+++ files/smb.conf.default 12 Mar 2004 14:05:07 -0000
X@@ -3,7 +3,7 @@
X # here. Samba has a huge number of configurable options (perhaps too
X # many!) most of which are not shown in this example
X #
X-# For a step by step guide on installation, configuration and usage of Samba,
X+# For a step to step guide on installing, configuring and using samba,
X # read the Samba HOWTO Collection.
X #
X # Any line which starts with a ; (semi-colon) or a # (hash)
X@@ -28,26 +28,6 @@
X # user level security. See the HOWTO Collection for details.
X security = user
X
X-# Use password server option only with security = server
X-# The argument list may include:
X-# password server = My_PDC_Name [My_BDC_Name] [My_Next_BDC_Name]
X-# or to auto-locate the domain controller/s
X-# password server = *
X-; password server = <NT-Server-Name>
X-
X-# You may wish to use password encryption. Please read
X-# ENCRYPTION.txt, Win95.txt and WinNT.txt in the Samba documentation.
X-# Do not enable this option unless you have read those documents
X-; encrypt passwords = yes
X-# Use the realm option only with security = ads
X-# Specifies the Active Directory realm the host is part of
X-; realm = MY_REALM
X-
X-# Backend to store user information in. New installations should
X-# use either tdbsam or ldapsam. smbpasswd is available for backwards
X-# compatibility. tdbsam requires no further configuration.
X-; passdb backend = tdbsam
X-
X # This option is important for security. It allows you to restrict
X # connections to machines which are on your local network. The
X # following example restricts access to two C class networks and
X@@ -69,8 +49,8 @@
X
X # It should not be necessary to specify the print system type unless
X # it is non-standard. Currently supported print systems include:
X-# cups, bsd, sysv, plp, lprng, aix, hpux, qnx
X-; printing = bsd
X+# bsd, cups, sysv, plp, lprng, aix, hpux, qnx
X+; printing = cups
X
X # Uncomment this if you want a guest account, you must add this to /etc/passwd
X # otherwise the user "nobody" is used
X@@ -83,6 +63,21 @@
X # Put a capping on the size of the log files (in Kb).
X max log size = 50
X
X+# Use password server option only with security = server
X+# The argument list may include:
X+# password server = My_PDC_Name [My_BDC_Name] [My_Next_BDC_Name]
X+# or to auto-locate the domain controller/s
X+# password server = *
X+; password server = <NT-Server-Name>
X+
X+# Use the realm option only with security = ads
X+# Specifies the Active Directory realm the host is part of
X+; realm = MY_REALM
X+
X+# Backend to store user information in. New installations should
X+# use either tdbsam or ldapsam. smbpasswd is available for backwards
X+# compatibility. tdbsam requires no further configuration.
X+; passdb backend = tdbsam
X
X # Using the following line enables you to customise your configuration
X # on a per machine basis. The %m gets replaced with the netbios name
X@@ -94,6 +89,8 @@
X # Most people will find that this option gives better performance.
X # See the chapter 'Samba performance issues' in the Samba HOWTO Collection
X # and the manual pages for details.
X+# You may want to add the following on a Linux system:
X+# SO_RCVBUF=8192 SO_SNDBUF=8192
X socket options = TCP_NODELAY
X
X # Configure Samba to use multiple interfaces
X@@ -118,10 +115,6 @@
X # Preferred Master causes Samba to force a local browser election on startup
X # and gives it a slightly higher chance of winning the election
X ; preferred master = yes
X-
X-# Use only if you have an NT server on your network that has been
X-# configured at install time to be a primary domain controller.
X-; domain controller = <NT-Domain-Controller-SMBName>
X
X # Enable this if you want Samba to be a domain logon server for
X # Windows95 workstations.
END-of-samba-devel.diff
exit
--EeQfGwPcQSOJBaQU--
More information about the freebsd-ports-bugs
mailing list