mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-23 00:43:28 +00:00
Code Issues Releases Activity

- Update to 3.0.10

Browse Source 
PR:		ports/75168
Submitted by:	Joerg Pulz <Joerg.Pulz(at)frm2.tum.de>
Reworked by:	maintainer
This commit is contained in:
Sergey Matveychuk 2004-12-21 12:24:03 +00:00
parent 287a5f4d4a
commit 92d47ccb5d
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=124697
8 changed files with 103 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
net/samba3/Makefile
View File

@ -6,7 +6,7 @@
#
PORTNAME= samba
PORTVERSION= 3.0.9
PORTVERSION= 3.0.10
PORTREVISION?= 0
PORTEPOCH?= 1
CATEGORIES?= net
@ -20,6 +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
USE_AUTOHEADER_VER= 259
USE_AUTOCONF_VER= 259
LATEST_LINK?= ${PKGNAMEPREFIX}${PORTNAME}3${PKGNAMESUFFIX}
@ -33,10 +34,10 @@ SAMBA_LOGDIR= ${VARDIR}/log/samba
SAMBA_RUNDIR= ${VARDIR}/run
SAMBA_LOCKDIR?= ${VARDIR}/db/samba
SAMBA_PRIVATE?= ${PREFIX}/private
SAMBA_CONFDIR= ${PREFIX}/etc
SAMBA_CONFDIR?= ${PREFIX}/etc
SAMBA_SWATDIR= ${PREFIX}/share/swat
SAMBA_LIBDIR= ${PREFIX}/lib
RC_DIR= ${SAMBA_CONFDIR}/rc.d
RC_DIR= ${PREFIX}/etc/rc.d
SAMBA_CONFIG= ${SAMBA_CONFDIR}/smb.conf
CONFIGURE_ENV+= CPPFLAGS=-I${LOCALBASE}/include \
@ -72,6 +73,7 @@ OPTIONS= LDAP "With LDAP support" on \
SAM_PGSQL "With PostgreSQL smbpasswd backend" off \
SAM_OLD_LDAP "With Samba2.x LDAP smbpasswd backend" off \
PAM_SMBPASS "With SMB PAM module" off \
EXP_MODULES "With experimental module(s)" off \
POPT "With installed POPT library" on
.endif
@ -173,6 +175,14 @@ WANT_EXPSAM_MODULES!= ${ECHO_CMD} ${WANT_EXPSAM_MODULES} | ${SED} -e 's/ /,/g'
CONFIGURE_ARGS+= --with-expsam=${WANT_EXPSAM_MODULES}
.endif
# SAM
.if defined(WITH_EXP_MODULES)
.if !defined(WANT_EXP_MODULES) || empty(WANT_EXP_MODULES)
WANT_EXP_MODULES= rpc_echo idmap_rid charset_weird
.endif
WANT_EXP_MODULES!= ${ECHO_CMD} ${WANT_EXP_MODULES} | ${SED} -e 's/ /,/g'
CONFIGURE_ARGS+= --with-shared-modules=${WANT_EXP_MODULES}
.endif
.if defined(WITH_PAM_SMBPASS)
CONFIGURE_ARGS+= --with-pam_smbpass
PLIST_SUB+= SMBPASS=""
@ -219,7 +229,7 @@ CONFIGURE_ARGS+= --without-ads
CONFIGURE_ARGS+= --with-krb5=${KRB5_HOME}
.elif defined(HEIMDAL_HOME) && exists(${HEIMDAL_HOME}/lib/libgssapi.a)
CONFIGURE_ARGS+= --with-krb5=${HEIMDAL_HOME}
.elif ( defined(MAKE_KERBEROS5) || ${OSVERSION} > 500105 ) && exists(${DESTDIR}/usr/lib/libkrb5.a)
.elif exists(${DESTDIR}/usr/lib/libkrb5.a) && exists(${DESTDIR}/usr/bin/krb5-config)
CONFIGURE_ARGS+= --with-krb5=${DESTDIR}/usr
.else
LIB_DEPENDS+= krb5:${PORTSDIR}/security/heimdal
@ -237,7 +247,6 @@ CONFIGURE_ARGS+= --without-ldap
.endif
.if !defined(SAMBA_SUBPORT)
MAN1= findsmb.1 nmblookup.1 log2pcap.1 rpcclient.1 \
smbget.1 smbcacls.1 smbclient.1 smbcontrol.1 smbsh.1 \
smbstatus.1 smbtar.1 testparm.1 testprns.1 vfstest.1 \
@ -248,7 +257,7 @@ MAN8= nmbd.8 smbd.8 net.8 pdbedit.8 smbpasswd.8 smbspool.8 \
swat.8 tdbdump.8 tdbbackup.8
.if !defined(WITHOUT_WINBIND)
MAN1+= wbinfo.1
MAN8+= winbindd.8
MAN8+= pam_winbind.8 winbindd.8
.endif
.if !defined(WITHOUT_WINBIND)
@ -259,7 +268,8 @@ WINBIND_FILTER= ${GREP} -v '^%%WINBIND%%'
PLIST_SUB+= RC_DIR=${RC_DIR} \
SAMBA_LOGDIR=${SAMBA_LOGDIR} \
SAMBA_LOCKDIR=${SAMBA_LOCKDIR}
SAMBA_LOCKDIR=${SAMBA_LOCKDIR} \
SAMBA_CONFIG=${SAMBA_CONFIG}
RC_SCRIPTS_SUB= PREFIX=${PREFIX} \
CUPS=${CUPS} \
@ -288,6 +298,10 @@ pre-fetch:
post-patch:
@${FIND} ${WRKSRC} -name CVS -o -name .cvsignore | ${XARGS} ${RM}
@${RM} -rf ${WRKDIR}/${DISTNAME}/examples/libsmbclient
@${RM} -rf ${WRKDIR}/${DISTNAME}/swat/lang
pre-install:
@${FIND} ${SAMBA_LIBDIR} -type f | ${SORT} | ${SED} -e 's|^${PREFIX}||; s|^/||' >> ${WRKDIR}/.PLIST.exclude
post-install:
.for sect in 1 5 7 8
@ -309,6 +323,21 @@ post-install:
${FILESDIR}/smb.conf.default > ${WRKDIR}/smb.conf.default
${INSTALL_DATA} ${WRKDIR}/smb.conf.default ${SAMBA_CONFIG}.default
${INSTALL_SCRIPT} ${WRKSRC}/script/mksmbpasswd.sh ${PREFIX}/bin/make_smbpasswd
.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)
@${INSTALL_PROGRAM} ${WRKSRC}/bin/pam_smbpass.so ${SAMBA_LIBDIR}
.endif
# Lib
@${FIND} ${SAMBA_LIBDIR} -type f | ${SED} -e 's|^${PREFIX}||; s|^/||' | ${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
# Spool
@test -d ${SAMBA_SPOOL} || ${MKDIR} ${SAMBA_SPOOL} && \
${CHMOD} 1777 ${SAMBA_SPOOL} && ${CHOWN} root:wheel ${SAMBA_SPOOL}
@ -342,16 +371,6 @@ post-install:
@${ECHO_CMD} "@exec ${CHOWN} root:wheel ${SAMBA_PRIVATE}" >> ${TMPPLIST}
@${ECHO_CMD} "@unexec ${RMDIR} ${SAMBA_PRIVATE} 2>/dev/null || true" >> ${TMPPLIST}
@${ECHO_CMD} "@unexec ${ECHO_CMD} \"Warning: If you will *NOT* use this package anymore, please remove ${SAMBA_PRIVATE}/* manually.\"" >> ${TMPPLIST}
.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)
@${INSTALL_PROGRAM} ${WRKSRC}/bin/pam_smbpass.so ${SAMBA_LIBDIR}
.endif
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
@${CP} -Rp ${WRKDIR}/${DISTNAME}/docs/registry ${DOCSDIR}

