diff options
Diffstat (limited to 'net/samba3')
| -rw-r--r-- | net/samba3/Makefile | 21 | ||||
| -rw-r--r-- | net/samba3/distinfo | 6 | ||||
| -rw-r--r-- | net/samba3/files/patch-Makefile.in | 18 | ||||
| -rw-r--r-- | net/samba3/pkg-plist | 10 |
4 files changed, 19 insertions, 36 deletions
diff --git a/net/samba3/Makefile b/net/samba3/Makefile index 8be83138dd3d..822ef7c64a48 100644 --- a/net/samba3/Makefile +++ b/net/samba3/Makefile @@ -6,7 +6,7 @@ # PORTNAME= samba -PORTVERSION= 3.0.7 +PORTVERSION= 3.0.8 PORTREVISION?= 0 PORTEPOCH?= 1 CATEGORIES?= net @@ -14,12 +14,6 @@ MASTER_SITES= ${MASTER_SITE_SAMBA} MASTER_SITE_SUBDIR= . old-versions rc pre DISTNAME= ${PORTNAME}-${PORTVERSION:S/.p/pre/:S/.r/rc/} -.if defined(WITH_MULTIBYTE) -PATCH_SITES= http://dist.bsdlab.org/ -PATCHFILES= samba-3.0.7-i18n-20040915.bz2 -PATCH_DIST_STRIP= -p0 -.endif - MAINTAINER?= timur@gnu.org COMMENT?= A free SMB and CIFS client and server for UNIX @@ -48,6 +42,8 @@ SAMBA_CONFIG= ${SAMBA_CONFDIR}/smb.conf CONFIGURE_ENV+= CPPFLAGS=-I${LOCALBASE}/include \ LDFLAGS=-L${LOCALBASE}/lib +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} + CONFIGURE_ARGS+= --exec-prefix=${PREFIX} \ --localstatedir=${VARDIR} \ --with-configdir=${SAMBA_CONFDIR} \ @@ -76,8 +72,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 \ - POPT "With installed POPT library" on \ - MULTIBYTE "With multibyte encoding patch" off + POPT "With installed POPT library" on .endif .include <bsd.port.pre.mk> @@ -254,14 +249,6 @@ WINBIND_FILTER= ${SED} -e 's|%%WINBIND%%||g' WINBIND_FILTER= ${GREP} -v '^%%WINBIND%%' .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 - PLIST_SUB+= RC_DIR=${RC_DIR} \ SAMBA_LOGDIR=${SAMBA_LOGDIR} \ SAMBA_LOCKDIR=${SAMBA_LOCKDIR} diff --git a/net/samba3/distinfo b/net/samba3/distinfo index 15d623f51709..207941c56d38 100644 --- a/net/samba3/distinfo +++ b/net/samba3/distinfo @@ -1,4 +1,2 @@ -MD5 (samba-3.0.7.tar.gz) = 5906341429e64214909865a4be92e4ab -SIZE (samba-3.0.7.tar.gz) = 15012667 -MD5 (samba-3.0.7-i18n-20040915.bz2) = f19a3cb34179632563c51c6cf54d3d3d -SIZE (samba-3.0.7-i18n-20040915.bz2) = 17160 +MD5 (samba-3.0.8.tar.gz) = 7088483c858ac362d302acc0c2a1d431 +SIZE (samba-3.0.8.tar.gz) = 15101353 diff --git a/net/samba3/files/patch-Makefile.in b/net/samba3/files/patch-Makefile.in index 742224c32c5c..160a940172f8 100644 --- a/net/samba3/files/patch-Makefile.in +++ b/net/samba3/files/patch-Makefile.in @@ -1,6 +1,6 @@ ---- Makefile.in.orig Thu Aug 19 15:39:11 2004 -+++ Makefile.in Mon Aug 30 22:02:08 2004 -@@ -104,6 +104,7 @@ +--- Makefile.in.orig Sun Nov 7 21:43:23 2004 ++++ Makefile.in Mon Nov 8 17:40:48 2004 +@@ -99,6 +99,7 @@ LIBSMBCLIENT_MAJOR=0 LIBSMBCLIENT_MINOR=1 @@ -8,18 +8,18 @@ FLAGS1 = $(CFLAGS) @FLAGS1@ -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I$(srcdir)/smbwrapper -I. $(CPPFLAGS) -I$(srcdir) FLAGS2 = -@@ -992,8 +993,8 @@ +@@ -989,8 +990,8 @@ @SONAMEFLAG@`basename $@` bin/libsmbclient.@SHLIBEXT@: $(LIBSMBCLIENT_PICOBJS) - @echo Linking libsmbclient shared library $@ -- @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBCLIENT_PICOBJS) $(LDFLAGS) $(DYNEXP) $(LIBS) \ +- @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBCLIENT_PICOBJS) $(LDFLAGS) $(LIBS) \ + @echo Linking libsmbclient shared library $@.$(LIBSMBCLIENT_MAJOR) -+ @$(SHLD) $(LDSHFLAGS) -o $@.$(LIBSMBCLIENT_MAJOR) $(LIBSMBCLIENT_PICOBJS) $(LDFLAGS) $(DYNEXP) $(LIBS) \ ++ @$(SHLD) $(LDSHFLAGS) -o $@.$(LIBSMBCLIENT_MAJOR) $(LIBSMBCLIENT_PICOBJS) $(LDFLAGS) $(LIBS) \ $(KRB5LIBS) $(LDAP_LIBS) \ @SONAMEFLAG@`basename $@`.$(LIBSMBCLIENT_MAJOR) -@@ -1076,13 +1077,13 @@ +@@ -1074,13 +1075,13 @@ @WINBIND_NSS@: $(WINBIND_NSS_PICOBJS) @echo "Linking $@" @$(SHLD) $(WINBIND_NSS_LDSHFLAGS) -o $@ $(WINBIND_NSS_PICOBJS) \ @@ -35,10 +35,10 @@ nsswitch/pam_winbind.@SHLIBEXT@: $(PAM_WINBIND_PICOBJ) bin/.dummy @echo "Linking $@" -@@ -1268,7 +1269,7 @@ +@@ -1276,7 +1277,7 @@ bin/t_snprintf@EXEEXT@: lib/snprintf.c - $(CC) $(FLAGS) -o $@ -DTEST_SNPRINTF lib/snprintf.c -lm + $(CC) $(FLAGS) -o $@ $(DYNEXP) -DTEST_SNPRINTF lib/snprintf.c -lm -install: installbin installman installscripts installdat installswat installmodules @INSTALLCLIENT@ +install: installbin installscripts installdat installswat installmodules diff --git a/net/samba3/pkg-plist b/net/samba3/pkg-plist index 8e947faec697..f907d81f4556 100644 --- a/net/samba3/pkg-plist +++ b/net/samba3/pkg-plist @@ -17,6 +17,7 @@ bin/smbtar bin/smbtree bin/tdbbackup bin/tdbdump +bin/tdbtool bin/testparm bin/testprns %%WINBIND%%bin/wbinfo @@ -44,7 +45,6 @@ lib/samba/vfs/cap.so lib/samba/vfs/default_quota.so lib/samba/vfs/expand_msdfs.so lib/samba/vfs/extd_audit.so -%%MULTIBYTE%%lib/samba/vfs/hex.so lib/samba/vfs/fake_perms.so lib/samba/vfs/full_audit.so lib/samba/vfs/netatalk.so @@ -127,6 +127,8 @@ lib/samba/charset/CP850.so %%EXAMPLESDIR%%/VFS/skel_transparent.c %%EXAMPLESDIR%%/auth/Makefile %%EXAMPLESDIR%%/auth/auth_skel.c +%%EXAMPLESDIR%%/auth/crackcheck/Makefile +%%EXAMPLESDIR%%/auth/crackcheck/crackcheck.c %%EXAMPLESDIR%%/autofs/auto.smb %%EXAMPLESDIR%%/dce-dfs/README %%EXAMPLESDIR%%/dce-dfs/smb.conf @@ -191,6 +193,7 @@ lib/samba/charset/CP850.so @dirrm %%EXAMPLESDIR%%/genlogon @dirrm %%EXAMPLESDIR%%/dce-dfs @dirrm %%EXAMPLESDIR%%/autofs +@dirrm %%EXAMPLESDIR%%/auth/crackcheck @dirrm %%EXAMPLESDIR%%/auth @dirrm %%EXAMPLESDIR%%/VFS @dirrm %%EXAMPLESDIR%%/LDAP/smbldap-tools/mkntpwd @@ -472,10 +475,6 @@ 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/ja/include/footer.html -share/swat/lang/ja/include/header.html -share/swat/lang/ja/include/header.nocss.html -share/swat/lang/ja/include/header_css.html share/swat/lang/tr/help/welcome.html share/swat/lang/tr/images/globals.gif share/swat/lang/tr/images/home.gif @@ -485,7 +484,6 @@ 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/lang/tr/include/header.html share/swat/using_samba/appa.html share/swat/using_samba/appb.html share/swat/using_samba/appc.html |