mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-28 01:06:17 +00:00
Update to 3.0.21b
- Server crashes in smbd. - Compile issues on 64-bit platforms. - Crash bugs on big-endian systems. - Over 30 bugzilla reports closed. PR: 93552 Submitted by: maintainer
This commit is contained in:
Tom McLaughlin
parent
4fb3432556
commit
538c89e6eb
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=156408
@ -6,7 +6,7 @@
|
||||
#
|
||||
|
||||
PORTNAME= samba
|
||||
PORTVERSION?= 3.0.21a
|
||||
PORTVERSION?= 3.0.21b
|
||||
PORTREVISION?= 0
|
||||
PORTEPOCH?= 1
|
||||
CATEGORIES?= net
|
||||
@ -20,7 +20,7 @@ COMMENT?= A free SMB and CIFS client and server for UNIX
|
||||
CONFLICTS?= ja-samba-2.* ja-samba-3.* samba-2.* sharity-light-1.*
|
||||
|
||||
USE_ICONV= yes
|
||||
#GNU_CONFIGURE= yes
|
||||
GNU_CONFIGURE= yes
|
||||
USE_AUTOTOOLS= autoconf:259 autoheader:259
|
||||
|
||||
LATEST_LINK?= ${PKGNAMEPREFIX}${PORTNAME}3${PKGNAMESUFFIX}
|
||||
@ -36,7 +36,8 @@ SAMBA_LOCKDIR?= ${VARDIR}/db/samba
|
||||
SAMBA_PRIVATE?= ${PREFIX}/private
|
||||
SAMBA_CONFDIR?= ${PREFIX}/etc
|
||||
SAMBA_SWATDIR= ${PREFIX}/share/swat
|
||||
SAMBA_LIBDIR= ${PREFIX}/lib
|
||||
SAMBA_LIB= lib
|
||||
SAMBA_LIBDIR= ${PREFIX}/${SAMBA_LIB}
|
||||
RC_DIR= ${PREFIX}/etc/rc.d
|
||||
SAMBA_CONFIG= ${SAMBA_CONFDIR}/smb.conf
|
||||
|
||||
@ -54,24 +55,7 @@ CONFIGURE_ARGS+= --exec-prefix=${PREFIX} \
|
||||
|
||||
CONFIGURE_ARGS+= --with-libiconv=${LOCALBASE}
|
||||
|
||||
.if defined(SAMBA_SUBPORT)
|
||||
# Switch off all extra functionality
|
||||
CONFIGURE_ARGS+= --disable-cups
|
||||
|
||||
CONFIGURE_ARGS+= --without-ldap
|
||||
CONFIGURE_ARGS+= --without-krb5
|
||||
CONFIGURE_ARGS+= --without-ads
|
||||
|
||||
CONFIGURE_ARGS+= --without-winbind
|
||||
|
||||
CONFIGURE_ARGS+= --without-syslog
|
||||
CONFIGURE_ARGS+= --without-quotas
|
||||
CONFIGURE_ARGS+= --without-utmp
|
||||
CONFIGURE_ARGS+= --without-ldapsam
|
||||
CONFIGURE_ARGS+= --without-pam
|
||||
CONFIGURE_ARGS+= --without-pam_smbpass
|
||||
CONFIGURE_ARGS+= --without-aio-support
|
||||
.else
|
||||
.if !defined(SAMBA_SUBPORT)
|
||||
# Samba server itself
|
||||
OPTIONS= LDAP "With LDAP support" on \
|
||||
ADS "With Active Directory support" off \
|
||||
@ -94,8 +78,19 @@ OPTIONS= LDAP "With LDAP support" on \
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
.if !defined(SAMBA_SUBPORT)
|
||||
.if defined(SAMBA_SUBPORT)
|
||||
# Switch off all extra functionality
|
||||
CONFIGURE_ARGS+= --disable-cups --without-winbind --without-syslog \
|
||||
--without-quotas --without-utmp --without-ldapsam \
|
||||
--without-pam --without-pam_smbpass --without-aio-support
|
||||
|
||||
# Dirty hack to work around usage of OPTIONS in slave ports
|
||||
.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
|
||||
.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
|
||||
.endif
|
||||
|
||||
.else
|
||||
# Samba server itself
|
||||
USE_RC_SUBR= yes
|
||||
|
||||
CONFIGURE_ARGS+= --with-pam --with-readline --with-sendfile-support \
|
||||
@ -187,7 +182,7 @@ CONFIGURE_ARGS+= --without-ldapsam
|
||||
.endif
|
||||
|
||||
.if defined(WANT_EXPSAM_MODULES) && !empty(WANT_EXPSAM_MODULES)
|
||||
WANT_EXPSAM_MODULES!= ${ECHO_CMD} ${WANT_EXPSAM_MODULES} | ${SED} -e 's/ /,/g'
|
||||
WANT_EXPSAM_MODULES!= ${ECHO_CMD} ${WANT_EXPSAM_MODULES} | ${SED} -E 's/ +/,/g'
|
||||
CONFIGURE_ARGS+= --with-expsam=${WANT_EXPSAM_MODULES}
|
||||
.endif
|
||||
# SAM
|
||||
@ -195,7 +190,7 @@ CONFIGURE_ARGS+= --with-expsam=${WANT_EXPSAM_MODULES}
|
||||
.if !defined(WANT_EXP_MODULES) || empty(WANT_EXP_MODULES)
|
||||
WANT_EXP_MODULES= rpc_echo idmap_ad idmap_rid charset_weird
|
||||
.endif
|
||||
WANT_EXP_MODULES!= ${ECHO_CMD} ${WANT_EXP_MODULES} | ${SED} -e 's/ /,/g'
|
||||
WANT_EXP_MODULES!= ${ECHO_CMD} ${WANT_EXP_MODULES} | ${SED} -E 's/ +/,/g'
|
||||
CONFIGURE_ARGS+= --with-shared-modules=${WANT_EXP_MODULES}
|
||||
.endif
|
||||
|
||||
@ -225,7 +220,12 @@ LIB_DEPENDS+= popt.0:${PORTSDIR}/devel/popt
|
||||
.else
|
||||
CONFIGURE_ARGS+= --with-included-popt
|
||||
.endif
|
||||
# !SAMBA_SUBPORT
|
||||
.endif
|
||||
|
||||
###
|
||||
### Common part for port and it's subports
|
||||
###
|
||||
# For 4.8 - 4.11 combination of Kerberos and OpenLDAP is broken
|
||||
# due the conflict between system and OpenSSL port libcrypto libraries
|
||||
.if ${OSVERSION} > 470103 && ${OSVERSION} < 500000
|
||||
@ -265,6 +265,8 @@ CONFIGURE_ARGS+= --with-ldap
|
||||
CONFIGURE_ARGS+= --without-ldap
|
||||
.endif
|
||||
|
||||
.if !defined(SAMBA_SUBPORT)
|
||||
# Samba server itself
|
||||
MAN1= findsmb.1 log2pcap.1 nmblookup.1 ntlm_auth.1 profiles.1 \
|
||||
rpcclient.1 smbcacls.1 smbclient.1 smbcontrol.1 smbcquotas.1 \
|
||||
smbget.1 smbsh.1 smbstatus.1 smbtar.1 smbtree.1 testparm.1 \
|
||||
@ -316,7 +318,7 @@ post-patch:
|
||||
@${FIND} ${WRKDIR}/${DISTNAME} -type f | ${XARGS} ${CHMOD} u+w,a+r
|
||||
|
||||
pre-install:
|
||||
-@${FIND} ${SAMBA_LIBDIR} -type f 2>/dev/null | ${SORT} | ${SED} -e 's|^${PREFIX}||; s|^/||' >> ${WRKDIR}/.PLIST.exclude
|
||||
-@${FIND} ${SAMBA_LIBDIR}/samba -type f 2>/dev/null | ${SORT} | ${SED} -E 's|^${PREFIX}/?||;' >> ${WRKDIR}/.PLIST.exclude
|
||||
|
||||
post-install:
|
||||
.for sect in 1 5 7 8
|
||||
@ -342,14 +344,18 @@ post-install:
|
||||
.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
|
||||
${ECHO_CMD} "${SAMBA_LIB}/nss_winbind.so.1" >> ${TMPPLIST};
|
||||
${ECHO_CMD} "${SAMBA_LIB}/nss_wins.so.1" >> ${TMPPLIST};
|
||||
.endif
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/nsswitch/pam_winbind.so ${SAMBA_LIBDIR}
|
||||
${ECHO_CMD} "${SAMBA_LIB}/pam_winbind.so" >> ${TMPPLIST};
|
||||
.endif
|
||||
.if defined(WITH_PAM_SMBPASS)
|
||||
@${INSTALL_PROGRAM} ${WRKSRC}/bin/pam_smbpass.so ${SAMBA_LIBDIR}
|
||||
${ECHO_CMD} "${SAMBA_LIB}/pam_smbpass.so" >> ${TMPPLIST};
|
||||
.endif
|
||||
# Lib
|
||||
@${FIND} ${SAMBA_LIBDIR} -type f | ${SED} -e 's|^${PREFIX}||; s|^/||' | ${EGREP} -F -v -f ${WRKDIR}/.PLIST.exclude | ${SORT} >> ${TMPPLIST}
|
||||
@${FIND} ${SAMBA_LIBDIR}/samba -type f | ${SED} -E 's|^${PREFIX}/?||;' | ${EGREP} -F -v -f ${WRKDIR}/.PLIST.exclude | ${SORT} >> ${TMPPLIST}
|
||||
@for d in `${FIND} ${SAMBA_LIBDIR}/samba -type d | ${SORT} -r`; do \
|
||||
${ECHO_CMD} "@unexec ${RMDIR} $$d 2>/dev/null || true" >> ${TMPPLIST}; \
|
||||
done
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
MD5 (samba-3.0.21a.tar.gz) = b5306d2681e97e4499daf7845581d116
|
||||
SHA256 (samba-3.0.21a.tar.gz) = 8f4902db38b20601cc3315fe9516a9380b067678c5a6828bd67e5a8bc46b097c
|
||||
SIZE (samba-3.0.21a.tar.gz) = 17524018
|
||||
MD5 (samba-3.0.21b.tar.gz) = bb73dffb33f4a39386ef9f3e07ae28ff
|
||||
SHA256 (samba-3.0.21b.tar.gz) = a5e6982024105276d347b3b521897d6937c727e273814e743ada8eddf972e7d0
|
||||
SIZE (samba-3.0.21b.tar.gz) = 17539079
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
--- configure.in.orig Tue Jul 12 18:42:55 2005
|
||||
+++ configure.in Tue Jul 26 19:19:40 2005
|
||||
@@ -909,6 +909,21 @@
|
||||
--- configure.in.orig Mon Jan 30 15:45:07 2006
|
||||
+++ configure.in Sun Feb 19 07:00:42 2006
|
||||
@@ -967,6 +967,21 @@
|
||||
AC_DEFINE(HAVE_SIG_ATOMIC_T_TYPE,1,[Whether we have the atomic_t variable type])
|
||||
fi
|
||||
|
||||
@ -15,52 +15,10 @@
|
||||
+ samba_cv_struct_sigevent=yes,samba_cv_struct_sigevent=no)])
|
||||
+if test x"$samba_cv_struct_sigevent" = x"yes"; then
|
||||
+ AC_DEFINE(HAVE_STRUCT_SIGEVENT,1,[Whether we have the struct sigevent])
|
||||
+ AC_CHECK_MEMBERS([struct sigevent.sigev_value.sival_ptr,struct sigevent.sigev_value.sigval_ptr],,,
|
||||
+ AC_CHECK_MEMBERS([struct sigevent.sigev_value.sival_ptr,struct sigevent.sigev_value.sigval_ptr], , ,
|
||||
+ [#include <signal.h>])
|
||||
+fi
|
||||
+
|
||||
AC_CACHE_CHECK([for struct timespec type],samba_cv_struct_timespec, [
|
||||
AC_TRY_COMPILE([
|
||||
#include <sys/types.h>
|
||||
@@ -4104,30 +4119,28 @@
|
||||
|
||||
case "$host_os" in
|
||||
*)
|
||||
- AC_CHECK_LIB(rt,aio_read,[AIO_LIBS="$ACL_LIBS -lrt"])
|
||||
+ ac_cv_save_LIBS=$LIBS
|
||||
+ AC_SEARCH_LIBS(aio_read, [rt], [
|
||||
+ if test "$ac_cv_search_aio_read" != "none required"; then
|
||||
+ LIBS="$LIBS $ac_cv_search_aio_read"
|
||||
+ fi
|
||||
+ ])
|
||||
AC_CACHE_CHECK([for asynchronous io support],samba_cv_HAVE_AIO,[
|
||||
- aio_LIBS=$LIBS
|
||||
- LIBS="$LIBS -lrt"
|
||||
AC_TRY_LINK([#include <sys/types.h>
|
||||
#include <aio.h>],
|
||||
[ struct aiocb a; return aio_read(&a);],
|
||||
-samba_cv_HAVE_AIO=yes,samba_cv_HAVE_AIO=no)
|
||||
- LIBS=$aio_LIBS])
|
||||
+samba_cv_HAVE_AIO=yes,samba_cv_HAVE_AIO=no)])
|
||||
AC_CACHE_CHECK([for 64-bit asynchronous io support],samba_cv_HAVE_AIO64,[
|
||||
- aio_LIBS=$LIBS
|
||||
- LIBS="$LIBS -lrt"
|
||||
AC_TRY_LINK([#include <sys/types.h>
|
||||
#include <aio.h>],
|
||||
[ struct aiocb64 a; return aio_read64(&a);],
|
||||
-samba_cv_HAVE_AIO64=yes,samba_cv_HAVE_AIO64=no)
|
||||
- LIBS=$aio_LIBS])
|
||||
+samba_cv_HAVE_AIO64=yes,samba_cv_HAVE_AIO64=no)])
|
||||
+
|
||||
if test x"$samba_cv_HAVE_AIO64" = x"yes"; then
|
||||
AC_DEFINE(HAVE_AIOCB64,1,[Whether 64 bit aio is available])
|
||||
- AC_DEFINE(WITH_AIO, 1, [Using asynchronous io])
|
||||
- LIBS="$LIBS -lrt"
|
||||
+ AC_DEFINE(WITH_AIO,1,[Using asynchronous io])
|
||||
elif test x"$samba_cv_HAVE_AIO" = x"yes"; then
|
||||
- AC_DEFINE(WITH_AIO, 1, [Using asynchronous io])
|
||||
- LIBS="$LIBS -lrt"
|
||||
+ AC_DEFINE(WITH_AIO,1,[Using asynchronous io])
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
Loading…
Reference in New Issue
Block a user