4
net/samba3/distinfo
View File

@ -1,2 +1,2 @@
MD5 (samba-3.0.9.tar.gz) = 9cf2bcef71509a81687dec8732545400
SIZE (samba-3.0.9.tar.gz) = 15172821
MD5 (samba-3.0.10.tar.gz) = b19fd86d3c11a1b43f75a5988cd9ceeb
SIZE (samba-3.0.10.tar.gz) = 15176926

33
net/samba3/files/patch-configure.in
View File

@ -1,6 +1,17 @@
--- configure.in.orig Fri Aug 6 23:38:21 2004
+++ configure.in Wed Sep 1 03:03:48 2004
@@ -810,6 +810,13 @@
--- configure.in.orig Tue Nov 16 04:03:30 2004
+++ configure.in Fri Nov 26 02:04:59 2004
@@ -691,7 +691,9 @@
AC_CHECK_HEADERS(nss.h nss_common.h nsswitch.h ns_api.h sys/security.h security/pam_appl.h)
AC_CHECK_HEADERS(stropts.h poll.h)
AC_CHECK_HEADERS(sys/capability.h syscall.h sys/syscall.h)
-AC_CHECK_HEADERS(sys/acl.h sys/attributes.h attr/xattr.h sys/xattr.h sys/cdefs.h glob.h)
+AC_CHECK_HEADERS(sys/acl.h sys/attributes.h attr/xattr.h sys/xattr.h sys/extattr.h sys/uio.h)
+AC_CHECK_HEADERS(sys/cdefs.h glob.h)
+
# These faile to compile on Solaris so just check for their presence
AC_CHECK_HEADERS(security/pam_modules.h net/if.h netinet/ip.h, [], [], -)
@@ -829,6 +831,13 @@
AC_DEFINE(HAVE_SIG_ATOMIC_T_TYPE,1,[Whether we have the atomic_t variable type])
fi
@ -14,7 +25,19 @@
# stupid headers have the functions but no declaration. grrrr.
AC_HAVE_DECL(errno, [#include <errno.h>])
AC_HAVE_DECL(setresuid, [#include <unistd.h>])
@@ -3870,7 +3877,7 @@
@@ -1125,6 +1134,11 @@
AC_CHECK_FUNCS(setxattr lsetxattr fsetxattr)
AC_CHECK_FUNCS(attr_get attr_list attr_set attr_remove)
AC_CHECK_FUNCS(attr_getf attr_listf attr_setf attr_removef)
+# Check if we have extattr
+AC_CHECK_FUNCS(extattr_delete_fd extattr_delete_file extattr_delete_link)
+AC_CHECK_FUNCS(extattr_get_fd extattr_get_file extattr_get_link)
+AC_CHECK_FUNCS(extattr_list_fd extattr_list_file extattr_list_link)
+AC_CHECK_FUNCS(extattr_set_fd extattr_set_file extattr_set_link)
# Assume non-shared by default and override below
BLDSHARED="false"
@@ -3939,7 +3953,7 @@
AC_DEFINE(HAVE_TRU64_ACLS,1,[Whether Tru64 ACLs are available])
ACL_LIBS="$ACL_LIBS -lpacl"
;;
@ -23,7 +46,7 @@
AC_MSG_RESULT(Using FreeBSD posix ACLs)
AC_DEFINE(HAVE_POSIX_ACLS,1,[Whether FreeBSD POSIX ACLs are available])
AC_DEFINE(HAVE_ACL_GET_PERM_NP,1,[Whether acl_get_perm_np() is available])
@@ -4189,7 +4196,7 @@
@@ -4258,7 +4272,7 @@
*linux*)
WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_linux.o"
;;

12
net/samba3/files/patch-include_config.h.in
View File

@ -1,12 +0,0 @@
--- include/config.h.in.orig Sat May 8 02:33:46 2004
+++ include/config.h.in Thu May 20 14:17:44 2004
@@ -236,6 +236,9 @@
/* Define to 1 if you have the `endnetgrent' function. */
#undef HAVE_ENDNETGRENT
+/* Whether optreset is available */
+#undef HAVE_OPTRESET
+
/* Whether errno() is available */
#undef HAVE_ERRNO_DECL

17
net/samba3/files/patch-include_includes.h Normal file
View File

@ -0,0 +1,17 @@
--- include/includes.h.orig Fri Nov 26 00:47:28 2004
+++ include/includes.h Fri Nov 26 01:59:16 2004
@@ -476,6 +476,14 @@
#include <sys/xattr.h>
#endif
+#ifdef HAVE_SYS_EXTATTR_H
+#include <sys/extattr.h>
+#endif
+
+#ifdef HAVE_SYS_UIO_H
+#include <sys/uio.h>
+#endif
+
#if HAVE_LOCALE_H
#include <locale.h>
#endif

10
net/samba3/files/patch-lib_util_str.c
View File

@ -1,13 +1,13 @@
--- lib/util_str.c.orig Tue Apr 20 22:42:55 2004
+++ lib/util_str.c Fri May 14 02:02:30 2004
@@ -1980,10 +1980,16 @@
--- lib/util_str.c.orig Wed Dec 15 15:33:12 2004
+++ lib/util_str.c Fri Dec 17 02:15:34 2004
@@ -2008,10 +2008,16 @@
{
int bits = 0;
int char_count = 0;
- size_t out_cnt = 0;
- size_t len = data.length;
- size_t output_len = data.length * 2;
- char *result = malloc(output_len); /* get us plenty of space */
- char *result = SMB_MALLOC(output_len); /* get us plenty of space */
+ size_t out_cnt, len, output_len;
+ char *result;
+
@ -17,7 +17,7 @@
+ out_cnt = 0;
+ len = data.length;
+ output_len = data.length * 2;
+ result = malloc(output_len); /* get us plenty of space */
+ result = SMB_MALLOC(output_len); /* get us plenty of space */
while (len-- && out_cnt < (data.length * 2) - 5) {
int c = (unsigned char) *(data.data++);

23
net/samba3/files/patch-script_installswat.sh
View File

@ -1,11 +1,12 @@
--- 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
--- script/installswat.sh.orig Fri Dec 17 03:59:34 2004
+++ script/installswat.sh Fri Dec 17 04:01:34 2004
@@ -8,8 +8,7 @@
echo Installing SWAT in $SWATDIR
echo Installing the Samba Web Administration Tool
-LANGS=". `cd $SRCDIR../swat/; /bin/echo lang/??`"
-echo Installing langs are `cd $SRCDIR../swat/lang/; /bin/echo ??`
+LANGS="."
for ln in $LANGS; do
SWATLANGDIR=$SWATDIR/$ln

63
net/samba3/pkg-plist
View File

@ -23,51 +23,12 @@ bin/testprns
%%WINBIND%%bin/wbinfo
@unexec %D/etc/rc.d/samba.sh forcestop 2>/dev/null || true
etc/rc.d/samba.sh
@unexec if cmp -s %D/etc/smb.conf %D/etc/smb.conf.default; then rm -f %D/etc/smb.conf; fi
etc/smb.conf.default
@unexec if cmp -s %%SAMBA_CONFIG%% %%SAMBA_CONFIG%%.default; then rm -f %%SAMBA_CONFIG%%; fi
@unexec rm -f %%SAMBA_CONFIG%%.default
sbin/smbd
sbin/nmbd
sbin/swat
%%WINBIND%%sbin/winbindd
lib/samba/lowcase.dat
lib/samba/upcase.dat
lib/samba/valid.dat
lib/samba/de.msg
lib/samba/en.msg
lib/samba/fr.msg
lib/samba/it.msg
lib/samba/ja.msg
lib/samba/nl.msg
lib/samba/pl.msg
lib/samba/tr.msg
lib/samba/vfs/audit.so
lib/samba/vfs/cap.so
lib/samba/vfs/default_quota.so
lib/samba/vfs/expand_msdfs.so
lib/samba/vfs/extd_audit.so
lib/samba/vfs/fake_perms.so
lib/samba/vfs/full_audit.so
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
%%SAMPGSQL%%lib/samba/pdb/pgsql.so
%%SAMXML%%lib/samba/pdb/xml.so
%%WINBIND_NSS%%lib/nss_winbind.so.1
%%WINBIND_NSS%%lib/nss_wins.so.1
%%WINBIND%%lib/pam_winbind.so
%%SMBPASS%%lib/pam_smbpass.so
@dirrm lib/samba/rpc
@dirrm lib/samba/pdb
@dirrm lib/samba/idmap
@dirrm lib/samba/charset
@dirrm lib/samba/auth
@unexec rmdir %D/lib/samba/vfs 2>/dev/null || true
@unexec rmdir %D/lib/samba 2>/dev/null || true
%%SMBPASS%%%%EXAMPLESDIR%%/pam_smbpass/README
%%SMBPASS%%%%EXAMPLESDIR%%/pam_smbpass/kdc-pdc
%%SMBPASS%%%%EXAMPLESDIR%%/pam_smbpass/password-mature
@ -434,6 +395,7 @@ share/swat/help/net.8.html
share/swat/help/nmbd.8.html
share/swat/help/nmblookup.1.html
share/swat/help/ntlm_auth.1.html
share/swat/help/pam_winbind.8.html
share/swat/help/pdbedit.8.html
share/swat/help/profiles.1.html
share/swat/help/rpcclient.1.html
@ -476,16 +438,6 @@ share/swat/images/viewconfig.gif
share/swat/images/wizard.gif
share/swat/include/footer.html
share/swat/include/header.html
share/swat/lang/ja/help/welcome.html
share/swat/lang/tr/help/welcome.html
share/swat/lang/tr/images/globals.gif
share/swat/lang/tr/images/home.gif
share/swat/lang/tr/images/passwd.gif
share/swat/lang/tr/images/printers.gif
share/swat/lang/tr/images/samba.gif
share/swat/lang/tr/images/shares.gif
share/swat/lang/tr/images/status.gif
share/swat/lang/tr/images/viewconfig.gif
share/swat/using_samba/appa.html
share/swat/using_samba/appb.html
share/swat/using_samba/appc.html
@ -651,15 +603,6 @@ share/swat/using_samba/samba2_xs.gif
share/swat/using_samba/toc.html
@dirrm share/swat/using_samba/figs
@dirrm share/swat/using_samba
@dirrm share/swat/lang/tr/include
@dirrm share/swat/lang/tr/images
@dirrm share/swat/lang/tr/help
@dirrm share/swat/lang/tr
@dirrm share/swat/lang/ja/include
@dirrm share/swat/lang/ja/images
@dirrm share/swat/lang/ja/help
@dirrm share/swat/lang/ja
@dirrm share/swat/lang
@dirrm share/swat/include
@dirrm share/swat/images
@dirrm share/swat/help/images