Update to 3.0.9

o Problem updating roaming user profiles.
o Crash in smbd when printing from a Windows 9x client.
o Unresolved symbols in libsmbclient which caused
  applications such as KDE's konqueror to fail when
  accessing smb:// URLs.

PR:		ports/74223
Submitted by:	maintainer
This commit is contained in:
Kirill Ponomarev 2004-11-23 17:34:51 +00:00
parent 2ab047d154
commit 6fc70a0faf
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=122235
6 changed files with 143 additions and 98 deletions

View file

@ -6,7 +6,7 @@
#
PORTNAME= samba
PORTVERSION= 3.0.8
PORTVERSION= 3.0.9
PORTREVISION?= 0
PORTEPOCH?= 1
CATEGORIES?= net
@ -17,7 +17,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.p/pre/:S/.r/rc/}
MAINTAINER?= timur@gnu.org
COMMENT?= A free SMB and CIFS client and server for UNIX
CONFLICTS?= ja-samba-2.* samba-2.* sharity-light-1.*
CONFLICTS?= ja-samba-2.* ja-samba-3.* samba-2.* sharity-light-1.*
USE_ICONV= yes
USE_AUTOCONF_VER= 259
@ -194,6 +194,14 @@ LIB_DEPENDS+= popt.0:${PORTSDIR}/devel/popt
.else
CONFIGURE_ARGS+= --with-included-popt
.endif
.if defined(WITH_MULTIBYTE)
# Based on patch from miraclelinux.com.
# http://www.miraclelinux.com/english/technet/samba30/index.html
PLIST_SUB+= MULTIBYTE=""
.else
PLIST_SUB+= MULTIBYTE="@comment "
.endif
# !SAMBA_SUBPORT
.endif
@ -263,6 +271,15 @@ RC_SCRIPTS_SUB= PREFIX=${PREFIX} \
SAMBA_LOCKDIR=${SAMBA_LOCKDIR} \
SAMBA_SPOOL=${SAMBA_SPOOL}
pre-everything::
@${ECHO_MSG} ""
@${ECHO_MSG} "!!! Due to the bug in the deinstall procedure in port versions prior 3.0.9"
@${ECHO_MSG} "!!! you may loose your valuable ${SAMBA_LOCKDIR}/windbindd_* files."
@${ECHO_MSG} "!!! Please, BACKUP them before you continue the (re)installation."
@${ECHO_MSG} ""
@${ECHO_MSG} "*** Press ctrl-C *now* if you need this files ***"
@sleep 5
pre-fetch:
@${ECHO_MSG} "===> -------------------------------------------"
@${ECHO_MSG} "===> Run 'make config' to (re)configure the port"
@ -314,7 +331,7 @@ post-install:
@${ECHO_CMD} "@exec ${CHMOD} 0755 ${SAMBA_LOCKDIR}" >> ${TMPPLIST}
@${ECHO_CMD} "@exec ${CHOWN} root:wheel ${SAMBA_LOCKDIR}" >> ${TMPPLIST}
@${ECHO_CMD} "@unexec ${RM} -rf ${SAMBA_LOCKDIR}/printing" >> ${TMPPLIST}
@${ECHO_CMD} "@unexec for f in \`${LS} ${SAMBA_LOCKDIR} | ${GREP} -v '^winbindd_'\`; do ${RM} -rf ${SAMBA_LOCKDIR}/${f}; done" >> ${TMPPLIST}
@${ECHO_CMD} "@unexec for f in \`${LS} ${SAMBA_LOCKDIR} | ${GREP} -v '^winbindd_'\`; do ${RM} -f ${SAMBA_LOCKDIR}/\$${f}; done" >> ${TMPPLIST}
@${ECHO_CMD} "@unexec ${RMDIR} ${SAMBA_LOCKDIR} 2>/dev/null || true" >> ${TMPPLIST}
@${ECHO_CMD} "@unexec ${ECHO_CMD} \"Warning: If you will *NOT* use this package anymore, please remove ${SAMBA_LOCKDIR}/* manually.\"" >> ${TMPPLIST}
# Private

