aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--net/samba32/Makefile5
-rw-r--r--net/samba32/distinfo6
-rw-r--r--net/samba32/files/patch-Makefile.in46
-rw-r--r--net/samba32/files/patch-configure.in4
-rw-r--r--net/samba32/files/patch-lib__iconv.c4
-rw-r--r--net/samba32/files/patch-lib__replace__libreplace_cc.m44
-rw-r--r--net/samba32/files/patch-m4__aclocal.m44
-rw-r--r--net/samba32/files/patch-nsswitch__pam_winbind.c4
-rw-r--r--net/samba32/files/patch-nsswitch__wins_freebsd.c4
-rw-r--r--net/samba32/files/patch-smbd__quotas.c4
-rw-r--r--net/samba32/files/patch-smbd__statvfs.c4
-rw-r--r--net/samba32/files/patch-utils__net_time.c4
-rw-r--r--net/samba32/pkg-plist.swat2
13 files changed, 66 insertions, 29 deletions
diff --git a/net/samba32/Makefile b/net/samba32/Makefile
index 8ddbb6374055..27ea1dd03882 100644
--- a/net/samba32/Makefile
+++ b/net/samba32/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= samba
-PORTVERSION?= 3.2.11
+PORTVERSION?= 3.2.13
CATEGORIES?= net
MASTER_SITES= ${MASTER_SITE_SAMBA}
MASTER_SITE_SUBDIR= . old-versions rc pre
@@ -303,8 +303,7 @@ MAN8= eventlogadm.8 net.8 nmbd.8 pdbedit.8 smbd.8 smbpasswd.8 \
.if !defined(WITHOUT_WINBIND)
MAN1+= wbinfo.1
-MAN7+= pam_winbind.7
-MAN8+= winbindd.8
+MAN8+= pam_winbind.8 winbindd.8
.endif
.if !defined(WITHOUT_SWAT)
diff --git a/net/samba32/distinfo b/net/samba32/distinfo
index 721dfcfc332f..054f1ad7fb02 100644
--- a/net/samba32/distinfo
+++ b/net/samba32/distinfo
@@ -1,3 +1,3 @@
-MD5 (samba-3.2.11.tar.gz) = fc514bc92184b9b64544afa457e4d84e
-SHA256 (samba-3.2.11.tar.gz) = 5db81a9bd2842e7bf5f2fe8eeb0533eb59e6bb75a7d5f79f9e04c13baec32ef5
-SIZE (samba-3.2.11.tar.gz) = 24399021
+MD5 (samba-3.2.13.tar.gz) = aed1c2df274f504d4e7d4883da4581f6
+SHA256 (samba-3.2.13.tar.gz) = 91223a742183675cb3bb9ba1cc379948e8666e69735f348ea7d3794ce3bc778d
+SIZE (samba-3.2.13.tar.gz) = 24436090
diff --git a/net/samba32/files/patch-Makefile.in b/net/samba32/files/patch-Makefile.in
index 2b72908b1269..f36489170cb0 100644
--- a/net/samba32/files/patch-Makefile.in
+++ b/net/samba32/files/patch-Makefile.in
@@ -1,6 +1,30 @@
---- Makefile.in.orig 2008-12-15 08:11:28.000000000 +0000
-+++ Makefile.in 2009-01-26 01:58:03.000000000 +0000
-@@ -124,9 +124,8 @@
+--- ./Makefile.in.orig 2009-06-22 21:05:38.000000000 +0000
++++ ./Makefile.in 2009-06-26 00:08:10.000000000 +0000
+@@ -45,7 +45,6 @@
+ LDSHFLAGS=@LDSHFLAGS@ @RELRO_LDFLAGS@ @LDFLAGS@
+ LDFLAGS=@PIE_LDFLAGS@ @RELRO_LDFLAGS@ @LDFLAGS@
+
+-WINBIND_NSS_LDSHFLAGS=@WINBIND_NSS_LDSHFLAGS@ @LDFLAGS@
+ AWK=@AWK@
+ PICFLAG=@PICFLAG@
+ DYNEXP=@DYNEXP@
+@@ -64,10 +63,14 @@
+ LDAP_LIBS=@LDAP_LIBS@
+ NSCD_LIBS=@NSCD_LIBS@
+ UUID_LIBS=@UUID_LIBS@
++
+ WINBIND_LIBS=@WINBIND_LIBS@
++WINBIND_NSS_LDSHFLAGS=@WINBIND_NSS_LDSHFLAGS@ @LDFLAGS@
+ WINBIND_NSS_EXTRA_LIBS=@WINBIND_NSS_EXTRA_LIBS@
+-WINBIND_NSS_PTHREAD=@WINBIND_NSS_PTHREAD@
+ PAM_WINBIND_EXTRA_LIBS=@PAM_WINBIND_EXTRA_LIBS@
++WINBIND_WINS_NSS_EXTRA_LIBS=@WINBIND_WINS_NSS_EXTRA_LIBS@
++WINBIND_NSS_PTHREAD=@WINBIND_NSS_PTHREAD@
++
+ DNSSD_LIBS=@DNSSD_LIBS@
+ POPT_LIBS=@POPTLIBS@
+ LIBTALLOC_LIBS=@LIBTALLOC_LIBS@
+@@ -122,9 +125,8 @@
# These can be overridden by command line switches (see smbd(8))
# or in smb.conf (see smb.conf(5))
LOGFILEBASE = @logfilebase@
@@ -11,7 +35,7 @@
# This is where smbpasswd et al go
PRIVATEDIR = @privatedir@
-@@ -153,10 +152,10 @@
+@@ -148,10 +150,10 @@
# the directory where pid files go
PIDDIR = @piddir@
@@ -24,3 +48,17 @@
FLAGS5 = $(FLAGS1) $(FLAGS2) $(FLAGS3) $(FLAGS4)
FLAGS = $(ISA) $(FLAGS5) -I$(srcdir)/lib -D_SAMBA_BUILD_=3
+@@ -962,9 +964,10 @@
+ $(RPCCLIENT_NDR_OBJ) \
+ $(PRIVILEGES_BASIC_OBJ)
+
+-WINBIND_WINS_NSS_OBJ = nsswitch/wins.o $(PARAM_OBJ) \
+- $(LIBSMB_OBJ) $(LIB_NONSMBD_OBJ) $(NSSWINS_OBJ) $(KRBCLIENT_OBJ) \
+- $(LIBNDR_GEN_OBJ0)
++WINBIND_WINS_NSS_OBJ = nsswitch/wins.o @WINBIND_WINS_NSS_EXTRA_OBJS@ \
++ $(PARAM_OBJ) $(LIBSMB_OBJ) $(LDB_OBJ) $(KRBCLIENT_OBJ) \
++ $(LIB_NONSMBD_OBJ) \
++ $(LIBNDR_GEN_OBJ0)
+
+ PAM_SMBPASS_OBJ_0 = pam_smbpass/pam_smb_auth.o pam_smbpass/pam_smb_passwd.o \
+ pam_smbpass/pam_smb_acct.o pam_smbpass/support.o
diff --git a/net/samba32/files/patch-configure.in b/net/samba32/files/patch-configure.in
index b04851d13ebd..7a2a92130820 100644
--- a/net/samba32/files/patch-configure.in
+++ b/net/samba32/files/patch-configure.in
@@ -1,5 +1,5 @@
---- configure.in.orig 2009-02-03 16:10:07.000000000 +0000
-+++ configure.in 2009-02-08 16:14:09.000000000 +0000
+--- ./configure.in.orig 2009-06-22 21:05:38.000000000 +0000
++++ ./configure.in 2009-06-25 23:59:12.000000000 +0000
@@ -184,16 +184,6 @@
fi
fi
diff --git a/net/samba32/files/patch-lib__iconv.c b/net/samba32/files/patch-lib__iconv.c
index 8e62d60933ae..9594ca9d8e35 100644
--- a/net/samba32/files/patch-lib__iconv.c
+++ b/net/samba32/files/patch-lib__iconv.c
@@ -1,5 +1,5 @@
---- ./lib/iconv.c.orig 2008-12-19 13:57:33.000000000 +0000
-+++ ./lib/iconv.c 2009-01-06 17:10:53.000000000 +0000
+--- ./lib/iconv.c.orig 2009-06-22 21:05:38.000000000 +0000
++++ ./lib/iconv.c 2009-06-25 20:49:35.000000000 +0000
@@ -136,7 +136,7 @@
char **outbuf, size_t *outbytesleft)
{
diff --git a/net/samba32/files/patch-lib__replace__libreplace_cc.m4 b/net/samba32/files/patch-lib__replace__libreplace_cc.m4
index 28244a7fe3ed..4b3c86a7c6c7 100644
--- a/net/samba32/files/patch-lib__replace__libreplace_cc.m4
+++ b/net/samba32/files/patch-lib__replace__libreplace_cc.m4
@@ -1,5 +1,5 @@
---- ./lib/replace/libreplace_cc.m4.orig 2008-12-19 13:57:33.000000000 +0000
-+++ ./lib/replace/libreplace_cc.m4 2009-01-06 17:10:53.000000000 +0000
+--- ./lib/replace/libreplace_cc.m4.orig 2009-06-22 21:05:38.000000000 +0000
++++ ./lib/replace/libreplace_cc.m4 2009-06-25 20:49:35.000000000 +0000
@@ -145,6 +145,10 @@
AC_CHECK_TYPE(uintptr_t, unsigned long long)
AC_CHECK_TYPE(ptrdiff_t, unsigned long long)
diff --git a/net/samba32/files/patch-m4__aclocal.m4 b/net/samba32/files/patch-m4__aclocal.m4
index fabdba79100e..2810ad8a2210 100644
--- a/net/samba32/files/patch-m4__aclocal.m4
+++ b/net/samba32/files/patch-m4__aclocal.m4
@@ -1,5 +1,5 @@
---- ./m4/aclocal.m4.orig 2008-12-19 13:57:33.000000000 +0000
-+++ ./m4/aclocal.m4 2009-01-06 17:10:53.000000000 +0000
+--- ./m4/aclocal.m4.orig 2009-06-22 21:05:38.000000000 +0000
++++ ./m4/aclocal.m4 2009-06-25 20:49:35.000000000 +0000
@@ -416,101 +416,79 @@
dnl those with the standalone portable libiconv installed).
AC_MSG_CHECKING(for iconv in $1)
diff --git a/net/samba32/files/patch-nsswitch__pam_winbind.c b/net/samba32/files/patch-nsswitch__pam_winbind.c
index 9098e8190121..1368280d024b 100644
--- a/net/samba32/files/patch-nsswitch__pam_winbind.c
+++ b/net/samba32/files/patch-nsswitch__pam_winbind.c
@@ -1,5 +1,5 @@
---- ./nsswitch/pam_winbind.c.orig 2008-12-19 13:57:33.000000000 +0000
-+++ ./nsswitch/pam_winbind.c 2009-01-06 17:10:53.000000000 +0000
+--- ./nsswitch/pam_winbind.c.orig 2009-06-22 21:05:38.000000000 +0000
++++ ./nsswitch/pam_winbind.c 2009-06-25 20:49:35.000000000 +0000
@@ -39,14 +39,14 @@
const void *_item)
{
diff --git a/net/samba32/files/patch-nsswitch__wins_freebsd.c b/net/samba32/files/patch-nsswitch__wins_freebsd.c
index 17efec3bca40..18e9edd1b900 100644
--- a/net/samba32/files/patch-nsswitch__wins_freebsd.c
+++ b/net/samba32/files/patch-nsswitch__wins_freebsd.c
@@ -1,5 +1,5 @@
---- ./nsswitch/wins_freebsd.c.orig 2009-01-06 17:10:53.000000000 +0000
-+++ ./nsswitch/wins_freebsd.c 2009-01-06 17:10:53.000000000 +0000
+--- ./nsswitch/wins_freebsd.c.orig 2009-06-25 20:49:35.000000000 +0000
++++ ./nsswitch/wins_freebsd.c 2009-06-25 20:49:35.000000000 +0000
@@ -0,0 +1,112 @@
+/*
+ Unix SMB/CIFS implementation.
diff --git a/net/samba32/files/patch-smbd__quotas.c b/net/samba32/files/patch-smbd__quotas.c
index 9e8bb2375b9d..7b197e288871 100644
--- a/net/samba32/files/patch-smbd__quotas.c
+++ b/net/samba32/files/patch-smbd__quotas.c
@@ -1,5 +1,5 @@
---- ./smbd/quotas.c.orig 2008-12-19 13:57:33.000000000 +0000
-+++ ./smbd/quotas.c 2009-01-06 17:10:53.000000000 +0000
+--- ./smbd/quotas.c.orig 2009-06-22 21:05:38.000000000 +0000
++++ ./smbd/quotas.c 2009-06-25 20:49:35.000000000 +0000
@@ -1023,6 +1023,8 @@
enum clnt_stat clnt_stat;
bool ret = True;
diff --git a/net/samba32/files/patch-smbd__statvfs.c b/net/samba32/files/patch-smbd__statvfs.c
index d15c4bcfa2d9..43661cf52542 100644
--- a/net/samba32/files/patch-smbd__statvfs.c
+++ b/net/samba32/files/patch-smbd__statvfs.c
@@ -1,5 +1,5 @@
---- ./smbd/statvfs.c.orig 2008-12-19 13:57:33.000000000 +0000
-+++ ./smbd/statvfs.c 2009-01-06 17:10:53.000000000 +0000
+--- ./smbd/statvfs.c.orig 2009-06-22 21:05:38.000000000 +0000
++++ ./smbd/statvfs.c 2009-06-25 20:49:35.000000000 +0000
@@ -3,6 +3,7 @@
VFS API's statvfs abstraction
Copyright (C) Alexander Bokovoy 2005
diff --git a/net/samba32/files/patch-utils__net_time.c b/net/samba32/files/patch-utils__net_time.c
index 155780336feb..2a1ce1514524 100644
--- a/net/samba32/files/patch-utils__net_time.c
+++ b/net/samba32/files/patch-utils__net_time.c
@@ -1,5 +1,5 @@
---- ./utils/net_time.c.orig 2008-12-19 13:57:33.000000000 +0000
-+++ ./utils/net_time.c 2009-01-06 17:10:53.000000000 +0000
+--- ./utils/net_time.c.orig 2009-06-22 21:05:38.000000000 +0000
++++ ./utils/net_time.c 2009-06-25 20:49:35.000000000 +0000
@@ -84,9 +84,15 @@
return "unknown";
}
diff --git a/net/samba32/pkg-plist.swat b/net/samba32/pkg-plist.swat
index 9d55c00a8e21..86752ee783d8 100644
--- a/net/samba32/pkg-plist.swat
+++ b/net/samba32/pkg-plist.swat
@@ -226,7 +226,7 @@ share/swat/help/manpages/net.8.html
share/swat/help/manpages/nmbd.8.html
share/swat/help/manpages/nmblookup.1.html
share/swat/help/manpages/ntlm_auth.1.html
-share/swat/help/manpages/pam_winbind.7.html
+share/swat/help/manpages/pam_winbind.8.html
share/swat/help/manpages/pdbedit.8.html
share/swat/help/manpages/profiles.1.html
share/swat/help/manpages/rpcclient.1.html
generated by cgit (git 2.34.1) at 2024-11-15 23:55:01 +0800