View file

@ -1,2 +1,2 @@
MD5 (samba-3.0.8.tar.gz) = 7088483c858ac362d302acc0c2a1d431
SIZE (samba-3.0.8.tar.gz) = 15101353
MD5 (samba-3.0.9.tar.gz) = 9cf2bcef71509a81687dec8732545400
SIZE (samba-3.0.9.tar.gz) = 15172821

View file

@ -0,0 +1,15 @@
--- lib/module.c.orig Sun Nov 21 00:14:24 2004
+++ lib/module.c Sun Nov 21 00:38:36 2004
@@ -40,9 +40,11 @@
*/
handle = sys_dlopen(module_name, RTLD_LAZY);
+ /* This call should reset any possible non-fatal errors that
+ occured since last call to dl* functions */
+ error = sys_dlerror();
if(!handle) {
int level = is_probe ? 3 : 0;
- error = sys_dlerror();
DEBUG(level, ("Error loading module '%s': %s\n", module_name, error ? error : ""));
return NT_STATUS_UNSUCCESSFUL;
}

View file

@ -0,0 +1,11 @@
--- script/installswat.sh.orig Fri Nov 19 21:11:15 2004
+++ script/installswat.sh Fri Nov 19 21:11:45 2004
@@ -103,7 +103,7 @@
fi
fi
for f in $SRCDIR../docs/$dir/images/*.png; do
- FNAME=$INSTALLDIR/`basename $f`
+ FNAME=$INSTALLDIR/images/`basename $f`
echo $FNAME
cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges?
chmod 0644 $FNAME

View file

@ -7,7 +7,7 @@
%%WINBIND%%# PROVIDE: winbindd
# REQUIRE: NETWORKING SERVERS named %%CUPS%%
# BEFORE: DAEMON
# KEYWORD: FreeBSD shutdown
# KEYWORD: shutdown
#
# Add the following lines to /etc/rc.conf to enable samba:

View file

@ -51,6 +51,7 @@ lib/samba/vfs/netatalk.so
lib/samba/vfs/readonly.so
lib/samba/vfs/recycle.so
lib/samba/vfs/shadow_copy.so
%%MULTIBYTE%%lib/samba/vfs/hex.so
lib/samba/charset/CP437.so
lib/samba/charset/CP850.so
%%SAMMYSQL%%lib/samba/pdb/mysql.so
@ -256,50 +257,55 @@ share/swat/help/Samba-Developers-Guide/vfs.html
share/swat/help/Samba-Developers-Guide/windows-debug.html
share/swat/help/Samba-Developers-Guide/wins.html
share/swat/help/Samba-Guide/2000users.html
share/swat/help/Samba-Guide/AccountingNetwork.png
share/swat/help/Samba-Guide/Big500users.html
share/swat/help/Samba-Guide/Charity-Network.png
share/swat/help/Samba-Guide/DomApps.html
share/swat/help/Samba-Guide/HA.html
share/swat/help/Samba-Guide/HostAnnouncment.png
share/swat/help/Samba-Guide/NullConnect.png
share/swat/help/Samba-Guide/UNIX-Samba-and-LDAP.png
share/swat/help/Samba-Guide/UserConnect.png
share/swat/help/Samba-Guide/UserMgrNT4.png
share/swat/help/Samba-Guide/WINREPRESSME-Capture.png
share/swat/help/Samba-Guide/WINREPRESSME-Capture2.png
share/swat/help/Samba-Guide/WindowsXP-NullConnection.png
share/swat/help/Samba-Guide/WindowsXP-UserConnection.png
share/swat/help/Samba-Guide/XP-screen001.png
share/swat/help/Samba-Guide/acct2net.png
share/swat/help/Samba-Guide/appendix.html
share/swat/help/Samba-Guide/ch7-dual-additive-LDAP-Ok.png
share/swat/help/Samba-Guide/ch7-dual-additive-LDAP.png
share/swat/help/Samba-Guide/ch7-fail-overLDAP.png
share/swat/help/Samba-Guide/ch7-singleLDAP.png
share/swat/help/Samba-Guide/ch8-migration.png
share/swat/help/Samba-Guide/chap4-net.png
share/swat/help/Samba-Guide/chap5-net.png
share/swat/help/Samba-Guide/chap6-net.png
share/swat/help/Samba-Guide/chap7-idresol.png
share/swat/help/Samba-Guide/chap7-net-Ar.png
share/swat/help/Samba-Guide/chap7-net2-Br.png
share/swat/help/Samba-Guide/chap9-ADSDC.png
share/swat/help/Samba-Guide/chap9-SambaDC.png
share/swat/help/Samba-Guide/go01.html
share/swat/help/Samba-Guide/gpl.html
share/swat/help/Samba-Guide/happy.html
share/swat/help/Samba-Guide/images/AccountingNetwork.png
share/swat/help/Samba-Guide/images/Charity-Network.png
share/swat/help/Samba-Guide/images/HostAnnouncment.png
share/swat/help/Samba-Guide/images/NullConnect.png
share/swat/help/Samba-Guide/images/UNIX-Samba-and-LDAP.png
share/swat/help/Samba-Guide/images/UserConnect.png
share/swat/help/Samba-Guide/images/UserMgrNT4.png
share/swat/help/Samba-Guide/images/WINREPRESSME-Capture.png
share/swat/help/Samba-Guide/images/WINREPRESSME-Capture2.png
share/swat/help/Samba-Guide/images/WindowsXP-NullConnection.png
share/swat/help/Samba-Guide/images/WindowsXP-UserConnection.png
share/swat/help/Samba-Guide/images/XP-screen001.png
share/swat/help/Samba-Guide/images/acct2net.png
share/swat/help/Samba-Guide/images/ch7-dual-additive-LDAP-Ok.png
share/swat/help/Samba-Guide/images/ch7-dual-additive-LDAP.png
share/swat/help/Samba-Guide/images/ch7-fail-overLDAP.png
share/swat/help/Samba-Guide/images/ch7-singleLDAP.png
share/swat/help/Samba-Guide/images/ch8-migration.png
share/swat/help/Samba-Guide/images/chap4-net.png
share/swat/help/Samba-Guide/images/chap5-net.png
share/swat/help/Samba-Guide/images/chap6-net.png
share/swat/help/Samba-Guide/images/chap7-idresol.png
share/swat/help/Samba-Guide/images/chap7-net-Ar.png
share/swat/help/Samba-Guide/images/chap7-net2-Br.png
share/swat/help/Samba-Guide/images/chap9-ADSDC.png
share/swat/help/Samba-Guide/images/chap9-SambaDC.png
share/swat/help/Samba-Guide/images/lam-config.png
share/swat/help/Samba-Guide/images/lam-group-members.png
share/swat/help/Samba-Guide/images/lam-groups.png
share/swat/help/Samba-Guide/images/lam-hosts.png
share/swat/help/Samba-Guide/images/lam-login.png
share/swat/help/Samba-Guide/images/lam-users.png
share/swat/help/Samba-Guide/images/openmag.png
share/swat/help/Samba-Guide/images/wxpp001.png
share/swat/help/Samba-Guide/images/wxpp004.png
share/swat/help/Samba-Guide/images/wxpp006.png
share/swat/help/Samba-Guide/images/wxpp007.png
share/swat/help/Samba-Guide/images/wxpp008.png
share/swat/help/Samba-Guide/index.html
share/swat/help/Samba-Guide/ix01.html
share/swat/help/Samba-Guide/kerberos.html
share/swat/help/Samba-Guide/lam-config.png
share/swat/help/Samba-Guide/lam-group-members.png
share/swat/help/Samba-Guide/lam-groups.png
share/swat/help/Samba-Guide/lam-hosts.png
share/swat/help/Samba-Guide/lam-login.png
share/swat/help/Samba-Guide/lam-users.png
share/swat/help/Samba-Guide/migration.html
share/swat/help/Samba-Guide/openmag.png
share/swat/help/Samba-Guide/pr01.html
share/swat/help/Samba-Guide/pr02.html
share/swat/help/Samba-Guide/pr03.html
@ -309,25 +315,6 @@ share/swat/help/Samba-Guide/secure.html
share/swat/help/Samba-Guide/simple.html
share/swat/help/Samba-Guide/small.html
share/swat/help/Samba-Guide/unixclients.html
share/swat/help/Samba-Guide/wxpp001.png
share/swat/help/Samba-Guide/wxpp004.png
share/swat/help/Samba-Guide/wxpp006.png
share/swat/help/Samba-Guide/wxpp007.png
share/swat/help/Samba-Guide/wxpp008.png
share/swat/help/Samba-HOWTO-Collection/10small.png
share/swat/help/Samba-HOWTO-Collection/11small.png
share/swat/help/Samba-HOWTO-Collection/12small.png
share/swat/help/Samba-HOWTO-Collection/13small.png
share/swat/help/Samba-HOWTO-Collection/14small.png
share/swat/help/Samba-HOWTO-Collection/1small.png
share/swat/help/Samba-HOWTO-Collection/2small.png
share/swat/help/Samba-HOWTO-Collection/3small.png
share/swat/help/Samba-HOWTO-Collection/4small.png
share/swat/help/Samba-HOWTO-Collection/5small.png
share/swat/help/Samba-HOWTO-Collection/6small.png
share/swat/help/Samba-HOWTO-Collection/7small.png
share/swat/help/Samba-HOWTO-Collection/8small.png
share/swat/help/Samba-HOWTO-Collection/9small.png
share/swat/help/Samba-HOWTO-Collection/AccessControls.html
share/swat/help/Samba-HOWTO-Collection/AdvancedNetworkManagement.html
share/swat/help/Samba-HOWTO-Collection/Appendix.html
@ -349,40 +336,68 @@ share/swat/help/Samba-HOWTO-Collection/SambaHA.html
share/swat/help/Samba-HOWTO-Collection/ServerType.html
share/swat/help/Samba-HOWTO-Collection/StandAloneServer.html
share/swat/help/Samba-HOWTO-Collection/VFS.html
share/swat/help/Samba-HOWTO-Collection/WME001.png
share/swat/help/Samba-HOWTO-Collection/WME002.png
share/swat/help/Samba-HOWTO-Collection/WME003.png
share/swat/help/Samba-HOWTO-Collection/WME005.png
share/swat/help/Samba-HOWTO-Collection/WME009.png
share/swat/help/Samba-HOWTO-Collection/WME010.png
share/swat/help/Samba-HOWTO-Collection/WME013.png
share/swat/help/Samba-HOWTO-Collection/WME014.png
share/swat/help/Samba-HOWTO-Collection/WXPP002.png
share/swat/help/Samba-HOWTO-Collection/WXPP003.png
share/swat/help/Samba-HOWTO-Collection/WXPP005.png
share/swat/help/Samba-HOWTO-Collection/WXPP009.png
share/swat/help/Samba-HOWTO-Collection/WXPP014.png
share/swat/help/Samba-HOWTO-Collection/a_small.png
share/swat/help/Samba-HOWTO-Collection/access1.png
share/swat/help/Samba-HOWTO-Collection/browsing1.png
share/swat/help/Samba-HOWTO-Collection/bugreport.html
share/swat/help/Samba-HOWTO-Collection/compiling.html
share/swat/help/Samba-HOWTO-Collection/cups1.png
share/swat/help/Samba-HOWTO-Collection/cups2.png
share/swat/help/Samba-HOWTO-Collection/diagnosis.html
share/swat/help/Samba-HOWTO-Collection/domain-member.html
share/swat/help/Samba-HOWTO-Collection/domain.png
share/swat/help/Samba-HOWTO-Collection/ethereal1.png
share/swat/help/Samba-HOWTO-Collection/ethereal2.png
share/swat/help/Samba-HOWTO-Collection/go01.html
share/swat/help/Samba-HOWTO-Collection/gpl.html
share/swat/help/Samba-HOWTO-Collection/groupmapping.html
share/swat/help/Samba-HOWTO-Collection/idmap-gid2sid.png
share/swat/help/Samba-HOWTO-Collection/idmap-sid2gid.png
share/swat/help/Samba-HOWTO-Collection/idmap-sid2uid.png
share/swat/help/Samba-HOWTO-Collection/idmap-store-gid2sid.png
share/swat/help/Samba-HOWTO-Collection/idmap-uid2sid.png
share/swat/help/Samba-HOWTO-Collection/idmap_winbind_no_loop.png
share/swat/help/Samba-HOWTO-Collection/idmapper.html
share/swat/help/Samba-HOWTO-Collection/images/10small.png
share/swat/help/Samba-HOWTO-Collection/images/11small.png
share/swat/help/Samba-HOWTO-Collection/images/12small.png
share/swat/help/Samba-HOWTO-Collection/images/13small.png
share/swat/help/Samba-HOWTO-Collection/images/14small.png
share/swat/help/Samba-HOWTO-Collection/images/1small.png
share/swat/help/Samba-HOWTO-Collection/images/2small.png
share/swat/help/Samba-HOWTO-Collection/images/3small.png
share/swat/help/Samba-HOWTO-Collection/images/4small.png
share/swat/help/Samba-HOWTO-Collection/images/5small.png
share/swat/help/Samba-HOWTO-Collection/images/6small.png
share/swat/help/Samba-HOWTO-Collection/images/7small.png
share/swat/help/Samba-HOWTO-Collection/images/8small.png
share/swat/help/Samba-HOWTO-Collection/images/9small.png
share/swat/help/Samba-HOWTO-Collection/images/WME001.png
share/swat/help/Samba-HOWTO-Collection/images/WME002.png
share/swat/help/Samba-HOWTO-Collection/images/WME003.png
share/swat/help/Samba-HOWTO-Collection/images/WME005.png
share/swat/help/Samba-HOWTO-Collection/images/WME009.png
share/swat/help/Samba-HOWTO-Collection/images/WME010.png
share/swat/help/Samba-HOWTO-Collection/images/WME013.png
share/swat/help/Samba-HOWTO-Collection/images/WME014.png
share/swat/help/Samba-HOWTO-Collection/images/WXPP002.png
share/swat/help/Samba-HOWTO-Collection/images/WXPP003.png
share/swat/help/Samba-HOWTO-Collection/images/WXPP005.png
share/swat/help/Samba-HOWTO-Collection/images/WXPP009.png
share/swat/help/Samba-HOWTO-Collection/images/WXPP014.png
share/swat/help/Samba-HOWTO-Collection/images/a_small.png
share/swat/help/Samba-HOWTO-Collection/images/access1.png
share/swat/help/Samba-HOWTO-Collection/images/browsing1.png
share/swat/help/Samba-HOWTO-Collection/images/cups1.png
share/swat/help/Samba-HOWTO-Collection/images/cups2.png
share/swat/help/Samba-HOWTO-Collection/images/domain.png
share/swat/help/Samba-HOWTO-Collection/images/ethereal1.png
share/swat/help/Samba-HOWTO-Collection/images/ethereal2.png
share/swat/help/Samba-HOWTO-Collection/images/idmap-gid2sid.png
share/swat/help/Samba-HOWTO-Collection/images/idmap-sid2gid.png
share/swat/help/Samba-HOWTO-Collection/images/idmap-sid2uid.png
share/swat/help/Samba-HOWTO-Collection/images/idmap-store-gid2sid.png
share/swat/help/Samba-HOWTO-Collection/images/idmap-uid2sid.png
share/swat/help/Samba-HOWTO-Collection/images/idmap_winbind_no_loop.png
share/swat/help/Samba-HOWTO-Collection/images/pdftoepsonusb.png
share/swat/help/Samba-HOWTO-Collection/images/pdftosocket.png
share/swat/help/Samba-HOWTO-Collection/images/trusts1.png
share/swat/help/Samba-HOWTO-Collection/images/w2kp001.png
share/swat/help/Samba-HOWTO-Collection/images/w2kp002.png
share/swat/help/Samba-HOWTO-Collection/images/w2kp003.png
share/swat/help/Samba-HOWTO-Collection/images/w2kp004.png
share/swat/help/Samba-HOWTO-Collection/images/w2kp005.png
share/swat/help/Samba-HOWTO-Collection/images/wxpp001.png
share/swat/help/Samba-HOWTO-Collection/images/wxpp004.png
share/swat/help/Samba-HOWTO-Collection/images/wxpp006.png
share/swat/help/Samba-HOWTO-Collection/images/wxpp007.png
share/swat/help/Samba-HOWTO-Collection/images/wxpp008.png
share/swat/help/Samba-HOWTO-Collection/index.html
share/swat/help/Samba-HOWTO-Collection/install.html
share/swat/help/Samba-HOWTO-Collection/integrate-ms-networks.html
@ -394,8 +409,6 @@ share/swat/help/Samba-HOWTO-Collection/msdfs.html
share/swat/help/Samba-HOWTO-Collection/optional.html
share/swat/help/Samba-HOWTO-Collection/pam.html
share/swat/help/Samba-HOWTO-Collection/passdb.html
share/swat/help/Samba-HOWTO-Collection/pdftoepsonusb.png
share/swat/help/Samba-HOWTO-Collection/pdftosocket.png
share/swat/help/Samba-HOWTO-Collection/pr01.html
share/swat/help/Samba-HOWTO-Collection/pr02.html
share/swat/help/Samba-HOWTO-Collection/pr03.html
@ -406,21 +419,10 @@ share/swat/help/Samba-HOWTO-Collection/samba-pdc.html
share/swat/help/Samba-HOWTO-Collection/securing-samba.html
share/swat/help/Samba-HOWTO-Collection/speed.html
share/swat/help/Samba-HOWTO-Collection/troubleshooting.html
share/swat/help/Samba-HOWTO-Collection/trusts1.png
share/swat/help/Samba-HOWTO-Collection/type.html
share/swat/help/Samba-HOWTO-Collection/unicode.html
share/swat/help/Samba-HOWTO-Collection/upgrading-to-3.0.html
share/swat/help/Samba-HOWTO-Collection/w2kp001.png
share/swat/help/Samba-HOWTO-Collection/w2kp002.png
share/swat/help/Samba-HOWTO-Collection/w2kp003.png
share/swat/help/Samba-HOWTO-Collection/w2kp004.png
share/swat/help/Samba-HOWTO-Collection/w2kp005.png
share/swat/help/Samba-HOWTO-Collection/winbind.html
share/swat/help/Samba-HOWTO-Collection/wxpp001.png
share/swat/help/Samba-HOWTO-Collection/wxpp004.png
share/swat/help/Samba-HOWTO-Collection/wxpp006.png
share/swat/help/Samba-HOWTO-Collection/wxpp007.png
share/swat/help/Samba-HOWTO-Collection/wxpp008.png
share/swat/help/editreg.1.html
share/swat/help/findsmb.1.html
share/swat/help/index.html